diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ceb94dc09df..9eaeefdb12d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,19 +1,21 @@
 # Debian version
-ARG VARIANT="buster"
+ARG VARIANT="bookworm"
 FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
 
 # Install PHP
+RUN apt-get -y update && apt-get -y install software-properties-common 
+RUN add-apt-repository ppa:ondrej/php
 RUN apt-get -y update
-RUN apt-get -y install php php-xml php-mbstring php-curl php-zip php-xdebug
+RUN apt-get -y install php8.4 php8.4-xml php8.4-mbstring php8.4-curl php8.4-zip php8.4-xdebug
 
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 # Install MySQL
-RUN apt-get -y install mysql-server php-mysql
+RUN apt-get -y install mysql-server php8.4-mysql
 
 # Xdebug
-ADD resources/xdebug.ini /etc/php/8.1/apache2/conf.d/xdebug.ini
+ADD resources/xdebug.ini /etc/php/8.4/apache2/conf.d/xdebug.ini
 
 # Configure Apache
 RUN echo "Listen 8080" >> /etc/apache2/ports.conf && \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/customisations-team/devcontainer.json
similarity index 74%
rename from .devcontainer/devcontainer.json
rename to .devcontainer/customisations-team/devcontainer.json
index 7bb0e9cc3a3..5a0803656e0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/customisations-team/devcontainer.json
@@ -1,12 +1,12 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.238.1/containers/ubuntu
 {
-	"name": "Ubuntu",
+	"name": "phpBB (Customisations Team)",
 	"build": {
-		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick an Ubuntu version: jammy / ubuntu-22.04, focal / ubuntu-20.04, bionic /ubuntu-18.04
-		// Use ubuntu-22.04 or ubuntu-18.04 on local arm64/Apple Silicon.
-		"args": { "VARIANT": "ubuntu-22.04" }
+		"dockerfile": "../Dockerfile",
+		"args": { 
+			"VARIANT": "ubuntu-22.04"
+		}
 	},
 
 	// Configure tool-specific properties.
@@ -27,7 +27,7 @@
 	"forwardPorts": [80, 9003],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postStartCommand": "bash .devcontainer/resources/setup.sh",
+	"postStartCommand": "bash .devcontainer/customisations-team/setup.sh",
 
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode",
diff --git a/.devcontainer/customisations-team/phpbb-config.yml b/.devcontainer/customisations-team/phpbb-config.yml
new file mode 100644
index 00000000000..1ddc1f4247c
--- /dev/null
+++ b/.devcontainer/customisations-team/phpbb-config.yml
@@ -0,0 +1,37 @@
+installer:
+    admin:
+        name: admin
+        password: adminadmin
+        email: admin@example.org
+
+    board:
+        lang: en
+        name: My Board (with Titania)
+        description: My amazing new phpBB board (with Titania)
+
+    database:
+        dbms: mysqli
+        dbhost: 127.0.0.1
+        dbport: 3306
+        dbuser: phpbb
+        dbpasswd: phpbb
+        dbname: phpbb
+        table_prefix: phpbb_
+
+    email:
+        enabled: false
+        smtp_delivery : ~
+        smtp_host: ~
+        smtp_port: ~
+        smtp_user: ~
+        smtp_pass: ~
+
+    server:
+        cookie_secure: false
+        server_protocol: http://
+        force_server_vars: true
+        server_name: localhost
+        server_port: 80
+        script_path: /
+
+    extensions: ["phpbb/titania"]
diff --git a/.devcontainer/customisations-team/setup.sh b/.devcontainer/customisations-team/setup.sh
new file mode 100644
index 00000000000..a29d5681b61
--- /dev/null
+++ b/.devcontainer/customisations-team/setup.sh
@@ -0,0 +1,81 @@
+# setup.sh - Customisations Team
+# Commands to install and configure phpBB
+echo "[Codespaces] Customisations Team configuration..."
+
+# Start MySQL
+echo "[Codespaces] Start MySQL"
+sudo service mysql start
+
+# Start Apache
+echo "[Codespaces] Start Apache"
+sudo apache2ctl start
+
+# Create a MySQL user to use
+echo "[Codespaces] Create MySQL user"
+sudo mysql -u root<<EOFMYSQL
+    CREATE USER 'phpbb'@'localhost' IDENTIFIED BY 'phpbb';
+    GRANT ALL PRIVILEGES ON *.* TO 'phpbb'@'localhost' WITH GRANT OPTION;
+    CREATE DATABASE IF NOT EXISTS phpbb;
+EOFMYSQL
+
+# Symlink the webroot so it can be viewed
+echo "[Codespaces] Create Symlink of webroot"
+sudo rm -rf /var/www/html
+sudo ln -s /workspaces/phpbb/phpBB /var/www/html
+
+# Force the server URL to reflect the Codespace
+# https://docs.github.com/en/codespaces/developing-in-a-codespace/default-environment-variables-for-your-codespace
+if [ "$CODESPACES" = true ] ; then
+    cp /workspaces/phpbb/.devcontainer/customisations-team/phpbb-config.yml /tmp/phpbb-config.yml
+    CODESPACES_URL="${CODESPACE_NAME}-80.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
+    echo "[Codespaces] Set the phpBB server name using default environment variables: $CODESPACES_URL"
+    sed -i "s/localhost/$CODESPACES_URL/g" /tmp/phpbb-config.yml
+fi
+
+URL_EPV="https://github.com/phpbb/epv"
+URL_TV="https://github.com/phpbb/phpbb-translation-validator"
+URL_TITANIA="https://github.com/phpbb/customisation-db.git"
+
+# Install Titania
+echo "[Codespaces] Install Titania"
+cd /workspaces/
+git clone -b oberon $URL_TITANIA titania
+cd /workspaces/titania
+chmod 755 files store
+composer install --no-interaction
+chmod 755 /workspaces/phpbb/phpBB/ext
+mkdir /workspaces/phpbb/phpBB/ext/phpbb
+sudo ln -s /workspaces/titania /workspaces/phpbb/phpBB/ext/phpbb/titania
+
+# Install EPV
+echo "[Codespaces] Install EPV"
+cd /workspaces/
+git clone -b master $URL_EPV epv
+cd /workspaces/epv
+composer install --no-interaction
+rm -rf /workspaces/phpbb/phpBB/ext/phpbb/titania/vendor/phpbb/epv
+sudo ln -s /workspaces/epv /workspaces/phpbb/phpBB/ext/phpbb/titania/vendor/phpbb/epv
+
+# Install Translation Validator
+echo "[Codespaces] Install Translation Validator"
+cd /workspaces/
+git clone -b master $URL_TV translation-validator
+cd /workspaces/translation-validator
+composer install --no-interaction
+rm -rf /workspaces/phpbb/phpBB/ext/phpbb/titania/vendor/phpbb/translation-validator
+sudo ln -s /workspaces/translation-validator /workspaces/phpbb/phpBB/ext/phpbb/titania/vendor/phpbb/translation-validator
+
+# Install phpBB (last so that the extension is auto-installed)
+echo "[Codespaces] Run phpBB CLI installation"
+cd /workspaces/phpbb/phpBB && composer install --no-interaction
+sudo php /workspaces/phpbb/phpBB/install/phpbbcli.php install /tmp/phpbb-config.yml
+rm -rf /workspaces/phpbb/phpBB/install
+
+# Set to debug mode
+sed -i \
+  -e "s|@define('PHPBB_ENVIRONMENT', 'production');|@define('PHPBB_ENVIRONMENT', 'development');|" \
+  -e "s|// *@define('DEBUG_CONTAINER', true);|@define('DEBUG_CONTAINER', true);|" \
+  /workspaces/phpbb/phpBB/config.php
+
+# Finished
+echo "[Codespaces] phpBB (Customisation Team) installation completed"
diff --git a/.devcontainer/development-team/devcontainer.json b/.devcontainer/development-team/devcontainer.json
new file mode 100644
index 00000000000..729eb1c48e4
--- /dev/null
+++ b/.devcontainer/development-team/devcontainer.json
@@ -0,0 +1,37 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.1/containers/ubuntu
+{
+	"name": "phpBB (Development Team)",
+	"build": {
+		"dockerfile": "../Dockerfile",
+		"args": { 
+			"VARIANT": "ubuntu-22.04"
+		}
+	},
+
+	// Configure tool-specific properties.
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			"settings": {
+				// Allow Xdebug to listen to requests from remote (or container)
+				"remote.localPortHost": "allInterfaces"
+			},
+			//"devPort": {},
+			// Specify which VS Code extensions to install (List of IDs)
+			"extensions": ["xdebug.php-debug"]
+			}
+		},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"forwardPorts": [80, 9003],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postStartCommand": "bash .devcontainer/development-team/setup.sh",
+
+	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode",
+	"features": {
+		"github-cli": "latest"
+	}
+}
diff --git a/.devcontainer/resources/phpbb-config.yml b/.devcontainer/development-team/phpbb-config.yml
similarity index 92%
rename from .devcontainer/resources/phpbb-config.yml
rename to .devcontainer/development-team/phpbb-config.yml
index 9a9db6abff7..21ff0fd9ca3 100644
--- a/.devcontainer/resources/phpbb-config.yml
+++ b/.devcontainer/development-team/phpbb-config.yml
@@ -23,14 +23,13 @@ installer:
         smtp_delivery : ~
         smtp_host: ~
         smtp_port: ~
-        smtp_auth: ~
         smtp_user: ~
         smtp_pass: ~
 
     server:
         cookie_secure: false
         server_protocol: http://
-        force_server_vars: false
+        force_server_vars: true
         server_name: localhost
         server_port: 80
         script_path: /
diff --git a/.devcontainer/development-team/setup.sh b/.devcontainer/development-team/setup.sh
new file mode 100644
index 00000000000..70fdf0bf6d8
--- /dev/null
+++ b/.devcontainer/development-team/setup.sh
@@ -0,0 +1,50 @@
+# setup.sh - Development Team
+# Commands to install and configure phpBB
+echo "[Codespaces] Development Team configuration..."
+
+# Start MySQL
+echo "[Codespaces] Start MySQL"
+sudo service mysql start
+
+# Start Apache
+echo "[Codespaces] Start Apache"
+sudo apache2ctl start
+
+# Create a MySQL user to use
+echo "[Codespaces] Create MySQL user"
+sudo mysql -u root<<EOFMYSQL
+    CREATE USER 'phpbb'@'localhost' IDENTIFIED BY 'phpbb';
+    GRANT ALL PRIVILEGES ON *.* TO 'phpbb'@'localhost' WITH GRANT OPTION;
+    CREATE DATABASE IF NOT EXISTS phpbb;
+EOFMYSQL
+
+# Download dependencies
+echo "[Codespaces] Install Composer dependencies"
+composer install --no-interaction
+
+# Symlink the webroot so it can be viewed
+echo "[Codespaces] Create Symlink of webroot"
+sudo rm -rf /var/www/html
+sudo ln -s /workspaces/phpbb/phpBB /var/www/html
+
+# Force the server URL to reflect the Codespace
+# https://docs.github.com/en/codespaces/developing-in-a-codespace/default-environment-variables-for-your-codespace
+if [ "$CODESPACES" = true ] ; then
+    cp /workspaces/phpbb/.devcontainer/development-team/phpbb-config.yml /tmp/phpbb-config.yml
+    CODESPACES_URL="${CODESPACE_NAME}-80.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
+    echo "[Codespaces] Set the phpBB server name using default environment variables: $CODESPACES_URL"
+    sed -i "s/localhost/$CODESPACES_URL/g" /tmp/phpbb-config.yml
+fi
+
+# Copy phpBB config
+# echo "[Codespaces] Copy phpBB configuration"
+# cp /workspaces/phpbb/.devcontainer/resources/phpbb-config.yml /workspaces/phpbb/phpBB/install/install-config.yml
+
+# Install phpBB
+echo "[Codespaces] Run phpBB CLI installation"
+cd /workspaces/phpbb/phpBB && composer install --no-interaction
+sudo php /workspaces/phpbb/phpBB/install/phpbbcli.php install /tmp/phpbb-config.yml
+rm -rf /workspaces/phpbb/phpBB/install
+
+# Finished
+echo "[Codespaces] phpBB (Development Team) installation completed"
diff --git a/.devcontainer/resources/setup.sh b/.devcontainer/resources/setup.sh
deleted file mode 100644
index b871db11dfb..00000000000
--- a/.devcontainer/resources/setup.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-# setup.sh
-# Commands to install and configure phpBB
-
-# Start MySQL
-echo "[Codespaces] Start MySQL"
-sudo service mysql start
-
-# Start Apache
-echo "[Codespaces] Start Apache"
-sudo service apache2 start
-
-# Add SSH key
-echo "[Codespaces] Add SSH key"
-echo "$SSH_KEY" > /home/vscode/.ssh/id_rsa && chmod 600 /home/vscode/.ssh/id_rsa
-
-# Create a MySQL user to use
-echo "[Codespaces] Create MySQL user"
-sudo mysql -u root<<EOFMYSQL
-    CREATE USER 'phpbb'@'localhost' IDENTIFIED BY 'phpbb';
-    GRANT ALL PRIVILEGES ON *.* TO 'phpbb'@'localhost' WITH GRANT OPTION;
-    CREATE DATABASE IF NOT EXISTS phpbb;
-EOFMYSQL
-
-# Download dependencies
-echo "[Codespaces] Install Composer dependencies"
-composer install --no-interaction
-
-# Symlink the webroot so it can be viewed
-echo "[Codespaces] Create Symlink of webroot"
-sudo rm -rf /var/www/html
-sudo ln -s /workspaces/phpbb/phpBB /var/www/html
-
-# Copy phpBB config
-echo "[Codespaces] Copy phpBB configuration"
-cp /workspaces/phpbb/.devcontainer/resources/phpbb-config.yml /workspaces/phpbb/phpBB/install/install-config.yml
-
-# Install phpBB
-echo "[Codespaces] Run phpBB CLI installation"
-cd /workspaces/phpbb/phpBB && composer install --no-interaction
-sudo php /workspaces/phpbb/phpBB/install/phpbbcli.php install /workspaces/phpbb/phpBB/install/install-config.yml
-rm -rf /workspaces/phpbb/phpBB/install
-
-# Finished
-echo "[Codespaces] phpBB installation completed"
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 179d83d8372..c7bec59af96 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,4 +7,4 @@ Checklist:
 
 Tracker ticket:
 
-https://tracker.phpbb.com/browse/PHPBB3-12345
+https://tracker.phpbb.com/browse/PHPBB-12345
diff --git a/.github/check-js.sh b/.github/check-js.sh
index 702ec03cbf1..85518ca5010 100755
--- a/.github/check-js.sh
+++ b/.github/check-js.sh
@@ -14,5 +14,5 @@ set +x
 sudo npm install -g > /dev/null
 npm ci > /dev/null
 set -x
-node_modules/eslint/bin/eslint.js "phpBB/**/*.js"
-node_modules/eslint/bin/eslint.js "gulpfile.js"
+node_modules/eslint/bin/eslint.js "phpBB/**/*.js" --ignore-pattern "phpBB/ext/"
+node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig" --ignore-pattern "phpBB/ext/"
diff --git a/.github/phpunit-mariadb-github.xml b/.github/phpunit-mariadb-github.xml
index 74b3b854834..d5ab282b3d1 100644
--- a/.github/phpunit-mariadb-github.xml
+++ b/.github/phpunit-mariadb-github.xml
@@ -1,39 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests</directory>
-			<exclude>../tests/functional</exclude>
-			<exclude>../tests/lint_test.php</exclude>
-		</testsuite>
-		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php">../tests/functional</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<server name="PHPBB_TEST_DBMS" value="mysqli" />
-		<server name="PHPBB_TEST_DBHOST" value="0.0.0.0" />
-		<server name="PHPBB_TEST_DBPORT" value="3306" />
-		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
-		<server name="PHPBB_TEST_DBUSER" value="root" />
-		<server name="PHPBB_TEST_DBPASSWD" value="" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
-	</php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		backupGlobals="true"
+		colors="true"
+		processIsolation="false"
+		stopOnFailure="false"
+		bootstrap="../tests/bootstrap.php"
+		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+		cacheDirectory=".phpunit.cache"
+		backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="phpBB Test Suite">
+      <directory suffix="_test.php">../tests</directory>
+      <exclude>../tests/functional</exclude>
+      <exclude>../tests/lint_test.php</exclude>
+    </testsuite>
+    <testsuite name="phpBB Functional Tests">
+      <directory suffix="_test.php">../tests/functional</directory>
+    </testsuite>
+  </testsuites>
+  <groups>
+    <exclude>
+      <group>slow</group>
+    </exclude>
+  </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">../phpBB/</directory>
+      <directory suffix=".php">../tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">../phpBB/vendor/</directory>
+      <directory suffix=".php">../phpBB/cache/</directory>
+      <directory suffix=".php">../phpBB/develop/</directory>
+      <directory suffix=".php">../phpBB/store/</directory>
+    </exclude>
+  </source>
+  <php>
+    <server name="PHPBB_TEST_DBMS" value="mysqli"/>
+    <server name="PHPBB_TEST_DBHOST" value="0.0.0.0"/>
+    <server name="PHPBB_TEST_DBPORT" value="3306"/>
+    <server name="PHPBB_TEST_DBNAME" value="phpbb_tests"/>
+    <server name="PHPBB_TEST_DBUSER" value="root"/>
+    <server name="PHPBB_TEST_DBPASSWD" value=""/>
+    <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
+    <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/"/>
+  </php>
 </phpunit>
diff --git a/.github/phpunit-mssql-github.xml b/.github/phpunit-mssql-github.xml
index 37c1deae2d3..bd240fa534b 100644
--- a/.github/phpunit-mssql-github.xml
+++ b/.github/phpunit-mssql-github.xml
@@ -1,41 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests</directory>
-			<exclude>../tests/functional</exclude>
-			<exclude>../tests/lint_test.php</exclude>
-		</testsuite>
-		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php">../tests/functional</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mssqlnative" />
-		<server name="PHPBB_TEST_DBHOST" value="127.0.0.1" />
-		<server name="PHPBB_TEST_DBPORT" value="" />
-		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
-		<server name="PHPBB_TEST_DBUSER" value="sa" />
-		<server name="PHPBB_TEST_DBPASSWD" value="Pssw0rd_12" />
-		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
-		<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
-	</php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		backupGlobals="true"
+		colors="true"
+		processIsolation="false"
+		stopOnFailure="false"
+		bootstrap="../tests/bootstrap.php"
+		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+		cacheDirectory=".phpunit.cache"
+		backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="phpBB Test Suite">
+      <directory suffix="_test.php">../tests</directory>
+      <exclude>../tests/functional</exclude>
+      <exclude>../tests/lint_test.php</exclude>
+    </testsuite>
+    <testsuite name="phpBB Functional Tests">
+      <directory suffix="_test.php">../tests/functional</directory>
+    </testsuite>
+  </testsuites>
+  <groups>
+    <exclude>
+      <group>slow</group>
+    </exclude>
+  </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">../phpBB/</directory>
+      <directory suffix=".php">../tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">../phpBB/vendor/</directory>
+      <directory suffix=".php">../phpBB/cache/</directory>
+      <directory suffix=".php">../phpBB/develop/</directory>
+      <directory suffix=".php">../phpBB/store/</directory>
+    </exclude>
+  </source>
+  <php>
+    <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mssqlnative"/>
+    <server name="PHPBB_TEST_DBHOST" value="127.0.0.1"/>
+    <server name="PHPBB_TEST_DBPORT" value=""/>
+    <server name="PHPBB_TEST_DBNAME" value="phpbb_tests"/>
+    <server name="PHPBB_TEST_DBUSER" value="sa"/>
+    <server name="PHPBB_TEST_DBPASSWD" value="Pssw0rd_12"/>
+    <server name="PHPBB_TEST_REDIS_HOST" value="localhost"/>
+    <server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost"/>
+    <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
+    <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/"/>
+  </php>
 </phpunit>
diff --git a/.github/phpunit-mysql-github.xml b/.github/phpunit-mysql-github.xml
index d14359d6183..ff42cf36dfd 100644
--- a/.github/phpunit-mysql-github.xml
+++ b/.github/phpunit-mysql-github.xml
@@ -1,41 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests</directory>
-			<exclude>../tests/functional</exclude>
-			<exclude>../tests/lint_test.php</exclude>
-		</testsuite>
-		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php">../tests/functional</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysqli" />
-		<server name="PHPBB_TEST_DBHOST" value="0.0.0.0" />
-		<server name="PHPBB_TEST_DBPORT" value="3306" />
-		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
-		<server name="PHPBB_TEST_DBUSER" value="root" />
-		<server name="PHPBB_TEST_DBPASSWD" value="" />
-		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
-		<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
-	</php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		backupGlobals="true"
+		colors="true"
+		processIsolation="false"
+		stopOnFailure="false"
+		bootstrap="../tests/bootstrap.php"
+		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+		cacheDirectory=".phpunit.cache"
+		backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="phpBB Test Suite">
+      <directory suffix="_test.php">../tests</directory>
+      <exclude>../tests/functional</exclude>
+      <exclude>../tests/lint_test.php</exclude>
+    </testsuite>
+    <testsuite name="phpBB Functional Tests">
+      <directory suffix="_test.php">../tests/functional</directory>
+    </testsuite>
+  </testsuites>
+  <groups>
+    <exclude>
+      <group>slow</group>
+    </exclude>
+  </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">../phpBB/</directory>
+      <directory suffix=".php">../tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">../phpBB/vendor/</directory>
+      <directory suffix=".php">../phpBB/cache/</directory>
+      <directory suffix=".php">../phpBB/develop/</directory>
+      <directory suffix=".php">../phpBB/store/</directory>
+    </exclude>
+  </source>
+  <php>
+    <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysqli"/>
+    <server name="PHPBB_TEST_DBHOST" value="0.0.0.0"/>
+    <server name="PHPBB_TEST_DBPORT" value="3306"/>
+    <server name="PHPBB_TEST_DBNAME" value="phpbb_tests"/>
+    <server name="PHPBB_TEST_DBUSER" value="root"/>
+    <server name="PHPBB_TEST_DBPASSWD" value=""/>
+    <server name="PHPBB_TEST_REDIS_HOST" value="localhost"/>
+    <server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost"/>
+    <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
+    <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/"/>
+  </php>
 </phpunit>
diff --git a/.github/phpunit-postgres-github.xml b/.github/phpunit-postgres-github.xml
index 2648f27befd..1636901039f 100644
--- a/.github/phpunit-postgres-github.xml
+++ b/.github/phpunit-postgres-github.xml
@@ -1,41 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests</directory>
-			<exclude>../tests/functional</exclude>
-			<exclude>../tests/lint_test.php</exclude>
-		</testsuite>
-		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php">../tests/functional</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
-		<server name="PHPBB_TEST_DBHOST" value="localhost" />
-		<server name="PHPBB_TEST_DBPORT" value="5432" />
-		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
-		<server name="PHPBB_TEST_DBUSER" value="postgres" />
-		<server name="PHPBB_TEST_DBPASSWD" value="postgres" />
-		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
-		<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
-	</php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		backupGlobals="true"
+		colors="true"
+		processIsolation="false"
+		stopOnFailure="false"
+		bootstrap="../tests/bootstrap.php"
+		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+		cacheDirectory=".phpunit.cache"
+		backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="phpBB Test Suite">
+      <directory suffix="_test.php">../tests</directory>
+      <exclude>../tests/functional</exclude>
+      <exclude>../tests/lint_test.php</exclude>
+    </testsuite>
+    <testsuite name="phpBB Functional Tests">
+      <directory suffix="_test.php">../tests/functional</directory>
+    </testsuite>
+  </testsuites>
+  <groups>
+    <exclude>
+      <group>slow</group>
+    </exclude>
+  </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">../phpBB/</directory>
+      <directory suffix=".php">../tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">../phpBB/vendor/</directory>
+      <directory suffix=".php">../phpBB/cache/</directory>
+      <directory suffix=".php">../phpBB/develop/</directory>
+      <directory suffix=".php">../phpBB/store/</directory>
+    </exclude>
+  </source>
+  <php>
+    <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
+    <server name="PHPBB_TEST_DBHOST" value="localhost"/>
+    <server name="PHPBB_TEST_DBPORT" value="5432"/>
+    <server name="PHPBB_TEST_DBNAME" value="phpbb_tests"/>
+    <server name="PHPBB_TEST_DBUSER" value="postgres"/>
+    <server name="PHPBB_TEST_DBPASSWD" value="postgres"/>
+    <server name="PHPBB_TEST_REDIS_HOST" value="localhost"/>
+    <server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost"/>
+    <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
+    <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/"/>
+  </php>
 </phpunit>
diff --git a/.github/phpunit-psql-windows-github.xml b/.github/phpunit-psql-windows-github.xml
index 5f131bae80f..7e71405e484 100644
--- a/.github/phpunit-psql-windows-github.xml
+++ b/.github/phpunit-psql-windows-github.xml
@@ -1,41 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		backupGlobals="true"
+		colors="true"
+		processIsolation="false"
+		stopOnFailure="false"
+		bootstrap="../tests/bootstrap.php"
+		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+		cacheDirectory=".phpunit.cache"
+		backupStaticProperties="false"
+		timeoutForSmallTests="60"
+		timeoutForMediumTests="300"
+		timeoutForLargeTests="600">
 	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests</directory>
-			<exclude>../tests/functional</exclude>
-			<exclude>../tests/lint_test.php</exclude>
-		</testsuite>
-		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php">../tests/functional</directory>
-		</testsuite>
+	<testsuite name="phpBB Test Suite">
+		<directory suffix="_test.php">../tests</directory>
+		<exclude>../tests/functional</exclude>
+		<exclude>../tests/lint_test.php</exclude>
+	</testsuite>
+	<testsuite name="phpBB Functional Tests">
+		<directory suffix="_test.php">../tests/functional</directory>
+	</testsuite>
 	</testsuites>
-
 	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
+	<exclude>
+		<group>slow</group>
+	</exclude>
 	</groups>
-
+	<source restrictDeprecations="true">
+	<include>
+		<directory suffix=".php">../phpBB/</directory>
+		<directory suffix=".php">../tests/</directory>
+	</include>
+	<exclude>
+		<directory suffix=".php">../phpBB/vendor/</directory>
+		<directory suffix=".php">../phpBB/cache/</directory>
+		<directory suffix=".php">../phpBB/develop/</directory>
+		<directory suffix=".php">../phpBB/store/</directory>
+	</exclude>
+	</source>
 	<php>
-		<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
-		<server name="PHPBB_TEST_DBHOST" value="localhost" />
-		<server name="PHPBB_TEST_DBPORT" value="5432" />
-		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
-		<server name="PHPBB_TEST_DBUSER" value="postgres" />
-		<server name="PHPBB_TEST_DBPASSWD" value="root" />
-		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
-		<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://phpbb.test/" />
+	<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
+	<server name="PHPBB_TEST_DBHOST" value="localhost"/>
+	<server name="PHPBB_TEST_DBPORT" value="5432"/>
+	<server name="PHPBB_TEST_DBNAME" value="phpbb_tests"/>
+	<server name="PHPBB_TEST_DBUSER" value="postgres"/>
+	<server name="PHPBB_TEST_DBPASSWD" value="root"/>
+	<server name="PHPBB_TEST_REDIS_HOST" value="localhost"/>
+	<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost"/>
+	<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
+	<server name="PHPBB_FUNCTIONAL_URL" value="http://phpbb.test/"/>
 	</php>
 </phpunit>
diff --git a/.github/phpunit-sqlite3-github.xml b/.github/phpunit-sqlite3-github.xml
index b079a0bbbe7..1ade12292c3 100644
--- a/.github/phpunit-sqlite3-github.xml
+++ b/.github/phpunit-sqlite3-github.xml
@@ -1,35 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests</directory>
-			<exclude>../tests/functional</exclude>
-			<exclude>../tests/lint_test.php</exclude>
-		</testsuite>
-		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php">../tests/functional</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
-		<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
-	</php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		backupGlobals="true"
+		colors="true"
+		processIsolation="false"
+		stopOnFailure="false"
+		bootstrap="../tests/bootstrap.php"
+		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+		cacheDirectory=".phpunit.cache"
+		backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="phpBB Test Suite">
+      <directory suffix="_test.php">../tests</directory>
+      <exclude>../tests/functional</exclude>
+      <exclude>../tests/lint_test.php</exclude>
+    </testsuite>
+    <testsuite name="phpBB Functional Tests">
+      <directory suffix="_test.php">../tests/functional</directory>
+    </testsuite>
+  </testsuites>
+  <groups>
+    <exclude>
+      <group>slow</group>
+    </exclude>
+  </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">../phpBB/</directory>
+      <directory suffix=".php">../tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">../phpBB/vendor/</directory>
+      <directory suffix=".php">../phpBB/cache/</directory>
+      <directory suffix=".php">../phpBB/develop/</directory>
+      <directory suffix=".php">../phpBB/store/</directory>
+    </exclude>
+  </source>
+  <php>
+    <server name="PHPBB_TEST_REDIS_HOST" value="0.0.0.0"/>
+    <server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost"/>
+    <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
+    <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/"/>
+  </php>
 </phpunit>
diff --git a/.github/setup-exiftool.sh b/.github/setup-exiftool.sh
index 04999b86006..082e621c7bb 100755
--- a/.github/setup-exiftool.sh
+++ b/.github/setup-exiftool.sh
@@ -10,5 +10,4 @@
 #
 set -e
 
-sudo apt-get update
 sudo apt-get install -y parallel libimage-exiftool-perl
diff --git a/.github/setup-sphinx.sh b/.github/setup-sphinx.sh
index 919d1425757..9e056aa1b89 100755
--- a/.github/setup-sphinx.sh
+++ b/.github/setup-sphinx.sh
@@ -11,7 +11,6 @@
 set -e
 set -x
 
-sudo apt-get update
 sudo apt-get install -q -y sphinxsearch
 
 DIR=$(dirname "$0")
@@ -135,7 +134,7 @@ searchd
 	read_timeout = 5
 	max_children = 30
 	pid_file = $SPHINX_DATA_DIR/searchd.pid
-	binlog_path = $SPHINX_DATA_DIR/
+	binlog_path = $SPHINX_DATA_DIR
 }
 " > $SPHINX_CONF
 
diff --git a/.github/setup-unbuffer.sh b/.github/setup-unbuffer.sh
index 4423d1b8b6b..4828a88997c 100755
--- a/.github/setup-unbuffer.sh
+++ b/.github/setup-unbuffer.sh
@@ -10,5 +10,4 @@
 #
 set -e
 
-sudo apt-get update
 sudo apt-get install -y expect-dev
diff --git a/.github/setup-webserver.sh b/.github/setup-webserver.sh
index 9f0c6e53ef9..7232807e3ef 100755
--- a/.github/setup-webserver.sh
+++ b/.github/setup-webserver.sh
@@ -11,7 +11,6 @@
 set -e
 set -x
 
-sudo apt-get update
 sudo apt-get install -y nginx coreutils
 
 sudo service nginx stop
diff --git a/.github/workflows/check_merge_to_master.yml b/.github/workflows/check_merge_to_master.yml
new file mode 100644
index 00000000000..45288a072a9
--- /dev/null
+++ b/.github/workflows/check_merge_to_master.yml
@@ -0,0 +1,70 @@
+name: Check merge to master
+
+on:
+    pull_request_target:
+        types: [ opened, synchronize, reopened ]
+        branches:
+            - 3.3.x
+
+jobs:
+    merge-check:
+        if: github.event_name == 'pull_request_target' && github.event.pull_request.base.ref == '3.3.x'
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Checkout the repository
+                uses: actions/checkout@v3
+                with:
+                    fetch-depth: 0  # Ensure full history is fetched
+
+            -   name: Set up Git user
+                run: |
+                    git config --global user.name "github-actions"
+                    git config --global user.email "github-actions@github.com"
+
+            -   name: Fetch all branches
+                run: git fetch origin
+
+            -   name: Simulate merging PR into 3.3.x
+                id: simulate_merge
+                run: |
+                    git checkout 3.3.x
+                    git fetch origin pull/${{ github.event.pull_request.number }}/head
+                    git merge --no-ff FETCH_HEAD || exit 1
+
+            -   name: Attempt to merge updated 3.3.x into master
+                id: merge_master
+                run: |
+                    git checkout master
+                    if git merge --no-ff 3.3.x --no-commit; then
+                      echo "mergeable=true" >> $GITHUB_OUTPUT
+                    else
+                      echo "mergeable=false" >> $GITHUB_OUTPUT
+                      git merge --abort
+                    fi
+
+            - name: Find Comment
+              uses: peter-evans/find-comment@v3
+              id: fc
+              with:
+                  issue-number: ${{ github.event.pull_request.number }}
+                  comment-author: 'github-actions[bot]'
+                  body-includes: The attempt to merge branch `3.3.x` into `master` has completed
+
+            -   name: Post comment on PR
+                if: always()  # Ensure this step always runs, regardless of merge result
+                uses: peter-evans/create-or-update-comment@v4
+                with:
+                    token: ${{ secrets.GITHUB_TOKEN }}
+                    issue-number: ${{ github.event.pull_request.number }}
+                    comment-id: ${{ steps.fc.outputs.comment-id }}
+                    edit-mode: replace
+                    body: |
+                        The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR.
+
+                        - Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success ✅' || 'Conflict ❌' }}
+
+                        ${{ steps.merge_master.outputs.mergeable == 'true' && 'This PR is ready to be merged.' || 'A separate PR will be needed to merge `3.3.x` into `master`.' }}
+
+            -   name: Mark job as succeeded
+                if: always()
+                run: echo "Merge check completed. Ignoring the result to avoid failed status."
diff --git a/.github/workflows/merge_3.3.x_to_master.yml b/.github/workflows/merge_3.3.x_to_master.yml
new file mode 100644
index 00000000000..67b74cd743c
--- /dev/null
+++ b/.github/workflows/merge_3.3.x_to_master.yml
@@ -0,0 +1,61 @@
+name: Merge 3.3.x into master
+
+on:
+    push:
+        branches:
+            - 3.3.x
+
+jobs:
+    merge-branch:
+        if: github.repository == 'phpbb/phpbb' && github.event.repository.fork == false
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/create-github-app-token@v1
+              id: app-token
+              with:
+                  app-id: ${{ vars.MERGE_MASTER_APP_ID }}
+                  private-key: ${{ secrets.MERGE_MASTER_SECRET }}
+
+            - name: Checkout the repository
+              uses: actions/checkout@v6
+              with:
+                  fetch-depth: 0  # Fetch full history for proper merging
+                  ref: 3.3.x      # Checkout the 3.3.x branch
+                  token: ${{ steps.app-token.outputs.token }}
+
+            - name: Fetch the latest commit information
+              id: get-commit-info
+              run: |
+                  # Get the latest commit SHA and its author details
+                  COMMIT_SHA=$(git rev-parse HEAD)
+                  COMMIT_AUTHOR_NAME=$(git log -1 --pretty=format:'%an' $COMMIT_SHA)
+                  COMMIT_AUTHOR_EMAIL=$(git log -1 --pretty=format:'%ae' $COMMIT_SHA)
+
+                  # Save them as output for later steps
+                  echo "commit_sha=$COMMIT_SHA" >> $GITHUB_ENV
+                  echo "commit_author_name=$COMMIT_AUTHOR_NAME" >> $GITHUB_ENV
+                  echo "commit_author_email=$COMMIT_AUTHOR_EMAIL" >> $GITHUB_ENV
+
+            - name: Set up Git with the pull request author's info
+              run: |
+                  git config --global user.name "${{ env.commit_author_name }}"
+                  git config --global user.email "${{ env.commit_author_email }}"
+
+            - name: Fetch all branches
+              run: git fetch --all
+
+            - name: Merge 3.3.x into master
+              run: |
+                  git checkout master
+                  if git merge --no-ff 3.3.x; then
+                      echo "merge_failed=false" >> $GITHUB_ENV
+                  else
+                      echo "merge_failed=true" >> $GITHUB_ENV
+                  fi
+
+            - name: Push changes to master if merge was successful
+              if: env.merge_failed == 'false'
+              run: git push origin master
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 982ca66a2ac..319ddaf4edd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,14 +22,18 @@ jobs:
             matrix:
                 include:
                     - db: 'none'
-                      php: '8.1'
+                      php: '8.2'
                       NOTESTS: 1
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db }}
 
         steps:
+            - name: Update Ubuntu package lists
+              run: |
+                  sudo apt-get update -y  --allow-releaseinfo-change
+
             - name: Checkout repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   fetch-depth: 100
 
@@ -48,7 +52,7 @@ jobs:
                   cd ..
 
             - name: Cache Composer dependencies
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
                   key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -101,42 +105,42 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "mariadb:10.2"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "mariadb:10.3"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "mariadb:10.4"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "mariadb:10.6"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "mariadb:10.9"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "mariadb:10.10"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "mariadb:10.11"
-                    - php: '8.1'
-                      db: "mysql:5.7"
+                    - php: '8.2'
+                      db: "mysql:8.0"
                       db_alias: "MySQL Slow Tests"
                       SLOWTESTS: 1
-                    - php: '8.1'
-                      db: "mysql:5.7"
+                    - php: '8.2'
+                      db: "mysql:8.0"
                       db_alias: "MyISAM Tests"
                       MYISAM: 1
-                    - php: '8.1'
-                      db: "mysql:5.7"
-                    - php: '8.1'
-                      db: "mysql:8.0"
-                    - php: '8.1'
-                      db: "mysql:8.1"
                     - php: '8.2'
                       db: "mysql:8.0"
                     - php: '8.2'
-                      db: "mariadb:10.2"
-                    - php: '8.3'
-                      db: "mysql:5.7"
+                      db: "mysql:8.4"
+                    - php: '8.2'
+                      db: "mysql:9.4"
                     - php: '8.3'
-                      db: "mariadb:10.2"
+                      db: "mysql:8.0"
+                    - php: '8.4'
+                      db: "mysql:8.4"
+                    - php: '8.5'
+                      db: "mysql:8.4"
+                    - php: '8.5'
+                      db: "mysql:9.4"
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
 
@@ -165,8 +169,12 @@ jobs:
                     - 6379:6379
 
         steps:
+            - name: Update Ubuntu package lists
+              run: |
+                  sudo apt-get update -y  --allow-releaseinfo-change
+
             - name: Checkout repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - id: database-type
               env:
@@ -192,7 +200,7 @@ jobs:
                   cd ..
 
             - name: Cache Composer dependencies
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
                   key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -217,6 +225,13 @@ jobs:
               run: |
                   .github/setup-ldap.sh
 
+            - name: Setup node
+              uses: actions/setup-node@v6
+              with:
+                  node-version: 20
+            - name: Setup node dependencies
+              run: npm ci
+
             - name: Setup SPHINX
               run: |
                   .github/setup-sphinx.sh
@@ -230,7 +245,7 @@ jobs:
                   DB: ${{steps.database-type.outputs.db}}
               if: ${{ matrix.SLOWTESTS != 1 && matrix.NOTESTS != 1 }}
               run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error
+                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --display-all-issues --stop-on-error
 
             - name: Slow tests
               env:
@@ -245,26 +260,28 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "postgres:9.5"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "postgres:9.6"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "postgres:10"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "postgres:11"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "postgres:12"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "postgres:13"
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "postgres:14"
-                    - php: '8.1'
-                      db: "postgres:15"
                     - php: '8.2'
-                      db: "postgres:9.5"
+                      db: "postgres:15"
                     - php: '8.3'
                       db: "postgres:9.5"
+                    - php: '8.4'
+                      db: "postgres:9.5"
+                    - php: '8.5'
+                      db: "postgres:9.5"
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db }}
 
@@ -295,8 +312,12 @@ jobs:
                     - 6379:6379
 
         steps:
+            - name: Update Ubuntu package lists
+              run: |
+                  sudo apt-get update -y  --allow-releaseinfo-change
+
             - name: Checkout repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - id: database-type
               env:
@@ -322,7 +343,7 @@ jobs:
                   cd ..
 
             - name: Cache Composer dependencies
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
                   key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -342,35 +363,39 @@ jobs:
               run: |
                   .github/setup-database.sh $DB $MYISAM
 
+            - name: Setup node
+              uses: actions/setup-node@v6
+              with:
+                  node-version: 20
+            - name: Setup node dependencies
+              run: npm ci
+
             - name: Run unit tests
               env:
                   DB: ${{steps.database-type.outputs.db}}
               run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error
+                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --display-all-issues --stop-on-error
 
     # Other database types, namely sqlite3 and mssql
     other-tests:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         strategy:
             matrix:
                 include:
-                    - php: '8.1'
+                    - php: '8.2'
                       db: "sqlite3"
-                    - php: '8.1'
-                      db: "mcr.microsoft.com/mssql/server:2017-latest"
-                      db_alias: 'MSSQL 2017'
-                    - php: '8.1'
-                      db: "mcr.microsoft.com/mssql/server:2019-latest"
+                    - php: '8.2'
+                      db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
                       db_alias: 'MSSQL 2019'
-                    - php: '8.1'
-                      db: "mcr.microsoft.com/mssql/server:2022-latest"
+                    - php: '8.2'
+                      db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
                       db_alias: 'MSSQL 2022'
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
 
         services:
             mssql:
-                image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
+                image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }}
                 env:
                     SA_PASSWORD: "Pssw0rd_12"
                     ACCEPT_EULA: "y"
@@ -395,14 +420,18 @@ jobs:
 
 
         steps:
+            - name: Update Ubuntu package lists
+              run: |
+                  sudo apt-get update -y  --allow-releaseinfo-change
+
             - name: Checkout repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - id: database-type
               env:
                   MATRIX_DB: ${{ matrix.db }}
               run: |
-                  if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-latest' ]
+                  if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ]
                   then
                       db='mssql'
                   else
@@ -427,7 +456,7 @@ jobs:
                   cd ..
 
             - name: Cache Composer dependencies
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
                   key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -447,22 +476,28 @@ jobs:
               run: |
                   .github/setup-database.sh $DB $MYISAM
 
+            - name: Setup node
+              uses: actions/setup-node@v6
+              with:
+                  node-version: 20
+            - name: Setup node dependencies
+              run: npm ci
+
             - name: Run unit tests
               env:
                   DB: ${{steps.database-type.outputs.db}}
               run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error
+                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --display-all-issues --stop-on-error
 
     # Test with IIS & PostgreSQL on Windows
     windows-tests:
-        runs-on: windows-latest
+        runs-on: windows-2025
         strategy:
             matrix:
-                type: ['unit', 'functional']
-                php: ['8.1', '8.2']
+                php: ['8.2', '8.3', '8.4', '8.5']
                 db: ['postgres']
 
-        name: Windows - ${{ matrix.type }} - PHP ${{ matrix.php }} - ${{ matrix.db }}
+        name: Windows - PHP ${{ matrix.php }} - ${{ matrix.db }}
 
         steps:
             - name: Prepare git for Windows
@@ -470,13 +505,13 @@ jobs:
                   git config --system core.autocrlf false
                   git config --system core.eol lf
             - name: Checkout repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql
+                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql, sodium, bz2, fileinfo
                   ini-values: upload_tmp_dir=${{ runner.temp }}, sys_temp_dir=${{ runner.temp }}
                   coverage: none
 
@@ -488,7 +523,7 @@ jobs:
                   cd ..
 
             - name: Cache Composer dependencies
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
                   key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -498,6 +533,9 @@ jobs:
                   GITHUB_WORKSPACE: ${{ github.workspace }}
                   TEMP_DIR: ${{ runner.temp }}
               run: |
+                  # Disable Windows Defender real-time monitoring early to improve performance
+                  Set-MpPreference -DisableRealtimeMonitoring $true
+
                   Enable-WindowsOptionalFeature -Online -FeatureName IIS-WebServerRole, IIS-WebServer, IIS-CommonHttpFeatures, IIS-ManagementConsole, IIS-HttpErrors, IIS-HttpRedirect, IIS-WindowsAuthentication, IIS-StaticContent, IIS-DefaultDocument, IIS-HttpCompressionStatic, IIS-DirectoryBrowsing, IIS-WebServerManagementTools, IIS-CGI -All
                   Set-Service wuauserv -StartupType Manual
                   (Get-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config).replace("<configuration>", "<configuration>`n`t<system.web>`n`t`t<customErrors mode=`"Off`"/>`n`t</system.web>") | Set-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config
@@ -518,16 +556,38 @@ jobs:
                   New-WebHandler -Name "PHP-FastCGI" -Path "*.php" -Modules FastCgiModule -ScriptProcessor "C:\tools\php\php-cgi.exe" -Verb '*' -ResourceType Either
                   iisreset
                   NET START W3SVC
-                  mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\test"
-                  mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\installer"
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\cache" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\files" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\store" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\ext" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\vendor-ext" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\composer-ext.json" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\composer-ext.lock" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\images\avatars\upload" /grant Users:F /T
+
+                  # Wait for IIS to be ready and test connectivity
+                  Start-Sleep -Seconds 10
+                  try {
+                      $response = Invoke-WebRequest -Uri "http://phpbb.test/" -UseBasicParsing -TimeoutSec 30
+                      Write-Host "Web server is responding: $($response.StatusCode)"
+                  } catch {
+                      Write-Host "Web server test failed: $_"
+                  }
+
+                  # Create directories and set permissions more efficiently
+                  $dirs = @("cache\test", "cache\installer")
+                  foreach ($dir in $dirs) {
+                      New-Item -Path "${env:GITHUB_WORKSPACE}\phpBB\$dir" -ItemType Directory -Force
+                  }
+
+                  # Set permissions in batch for better performance
+                  $paths = @("cache", "files", "store", "ext", "vendor-ext", "images\avatars\upload")
+                  foreach ($path in $paths) {
+                      if (Test-Path "${env:GITHUB_WORKSPACE}\phpBB\$path") {
+                          icacls "${env:GITHUB_WORKSPACE}\phpBB\$path" /grant Users:F /T /Q
+                      }
+                  }
+
+                  # Set permissions for specific files
+                  $files = @("composer-ext.json", "composer-ext.lock")
+                  foreach ($file in $files) {
+                      if (Test-Path "${env:GITHUB_WORKSPACE}\phpBB\$file") {
+                          icacls "${env:GITHUB_WORKSPACE}\phpBB\$file" /grant Users:F /Q
+                      }
+                  }
+
                   $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule("IIS_IUSRS", "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow")
                   $acl = Get-ACL "${env:TEMP_DIR}"
                   $acl.AddAccessRule($accessRule)
@@ -540,7 +600,7 @@ jobs:
                   $postgreSqlSvc = Get-Service "postgresql*"
                   Set-Service $postgreSqlSvc.Name -StartupType manual
                   $runningStatus = [System.ServiceProcess.ServiceControllerStatus]::Running
-                  $maxStartTimeout = New-TimeSpan -Seconds 30
+                  $maxStartTimeout = New-TimeSpan -Seconds 120
                   try {
                     $postgreSqlSvc.Start()
                     $postgreSqlSvc.WaitForStatus($runningStatus, $maxStartTimeout)
@@ -549,17 +609,28 @@ jobs:
                   }
                   [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";${env:PGBIN}")
                   $env:PGPASSWORD = 'root'
-                  psql -c 'ALTER SYSTEM SET hot_standby = on;' -U postgres
-                  psql -c 'ALTER SYSTEM SET wal_level = minimal;' -U postgres
+
+                  # Optimize PostgreSQL for testing performance
+                  psql -c "ALTER SYSTEM SET fsync = off;" -U postgres
+                  psql -c "ALTER SYSTEM SET synchronous_commit = off;" -U postgres
+                  psql -c "ALTER SYSTEM SET checkpoint_completion_target = 0.9;" -U postgres
+                  psql -c "ALTER SYSTEM SET wal_buffers = '16MB';" -U postgres
+                  psql -c "ALTER SYSTEM SET shared_buffers = '128MB';" -U postgres
                   psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres
                   psql -c 'create database phpbb_tests;' -U postgres
+
                   Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender
-                  Set-MpPreference -DisableRealtimeMonitoring $true
+
+            - name: Setup node
+              uses: actions/setup-node@v6
+              with:
+                  node-version: 20
+            - name: Setup node dependencies
+              run: npm ci
+
             - name: Run unit tests
-              if: ${{ matrix.type == 'unit' }}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --exclude-group functional,slow
-            - name: Run functional tests
-              if: ${{ matrix.type == 'functional' }}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --group functional
+              uses: nick-fields/retry@v3
+              with:
+                  timeout_minutes: 15
+                  max_attempts: 3
+                  command: phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --display-all-issues --stop-on-error --exclude-group functional,slow
diff --git a/.gitignore b/.gitignore
index 69f93652be4..c988f7fe297 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,13 +41,16 @@
 
 # Excludes test / dev files
 /phpunit.xml
+/.phpunit.result.cache
 /phpBB/composer.phar
 /tests/phpbb_unit_tests.sqlite*
 /tests/test_config*.php
 /tests/tmp/*
 /tests/vendor
 /vagrant/phpbb-install-config.yml
-.vagrant
+/vagrant/.vagrant
+/vagrant/composer.lock
+/vagrant/vendor
 node_modules
 /build/package_signature
 
@@ -56,3 +59,4 @@ node_modules
 .idea
 *.DS_Store*
 /.vscode
+/.phpunit.result.cache
diff --git a/.postcss-sorting.json b/.postcss-sorting.json
deleted file mode 100644
index 4a738f4fa73..00000000000
--- a/.postcss-sorting.json
+++ /dev/null
@@ -1,206 +0,0 @@
-{
-	"order": [
-		"custom-properties",
-		"dollar-variables",
-		{
-			"type": "at-rule",
-			"name": "include"
-		},
-		"declarations",
-		"rules",
-		{
-			"type": "at-rule",
-			"name": "media"
-		}
-	],
-	"properties-order": [
-		"font",
-		"font-family",
-		"font-size",
-		"font-weight",
-		"font-style",
-		"font-variant",
-		"font-size-adjust",
-		"font-stretch",
-		"font-effect",
-		"font-emphasize",
-		"font-emphasize-position",
-		"font-emphasize-style",
-		"font-smooth",
-		"font-smoothing",
-		"line-height",
-		"text-align",
-		"text-align-last",
-		"vertical-align",
-		"white-space",
-		"text-decoration",
-		"text-emphasis",
-		"text-emphasis-color",
-		"text-emphasis-style",
-		"text-emphasis-position",
-		"text-indent",
-		"text-justify",
-		"letter-spacing",
-		"word-spacing",
-		"writing-mode",
-		"text-outline",
-		"text-transform",
-		"text-size-adjust",
-		"text-wrap",
-		"text-overflow",
-		"text-overflow-ellipsis",
-		"text-overflow-mode",
-		"word-wrap",
-		"word-break",
-		"tab-size",
-		"hyphens",
-
-		"background",
-		"background-color",
-		"background-image",
-		"background-repeat",
-		"background-attachment",
-		"background-position",
-		"background-position-x",
-		"background-position-y",
-		"background-clip",
-		"background-origin",
-		"background-size",
-		"interpolation-mode",
-		"filter",
-		"border",
-		"border-width",
-		"border-style",
-		"border-color",
-		"border-top",
-		"border-top-width",
-		"border-top-style",
-		"border-top-color",
-		"border-right",
-		"border-right-width",
-		"border-right-style",
-		"border-right-color",
-		"border-bottom",
-		"border-bottom-width",
-		"border-bottom-style",
-		"border-bottom-color",
-		"border-left",
-		"border-left-width",
-		"border-left-style",
-		"border-left-color",
-		"border-radius",
-		"border-top-left-radius",
-		"border-top-right-radius",
-		"border-bottom-right-radius",
-		"border-bottom-left-radius",
-		"border-image",
-		"border-image-source",
-		"border-image-slice",
-		"border-image-width",
-		"border-image-outset",
-		"border-image-repeat",
-		"outline",
-		"outline-width",
-		"outline-style",
-		"outline-color",
-		"outline-offset",
-		"tap-highlight-color",
-
-		"box-decoration-break",
-		"box-shadow",
-		"text-shadow",
-
-		"color",
-		"opacity",
-
-		"position",
-		"z-index",
-		"top",
-		"right",
-		"bottom",
-		"left",
-
-		"display",
-		"visibility",
-		"float",
-		"clear",
-		"overflow",
-		"overflow-x",
-		"overflow-y",
-		"overflow-scrolling",
-		"clip",
-		"zoom",
-		"flex",
-		"flex-direction",
-		"flex-order",
-		"flex-pack",
-		"flex-align",
-		"flex-grow",
-		"flex-shrink",
-		"flex-basis",
-		"flex-wrap",
-		"justify-content",
-		"align-items",
-		"align-self",
-
-		"box-sizing",
-		"width",
-		"min-width",
-		"max-width",
-		"height",
-		"min-height",
-		"max-height",
-		"margin",
-		"margin-top",
-		"margin-right",
-		"margin-bottom",
-		"margin-left",
-		"padding",
-		"padding-top",
-		"padding-right",
-		"padding-bottom",
-		"padding-left",
-
-		"table-layout",
-		"empty-cells",
-		"caption-side",
-		"border-spacing",
-		"border-collapse",
-		"list-style",
-		"list-style-position",
-		"list-style-type",
-		"list-style-image",
-
-		"content",
-		"quotes",
-		"counter-reset",
-		"counter-increment",
-		"resize",
-		"cursor",
-		"touch-callout",
-		"touch-action",
-		"user-select",
-		"nav-index",
-		"nav-up",
-		"nav-right",
-		"nav-down",
-		"nav-left",
-		"transition",
-		"transition-delay",
-		"transition-timing-function",
-		"transition-duration",
-		"transition-property",
-		"transform",
-		"transform-origin",
-		"animation",
-		"animation-name",
-		"animation-duration",
-		"animation-play-state",
-		"animation-timing-function",
-		"animation-delay",
-		"animation-iteration-count",
-		"animation-direction",
-		"pointer-events"
-	],
-	"unspecified-properties-position": "bottomAlphabetical"
-}
diff --git a/README.md b/README.md
index af3fb91de74..c7aecc2bd07 100644
--- a/README.md
+++ b/README.md
@@ -42,9 +42,12 @@ We have unit and functional tests in order to prevent regressions. You can view
 
 Branch  | Description | GitHub Actions |
 ------- | ----------- | -------------- |
-**master** | Latest development version | ![Tests](https://github.com/phpbb/phpbb/workflows/Tests/badge.svg?branch=master) |
-**3.3.x** | Development of version 3.3.x | ![Tests](https://github.com/phpbb/phpbb/workflows/Tests/badge.svg?branch=3.3.x) |
+**master** | Latest development version | ![Tests](https://github.com/phpbb/phpbb/actions/workflows/tests.yml/badge.svg?branch=master) |
+**3.3.x** | Development of version 3.3.x | ![Tests](https://github.com/phpbb/phpbb/actions/workflows/tests.yml/badge.svg?branch=3.3.x) |
 
 ## 📜 License
 
 [GNU General Public License v2](http://opensource.org/licenses/gpl-2.0.php)
+
+## 🔋 Powered by
+[![JetBrains logo.](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)](https://jb.gg/OpenSource)
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000000..b62f160225e
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,13 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please do not post potential security vulnerabilities publicly. Instead, report them to the phpBB team.
+We take security very seriously and will respond to reports about potential security vulnerabilities as quickly as possible.
+There are multiple ways a potential security vulnerability can be reported:
+
+- HackerOne: [phpBB | Vulnerability Disclosure Program | HackerOne](https://hackerone.com/phpbb)
+- Create a report in the security tracker: [Security Tracker](https://www.phpbb.com/security/)
+- Send an email: [security@phpbb.com](mailto:security@phpbb.com)
+
+Please provide as much detail as possible when reporting a vulnerability. You can expect to receive an update on your report within a few days. If the vulnerability is accepted, we will work on a fix and keep you informed of the progress. If the vulnerability is declined, we will provide an explanation.
diff --git a/build/build.xml b/build/build.xml
index 398d2eab059..1bddbcabd25 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="4.0.0-a1-dev" />
-	<property name="prevversion" value="3.3.11" />
-	<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10" />
+	<property name="newversion" value="4.0.0-a3-dev" />
+	<property name="prevversion" value="4.0.0-a2" />
+	<property name="olderversions" value="3.1.12, 3.2.11, 3.3.16, 3.3.17" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -106,13 +106,22 @@
 				--ignore=${sniffIgnoreList}
 				phpBB"
 			dir="." returnProperty="retval-php-legacy" passthru="true" />
-		<exec command="phpBB/vendor/bin/phpcs
-				-s -p
-				--extensions=php
-				--standard=build/code_sniffer/ruleset-php-extensions.xml
-				--ignore=${project.basedir}/phpBB/ext/*/tests/*,${project.basedir}/phpBB/ext/*/vendor/*
-				phpBB/ext"
-			dir="." returnProperty="retval-php-ext" passthru="true" />
+		<exec command="find phpBB/ext -name '*.php' -type f | head -1" dir="." outputProperty="ext-php-files" />
+		<if>
+			<not><equals arg1="${ext-php-files}" arg2="" /></not>
+			<then>
+				<exec command="phpBB/vendor/bin/phpcs
+						-s -p
+						--extensions=php
+						--standard=build/code_sniffer/ruleset-php-extensions.xml
+						--ignore=${project.basedir}/phpBB/ext/*/tests/*,${project.basedir}/phpBB/ext/*/vendor/*
+						phpBB/ext"
+					dir="." returnProperty="retval-php-ext" passthru="true" />
+			</then>
+			<else>
+				<property name="retval-php-ext" value="0" />
+			</else>
+		</if>
 		<if>
 			<or>
 				<not><equals arg1="${retval-php-strict}" arg2="0" /></not>
@@ -166,31 +175,32 @@
 
 	<target name="prepare-new-version">
 		<!-- select the currently checked out commit (HEAD) for packaging -->
-		<mkdir dir="build/new_version/phpBB3" />
+		<mkdir dir="build/new_version/phpBB" />
 		<phingcall target="export">
 			<property name="revision" value="HEAD" />
-			<property name="dir" value="build/new_version/phpBB3" />
+			<property name="dir" value="build/new_version/phpBB" />
 		</phingcall>
 
 		<!-- copy into directory for diffs -->
-		<exec dir="build" command="cp -rp new_version/phpBB3 old_versions/release-${newversion}" />
+		<exec dir="build" command="cp -rp new_version/phpBB old_versions/release-${newversion}" />
 		<!-- and clean up -->
 		<phingcall target="clean-diff-dir">
 			<property name="dir" value="build/old_versions/release-${newversion}" />
 		</phingcall>
 
 		<!-- create an empty config.php file (not for diffs) -->
-		<touch file="build/new_version/phpBB3/config.php" />
+		<touch file="build/new_version/phpBB/config.php" />
+		<copy file="build/new_version/phpBB/vendor-ext/.htaccess" tofile="build/new_version/phpBB/vendor/.htaccess" />
 
 	</target>
 
 	<target name="package" depends="clean,prepare,prepare-new-version,old-version-diffs">
 		<exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" />
 		<exec dir="build" escape="false"
-			command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/language new_version/phpBB3/language >
+			command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/language new_version/phpBB/language >
 				save/phpbb-${prevversion}_to_${newversion}_language.patch" />
 		<exec dir="build" escape="false"
-			command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver >
+			command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB/styles/prosilver >
 				save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />
 
 		<exec dir="build" escape="false"
diff --git a/build/build_changelog.php b/build/build_changelog.php
index 9457c265118..e95ed0e7b93 100755
--- a/build/build_changelog.php
+++ b/build/build_changelog.php
@@ -29,7 +29,7 @@
 {
 	$fixVersion = $_SERVER['argv'][1];
 
-	$query = 'project IN (PHPBB3, SECURITY)
+	$query = 'project IN (PHPBB, PHPBB3, SECURITY)
 		AND resolution = Fixed
 		AND fixVersion = "' . $fixVersion . '"
 		AND status IN ("Unverified Fix", Closed)';
diff --git a/build/build_helper.php b/build/build_helper.php
index 118ab724ab2..63d0c3c7702 100644
--- a/build/build_helper.php
+++ b/build/build_helper.php
@@ -50,7 +50,7 @@ function __construct($versions, $verbose = false)
 		);
 
 		$this->package_infos = array(
-			'package_name'			=> 'phpBB3',
+			'package_name'			=> 'phpBB',
 			'name_prefix'			=> 'phpbb',
 			'simple_name'			=> 'release-' . $_latest,
 			'new_version_number'	=> $_latest,
diff --git a/build/code_sniffer/phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php b/build/code_sniffer/phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php
new file mode 100644
index 00000000000..64b30a859e3
--- /dev/null
+++ b/build/code_sniffer/phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\Sniffs\CodeLayout;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Checks that union type declarations follows the coding guidelines.
+ */
+class UnionTypesCheckSniff implements Sniff
+{
+	/**
+	* {@inheritdoc}
+	*/
+	public function register()
+	{
+		return [
+			T_FUNCTION,
+			T_CLASS,
+		];
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+		if ($tokens[$stackPtr]['type'] === 'T_FUNCTION')
+		{
+			$method_params = $phpcsFile->getMethodParameters($stackPtr);
+			$method_params_array = array_column($method_params, 'type_hint', 'token');
+			foreach ($method_params_array as $stack_pointer => $type_hint)
+			{
+				$this->check_union_type($phpcsFile, $stack_pointer, $type_hint);
+			}
+
+			$method_properties = $phpcsFile->getMethodProperties($stackPtr);
+			$this->check_union_type($phpcsFile, $stackPtr, $method_properties['return_type']);
+		}
+		else if ($tokens[$stackPtr]['type'] === 'T_CLASS')
+		{
+			$class_token = $tokens[$stackPtr];
+			$class_closer_pointer = $class_token['scope_closer'];
+			$first_method_pointer = $phpcsFile->findNext(T_FUNCTION, $stackPtr);
+			$class_members_declarations_end_pointer = $first_method_pointer ?: $class_closer_pointer;
+
+			$stack_pointer = $stackPtr;
+			while(($class_member_pointer = $phpcsFile->findNext(T_VARIABLE, $stack_pointer)) !== false && ($class_member_pointer < $class_members_declarations_end_pointer))
+			{
+				$properties = $phpcsFile->getMemberProperties($class_member_pointer);
+				$this->check_union_type($phpcsFile, $class_member_pointer, $properties['type']);
+				$stack_pointer = $class_member_pointer + 1;
+			}
+		}
+	}
+
+	public function check_union_type(File $phpcsFile, $stack_pointer, $type_hint)
+	{
+		if (empty($type_hint))
+		{
+			return;
+		}
+
+		if (!strpos($type_hint, '|') && $type_hint[0] == '?') // Check nullable shortcut syntax
+		{
+			$type = substr($type_hint, 1);
+			$error = 'Nullable shortcut syntax must not be used. Use union type instead: %1$s|null; found %2$s';
+			$data  = [$type, $type_hint];
+			$phpcsFile->addError($error, $stack_pointer, 'ShortNullableSyntax', $data);					
+		}
+		else if ((count($types_array = explode('|', $type_hint))) > 1) // Check union type layout
+		{
+			$types_array_null_less = $types_array;
+
+			// Check 'null' to be the last element
+			$null_position = array_search('null', $types_array);
+			if ($null_position !== false && $null_position != array_key_last($types_array))
+			{
+				$error = 'The "null" type hint must be the last of the union type elements; found %s';
+				$data  = [implode('|', $types_array)];
+				$phpcsFile->addError($error, $stack_pointer, 'NullAlwaysLast', $data);
+			}
+
+			// Check types excepting 'null' to follow alphabetical order
+			if ($null_position !== false)
+			{
+				array_splice($types_array_null_less, $null_position, 1);
+			}
+
+			if (count($types_array_null_less) > 1)
+			{
+				$types_array_null_less_sorted = $types_array_null_less;
+				sort($types_array_null_less_sorted);
+				if (!empty(array_diff_assoc($types_array_null_less, $types_array_null_less_sorted)))
+				{
+					$error = 'Union type elements must be sorted alphabetically excepting the "null" type hint must be the last if any; found %s';
+					$data  = [implode('|', $types_array)];
+					$phpcsFile->addError($error, $stack_pointer, 'AlphabeticalSort', $data);
+				}
+			}
+		}
+	}
+}
diff --git a/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php b/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php
index ed8b231be53..d79657af12c 100644
--- a/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php
@@ -11,6 +11,8 @@
 *
 */
 
+namespace phpbb\Sniffs\Commenting;
+
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -21,7 +23,7 @@
 * @package code_sniffer
 * @author Manuel Pichler <mapi@phpundercontrol.org>
 */
-class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
+class FileCommentSniff implements Sniff
 {
 	/**
 	* Returns an array of tokens this test wants to listen for.
diff --git a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php
index a529fc25cbf..9e74f25839d 100644
--- a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php
@@ -11,6 +11,8 @@
 *
 */
 
+namespace phpbb\Sniffs\ControlStructures;
+
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -18,7 +20,7 @@
  * Checks that the opening brace of a control structures is on the line after.
  * From Generic_Sniffs_Functions_OpeningFunctionBraceBsdAllmanSniff
  */
-class phpbb_Sniffs_ControlStructures_OpeningBraceBsdAllmanSniff implements Sniff
+class OpeningBraceBsdAllmanSniff implements Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.
diff --git a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php
index d4ecd6cb95d..daad603a6cb 100644
--- a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php
@@ -10,6 +10,7 @@
  * the docs/CREDITS.txt file.
  *
  */
+namespace phpbb\Sniffs\ControlStructures;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
@@ -18,7 +19,7 @@
  * Checks that there is exactly one space between the keyword and the opening
  * parenthesis of a control structures.
  */
-class phpbb_Sniffs_ControlStructures_OpeningParenthesisSniff implements Sniff
+class OpeningParenthesisSniff implements Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.
diff --git a/build/code_sniffer/phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php b/build/code_sniffer/phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php
index 967ee6be43b..948987cd376 100644
--- a/build/code_sniffer/phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php
@@ -11,6 +11,8 @@
  *
  */
 
+namespace phpbb\Sniffs\ControlStructures;
+
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -18,7 +20,7 @@
  * Checks that the visibility qualifiers are placed after the static keyword
  * according to the coding guidelines
  */
-class phpbb_Sniffs_ControlStructures_StaticKeywordSniff implements Sniff
+class StaticKeywordSniff implements Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.
diff --git a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php
index 084c310e9ba..258360bd299 100644
--- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php
@@ -11,13 +11,15 @@
 *
 */
 
+namespace phpbb\Sniffs\Namespaces;
+
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
 * Checks that each use statement is used.
 */
-class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
+class UnusedUseSniff implements Sniff
 {
 	const FIND = [
 		T_NS_SEPARATOR,
@@ -25,6 +27,24 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 		T_WHITESPACE,
 	];
 
+	private function getNameTokens()
+	{
+		$tokens = [T_NS_SEPARATOR, T_STRING];
+		if (defined('T_NAME_QUALIFIED'))
+		{
+			$tokens[] = T_NAME_QUALIFIED;
+		}
+		if (defined('T_NAME_FULLY_QUALIFIED'))
+		{
+			$tokens[] = T_NAME_FULLY_QUALIFIED;
+		}
+		if (defined('T_NAME_RELATIVE'))
+		{
+			$tokens[] = T_NAME_RELATIVE;
+		}
+		return $tokens;
+	}
+
 	/**
 	* {@inheritdoc}
 	*/
@@ -49,9 +69,20 @@ protected function check(File $phpcsFile, $found_name, $full_name, $short_name,
 			$phpcsFile->addError($error, $stack_pointer, 'FullName');
 		}
 
-		if ($found_name === $short_name)
+		/*
+		 * Check for possible union types (like string|MyType|null)
+		 * and question mark nullable type syntax (like ?MyType)
+		 */
+		$types = explode('|', $found_name);
+		foreach ($types as $type)
 		{
-			return true;
+			// Nullable type syntax
+			$type = (strpos($type, '?') === 0) ? substr($type, 1) : $type;
+
+			if ($short_name === $type)
+			{
+				return true;
+			}
 		}
 
 		return false;
@@ -69,23 +100,47 @@ public function process(File $phpcsFile, $stackPtr)
 
 		$tokens = $phpcsFile->getTokens();
 
-		$class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($stackPtr + 1));
-
-		$class_name_end = $phpcsFile->findNext(self::FIND, ($stackPtr + 1), null, true);
+		$class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($stackPtr + 1));
 
-		$aliasing_as_position = $phpcsFile->findNext(T_AS, $class_name_end, null, false, null, true);
-		if ($aliasing_as_position !== false)
+		// Handle PHPCS v4 T_NAME_QUALIFIED tokens
+		if (isset($tokens[$class_name_start]) &&
+			(defined('T_NAME_QUALIFIED') && $tokens[$class_name_start]['code'] === T_NAME_QUALIFIED ||
+			 defined('T_NAME_FULLY_QUALIFIED') && $tokens[$class_name_start]['code'] === T_NAME_FULLY_QUALIFIED ||
+			 defined('T_NAME_RELATIVE') && $tokens[$class_name_start]['code'] === T_NAME_RELATIVE))
 		{
-			$alias_position = $phpcsFile->findNext(T_STRING, $aliasing_as_position, null, false, null, true);
-			$name_short = $tokens[$alias_position]['content'];
-			$name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1));
+			$name_full = $tokens[$class_name_start]['content'];
+			$class_name_end = $class_name_start + 1;
+			$parts = explode('\\', $name_full);
+			$name_short = end($parts);
 		}
 		else
 		{
+			$class_name_end = $phpcsFile->findNext(self::FIND, ($stackPtr + 1), null, true);
 			$name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start));
 			$name_short = $tokens[$class_name_end - 1]['content'];
 		}
 
+		$aliasing_as_position = $phpcsFile->findNext(T_AS, $class_name_end, null, false, null, true);
+		if ($aliasing_as_position !== false)
+		{
+			$alias_position = $phpcsFile->findNext(T_STRING, $aliasing_as_position, null, false, null, true);
+			$name_short = $tokens[$alias_position]['content'];
+
+			// Only recalculate name_full if it wasn't a single token (T_NAME_QUALIFIED)
+			// to avoid calculating it as 0 length string. Prevents incorrectly calculating the
+			// "full name" of the aliased class (resolving it to an empty string in some cases).
+			if (!isset($tokens[$class_name_start]) ||
+				(
+					(!defined('T_NAME_QUALIFIED') || $tokens[$class_name_start]['code'] !== T_NAME_QUALIFIED) &&
+					(!defined('T_NAME_FULLY_QUALIFIED') || $tokens[$class_name_start]['code'] !== T_NAME_FULLY_QUALIFIED) &&
+					(!defined('T_NAME_RELATIVE') || $tokens[$class_name_start]['code'] !== T_NAME_RELATIVE)
+				)
+			)
+			{
+				$name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1));
+			}
+		}
+
 		if ($tokens[$class_name_start]['content'] === 'function'
 			&& $tokens[$class_name_start + 1]['code'] === T_WHITESPACE)
 		{
@@ -101,7 +156,7 @@ public function process(File $phpcsFile, $stackPtr)
 			$ok = $this->findClassUsage($phpcsFile, $stackPtr, $tokens, $name_full, $name_short);
 		}
 
-		if ($name_full[0] === '\\')
+		if (!empty($name_full) && $name_full[0] === '\\')
 		{
 			$phpcsFile->addError("There must not be a leading '\\' in use statements.", $stackPtr, 'Malformed');
 		}
@@ -125,9 +180,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name
 			{
 				$old_simple_statement = $simple_statement;
 
-				$simple_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($simple_statement + 1));
+				$simple_class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($simple_statement + 1));
 
-				if ($simple_class_name_start === false) {
+				if ($simple_class_name_start === false)
+				{
 					continue;
 				}
 
@@ -135,7 +191,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name
 
 				$simple_class_name = trim($phpcsFile->getTokensAsString($simple_class_name_start, ($simple_class_name_end - $simple_class_name_start)));
 
-				$ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) || $ok;
+				if (!empty($simple_class_name))
+				{
+					$ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) || $ok;
+				}
 			}
 		}
 
@@ -150,7 +209,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name
 
 			$paamayim_nekudotayim_class_name = trim($phpcsFile->getTokensAsString($paamayim_nekudotayim_class_name_start + 1, ($paamayim_nekudotayim_class_name_end - $paamayim_nekudotayim_class_name_start)));
 
-			$ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) || $ok;
+			if (!empty($paamayim_nekudotayim_class_name))
+			{
+				$ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) || $ok;
+			}
 		}
 
 		// Checks in implements
@@ -164,12 +226,15 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name
 			{
 				$old_implemented_class = $implemented_class;
 
-				$implements_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($implemented_class - 1));
+				$implements_class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($implemented_class - 1));
 				$implements_class_name_end = $phpcsFile->findNext(self::FIND, ($implemented_class - 1), null, true);
 
 				$implements_class_name = trim($phpcsFile->getTokensAsString($implements_class_name_start, ($implements_class_name_end - $implements_class_name_start)));
 
-				$ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) || $ok;
+				if (!empty($implements_class_name))
+				{
+					$ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) || $ok;
+				}
 			}
 		}
 
@@ -190,11 +255,38 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name
 			$params = $phpcsFile->getMethodParameters($function_declaration);
 			foreach ($params as $param)
 			{
-				$ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) || $ok;
+				if (!empty($param['type_hint']))
+				{
+					$ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) || $ok;
+				}
 			}
 
 			$method_properties = $phpcsFile->getMethodProperties($function_declaration);
-			$ok = $this->check($phpcsFile, $method_properties['return_type'], $class_name_full, $class_name_short, $function_declaration) || $ok;
+			if (!empty($method_properties['return_type']))
+			{
+				$ok = $this->check($phpcsFile, $method_properties['return_type'], $class_name_full, $class_name_short, $function_declaration) || $ok;
+			}
+		}
+
+		// Checks in property type declarations
+		$old_property = $stackPtr;
+		while (($property = $phpcsFile->findNext(T_VARIABLE, ($old_property + 1))) !== false)
+		{
+			$old_property = $property;
+
+			try
+			{
+				$property_props = $phpcsFile->getMemberProperties($property);
+				if (!empty($property_props['type']))
+				{
+					$ok = $this->check($phpcsFile, $property_props['type'], $class_name_full, $class_name_short, $property) || $ok;
+				}
+			}
+			catch (\Exception $e)
+			{
+				// Not a class member property, skip it
+				continue;
+			}
 		}
 
 		// Checks in catch blocks
@@ -203,12 +295,35 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name
 		{
 			$old_catch = $catch;
 
-			$caught_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $catch + 1);
-			$caught_class_name_end = $phpcsFile->findNext(self::FIND, $caught_class_name_start + 1, null, true);
+			// Find the opening parenthesis of the catch clause to use as a boundary.
+			$open_paren = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $catch + 1);
+			if ($open_paren === false || !isset($tokens[$open_paren]['parenthesis_closer']))
+			{
+				continue;
+			}
+			$close_paren = $tokens[$open_paren]['parenthesis_closer'];
+
+			// Iterate over all exception class names within the catch parentheses.
+			// Multiple classes may be separated by | for multi-catch (e.g. catch (A|B $e)).
+			$search_pos = $open_paren;
+			while (($caught_class_name_start = $phpcsFile->findNext($this->getNameTokens(), $search_pos + 1, $close_paren)) !== false)
+			{
+				$caught_class_name_end = $phpcsFile->findNext(self::FIND, $caught_class_name_start + 1, $close_paren, true);
+				if ($caught_class_name_end === false)
+				{
+					$caught_class_name_end = $close_paren;
+				}
 
-			$caught_class_name = trim($phpcsFile->getTokensAsString($caught_class_name_start, ($caught_class_name_end - $caught_class_name_start)));
+				$caught_class_name = trim($phpcsFile->getTokensAsString($caught_class_name_start, ($caught_class_name_end - $caught_class_name_start)));
+
+				if (!empty($caught_class_name))
+				{
+					$ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) || $ok;
+				}
 
-			$ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) || $ok;
+				// Advance past the extracted name so the next iteration finds the next class.
+				$search_pos = $caught_class_name_end;
+			}
 		}
 
 		$old_use = $stackPtr;
@@ -228,11 +343,14 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name
 				continue;
 			}
 
-			$class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $use + 1, null, false, null, true);
+			$class_name_start = $phpcsFile->findNext($this->getNameTokens(), $use + 1, null, false, null, true);
 			$class_name_end = $phpcsFile->findNext(self::FIND, $class_name_start + 1, null, true, null, true);
 			$found_name = trim($phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start)));
 
-			$ok = $this->check($phpcsFile, $found_name, $class_name_full, $class_name_short, $use) || $ok;
+			if (!empty($found_name))
+			{
+				$ok = $this->check($phpcsFile, $found_name, $class_name_full, $class_name_short, $use) || $ok;
+			}
 		}
 
 		return $ok;
@@ -253,7 +371,7 @@ private function findFunctionUsage(File $phpcsFile, $stackPtr, $tokens, $name_fu
 			);
 
 			$position = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $position + 1);
-			if ($found_start === null)
+			if ($found_start === null || $found_start === false)
 			{
 				continue;
 			}
diff --git a/build/code_sniffer/ruleset-php-legacy.xml b/build/code_sniffer/ruleset-php-legacy.xml
index 47d0ca772ac..8252cab03b1 100644
--- a/build/code_sniffer/ruleset-php-legacy.xml
+++ b/build/code_sniffer/ruleset-php-legacy.xml
@@ -17,9 +17,6 @@
  <!-- There MUST not be more than one statement per line. -->
  <rule ref="Generic.Formatting.DisallowMultipleStatements" />
 
- <!-- Call-time pass-by-reference MUST not be used. -->
- <rule ref="Generic.Functions.CallTimePassByReference.NotAllowed" />
-
  <!-- Filenames MUST be lowercase. -->
  <rule ref="Generic.Files.LowercasedFilename" />
 
diff --git a/build/code_sniffer/ruleset-php-strict.xml b/build/code_sniffer/ruleset-php-strict.xml
index 9e2f0664d8f..8a06b72ba60 100644
--- a/build/code_sniffer/ruleset-php-strict.xml
+++ b/build/code_sniffer/ruleset-php-strict.xml
@@ -32,7 +32,9 @@
  <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses" />
 
  <!-- Files containing classes MUST not have any side-effects -->
- <rule ref="PSR1.Files.SideEffects.FoundWithSymbols" />
+ <rule ref="PSR1.Files.SideEffects.FoundWithSymbols">
+  <exclude-pattern>*/tests/*</exclude-pattern>
+ </rule>
 
  <!-- When present, all use declarations MUST go after the namespace declaration.
       There MUST be one use keyword per declaration.
@@ -45,4 +47,8 @@
  <!-- There MUST NOT be unused use statements. -->
  <rule ref="./phpbb/Sniffs/Namespaces/UnusedUseSniff.php" />
 
+ <!-- The null type SHALL be the last union type element, other types SHALL follow alphabetical order.
+	No nullable type shortcut syntax should be used. -->
+ <rule ref="./phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php" />
+
 </ruleset>
diff --git a/build/compare.sh b/build/compare.sh
index df442fd4c79..9d01028aa96 100755
--- a/build/compare.sh
+++ b/build/compare.sh
@@ -19,9 +19,9 @@ do
 
 	$command "$1.$ext"
 
-	for file in `find phpBB3 -name '.svn' -prune -o -type f -print`
+	for file in `find phpBB -name '.svn' -prune -o -type f -print`
 	do
-		orig_file="${file/#phpBB3/$orig_dir}"
+		orig_file="${file/#phpBB/$orig_dir}"
 		diff_result=`diff $orig_file $file`
 
 		if [ -n "$diff_result" ]
@@ -31,7 +31,7 @@ do
 		fi
 	done
 
-	rm -rf phpBB3
+	rm -rf phpBB
 done
 
 cd ..
diff --git a/build/package.php b/build/package.php
index 18798d0602f..ba40f110f97 100755
--- a/build/package.php
+++ b/build/package.php
@@ -489,12 +489,6 @@
 	$package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name'));
 }
 
-// Microsoft Web PI packaging
-$package->begin_status('Packaging phpBB for Microsoft WebPI');
-$file = './release_files/' . $package->get('release_filename') . '.webpi.zip';
-$package->run_command('cp -p ./release_files/' . $package->get('release_filename') . ".zip $file");
-$package->run_command('cd ./../webpi && ' . $compress_programs['zip'] . " ./../new_version/$file *");
-
 // verify results
 chdir($package->locations['root']);
 $package->begin_status('********** Verifying packages **********');
diff --git a/build/psalm_bootstrap.php b/build/psalm_bootstrap.php
index 03afd6da3d9..92099c77f50 100644
--- a/build/psalm_bootstrap.php
+++ b/build/psalm_bootstrap.php
@@ -33,7 +33,6 @@
 require_once $phpbb_root_path . 'includes/functions_content.' . $phpEx;
 require_once $phpbb_root_path . 'includes/functions_display.' . $phpEx;
 require_once $phpbb_root_path . 'includes/functions_mcp.' . $phpEx;
-require_once $phpbb_root_path . 'includes/functions_messenger.' . $phpEx;
 require_once $phpbb_root_path . 'includes/functions_module.' . $phpEx;
 require_once $phpbb_root_path . 'includes/functions_posting.' . $phpEx;
 require_once $phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx;
diff --git a/build/webpi/install/mssql.sql b/build/webpi/install/mssql.sql
deleted file mode 100644
index 9c0b46678a3..00000000000
--- a/build/webpi/install/mssql.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-/**********************************************************************/
-/* Install.SQL                                                        */
-/* Creates a login and makes the user a member of db roles            */
-/*                                                                    */
-/**********************************************************************/
-
--- Declare variables for database name, username and password
-DECLARE @dbName sysname,
-      @dbUser sysname,
-      @dbPwd nvarchar(max);
-
--- Set variables for database name, username and password
-SET @dbName = 'PlaceHolderForDb';
-SET @dbUser = 'PlaceHolderForUser';
-SET @dbPwd = 'PlaceHolderForPassword';
-
-DECLARE @cmd nvarchar(max)
-
--- Create login
-IF( SUSER_SID(@dbUser) is null )
-BEGIN
-    print '-- Creating login '
-    SET @cmd = N'CREATE LOGIN ' + quotename(@dbUser) + N' WITH PASSWORD ='''+ replace(@dbPwd, '''', '''''') + N''''
-    EXEC(@cmd)
-END
-
--- Create database user and map to login
--- and add user to the datareader, datawriter, ddladmin and securityadmin roles
---
-SET @cmd = N'USE ' + quotename(@DBName) + N'; 
-IF( NOT EXISTS (SELECT * FROM sys.database_principals WHERE name = ''' + replace(@dbUser, '''', '''''') + N'''))
-BEGIN
-    print ''-- Creating user'';
-    CREATE USER ' + quotename(@dbUser) + N' FOR LOGIN ' + quotename(@dbUser) + N';
-    print ''-- Adding user'';
-    EXEC sp_addrolemember ''db_owner'', ''' + replace(@dbUser, '''', '''''') + N''';
-END'
-EXEC(@cmd)
-GO
diff --git a/build/webpi/install/mysql.sql b/build/webpi/install/mysql.sql
deleted file mode 100644
index 5c9d8cd9223..00000000000
--- a/build/webpi/install/mysql.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-USE PlaceHolderForDb$$
-
-DROP PROCEDURE IF EXISTS add_user $$
-
-CREATE PROCEDURE add_user()
-BEGIN
-DECLARE EXIT HANDLER FOR 1044 BEGIN END;
-GRANT ALL PRIVILEGES ON PlaceHolderForDb.* to 'PlaceHolderForUser'@'PlaceHolderForServer' IDENTIFIED BY 'PlaceHolderForPassword';
-FLUSH PRIVILEGES;
-END
-$$
-
-CALL add_user() $$
-
-DROP PROCEDURE IF EXISTS add_user $$
diff --git a/build/webpi/manifest.xml b/build/webpi/manifest.xml
deleted file mode 100644
index 947377893ba..00000000000
--- a/build/webpi/manifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<msdeploy.iisapp>
-	<iisapp path="phpBB3" />
-
-	<dbmysql path="install/mysql.sql" commandDelimiter="$$"	removeCommandDelimiter="true" />
-
-	<dbfullsql path="install/mssql.sql" />
-
-	<setAcl path="phpBB3/cache" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" />
-	<setAcl path="phpBB3/files" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" />
-	<setAcl path="phpBB3/store" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" />
-	<setAcl path="phpBB3/images/avatars/upload" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" />
-	<setAcl path="phpBB3/config.php" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" setAclResourceType="File" />
-</msdeploy.iisapp>
diff --git a/build/webpi/parameters.xml b/build/webpi/parameters.xml
deleted file mode 100644
index be4d374632a..00000000000
--- a/build/webpi/parameters.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<parameters>
-	<parameter
-		name="AppPath"
-		defaultValue="Default Web Site/phpBB3"
-		tags="iisapp">
-		
-		<parameterEntry
-			type="ProviderPath"
-			scope="iisapp"
-			match="phpBB3" />
-	</parameter>
-	<!--ACLs-->
-	<parameter
-		name="aclCache"
-		description="Sets the ACL on the cache/ folder"
-		defaultValue="{AppPath}/cache"
-		tags="Hidden">
-
-		<parameterEntry
-			type="ProviderPath"
-			scope="setAcl"
-			match="phpBB3/cache$" />
-	</parameter>
-
-	<parameter
-		name="aclFiles"
-		description="Sets the ACL on the files/ folder"
-		defaultValue="{AppPath}/files"
-		tags="Hidden">
-
-		<parameterEntry
-			type="ProviderPath"
-			scope="setAcl"
-			match="phpBB3/files$" />
-	</parameter>
-
-	<parameter
-		name="aclStore"
-		description="Sets the ACL on the store/ folder"
-		defaultValue="{AppPath}/store"
-		tags="Hidden">
-
-		<parameterEntry
-			type="ProviderPath"
-			scope="setAcl"
-			match="phpBB3/store$" />
-	</parameter>
-
-	<parameter
-		name="aclAvatarUpload"
-		description="Sets the ACL on the avatars/upload/ folder"
-		defaultValue="{AppPath}/images/avatars/upload"
-		tags="Hidden">
-
-		<parameterEntry
-			type="ProviderPath"
-			scope="setAcl"
-			match="phpBB3/images/avatars/upload$" />
-	</parameter>
-
-	<parameter
-		name="aclConfig"
-		description="Sets the ACL on the config.php file"
-		defaultValue="{AppPath}/config.php"
-		tags="Hidden">
-
-		<parameterEntry
-			type="ProviderPath"
-			scope="setAcl"
-			match="phpBB3/config.php$" />
-	</parameter>
-
-	<!-- SQL parameters -->
-	<parameter  name="SQL Database Server"  description="Enter the database server (usually machine name ) "  defaultValue="."  tags="SQL">
-	</parameter>
-
-	<parameter name="SQL DatabaseServer Instance" description="Enter the database instance name" defaultValue="SQLExpress" tags="SQL">
-	</parameter>
-	<!-- Read database server from config.php . Update 'dbhost' in config.php on publish -->
-	<parameter name="SQL Automatic DatabaseServer" defaultValue="dbhost = '{SQL Database Server}\\{SQL DatabaseServer Instance}';" tags="Hidden,SQL">
-		<parameterEntry kind="TextFile" scope="\\config\.php$" match="dbhost\s*=\s*'([^']*)'\s*;" />
-	</parameter>
-	<parameter
-		name="SQL DatabaseName" description="Database name for your application." defaultValue="phpbb" tags="SQL, dbName">
-
-		<parameterEntry type="TextFile" scope="install/mssql.sql" match="PlaceHolderForDb" />   
-	</parameter>
-	<!-- Read database name from config.php . Update 'dbname' in config.php on publish -->
-	<parameter name="SQL Automatic DatabaseName" defaultValue="dbname = '{SQL DatabaseName}';" tags="Hidden,SQL">
-		<parameterEntry kind="TextFile" scope="\\config\.php$" match="dbname\s*=\s*'([^']*)'\s*;" />
-	</parameter>
-  
-	<parameter
-		name="SQL DatabaseAdministrator"
-		description="Database server administartor username."
-		defaultValue="sa"
-		tags="SQL, DbAdminUsername" >
-	</parameter>
-
-	<parameter
-		name="SQL DatabaseAdministratorPassword"
-		description="Database server administrator password."
-		tags="Password,SQL,DbAdminPassword">
-	</parameter>
-
-	<parameter
-		name="SQL Database Username"
-		description="Username to access your database."
-		defaultValue="phpbb"
-		tags="SQL, DbUsername">
-
-		<parameterEntry
-			type="TextFile"
-			scope="install/mssql.sql"
-			match="PlaceHolderForUser" />
-	</parameter>
-	<!-- Read database user from config.php . Update 'dbuser' in config.php on publish -->
-	<parameter name="SQL Automatic Database User" defaultValue="dbuser = '{SQL Database Username}';" tags="Hidden,SQL">
-		<parameterEntry kind="TextFile" scope="\\config\.php$" match="dbuser\s*=\s*'([^']*)'\s*;" />
-	</parameter>
-  
-	<parameter
-		name="SQL Database Password"
-		description="Password for your phpBB database. (Must be at least 8 characters, contain at least one lower case letter, one upper case letter and one digit)"
-		tags="New, Password,SQL,  DbUserPassword">
-
-		<parameterValidation
-			type = "RegularExpression"   
-			validationString = "^.*(?=.{8,})(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).*$" />
-
-		<parameterEntry
-			type="TextFile"
-			scope="install/mssql.sql"
-			match="PlaceHolderForPassword" />
-	</parameter>
-
-	<!-- Read database user password from config.php . Update 'dbpasswd' in config.php on publish -->
-	<parameter name="SQL Automatic Database Password" defaultValue="dbpasswd = '{SQL Database Password}';" tags="Hidden,SQL">
-		<parameterEntry kind="TextFile" scope="\\config\.php$" match="dbpasswd\s*=\s*'([^']*)'\s*;" />
-	</parameter>
-
-	<!-- SQL Connection string -->
-	<parameter
-		name="SQL ConnectionString"
-		description="Automatically sets the connection string for the connection request."
-		defaultValue="Server={SQL Database Server}\{SQL DatabaseServer Instance};Database={SQL DatabaseName};uid={SQL DatabaseAdministrator};Pwd={SQL DatabaseAdministratorPassword};"
-		tags="Hidden,SQLConnectionString,Validate">
-
-		<parameterEntry
-			type="ProviderPath"
-			scope="dbfullsql"
-			match="install/mssql.sql" />
-	</parameter>
-
-	<parameter
-		name="SQL Database type"
-		description="SQL database type"
-		defaultValue="mssql"
-		tags="SQL,Hidden">
-	</parameter>
-
-	<!-- MYSQL parameters -->
-	<parameter
-		name="MySQL Database Server"
-		description="Enter the hostname"
-		defaultValue="localhost"
-		tags="MySQL, dbServer">
-
-		<parameterEntry
-			type="TextFile"
-			scope="install/mysql.sql"
-			match="PlaceHolderForServer" />
-	</parameter>
-
-	<!-- Read database server from config.php . Update 'dbhost' in config.php on publish -->
-	<parameter name="Automatic MySQL DatabaseServer" defaultValue="dbhost = '{MySQL Database Server}';" tags="Hidden,MySQL">
-		<parameterEntry kind="TextFile" scope="\\config\.php$" match="dbhost\s*=\s*'([^']*)'\s*;" />
-	</parameter>
-  
-	<parameter
-		name="MySQL Database Name"
-		description="Database Name for your application."
-		defaultValue="phpbb"
-		tags="MySQL, dbName">
-
-		<parameterEntry
-			type="TextFile"
-			scope="install/mysql.sql"
-			match="PlaceHolderForDb"  />
-	</parameter>
-	<!-- Read database name from config.php . Update 'dbname' in config.php on publish -->
-	<parameter name="Automatic MySQL Database Name" defaultValue="dbname = '{MySQL Database Name}';" tags="Hidden,MySQL">
-		<parameterEntry kind="TextFile" scope="\\config\.php$" match="dbname\s*=\s*'([^']*)'\s*;" />
-	</parameter>
-
-	<parameter
-		name="MySQL Database Username"
-		description="Username to access your phpBB database."
-		defaultValue="phpbb"
-		tags="MySQL, DbUsername">
-
-		<parameterEntry
-			type="TextFile"
-			scope="install/mysql.sql"
-			match="PlaceHolderForUser" />
-	</parameter>
-	<!-- Read database user from config.php . Update 'dbuser' in config.php on publish -->
-	<parameter name="Automatic MySQL Database User" defaultValue="dbuser = '{MySQL Database Username}';" tags="Hidden,MySQL">
-		<parameterEntry kind="TextFile" scope="\\config\.php$" match="dbuser\s*=\s*'([^']*)'\s*;" />
-	</parameter>
-
-	<parameter
-		name="MySQL Database Password"
-		description="Password for your phpBB database. (Minimum 4 characters)"
-		tags="New, Password,MySQL,DbUserPassword">
-
-		<parameterValidation
-			type = "RegularExpression"
-			validationString = "^.{4,}$" />
-
-		<parameterEntry
-			type="TextFile"
-			scope="install/mysql.sql"
-			match="PlaceHolderForPassword" />
-		</parameter>
-		<!-- Read database password from config.php . Update 'dbpasswd' in config.php on publish -->
-		<parameter name="MySQL Automatic Database Password" defaultValue="dbpasswd = '{MySQL Database Password}';" tags="Hidden,MySQL">
-			<parameterEntry kind="TextFile" scope="\\config\.php$" match="dbpasswd\s*=\s*'([^']*)'\s*;" />
-		</parameter>
-
-	<!-- MySQL admin credentials -->
-	<parameter
-		name="MySQL Database Administrator"
-		description="Database administrator username."
-		defaultValue="root"
-		tags="MySQL, DbAdminUsername" >
-	</parameter>
-	<parameter
-		name="MySQL Database Administrator Password"
-		description="Database administrator password."
-		tags="Password,MySQL,DbAdminPassword" >
-	</parameter>
-
-	<!-- MySQL Connectionstring -->
-	<parameter
-		name="MySQLConnectionString"
-		description="Automatically sets the connection string for the connection request."
-		defaultValue="Server={MySQL Database Server};Database={MySQL Database Name};uid={MySQL Database Administrator};Pwd={MySQL Database Administrator Password};"
-		tags="Hidden,MySQLConnectionString,Validate">
-
-		<parameterEntry
-			type="ProviderPath"
-			scope="dbmysql"
-			match="install/mysql.sql" />
-	</parameter>
-</parameters>
diff --git a/composer.phar b/composer.phar
index bd5bab8c1f5..212c0c3d0a7 100755
Binary files a/composer.phar and b/composer.phar differ
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 00000000000..0f2f72bf69a
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,67 @@
+import globals from 'globals';
+
+// File patterns to ignore
+const IGNORED_FILES = [
+	'phpBB/assets/javascript/cropper.js',
+	'phpBB/assets/javascript/hermite.js',
+	'phpBB/assets/javascript/jquery-cropper.js',
+	'phpBB/**/*.min.js',
+	'phpBB/vendor/**/*.js',
+	'phpBB/vendor-ext/**/*.js',
+	'phpBB/phpbb/**/*.js',
+	'phpBB/tests/**/*.js',
+];
+
+// ESLint rule configurations
+const FORMATTING_RULES = {
+	'quotes': ['error', 'single'],
+	'comma-dangle': ['error', 'always-multiline'],
+	'block-spacing': 'error',
+	'array-bracket-spacing': ['error', 'always'],
+	'object-curly-spacing': ['error', 'always'],
+	'space-before-function-paren': ['error', 'never'],
+	'space-in-parens': 'off',
+};
+
+const CODE_QUALITY_RULES = {
+	'semi': ['error', 'always'],
+	'eqeqeq': ['error', 'always'],
+	'curly': ['error', 'multi-line'],
+	'no-var': 'error',
+	'prefer-const': 'error',
+	'no-console': 'off',
+	'no-unused-vars': ['error', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
+};
+
+const DISABLED_STYLE_RULES = {
+	'multiline-comment-style': 'off',
+	'computed-property-spacing': 'off',
+	'capitalized-comments': 'off',
+	'no-lonely-if': 'off',
+};
+
+const mainConfig = {
+	files: ['**/*.js', '**/*.js.twig'],
+	linterOptions: {
+		reportUnusedDisableDirectives: false,
+	},
+	languageOptions: {
+		ecmaVersion: 'latest',
+		sourceType: 'module',
+		globals: {
+			...globals.browser,
+			...globals.node,
+			...globals.jquery,
+		},
+	},
+	rules: {
+		...FORMATTING_RULES,
+		...CODE_QUALITY_RULES,
+		...DISABLED_STYLE_RULES,
+	},
+};
+
+export default [
+	{ ignores: IGNORED_FILES },
+	mainConfig,
+];
diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 5f5e9c29ceb..b35d1c89c71 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# A hook to check syntax of a phpBB3 commit message, per:
+# A hook to check syntax of a phpBB commit message, per:
 # * <https://area51.phpbb.com/docs/dev/master/development/git.html>
 # * <http://area51.phpbb.com/phpBB/viewtopic.php?p=209919#p209919>
 #
@@ -224,7 +224,7 @@ do
 			"footer")
 				err=$ERR_FOOTER;
 				# Each ticket is on its own line
-				echo "$line" | grep -Eq "^PHPBB3-[0-9]+$";
+				echo "$line" | grep -Eq "^PHPBB3?-[0-9]+$";
 			;;
 			"eof")
 				err=$ERR_EOF;
@@ -337,7 +337,7 @@ done
 # If EOF is expected exit cleanly
 echo "$expecting" | grep -q "eof" || (
 	# Unexpected EOF, error
-	complain "Unexpected EOF encountered" >&2;
+	complain "Expected to see footer (e.g. PHPBB-12345) or description line, but reached end of file." >&2;
 	quit $ERR_EOF;
 ) && (
 	# Do post scan checks
@@ -356,7 +356,7 @@ echo "$expecting" | grep -q "eof" || (
 	# Check the branch ticket is mentioned, doesn't make sense otherwise
 	if [ $ticket -gt 0 ]
 	then
-		echo "$tickets" | grep -Eq "\bPHPBB3-$ticket\b" || (
+		echo "$tickets" | grep -Eq "\bPHPBB3?-$ticket\b" || (
 			complain "Ticket ID [$ticket] of branch missing from list of tickets:" >&2;
 			complain "$tickets" | sed 's/ /\n/g;s/^/* /g' >&2;
 			quit $ERR_FOOTER;
diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit
index 06ba15c7fa3..d7071f2c474 100755
--- a/git-tools/hooks/pre-commit
+++ b/git-tools/hooks/pre-commit
@@ -75,7 +75,7 @@ do
 	if [ $? -ne 0 ]
 	then
 		# Swap back in correct filenames
-		errors=$(echo "$errors"; echo "$result" | grep ':' | sed -e "s@in - on@in $filename on@g")
+		errors=$(echo "$errors"; echo "$result" | grep ':' | sed -E "s@in (.+) on line@in $filename on@g")
 	fi
 done
 unset IFS
diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg
index 83db1f9ba16..6e5b701fdea 100755
--- a/git-tools/hooks/prepare-commit-msg
+++ b/git-tools/hooks/prepare-commit-msg
@@ -47,7 +47,7 @@ then
 		# Branch is prefixed with 'ticket/', append ticket ID to message
 		if [ "$branch" != "${branch##ticket/}" ];
 		then
-			tail="$(printf '\n\nPHPBB3-%s' "$ticket_id")";
+			tail="$(printf '\n\nPHPBB-%s' "$ticket_id")";
 		fi
 	fi
 
diff --git a/git-tools/merge.php b/git-tools/merge.php
index a9bb0514013..7feda889333 100755
--- a/git-tools/merge.php
+++ b/git-tools/merge.php
@@ -56,7 +56,7 @@ function show_usage()
 function work($pull_id, $remote)
 {
 	// Get some basic data
-	$pull = get_pull('phpbb', 'phpbb3', $pull_id);
+	$pull = get_pull('phpbb', 'phpbb', $pull_id);
 
 	if (!$pull_id)
 	{
@@ -79,7 +79,7 @@ function work($pull_id, $remote)
 			run("git checkout develop-olympus");
 			run("git pull $remote develop-olympus");
 
-			add_remote($pull_user, 'phpbb3');
+			add_remote($pull_user, 'phpbb');
 			run("git fetch $pull_user");
 			run("git merge --no-ff $pull_user/$pull_branch");
 			run("phpBB/vendor/bin/phpunit");
@@ -94,7 +94,7 @@ function work($pull_id, $remote)
 			run("git checkout develop");
 			run("git pull $remote develop");
 
-			add_remote($pull_user, 'phpbb3');
+			add_remote($pull_user, 'phpbb');
 			run("git fetch $pull_user");
 			run("git merge --no-ff $pull_user/$pull_branch");
 			run("phpBB/vendor/bin/phpunit");
diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
index 330af7f7683..00000000000
--- a/gulpfile.js
+++ /dev/null
@@ -1,74 +0,0 @@
-'use strict';
-
-const gulp = require('gulp');
-const rename = require('gulp-rename');
-const sourcemaps = require('gulp-sourcemaps');
-const concat = require('gulp-concat-css');
-const postcss = require('gulp-postcss');
-const autoprefixer = require('autoprefixer');
-const cssnano = require('cssnano');
-const sorting = require('postcss-sorting');
-const sortOrder = require('./.postcss-sorting.json');
-
-// Config
-const paths = {
-	styles: {
-		src: './phpBB/styles/prosilver/theme/*.css',
-		css: './phpBB/styles/prosilver/theme/',
-	},
-};
-
-function styles() {
-	return gulp.src(paths.styles.src)
-		.pipe(sourcemaps.init())
-		.pipe(
-			postcss([
-				autoprefixer(),
-				sorting(sortOrder),
-			]),
-		)
-		.pipe(sourcemaps.write('./'))
-		.pipe(gulp.dest(paths.styles.css));
-}
-
-function minify() {
-	return gulp.src([
-		paths.styles.css + 'normalize.css',
-		paths.styles.css + 'base.css',
-		paths.styles.css + 'utilities.css',
-		paths.styles.css + 'icons.css',
-		paths.styles.css + 'common.css',
-		paths.styles.css + 'buttons.css',
-		paths.styles.css + 'links.css',
-		paths.styles.css + 'mentions.css',
-		paths.styles.css + 'content.css',
-		paths.styles.css + 'cp.css',
-		paths.styles.css + 'forms.css',
-		paths.styles.css + 'colours.css',
-		paths.styles.css + 'responsive.css',
-		paths.styles.css + 'bidi.css',
-	])
-		.pipe(sourcemaps.init())
-		.pipe(concat('stylesheet.css'))
-		.pipe(
-			postcss([
-				cssnano(),
-			]),
-		)
-		.pipe(rename({
-			suffix: '.min',
-			extname: '.css',
-		}))
-		.pipe(sourcemaps.write('./'))
-		.pipe(gulp.dest(paths.styles.css));
-}
-
-function watch() {
-	gulp.watch(paths.styles.src, styles);
-}
-
-exports.style = styles;
-exports.minify = minify;
-exports.watch = watch;
-
-exports.default = gulp.series(styles, minify, watch);
diff --git a/package-lock.json b/package-lock.json
index 7471a2fec21..b8c0658742c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,7 +1,7 @@
 {
 	"name": "phpbb",
 	"version": "4.0.0-dev",
-	"lockfileVersion": 2,
+	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
@@ -9,265 +9,270 @@
 			"version": "4.0.0-dev",
 			"license": "GPL-2.0",
 			"devDependencies": {
-				"autoprefixer": "^10.4.4",
-				"cssnano": "^5.1.7",
-				"eslint": "^8.13.0",
-				"eslint-config-xo": "^0.40.0",
-				"gulp": "^4.0.2",
-				"gulp-concat-css": "^3.1.0",
-				"gulp-postcss": "^9.0.1",
-				"gulp-rename": "^2.0.0",
-				"gulp-sourcemaps": "^3.0.0",
-				"postcss": "^8.4.31",
-				"postcss-sorting": "^7.0.1",
+				"eslint": "^9.28.0",
+				"globals": "^17.0.0",
 				"stylelint": "^14.7.0",
-				"stylelint-order": "^5.0.0"
+				"stylelint-order": "^5.0.0",
+				"web-push-testing": "^1.1.1"
 			}
 		},
 		"node_modules/@babel/code-frame": {
-			"version": "7.12.11",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+			"version": "7.27.1",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+			"integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@babel/highlight": "^7.10.4"
+				"@babel/helper-validator-identifier": "^7.27.1",
+				"js-tokens": "^4.0.0",
+				"picocolors": "^1.1.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
-			"integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==",
+			"version": "7.28.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+			"integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/highlight": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-			"integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+		"node_modules/@csstools/selector-specificity": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+			"integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
 			"dev": true,
-			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.14.5",
-				"chalk": "^2.0.0",
-				"js-tokens": "^4.0.0"
-			},
+			"license": "CC0-1.0",
 			"engines": {
-				"node": ">=6.9.0"
+				"node": "^14 || ^16 || >=18"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/csstools"
+			},
+			"peerDependencies": {
+				"postcss-selector-parser": "^6.0.10"
 			}
 		},
-		"node_modules/@babel/highlight/node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+		"node_modules/@eslint-community/eslint-utils": {
+			"version": "4.9.1",
+			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
+			"integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"color-convert": "^1.9.0"
+				"eslint-visitor-keys": "^3.4.3"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
 			}
 		},
-		"node_modules/@babel/highlight/node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			},
+			"license": "Apache-2.0",
 			"engines": {
-				"node": ">=4"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/@babel/highlight/node_modules/color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+		"node_modules/@eslint-community/regexpp": {
+			"version": "4.12.2",
+			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+			"integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
 			"dev": true,
-			"dependencies": {
-				"color-name": "1.1.3"
+			"license": "MIT",
+			"engines": {
+				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
 			}
 		},
-		"node_modules/@babel/highlight/node_modules/color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-			"dev": true
-		},
-		"node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+		"node_modules/@eslint/config-array": {
+			"version": "0.21.1",
+			"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
+			"integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
 			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@eslint/object-schema": "^2.1.7",
+				"debug": "^4.3.1",
+				"minimatch": "^3.1.2"
+			},
 			"engines": {
-				"node": ">=0.8.0"
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			}
 		},
-		"node_modules/@babel/highlight/node_modules/has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+		"node_modules/@eslint/config-helpers": {
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
+			"integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
 			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@eslint/core": "^0.17.0"
+			},
 			"engines": {
-				"node": ">=4"
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			}
 		},
-		"node_modules/@babel/highlight/node_modules/supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+		"node_modules/@eslint/core": {
+			"version": "0.17.0",
+			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+			"integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"dependencies": {
-				"has-flag": "^3.0.0"
+				"@types/json-schema": "^7.0.15"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			}
 		},
 		"node_modules/@eslint/eslintrc": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
-			"integrity": "sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==",
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz",
+			"integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"ajv": "^6.12.4",
 				"debug": "^4.3.2",
-				"espree": "^9.3.1",
-				"globals": "^13.9.0",
+				"espree": "^10.0.1",
+				"globals": "^14.0.0",
 				"ignore": "^5.2.0",
 				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.0.4",
+				"js-yaml": "^4.1.1",
+				"minimatch": "^3.1.2",
 				"strip-json-comments": "^3.1.1"
 			},
 			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/@gulp-sourcemaps/identity-map": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
-			"integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==",
-			"dev": true,
-			"dependencies": {
-				"acorn": "^6.4.1",
-				"normalize-path": "^3.0.0",
-				"postcss": "^7.0.16",
-				"source-map": "^0.6.0",
-				"through2": "^3.0.1"
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			},
-			"engines": {
-				"node": ">= 0.10"
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/@gulp-sourcemaps/identity-map/node_modules/acorn": {
-			"version": "6.4.2",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-			"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+		"node_modules/@eslint/eslintrc/node_modules/globals": {
+			"version": "14.0.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+			"integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
 			"dev": true,
-			"bin": {
-				"acorn": "bin/acorn"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.4.0"
+				"node": ">=18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@gulp-sourcemaps/identity-map/node_modules/picocolors": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-			"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-			"dev": true
-		},
-		"node_modules/@gulp-sourcemaps/identity-map/node_modules/postcss": {
-			"version": "7.0.39",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-			"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+		"node_modules/@eslint/js": {
+			"version": "9.39.2",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz",
+			"integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==",
 			"dev": true,
-			"dependencies": {
-				"picocolors": "^0.2.1",
-				"source-map": "^0.6.1"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=6.0.0"
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			},
 			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/postcss/"
+				"url": "https://eslint.org/donate"
 			}
 		},
-		"node_modules/@gulp-sourcemaps/identity-map/node_modules/through2": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-			"integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+		"node_modules/@eslint/object-schema": {
+			"version": "2.1.7",
+			"resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+			"integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
 			"dev": true,
-			"dependencies": {
-				"inherits": "^2.0.4",
-				"readable-stream": "2 || 3"
+			"license": "Apache-2.0",
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			}
 		},
-		"node_modules/@gulp-sourcemaps/map-sources": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-			"integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
+		"node_modules/@eslint/plugin-kit": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz",
+			"integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"dependencies": {
-				"normalize-path": "^2.0.1",
-				"through2": "^2.0.3"
+				"@eslint/core": "^0.17.0",
+				"levn": "^0.4.1"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			}
 		},
-		"node_modules/@gulp-sourcemaps/map-sources/node_modules/normalize-path": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+		"node_modules/@humanfs/core": {
+			"version": "0.19.1",
+			"resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+			"integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
 			"dev": true,
-			"dependencies": {
-				"remove-trailing-separator": "^1.0.1"
-			},
+			"license": "Apache-2.0",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=18.18.0"
 			}
 		},
-		"node_modules/@gulp-sourcemaps/map-sources/node_modules/through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+		"node_modules/@humanfs/node": {
+			"version": "0.16.7",
+			"resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+			"integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"dependencies": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
+				"@humanfs/core": "^0.19.1",
+				"@humanwhocodes/retry": "^0.4.0"
+			},
+			"engines": {
+				"node": ">=18.18.0"
 			}
 		},
-		"node_modules/@humanwhocodes/config-array": {
-			"version": "0.9.5",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-			"integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+		"node_modules/@humanwhocodes/module-importer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
 			"dev": true,
-			"dependencies": {
-				"@humanwhocodes/object-schema": "^1.2.1",
-				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
-			},
+			"license": "Apache-2.0",
 			"engines": {
-				"node": ">=10.10.0"
+				"node": ">=12.22"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/nzakas"
 			}
 		},
-		"node_modules/@humanwhocodes/object-schema": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-			"dev": true
+		"node_modules/@humanwhocodes/retry": {
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+			"integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=18.18"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/nzakas"
+			}
 		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
 			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@nodelib/fs.stat": "2.0.5",
 				"run-parallel": "^1.1.9"
@@ -281,6 +286,7 @@
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
 			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 8"
 			}
@@ -290,6 +296,7 @@
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
 			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@nodelib/fs.scandir": "2.1.5",
 				"fastq": "^1.6.0"
@@ -298,38 +305,61 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/@trysound/sax": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-			"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+		"node_modules/@types/estree": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+			"integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
 			"dev": true,
-			"engines": {
-				"node": ">=10.13.0"
-			}
+			"license": "MIT"
+		},
+		"node_modules/@types/json-schema": {
+			"version": "7.0.15",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/minimist": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
-			"integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
-			"dev": true
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/normalize-package-data": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-			"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-			"dev": true
+			"version": "2.4.4",
+			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+			"integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/parse-json": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-			"dev": true
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+			"integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/accepts": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+			"integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"mime-types": "~2.1.34",
+				"negotiator": "0.6.3"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
 		"node_modules/acorn": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+			"version": "8.15.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+			"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -342,15 +372,17 @@
 			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
 			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
 			"dev": true,
+			"license": "MIT",
 			"peerDependencies": {
 				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
 		"node_modules/ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"version": "6.14.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+			"integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"fast-json-stable-stringify": "^2.0.0",
@@ -362,47 +394,12 @@
 				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
-		"node_modules/ansi-cyan": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-			"integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
-			"dev": true,
-			"dependencies": {
-				"ansi-wrap": "0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/ansi-gray": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-			"integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-			"dev": true,
-			"dependencies": {
-				"ansi-wrap": "0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/ansi-red": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-			"integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
-			"dev": true,
-			"dependencies": {
-				"ansi-wrap": "0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/ansi-regex": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
 			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
@@ -412,6 +409,7 @@
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
 			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"color-convert": "^2.0.1"
 			},
@@ -422,2371 +420,2158 @@
 				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"node_modules/ansi-wrap": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-			"integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+		"node_modules/arg": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+			"integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/anymatch": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-			"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+		"node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
 			"dev": true,
-			"dependencies": {
-				"micromatch": "^3.1.4",
-				"normalize-path": "^2.1.1"
-			}
+			"license": "Python-2.0"
 		},
-		"node_modules/anymatch/node_modules/normalize-path": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+		"node_modules/array-flatten": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
 			"dev": true,
-			"dependencies": {
-				"remove-trailing-separator": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/append-buffer": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-			"integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+		"node_modules/array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
 			"dev": true,
-			"dependencies": {
-				"buffer-equal": "^1.0.0"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
 			}
 		},
-		"node_modules/archy": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-			"integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-			"dev": true
-		},
-		"node_modules/argparse": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
-		},
-		"node_modules/arr-diff": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-			"integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+		"node_modules/arrify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+			"integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/arr-filter": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-			"integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+		"node_modules/astral-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
 			"dev": true,
-			"dependencies": {
-				"make-iterator": "^1.0.0"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
 			}
 		},
-		"node_modules/arr-flatten": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+		"node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/arr-map": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-			"integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+		"node_modules/body-parser": {
+			"version": "1.20.4",
+			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz",
+			"integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"make-iterator": "^1.0.0"
+				"bytes": "~3.1.2",
+				"content-type": "~1.0.5",
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"destroy": "~1.2.0",
+				"http-errors": "~2.0.1",
+				"iconv-lite": "~0.4.24",
+				"on-finished": "~2.4.1",
+				"qs": "~6.14.0",
+				"raw-body": "~2.5.3",
+				"type-is": "~1.6.18",
+				"unpipe": "~1.0.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/arr-union": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-			"integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.8",
+				"npm": "1.2.8000 || >= 1.4.16"
 			}
 		},
-		"node_modules/array-each": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-			"integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+		"node_modules/body-parser/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
 			}
 		},
-		"node_modules/array-initial": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-			"integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
+		"node_modules/body-parser/node_modules/iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"array-slice": "^1.0.0",
-				"is-number": "^4.0.0"
+				"safer-buffer": ">= 2.1.2 < 3"
 			},
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/array-initial/node_modules/is-number": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-			"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+		"node_modules/body-parser/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+			"license": "MIT"
+		},
+		"node_modules/brace-expansion": {
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+			"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
 			}
 		},
-		"node_modules/array-last": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-			"integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+		"node_modules/braces": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-number": "^4.0.0"
+				"fill-range": "^7.1.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
 			}
 		},
-		"node_modules/array-last/node_modules/is-number": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-			"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+		"node_modules/buffer-equal-constant-time": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+			"integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "BSD-3-Clause"
 		},
-		"node_modules/array-slice": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-			"integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+		"node_modules/bytes": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.8"
 			}
 		},
-		"node_modules/array-sort": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-			"integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+		"node_modules/call-bind-apply-helpers": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+			"integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"default-compare": "^1.0.0",
-				"get-value": "^2.0.6",
-				"kind-of": "^5.0.2"
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
 			}
 		},
-		"node_modules/array-union": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+		"node_modules/call-bound": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+			"integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"array-uniq": "^1.0.1"
+				"call-bind-apply-helpers": "^1.0.2",
+				"get-intrinsic": "^1.3.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/array-uniq": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+		"node_modules/callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=6"
 			}
 		},
-		"node_modules/array-unique": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/arrify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+		"node_modules/camelcase": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=6"
 			}
 		},
-		"node_modules/assign-symbols": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+		"node_modules/camelcase-keys": {
+			"version": "6.2.2",
+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
 			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"camelcase": "^5.3.1",
+				"map-obj": "^4.0.0",
+				"quick-lru": "^4.0.1"
+			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/astral-regex": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+		"node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"node_modules/async": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-			"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-			"dev": true
-		},
-		"node_modules/async-done": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-			"integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+		"node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.2",
-				"process-nextick-args": "^2.0.0",
-				"stream-exhaust": "^1.0.1"
+				"color-name": "~1.1.4"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=7.0.0"
 			}
 		},
-		"node_modules/async-each": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-			"integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-			"dev": true
+		"node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/colord": {
+			"version": "2.9.3",
+			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+			"integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"node_modules/async-settle": {
+		"node_modules/connected-domain": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-			"integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+			"resolved": "https://registry.npmjs.org/connected-domain/-/connected-domain-1.0.0.tgz",
+			"integrity": "sha512-lHlohUiJxlpunvDag2Y0pO20bnvarMjnrdciZeuJUqRwrf/5JHNhdpiPIr5GQ8IkqrFj5TDMQwcCjblGo1oeuA==",
 			"dev": true,
-			"dependencies": {
-				"async-done": "^1.2.2"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
+			"license": "MIT"
 		},
-		"node_modules/atob": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+		"node_modules/content-disposition": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+			"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
 			"dev": true,
-			"bin": {
-				"atob": "bin/atob.js"
+			"license": "MIT",
+			"dependencies": {
+				"safe-buffer": "5.2.1"
 			},
 			"engines": {
-				"node": ">= 4.5.0"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/autoprefixer": {
-			"version": "10.4.4",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.4.tgz",
-			"integrity": "sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA==",
+		"node_modules/content-disposition/node_modules/safe-buffer": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 			"dev": true,
 			"funding": [
 				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/postcss/"
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
 				},
 				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/autoprefixer"
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
 				}
 			],
-			"dependencies": {
-				"browserslist": "^4.20.2",
-				"caniuse-lite": "^1.0.30001317",
-				"fraction.js": "^4.2.0",
-				"normalize-range": "^0.1.2",
-				"picocolors": "^1.0.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"bin": {
-				"autoprefixer": "bin/autoprefixer"
-			},
+			"license": "MIT"
+		},
+		"node_modules/content-type": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": "^10 || ^12 || >=14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/bach": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-			"integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
+		"node_modules/cookie": {
+			"version": "0.7.2",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+			"integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
 			"dev": true,
-			"dependencies": {
-				"arr-filter": "^1.1.1",
-				"arr-flatten": "^1.0.1",
-				"arr-map": "^2.0.0",
-				"array-each": "^1.0.0",
-				"array-initial": "^1.0.0",
-				"array-last": "^1.1.1",
-				"async-done": "^1.2.2",
-				"async-settle": "^1.0.0",
-				"now-and-later": "^2.0.0"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/balanced-match": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-			"dev": true
+		"node_modules/cookie-signature": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
+			"integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"node_modules/base": {
-			"version": "0.11.2",
-			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+		"node_modules/cosmiconfig": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+			"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"cache-base": "^1.0.1",
-				"class-utils": "^0.3.5",
-				"component-emitter": "^1.2.1",
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.1",
-				"mixin-deep": "^1.2.0",
-				"pascalcase": "^0.1.1"
+				"@types/parse-json": "^4.0.0",
+				"import-fresh": "^3.2.1",
+				"parse-json": "^5.0.0",
+				"path-type": "^4.0.0",
+				"yaml": "^1.10.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=10"
 			}
 		},
-		"node_modules/base/node_modules/define-property": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-			"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+		"node_modules/cross-spawn": {
+			"version": "7.0.6",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+			"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-descriptor": "^1.0.0"
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 8"
 			}
 		},
-		"node_modules/binary-extensions": {
-			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-			"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+		"node_modules/css-functions-list": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.3.tgz",
+			"integrity": "sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/bindings": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-			"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-			"dev": true,
-			"optional": true,
-			"dependencies": {
-				"file-uri-to-path": "1.0.0"
-			}
-		},
-		"node_modules/boolbase": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-			"dev": true
-		},
-		"node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
+				"node": ">=12 || >=16"
 			}
 		},
-		"node_modules/braces": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+		"node_modules/cssesc": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
 			"dev": true,
-			"dependencies": {
-				"arr-flatten": "^1.1.0",
-				"array-unique": "^0.3.2",
-				"extend-shallow": "^2.0.1",
-				"fill-range": "^4.0.0",
-				"isobject": "^3.0.1",
-				"repeat-element": "^1.1.2",
-				"snapdragon": "^0.8.1",
-				"snapdragon-node": "^2.0.1",
-				"split-string": "^3.0.2",
-				"to-regex": "^3.0.1"
+			"license": "MIT",
+			"bin": {
+				"cssesc": "bin/cssesc"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=4"
 			}
 		},
-		"node_modules/browserslist": {
-			"version": "4.20.2",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
-			"integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
+		"node_modules/debug": {
+			"version": "4.4.3",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+			"integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
 			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/browserslist"
-				}
-			],
+			"license": "MIT",
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001317",
-				"electron-to-chromium": "^1.4.84",
-				"escalade": "^3.1.1",
-				"node-releases": "^2.0.2",
-				"picocolors": "^1.0.0"
-			},
-			"bin": {
-				"browserslist": "cli.js"
+				"ms": "^2.1.3"
 			},
 			"engines": {
-				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/buffer-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-			"integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+		"node_modules/decamelize": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.4.0"
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/buffer-from": {
+		"node_modules/decamelize-keys": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-			"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-			"dev": true
-		},
-		"node_modules/cache-base": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+			"integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"collection-visit": "^1.0.0",
-				"component-emitter": "^1.2.1",
-				"get-value": "^2.0.6",
-				"has-value": "^1.0.0",
-				"isobject": "^3.0.1",
-				"set-value": "^2.0.0",
-				"to-object-path": "^0.3.0",
-				"union-value": "^1.0.0",
-				"unset-value": "^1.0.0"
+				"decamelize": "^1.1.0",
+				"map-obj": "^1.0.0"
 			},
 			"engines": {
 				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-			"dev": true,
-			"dependencies": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+		"node_modules/decamelize-keys/node_modules/map-obj": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+			"integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=6"
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+		"node_modules/deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
 			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
+			"license": "MIT"
 		},
-		"node_modules/camelcase-keys": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+		"node_modules/depd": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
 			"dev": true,
-			"dependencies": {
-				"camelcase": "^5.3.1",
-				"map-obj": "^4.0.0",
-				"quick-lru": "^4.0.1"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": ">= 0.8"
 			}
 		},
-		"node_modules/caniuse-api": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+		"node_modules/destroy": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
 			"dev": true,
-			"dependencies": {
-				"browserslist": "^4.0.0",
-				"caniuse-lite": "^1.0.0",
-				"lodash.memoize": "^4.1.2",
-				"lodash.uniq": "^4.5.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8",
+				"npm": "1.2.8000 || >= 1.4.16"
 			}
 		},
-		"node_modules/caniuse-lite": {
-			"version": "1.0.30001332",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
-			"integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-				}
-			]
-		},
-		"node_modules/chalk": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-			"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+		"node_modules/dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
+				"path-type": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
+				"node": ">=8"
 			}
 		},
-		"node_modules/chokidar": {
-			"version": "2.1.8",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-			"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-			"deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
+		"node_modules/dunder-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+			"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"anymatch": "^2.0.0",
-				"async-each": "^1.0.1",
-				"braces": "^2.3.2",
-				"glob-parent": "^3.1.0",
-				"inherits": "^2.0.3",
-				"is-binary-path": "^1.0.0",
-				"is-glob": "^4.0.0",
-				"normalize-path": "^3.0.0",
-				"path-is-absolute": "^1.0.0",
-				"readdirp": "^2.2.1",
-				"upath": "^1.1.1"
+				"call-bind-apply-helpers": "^1.0.1",
+				"es-errors": "^1.3.0",
+				"gopd": "^1.2.0"
 			},
-			"optionalDependencies": {
-				"fsevents": "^1.2.7"
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
-		"node_modules/chokidar/node_modules/glob-parent": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-			"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+		"node_modules/ecdsa-sig-formatter": {
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+			"integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"dependencies": {
-				"is-glob": "^3.1.0",
-				"path-dirname": "^1.0.0"
+				"safe-buffer": "^5.0.1"
 			}
 		},
-		"node_modules/chokidar/node_modules/glob-parent/node_modules/is-glob": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-			"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+		"node_modules/ee-first": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
 			"dev": true,
-			"dependencies": {
-				"is-extglob": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/class-utils": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+		"node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
 			"dev": true,
-			"dependencies": {
-				"arr-union": "^3.1.0",
-				"define-property": "^0.2.5",
-				"isobject": "^3.0.0",
-				"static-extend": "^0.1.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/class-utils/node_modules/arr-union": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-			"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+		"node_modules/encodeurl": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+			"integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.8"
 			}
 		},
-		"node_modules/class-utils/node_modules/define-property": {
-			"version": "0.2.5",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-			"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+		"node_modules/error-ex": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+			"integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-descriptor": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
+				"is-arrayish": "^0.2.1"
 			}
 		},
-		"node_modules/class-utils/node_modules/is-accessor-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+		"node_modules/es-define-property": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+			"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
 			"dev": true,
-			"dependencies": {
-				"kind-of": "^3.0.2"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
 			}
 		},
-		"node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+		"node_modules/es-errors": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
 			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
 			}
 		},
-		"node_modules/class-utils/node_modules/is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"node_modules/class-utils/node_modules/is-data-descriptor": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+		"node_modules/es-object-atoms": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+			"integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"kind-of": "^3.0.2"
+				"es-errors": "^1.3.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
 			}
 		},
-		"node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+		"node_modules/escape-html": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
 			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5"
-			},
+			"license": "MIT"
+		},
+		"node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/class-utils/node_modules/is-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-			"dev": true,
-			"dependencies": {
-				"is-accessor-descriptor": "^0.1.6",
-				"is-data-descriptor": "^0.1.4",
-				"kind-of": "^5.0.0"
+		"node_modules/eslint": {
+			"version": "9.39.2",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz",
+			"integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@eslint-community/eslint-utils": "^4.8.0",
+				"@eslint-community/regexpp": "^4.12.1",
+				"@eslint/config-array": "^0.21.1",
+				"@eslint/config-helpers": "^0.4.2",
+				"@eslint/core": "^0.17.0",
+				"@eslint/eslintrc": "^3.3.1",
+				"@eslint/js": "9.39.2",
+				"@eslint/plugin-kit": "^0.4.1",
+				"@humanfs/node": "^0.16.6",
+				"@humanwhocodes/module-importer": "^1.0.1",
+				"@humanwhocodes/retry": "^0.4.2",
+				"@types/estree": "^1.0.6",
+				"ajv": "^6.12.4",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.6",
+				"debug": "^4.3.2",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^8.4.0",
+				"eslint-visitor-keys": "^4.2.1",
+				"espree": "^10.4.0",
+				"esquery": "^1.5.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^8.0.0",
+				"find-up": "^5.0.0",
+				"glob-parent": "^6.0.2",
+				"ignore": "^5.2.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.1.2",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.3"
+			},
+			"bin": {
+				"eslint": "bin/eslint.js"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"url": "https://eslint.org/donate"
+			},
+			"peerDependencies": {
+				"jiti": "*"
+			},
+			"peerDependenciesMeta": {
+				"jiti": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/cliui": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-			"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+		"node_modules/eslint-scope": {
+			"version": "8.4.0",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+			"integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
-				"string-width": "^1.0.1",
-				"strip-ansi": "^3.0.1",
-				"wrap-ansi": "^2.0.0"
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/cliui/node_modules/ansi-regex": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+		"node_modules/eslint-visitor-keys": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+			"integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/cliui/node_modules/is-fullwidth-code-point": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-			"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+		"node_modules/espree": {
+			"version": "10.4.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+			"integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
-				"number-is-nan": "^1.0.0"
+				"acorn": "^8.15.0",
+				"acorn-jsx": "^5.3.2",
+				"eslint-visitor-keys": "^4.2.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/cliui/node_modules/string-width": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+		"node_modules/esquery": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
+			"integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
-				"code-point-at": "^1.0.0",
-				"is-fullwidth-code-point": "^1.0.0",
-				"strip-ansi": "^3.0.0"
+				"estraverse": "^5.1.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=0.10"
 			}
 		},
-		"node_modules/cliui/node_modules/strip-ansi": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+		"node_modules/esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
-				"ansi-regex": "^2.0.0"
+				"estraverse": "^5.2.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=4.0"
 			}
 		},
-		"node_modules/clone": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-			"integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+		"node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"engines": {
-				"node": ">=0.8"
+				"node": ">=4.0"
 			}
 		},
-		"node_modules/clone-buffer": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-			"integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
 			"dev": true,
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/etag": {
+			"version": "1.8.1",
+			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/express": {
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
+			"integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"accepts": "~1.3.8",
+				"array-flatten": "1.1.1",
+				"body-parser": "~1.20.3",
+				"content-disposition": "~0.5.4",
+				"content-type": "~1.0.4",
+				"cookie": "~0.7.1",
+				"cookie-signature": "~1.0.6",
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"encodeurl": "~2.0.0",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"finalhandler": "~1.3.1",
+				"fresh": "~0.5.2",
+				"http-errors": "~2.0.0",
+				"merge-descriptors": "1.0.3",
+				"methods": "~1.1.2",
+				"on-finished": "~2.4.1",
+				"parseurl": "~1.3.3",
+				"path-to-regexp": "~0.1.12",
+				"proxy-addr": "~2.0.7",
+				"qs": "~6.14.0",
+				"range-parser": "~1.2.1",
+				"safe-buffer": "5.2.1",
+				"send": "~0.19.0",
+				"serve-static": "~1.16.2",
+				"setprototypeof": "1.2.0",
+				"statuses": "~2.0.1",
+				"type-is": "~1.6.18",
+				"utils-merge": "1.0.1",
+				"vary": "~1.1.2"
+			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">= 0.10.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/express"
 			}
 		},
-		"node_modules/clone-regexp": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
-			"integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
+		"node_modules/express/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-regexp": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
+				"ms": "2.0.0"
 			}
 		},
-		"node_modules/clone-stats": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-			"integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-			"dev": true
-		},
-		"node_modules/cloneable-readable": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-			"integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+		"node_modules/express/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 			"dev": true,
-			"dependencies": {
-				"inherits": "^2.0.1",
-				"process-nextick-args": "^2.0.0",
-				"readable-stream": "^2.3.5"
-			}
+			"license": "MIT"
 		},
-		"node_modules/code-point-at": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+		"node_modules/express/node_modules/safe-buffer": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"license": "MIT"
 		},
-		"node_modules/collection-map": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-			"integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
+		"node_modules/fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
 			"dev": true,
-			"dependencies": {
-				"arr-map": "^2.0.2",
-				"for-own": "^1.0.0",
-				"make-iterator": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/collection-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-			"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+		"node_modules/fast-glob": {
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+			"integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"map-visit": "^1.0.0",
-				"object-visit": "^1.0.0"
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.2",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.8"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8.6.0"
 			}
 		},
-		"node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+		"node_modules/fast-glob/node_modules/glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"color-name": "~1.1.4"
+				"is-glob": "^4.0.1"
 			},
 			"engines": {
-				"node": ">=7.0.0"
+				"node": ">= 6"
 			}
 		},
-		"node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
+		"node_modules/fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"node_modules/color-support": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-			"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+		"node_modules/fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
 			"dev": true,
-			"bin": {
-				"color-support": "bin.js"
-			}
+			"license": "MIT"
 		},
-		"node_modules/colord": {
-			"version": "2.9.2",
-			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
-			"integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
-			"dev": true
+		"node_modules/fast-uri": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
+			"integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fastify"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/fastify"
+				}
+			],
+			"license": "BSD-3-Clause"
 		},
-		"node_modules/commander": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+		"node_modules/fastest-levenshtein": {
+			"version": "1.0.16",
+			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+			"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">= 10"
+				"node": ">= 4.9.1"
 			}
 		},
-		"node_modules/component-emitter": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-			"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-			"dev": true
-		},
-		"node_modules/concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-			"dev": true
-		},
-		"node_modules/concat-stream": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+		"node_modules/fastq": {
+			"version": "1.20.1",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+			"integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
 			"dev": true,
-			"engines": [
-				"node >= 0.8"
-			],
+			"license": "ISC",
 			"dependencies": {
-				"buffer-from": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.2.2",
-				"typedarray": "^0.0.6"
+				"reusify": "^1.0.4"
 			}
 		},
-		"node_modules/confusing-browser-globals": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-			"integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-			"dev": true
-		},
-		"node_modules/convert-source-map": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-			"integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+		"node_modules/file-entry-cache": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+			"integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"safe-buffer": "~5.1.1"
+				"flat-cache": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=16.0.0"
 			}
 		},
-		"node_modules/copy-descriptor": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+		"node_modules/fill-range": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
 			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
 			}
 		},
-		"node_modules/copy-props": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
-			"integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
+		"node_modules/finalhandler": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
+			"integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"each-props": "^1.3.2",
-				"is-plain-object": "^5.0.0"
-			}
+				"debug": "2.6.9",
+				"encodeurl": "~2.0.0",
+				"escape-html": "~1.0.3",
+				"on-finished": "~2.4.1",
+				"parseurl": "~1.3.3",
+				"statuses": "~2.0.2",
+				"unpipe": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"node_modules/core-util-is": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-			"dev": true
+		"node_modules/finalhandler/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
 		},
-		"node_modules/cosmiconfig": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-			"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+		"node_modules/finalhandler/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@types/parse-json": "^4.0.0",
-				"import-fresh": "^3.2.1",
-				"parse-json": "^5.0.0",
-				"path-type": "^4.0.0",
-				"yaml": "^1.10.0"
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
 			},
 			"engines": {
 				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+		"node_modules/flat-cache": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+			"integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
+				"flatted": "^3.2.9",
+				"keyv": "^4.5.4"
 			},
 			"engines": {
-				"node": ">= 8"
+				"node": ">=16"
 			}
 		},
-		"node_modules/css": {
-			"version": "2.2.4",
-			"resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-			"integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+		"node_modules/flatted": {
+			"version": "3.4.2",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+			"integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
 			"dev": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"source-map": "^0.6.1",
-				"source-map-resolve": "^0.5.2",
-				"urix": "^0.1.0"
-			}
+			"license": "ISC"
 		},
-		"node_modules/css-declaration-sorter": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz",
-			"integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==",
+		"node_modules/forwarded": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": "^10 || ^12 || >=14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.0.9"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/css-functions-list": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
-			"integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
+		"node_modules/fresh": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=12.22"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/css-select": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-			"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
 			"dev": true,
-			"dependencies": {
-				"boolbase": "^1.0.0",
-				"css-what": "^6.0.1",
-				"domhandler": "^4.3.1",
-				"domutils": "^2.8.0",
-				"nth-check": "^2.0.1"
-			},
+			"license": "ISC"
+		},
+		"node_modules/function-bind": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"dev": true,
+			"license": "MIT",
 			"funding": {
-				"url": "https://github.com/sponsors/fb55"
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/css-tree": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-			"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+		"node_modules/get-intrinsic": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+			"integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"mdn-data": "2.0.14",
-				"source-map": "^0.6.1"
+				"call-bind-apply-helpers": "^1.0.2",
+				"es-define-property": "^1.0.1",
+				"es-errors": "^1.3.0",
+				"es-object-atoms": "^1.1.1",
+				"function-bind": "^1.1.2",
+				"get-proto": "^1.0.1",
+				"gopd": "^1.2.0",
+				"has-symbols": "^1.1.0",
+				"hasown": "^2.0.2",
+				"math-intrinsics": "^1.1.0"
 			},
 			"engines": {
-				"node": ">=8.0.0"
-			}
-		},
-		"node_modules/css-what": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 6"
+				"node": ">= 0.4"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/fb55"
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/cssesc": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+		"node_modules/get-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+			"integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
 			"dev": true,
-			"bin": {
-				"cssesc": "bin/cssesc"
+			"license": "MIT",
+			"dependencies": {
+				"dunder-proto": "^1.0.1",
+				"es-object-atoms": "^1.0.0"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": ">= 0.4"
 			}
 		},
-		"node_modules/cssnano": {
-			"version": "5.1.7",
-			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.7.tgz",
-			"integrity": "sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg==",
+		"node_modules/glob": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"deprecated": "Glob versions prior to v9 are no longer supported",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"cssnano-preset-default": "^5.2.7",
-				"lilconfig": "^2.0.3",
-				"yaml": "^1.10.2"
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
 			},
 			"engines": {
-				"node": "^10 || ^12 || >=14.0"
+				"node": "*"
 			},
 			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/cssnano"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/cssnano-preset-default": {
-			"version": "5.2.7",
-			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz",
-			"integrity": "sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==",
-			"dev": true,
-			"dependencies": {
-				"css-declaration-sorter": "^6.2.2",
-				"cssnano-utils": "^3.1.0",
-				"postcss-calc": "^8.2.3",
-				"postcss-colormin": "^5.3.0",
-				"postcss-convert-values": "^5.1.0",
-				"postcss-discard-comments": "^5.1.1",
-				"postcss-discard-duplicates": "^5.1.0",
-				"postcss-discard-empty": "^5.1.1",
-				"postcss-discard-overridden": "^5.1.0",
-				"postcss-merge-longhand": "^5.1.4",
-				"postcss-merge-rules": "^5.1.1",
-				"postcss-minify-font-values": "^5.1.0",
-				"postcss-minify-gradients": "^5.1.1",
-				"postcss-minify-params": "^5.1.2",
-				"postcss-minify-selectors": "^5.2.0",
-				"postcss-normalize-charset": "^5.1.0",
-				"postcss-normalize-display-values": "^5.1.0",
-				"postcss-normalize-positions": "^5.1.0",
-				"postcss-normalize-repeat-style": "^5.1.0",
-				"postcss-normalize-string": "^5.1.0",
-				"postcss-normalize-timing-functions": "^5.1.0",
-				"postcss-normalize-unicode": "^5.1.0",
-				"postcss-normalize-url": "^5.1.0",
-				"postcss-normalize-whitespace": "^5.1.1",
-				"postcss-ordered-values": "^5.1.1",
-				"postcss-reduce-initial": "^5.1.0",
-				"postcss-reduce-transforms": "^5.1.0",
-				"postcss-svgo": "^5.1.0",
-				"postcss-unique-selectors": "^5.1.1"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/cssnano-utils": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
-			"integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-			"dev": true,
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/csso": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-			"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+		"node_modules/glob-parent": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"css-tree": "^1.1.2"
+				"is-glob": "^4.0.3"
 			},
 			"engines": {
-				"node": ">=8.0.0"
+				"node": ">=10.13.0"
 			}
 		},
-		"node_modules/d": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-			"integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+		"node_modules/globals": {
+			"version": "17.0.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-17.0.0.tgz",
+			"integrity": "sha512-gv5BeD2EssA793rlFWVPMMCqefTlpusw6/2TbAVMy0FzcG8wKJn4O+NqJ4+XWmmwrayJgw5TzrmWjFgmz1XPqw==",
 			"dev": true,
-			"dependencies": {
-				"es5-ext": "^0.10.50",
-				"type": "^1.0.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+		"node_modules/globby": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ms": "2.1.2"
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.2.9",
+				"ignore": "^5.2.0",
+				"merge2": "^1.4.1",
+				"slash": "^3.0.0"
 			},
 			"engines": {
-				"node": ">=6.0"
+				"node": ">=10"
 			},
-			"peerDependenciesMeta": {
-				"supports-color": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/debug-fabulous": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
-			"integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
-			"dev": true,
-			"dependencies": {
-				"debug": "3.X",
-				"memoizee": "0.4.X",
-				"object-assign": "4.X"
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/debug-fabulous/node_modules/debug": {
-			"version": "3.2.7",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+		"node_modules/globjoin": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+			"integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
 			"dev": true,
-			"dependencies": {
-				"ms": "^2.1.1"
-			}
+			"license": "MIT"
 		},
-		"node_modules/decamelize": {
+		"node_modules/gopd": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+			"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/decamelize-keys": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-			"integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-			"dev": true,
-			"dependencies": {
-				"decamelize": "^1.1.0",
-				"map-obj": "^1.0.0"
+				"node": ">= 0.4"
 			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/decamelize-keys/node_modules/map-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/decode-uri-component": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-			"integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+		"node_modules/hard-rejection": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10"
+				"node": ">=6"
 			}
 		},
-		"node_modules/deep-is": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-			"dev": true
-		},
-		"node_modules/default-compare": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-			"integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+		"node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"dependencies": {
-				"kind-of": "^5.0.2"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
 			}
 		},
-		"node_modules/default-resolution": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-			"integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
+		"node_modules/has-symbols": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+			"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/define-properties": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+		"node_modules/hasown": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"object-keys": "^1.0.12"
+				"function-bind": "^1.1.2"
 			},
 			"engines": {
 				"node": ">= 0.4"
 			}
 		},
-		"node_modules/define-property": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+		"node_modules/hosted-git-info": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+			"integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"is-descriptor": "^1.0.2",
-				"isobject": "^3.0.1"
+				"lru-cache": "^6.0.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=10"
 			}
 		},
-		"node_modules/detect-file": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+		"node_modules/html-tags": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
+			"integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/detect-newline": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-			"integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
+		"node_modules/http_ece": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.2.1.tgz",
+			"integrity": "sha512-+tzLoMYgXvicu60sVFoswTiu6BiQ6EX3DORRJQ3W2dNpNWCyZ3tcmRFZZ3jgVyw8ziWUCeUARKCkYDY6JgFx+w==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=16"
 			}
 		},
-		"node_modules/dir-glob": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+		"node_modules/http-errors": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
+			"integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"path-type": "^4.0.0"
+				"depd": "~2.0.0",
+				"inherits": "~2.0.4",
+				"setprototypeof": "~1.2.0",
+				"statuses": "~2.0.2",
+				"toidentifier": "~1.0.1"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">= 0.8"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/express"
 			}
 		},
-		"node_modules/doctrine": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+		"node_modules/ignore": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+			"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
 			"dev": true,
-			"dependencies": {
-				"esutils": "^2.0.2"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=6.0.0"
+				"node": ">= 4"
 			}
 		},
-		"node_modules/dom-serializer": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-			"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+		"node_modules/import-fresh": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+			"integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"domelementtype": "^2.0.1",
-				"domhandler": "^4.2.0",
-				"entities": "^2.0.0"
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			},
 			"funding": {
-				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/domelementtype": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+		"node_modules/import-lazy": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
 			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/fb55"
-				}
-			]
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"node_modules/domhandler": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-			"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+		"node_modules/imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
 			"dev": true,
-			"dependencies": {
-				"domelementtype": "^2.2.0"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">= 4"
-			},
-			"funding": {
-				"url": "https://github.com/fb55/domhandler?sponsor=1"
+				"node": ">=0.8.19"
 			}
 		},
-		"node_modules/domutils": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-			"dev": true,
-			"dependencies": {
-				"dom-serializer": "^1.0.1",
-				"domelementtype": "^2.2.0",
-				"domhandler": "^4.2.0"
-			},
-			"funding": {
-				"url": "https://github.com/fb55/domutils?sponsor=1"
-			}
-		},
-		"node_modules/duplexify": {
-			"version": "3.7.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+		"node_modules/indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
 			"dev": true,
-			"dependencies": {
-				"end-of-stream": "^1.0.0",
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.0",
-				"stream-shift": "^1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"node_modules/each-props": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-			"integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+			"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"is-plain-object": "^2.0.1",
-				"object.defaults": "^1.1.0"
+				"once": "^1.3.0",
+				"wrappy": "1"
 			}
 		},
-		"node_modules/each-props/node_modules/is-plain-object": {
+		"node_modules/inherits": {
 			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
 			"dev": true,
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/electron-to-chromium": {
-			"version": "1.4.111",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.111.tgz",
-			"integrity": "sha512-/s3+fwhKf1YK4k7btOImOzCQLpUjS6MaPf0ODTNuT4eTM1Bg4itBpLkydhOzJmpmH6Z9eXFyuuK5czsmzRzwtw==",
-			"dev": true
-		},
-		"node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
+			"license": "ISC"
 		},
-		"node_modules/end-of-stream": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+		"node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
 			"dev": true,
-			"dependencies": {
-				"once": "^1.4.0"
-			}
+			"license": "ISC"
 		},
-		"node_modules/entities": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+		"node_modules/ipaddr.js": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
 			"dev": true,
-			"funding": {
-				"url": "https://github.com/fb55/entities?sponsor=1"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"node_modules/error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+		"node_modules/is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
 			"dev": true,
-			"dependencies": {
-				"is-arrayish": "^0.2.1"
-			}
+			"license": "MIT"
 		},
-		"node_modules/es5-ext": {
-			"version": "0.10.53",
-			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-			"integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+		"node_modules/is-core-module": {
+			"version": "2.16.1",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+			"integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"es6-iterator": "~2.0.3",
-				"es6-symbol": "~3.1.3",
-				"next-tick": "~1.0.0"
+				"hasown": "^2.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/es5-ext/node_modules/next-tick": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-			"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-			"dev": true
-		},
-		"node_modules/es6-iterator": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-			"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+		"node_modules/is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
 			"dev": true,
-			"dependencies": {
-				"d": "1",
-				"es5-ext": "^0.10.35",
-				"es6-symbol": "^3.1.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/es6-symbol": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-			"integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+		"node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
 			"dev": true,
-			"dependencies": {
-				"d": "^1.0.1",
-				"ext": "^1.1.2"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"node_modules/es6-weak-map": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-			"integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+		"node_modules/is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"d": "1",
-				"es5-ext": "^0.10.46",
-				"es6-iterator": "^2.0.3",
-				"es6-symbol": "^3.1.1"
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+		"node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=6"
+				"node": ">=0.12.0"
 			}
 		},
-		"node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+		"node_modules/is-plain-obj": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+			"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/eslint": {
-			"version": "8.13.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz",
-			"integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==",
+		"node_modules/is-plain-object": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+			"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
 			"dev": true,
-			"dependencies": {
-				"@eslint/eslintrc": "^1.2.1",
-				"@humanwhocodes/config-array": "^0.9.2",
-				"ajv": "^6.10.0",
-				"chalk": "^4.0.0",
-				"cross-spawn": "^7.0.2",
-				"debug": "^4.3.2",
-				"doctrine": "^3.0.0",
-				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^7.1.1",
-				"eslint-utils": "^3.0.0",
-				"eslint-visitor-keys": "^3.3.0",
-				"espree": "^9.3.1",
-				"esquery": "^1.4.0",
-				"esutils": "^2.0.2",
-				"fast-deep-equal": "^3.1.3",
-				"file-entry-cache": "^6.0.1",
-				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.6.0",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.0.0",
-				"imurmurhash": "^0.1.4",
-				"is-glob": "^4.0.0",
-				"js-yaml": "^4.1.0",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"levn": "^0.4.1",
-				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.0.4",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.1",
-				"regexpp": "^3.2.0",
-				"strip-ansi": "^6.0.1",
-				"strip-json-comments": "^3.1.0",
-				"text-table": "^0.2.0",
-				"v8-compile-cache": "^2.0.3"
-			},
-			"bin": {
-				"eslint": "bin/eslint.js"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/eslint-config-xo": {
-			"version": "0.40.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-xo/-/eslint-config-xo-0.40.0.tgz",
-			"integrity": "sha512-msI1O0JGxeK2bbExg3U6EGaWKcjhOFzEjwzObywG/DC5GSNZTOyJT+b2l9MZGBeZsVdxfIGwdXTNeWXl8cN9iw==",
+		"node_modules/isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
 			"dev": true,
-			"dependencies": {
-				"confusing-browser-globals": "1.0.11"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			},
-			"peerDependencies": {
-				"eslint": ">=8.6.0"
-			}
+			"license": "ISC"
 		},
-		"node_modules/eslint-scope": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-			"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+		"node_modules/js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
 			"dev": true,
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/eslint-utils": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+		"node_modules/js-yaml": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+			"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"eslint-visitor-keys": "^2.0.0"
-			},
-			"engines": {
-				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
+				"argparse": "^2.0.1"
 			},
-			"peerDependencies": {
-				"eslint": ">=5"
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
 			}
 		},
-		"node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+		"node_modules/json-buffer": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
 			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
+			"license": "MIT"
 		},
-		"node_modules/eslint-visitor-keys": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+		"node_modules/json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
 			"dev": true,
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/espree": {
-			"version": "9.3.1",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
-			"integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
+		"node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jsonwebtoken": {
+			"version": "9.0.3",
+			"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz",
+			"integrity": "sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"acorn": "^8.7.0",
-				"acorn-jsx": "^5.3.1",
-				"eslint-visitor-keys": "^3.3.0"
+				"jws": "^4.0.1",
+				"lodash.includes": "^4.3.0",
+				"lodash.isboolean": "^3.0.3",
+				"lodash.isinteger": "^4.0.4",
+				"lodash.isnumber": "^3.0.3",
+				"lodash.isplainobject": "^4.0.6",
+				"lodash.isstring": "^4.0.1",
+				"lodash.once": "^4.0.0",
+				"ms": "^2.1.1",
+				"semver": "^7.5.4"
 			},
 			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+				"node": ">=12",
+				"npm": ">=6"
 			}
 		},
-		"node_modules/esquery": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+		"node_modules/jwa": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
+			"integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"estraverse": "^5.1.0"
-			},
-			"engines": {
-				"node": ">=0.10"
+				"buffer-equal-constant-time": "^1.0.1",
+				"ecdsa-sig-formatter": "1.0.11",
+				"safe-buffer": "^5.0.1"
 			}
 		},
-		"node_modules/esrecurse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+		"node_modules/jws": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
+			"integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": ">=4.0"
+				"jwa": "^2.0.1",
+				"safe-buffer": "^5.0.1"
 			}
 		},
-		"node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+		"node_modules/keyv": {
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+			"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
 			"dev": true,
-			"engines": {
-				"node": ">=4.0"
+			"license": "MIT",
+			"dependencies": {
+				"json-buffer": "3.0.1"
 			}
 		},
-		"node_modules/esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+		"node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/event-emitter": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+		"node_modules/known-css-properties": {
+			"version": "0.26.0",
+			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
+			"integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
 			"dev": true,
-			"dependencies": {
-				"d": "1",
-				"es5-ext": "~0.10.14"
-			}
+			"license": "MIT"
 		},
-		"node_modules/execall": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-			"integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
+		"node_modules/levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"clone-regexp": "^2.1.0"
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/expand-brackets": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+		"node_modules/lines-and-columns": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"debug": "^2.3.3",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"posix-character-classes": "^0.1.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
+				"p-locate": "^5.0.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/expand-brackets/node_modules/debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+		"node_modules/lodash.includes": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+			"integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
 			"dev": true,
-			"dependencies": {
-				"ms": "2.0.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/expand-brackets/node_modules/define-property": {
-			"version": "0.2.5",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-			"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+		"node_modules/lodash.isboolean": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+			"integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
 			"dev": true,
-			"dependencies": {
-				"is-descriptor": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+		"node_modules/lodash.isinteger": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+			"integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.isnumber": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+			"integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.isplainobject": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+			"integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.isstring": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+			"integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.once": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+			"integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.truncate": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+			"integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"kind-of": "^3.0.2"
+				"yallist": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=10"
 			}
 		},
-		"node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+		"node_modules/map-obj": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+			"integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
 			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/expand-brackets/node_modules/is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"node_modules/expand-brackets/node_modules/is-data-descriptor": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+		"node_modules/math-intrinsics": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+			"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
 			"dev": true,
-			"dependencies": {
-				"kind-of": "^3.0.2"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
 			}
 		},
-		"node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+		"node_modules/mathml-tag-names": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
+			"integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
 			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5"
-			},
-			"engines": {
-				"node": ">=0.10.0"
+			"license": "MIT",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
-		"node_modules/expand-brackets/node_modules/is-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+		"node_modules/media-typer": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
 			"dev": true,
-			"dependencies": {
-				"is-accessor-descriptor": "^0.1.6",
-				"is-data-descriptor": "^0.1.4",
-				"kind-of": "^5.0.0"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/expand-brackets/node_modules/ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-			"dev": true
-		},
-		"node_modules/expand-tilde": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+		"node_modules/meow": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"homedir-polyfill": "^1.0.1"
+				"@types/minimist": "^1.2.0",
+				"camelcase-keys": "^6.2.2",
+				"decamelize": "^1.2.0",
+				"decamelize-keys": "^1.1.0",
+				"hard-rejection": "^2.1.0",
+				"minimist-options": "4.1.0",
+				"normalize-package-data": "^3.0.0",
+				"read-pkg-up": "^7.0.1",
+				"redent": "^3.0.0",
+				"trim-newlines": "^3.0.0",
+				"type-fest": "^0.18.0",
+				"yargs-parser": "^20.2.3"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/ext": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-			"integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+		"node_modules/merge-descriptors": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+			"integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
 			"dev": true,
-			"dependencies": {
-				"type": "^2.0.0"
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/ext/node_modules/type": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
-			"integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
-			"dev": true
-		},
-		"node_modules/extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-			"dev": true
-		},
-		"node_modules/extend-shallow": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+		"node_modules/merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
 			"dev": true,
-			"dependencies": {
-				"is-extendable": "^0.1.0"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 8"
 			}
 		},
-		"node_modules/extglob": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+		"node_modules/methods": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
 			"dev": true,
-			"dependencies": {
-				"array-unique": "^0.3.2",
-				"define-property": "^1.0.0",
-				"expand-brackets": "^2.1.4",
-				"extend-shallow": "^2.0.1",
-				"fragment-cache": "^0.2.1",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/extglob/node_modules/define-property": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-			"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+		"node_modules/micromatch": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-descriptor": "^1.0.0"
+				"braces": "^3.0.3",
+				"picomatch": "^2.3.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8.6"
 			}
 		},
-		"node_modules/fancy-log": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-			"integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+		"node_modules/mime": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
 			"dev": true,
-			"dependencies": {
-				"ansi-gray": "^0.1.1",
-				"color-support": "^1.1.3",
-				"parse-node-version": "^1.0.0",
-				"time-stamp": "^1.0.0"
+			"license": "MIT",
+			"bin": {
+				"mime": "cli.js"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=4"
 			}
 		},
-		"node_modules/fast-deep-equal": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-			"dev": true
-		},
-		"node_modules/fast-glob": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-			"integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+		"node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
 			"dev": true,
-			"dependencies": {
-				"@nodelib/fs.stat": "^2.0.2",
-				"@nodelib/fs.walk": "^1.2.3",
-				"glob-parent": "^5.1.2",
-				"merge2": "^1.3.0",
-				"micromatch": "^4.0.4"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=8.6.0"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/fast-glob/node_modules/braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+		"node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"fill-range": "^7.0.1"
+				"mime-db": "1.52.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/fast-glob/node_modules/fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+		"node_modules/min-indent": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
 			"dev": true,
-			"dependencies": {
-				"to-regex-range": "^5.0.1"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=8"
+				"node": ">=4"
 			}
 		},
-		"node_modules/fast-glob/node_modules/glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+		"node_modules/minimatch": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+			"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"is-glob": "^4.0.1"
+				"brace-expansion": "^1.1.7"
 			},
 			"engines": {
-				"node": ">= 6"
+				"node": "*"
 			}
 		},
-		"node_modules/fast-glob/node_modules/is-number": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+		"node_modules/minimist": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.12.0"
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/fast-glob/node_modules/micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+		"node_modules/minimist-options": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"braces": "^3.0.2",
-				"picomatch": "^2.3.1"
+				"arrify": "^1.0.1",
+				"is-plain-obj": "^1.1.0",
+				"kind-of": "^6.0.3"
 			},
 			"engines": {
-				"node": ">=8.6"
+				"node": ">= 6"
 			}
 		},
-		"node_modules/fast-glob/node_modules/to-regex-range": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+		"node_modules/mkdirp": {
+			"version": "0.5.6",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+			"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-number": "^7.0.0"
+				"minimist": "^1.2.6"
 			},
-			"engines": {
-				"node": ">=8.0"
+			"bin": {
+				"mkdirp": "bin/cmd.js"
 			}
 		},
-		"node_modules/fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true
-		},
-		"node_modules/fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-			"dev": true
-		},
-		"node_modules/fastest-levenshtein": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-			"integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-			"dev": true
-		},
-		"node_modules/fastq": {
-			"version": "1.13.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-			"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+		"node_modules/ms": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
 			"dev": true,
-			"dependencies": {
-				"reusify": "^1.0.4"
-			}
+			"license": "MIT"
 		},
-		"node_modules/file-entry-cache": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+		"node_modules/nanoid": {
+			"version": "3.3.11",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+			"integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
 			"dev": true,
-			"dependencies": {
-				"flat-cache": "^3.0.4"
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
 			},
 			"engines": {
-				"node": "^10.12.0 || >=12.0.0"
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
 			}
 		},
-		"node_modules/file-uri-to-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+		"node_modules/natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
 			"dev": true,
-			"optional": true
+			"license": "MIT"
 		},
-		"node_modules/fill-range": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-			"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+		"node_modules/negotiator": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
 			"dev": true,
-			"dependencies": {
-				"extend-shallow": "^2.0.1",
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1",
-				"to-regex-range": "^2.1.0"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+		"node_modules/node-persist": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/node-persist/-/node-persist-2.1.0.tgz",
+			"integrity": "sha512-NI30KmynAIpKtvl3XaLE/Q/hPUNfh2bFM0U9zgWyIVzBUL/fh1EMk2/rTAqWY6KXrX8jqusVA6avPJ6I2S9B4w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
+				"is-absolute": "^0.2.6",
+				"mkdirp": "~0.5.1",
+				"q": "~1.1.1"
 			}
 		},
-		"node_modules/findup-sync": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-			"integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+		"node_modules/node-persist/node_modules/is-absolute": {
+			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
+			"integrity": "sha512-7Kr05z5LkcOpoMvxHN1PC11WbPabdNFmMYYo0eZvWu3BfVS0T03yoqYDczoCBx17xqk2x1XAZrcKiFVL88jxlQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"detect-file": "^1.0.0",
-				"is-glob": "^4.0.0",
-				"micromatch": "^3.0.4",
-				"resolve-dir": "^1.0.1"
+				"is-relative": "^0.2.1",
+				"is-windows": "^0.2.0"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/fined": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-			"integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+		"node_modules/node-persist/node_modules/is-relative": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz",
+			"integrity": "sha512-9AMzjRmLqcue629b4ezEVSK6kJsYJlUIhMcygmYORUgwUNJiavHcC3HkaGx0XYpyVKQSOqFbMEZmW42cY87sYw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"expand-tilde": "^2.0.2",
-				"is-plain-object": "^2.0.3",
-				"object.defaults": "^1.1.0",
-				"object.pick": "^1.2.0",
-				"parse-filepath": "^1.0.1"
+				"is-unc-path": "^0.1.1"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/fined/node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+		"node_modules/node-persist/node_modules/is-unc-path": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz",
+			"integrity": "sha512-HhLc5VDMH4pu3oMtIuunz/DFQUIoR561kMME3U3Afhj8b7vH085vkIkemrz1kLXCEIuoMAmO3yVmafWdSbGW8w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"isobject": "^3.0.1"
+				"unc-path-regex": "^0.1.0"
 			},
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/flagged-respawn": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-			"integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+		"node_modules/node-persist/node_modules/is-windows": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
+			"integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/flat-cache": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+		"node_modules/normalize-package-data": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+			"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
-				"flatted": "^3.1.0",
-				"rimraf": "^3.0.2"
+				"hosted-git-info": "^4.0.1",
+				"is-core-module": "^2.5.0",
+				"semver": "^7.3.4",
+				"validate-npm-package-license": "^3.0.1"
 			},
 			"engines": {
-				"node": "^10.12.0 || >=12.0.0"
-			}
-		},
-		"node_modules/flatted": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-			"integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
-			"dev": true
-		},
-		"node_modules/flush-write-stream": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-			"dev": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.3.6"
-			}
-		},
-		"node_modules/for-in": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=10"
 			}
 		},
-		"node_modules/for-own": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-			"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+		"node_modules/normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 			"dev": true,
-			"dependencies": {
-				"for-in": "^1.0.1"
-			},
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/fraction.js": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-			"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+		"node_modules/object-inspect": {
+			"version": "1.13.4",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+			"integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": "*"
+				"node": ">= 0.4"
 			},
 			"funding": {
-				"type": "patreon",
-				"url": "https://www.patreon.com/infusion"
-			}
-		},
-		"node_modules/fragment-cache": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-			"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-			"dev": true,
-			"dependencies": {
-				"map-cache": "^0.2.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/fs-mkdirp-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-			"integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
+		"node_modules/on-finished": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"graceful-fs": "^4.1.11",
-				"through2": "^2.0.3"
+				"ee-first": "1.1.1"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">= 0.8"
 			}
 		},
-		"node_modules/fs-mkdirp-stream/node_modules/through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+		"node_modules/once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
+				"wrappy": "1"
 			}
 		},
-		"node_modules/fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-			"dev": true
-		},
-		"node_modules/fsevents": {
-			"version": "1.2.13",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-			"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-			"deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
+		"node_modules/optionator": {
+			"version": "0.9.4",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+			"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
 			"dev": true,
-			"hasInstallScript": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			],
+			"license": "MIT",
 			"dependencies": {
-				"bindings": "^1.5.0",
-				"nan": "^2.12.1"
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.5"
 			},
 			"engines": {
-				"node": ">= 4.0"
+				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-			"dev": true
-		},
-		"node_modules/functional-red-black-tree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-			"dev": true
-		},
-		"node_modules/get-caller-file": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-			"dev": true
-		},
-		"node_modules/get-imports": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/get-imports/-/get-imports-1.0.0.tgz",
-			"integrity": "sha1-R8C07piTUWQsVJdxk79Pyqv1N48=",
+		"node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"array-uniq": "^1.0.1",
-				"import-regex": "^1.1.0"
+				"yocto-queue": "^0.1.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/get-intrinsic": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-			"dev": true,
-			"dependencies": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.1"
+				"node": ">=10"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/get-stdin": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-			"integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+		"node_modules/p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
 			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^3.0.2"
+			},
 			"engines": {
 				"node": ">=10"
 			},
@@ -2794,520 +2579,543 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/get-value": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+		"node_modules/p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=6"
 			}
 		},
-		"node_modules/glob": {
-			"version": "5.0.15",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-			"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+		"node_modules/parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "2 || 3",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
+				"callsites": "^3.0.0"
 			},
 			"engines": {
-				"node": "*"
+				"node": ">=6"
 			}
 		},
-		"node_modules/glob-parent": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+		"node_modules/parse-json": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-glob": "^4.0.3"
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
 			},
 			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/glob-stream": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-			"integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
-			"dev": true,
-			"dependencies": {
-				"extend": "^3.0.0",
-				"glob": "^7.1.1",
-				"glob-parent": "^3.1.0",
-				"is-negated-glob": "^1.0.0",
-				"ordered-read-streams": "^1.0.0",
-				"pumpify": "^1.3.5",
-				"readable-stream": "^2.1.5",
-				"remove-trailing-separator": "^1.0.1",
-				"to-absolute-glob": "^2.0.0",
-				"unique-stream": "^2.0.2"
+				"node": ">=8"
 			},
-			"engines": {
-				"node": ">= 0.10"
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/glob-stream/node_modules/glob": {
-			"version": "7.1.7",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-			"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+		"node_modules/parseurl": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
 			"dev": true,
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
+				"node": ">= 0.8"
 			}
 		},
-		"node_modules/glob-stream/node_modules/glob-parent": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-			"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+		"node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
 			"dev": true,
-			"dependencies": {
-				"is-glob": "^3.1.0",
-				"path-dirname": "^1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"node_modules/glob-stream/node_modules/is-glob": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-			"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+		"node_modules/path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
 			"dev": true,
-			"dependencies": {
-				"is-extglob": "^2.1.0"
-			},
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/glob-watcher": {
-			"version": "5.0.5",
-			"resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
-			"integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
+		"node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
 			"dev": true,
-			"dependencies": {
-				"anymatch": "^2.0.0",
-				"async-done": "^1.2.0",
-				"chokidar": "^2.0.0",
-				"is-negated-glob": "^1.0.0",
-				"just-debounce": "^1.0.0",
-				"normalize-path": "^3.0.0",
-				"object.defaults": "^1.1.0"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=8"
 			}
 		},
-		"node_modules/global-modules": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-			"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+		"node_modules/path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
 			"dev": true,
-			"dependencies": {
-				"global-prefix": "^1.0.1",
-				"is-windows": "^1.0.1",
-				"resolve-dir": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/global-prefix": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-			"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+		"node_modules/path-to-regexp": {
+			"version": "0.1.13",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz",
+			"integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==",
 			"dev": true,
-			"dependencies": {
-				"expand-tilde": "^2.0.2",
-				"homedir-polyfill": "^1.0.1",
-				"ini": "^1.3.4",
-				"is-windows": "^1.0.1",
-				"which": "^1.2.14"
-			},
+			"license": "MIT"
+		},
+		"node_modules/path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
 			}
 		},
-		"node_modules/global-prefix/node_modules/which": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+		"node_modules/picocolors": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
 			"dev": true,
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"which": "bin/which"
-			}
+			"license": "ISC"
 		},
-		"node_modules/globals": {
-			"version": "13.13.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
-			"integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
+		"node_modules/picomatch": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+			"integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
 			"dev": true,
-			"dependencies": {
-				"type-fest": "^0.20.2"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=8"
+				"node": ">=8.6"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
-		"node_modules/globby": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-2.1.0.tgz",
-			"integrity": "sha1-npGSvNM/Srak+JTl5+qLcTITxII=",
+		"node_modules/postcss": {
+			"version": "8.5.6",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+			"integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
 			"dependencies": {
-				"array-union": "^1.0.1",
-				"async": "^1.2.1",
-				"glob": "^5.0.3",
-				"object-assign": "^3.0.0"
+				"nanoid": "^3.3.11",
+				"picocolors": "^1.1.1",
+				"source-map-js": "^1.2.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": "^10 || ^12 || >=14"
 			}
 		},
-		"node_modules/globby/node_modules/object-assign": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-			"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+		"node_modules/postcss-media-query-parser": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+			"integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/globjoin": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-			"integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-			"dev": true
+		"node_modules/postcss-resolve-nested-selector": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz",
+			"integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"node_modules/glogg": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-			"integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+		"node_modules/postcss-safe-parser": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+			"integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
 			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/postcss/"
+			},
+			"peerDependencies": {
+				"postcss": "^8.3.3"
+			}
+		},
+		"node_modules/postcss-selector-parser": {
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+			"integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"sparkles": "^1.0.0"
+				"cssesc": "^3.0.0",
+				"util-deprecate": "^1.0.2"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=4"
 			}
 		},
-		"node_modules/graceful-fs": {
-			"version": "4.2.6",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-			"integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
-			"dev": true
+		"node_modules/postcss-sorting": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
+			"integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
+			"dev": true,
+			"license": "MIT",
+			"peerDependencies": {
+				"postcss": "^8.3.9"
+			}
 		},
-		"node_modules/gulp": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-			"integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+		"node_modules/postcss-value-parser": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
 			"dev": true,
-			"dependencies": {
-				"glob-watcher": "^5.0.3",
-				"gulp-cli": "^2.2.0",
-				"undertaker": "^1.2.1",
-				"vinyl-fs": "^3.0.0"
-			},
-			"bin": {
-				"gulp": "bin/gulp.js"
-			},
+			"license": "MIT"
+		},
+		"node_modules/prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/gulp-cli": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-			"integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-			"dev": true,
-			"dependencies": {
-				"ansi-colors": "^1.0.1",
-				"archy": "^1.0.0",
-				"array-sort": "^1.0.0",
-				"color-support": "^1.1.3",
-				"concat-stream": "^1.6.0",
-				"copy-props": "^2.0.1",
-				"fancy-log": "^1.3.2",
-				"gulplog": "^1.0.0",
-				"interpret": "^1.4.0",
-				"isobject": "^3.0.1",
-				"liftoff": "^3.1.0",
-				"matchdep": "^2.0.0",
-				"mute-stdout": "^1.0.0",
-				"pretty-hrtime": "^1.0.0",
-				"replace-homedir": "^1.0.0",
-				"semver-greatest-satisfied-range": "^1.1.0",
-				"v8flags": "^3.2.0",
-				"yargs": "^7.1.0"
-			},
-			"bin": {
-				"gulp": "bin/gulp.js"
+		"node_modules/proxy-addr": {
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"forwarded": "0.2.0",
+				"ipaddr.js": "1.9.1"
 			},
 			"engines": {
 				"node": ">= 0.10"
 			}
 		},
-		"node_modules/gulp-cli/node_modules/ansi-colors": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-			"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+		"node_modules/ps-node": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/ps-node/-/ps-node-0.1.6.tgz",
+			"integrity": "sha512-w7QJhUTbu70hpDso0YXDRNKCPNuchV8UTUZsAv0m7Qj5g85oHOJfr9drA1EjvK4nQK/bG8P97W4L6PJ3IQLoOA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ansi-wrap": "^0.1.0"
-			},
+				"table-parser": "^0.1.3"
+			}
+		},
+		"node_modules/punycode": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=6"
 			}
 		},
-		"node_modules/gulp-concat-css": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/gulp-concat-css/-/gulp-concat-css-3.1.0.tgz",
-			"integrity": "sha512-iLTBPS+cutlgLyK3bp9DMts+WuS8n2mQpjzQ7p/ZVQc8FO5fvpN+ntg9U6jsuNvPeuii82aKm8XeOzF0nUK+TA==",
+		"node_modules/q": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/q/-/q-1.1.2.tgz",
+			"integrity": "sha512-ROtylwux7Vkc4C07oKE/ReigUmb33kVoLtcR4SJ1QVqwaZkBEDL3vX4/kwFzIERQ5PfCl0XafbU8u2YUhyGgVA==",
+			"deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)",
 			"dev": true,
-			"dependencies": {
-				"lodash.defaults": "^3.0.0",
-				"parse-import": "^2.0.0",
-				"plugin-error": "^0.1.2",
-				"rework": "~1.0.0",
-				"rework-import": "^2.0.0",
-				"rework-plugin-url": "^1.0.1",
-				"through2": "~1.1.1",
-				"vinyl": "^2.1.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.6.0",
+				"teleport": ">=0.2.0"
 			}
 		},
-		"node_modules/gulp-postcss": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-9.0.1.tgz",
-			"integrity": "sha512-9QUHam5JyXwGUxaaMvoFQVT44tohpEFpM8xBdPfdwTYGM0AItS1iTQz0MpsF8Jroh7GF5Jt2GVPaYgvy8qD2Fw==",
+		"node_modules/qs": {
+			"version": "6.14.2",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
+			"integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
-				"fancy-log": "^1.3.3",
-				"plugin-error": "^1.0.1",
-				"postcss-load-config": "^3.0.0",
-				"vinyl-sourcemaps-apply": "^0.2.1"
+				"side-channel": "^1.1.0"
 			},
 			"engines": {
-				"node": "^10 || ^12 || >=14"
+				"node": ">=0.6"
 			},
-			"peerDependencies": {
-				"postcss": "^8.0.0"
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/gulp-postcss/node_modules/ansi-colors": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-			"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+		"node_modules/queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
 			"dev": true,
-			"dependencies": {
-				"ansi-wrap": "^0.1.0"
-			},
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"license": "MIT"
+		},
+		"node_modules/quick-lru": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
 			}
 		},
-		"node_modules/gulp-postcss/node_modules/arr-union": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-			"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+		"node_modules/range-parser": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/gulp-postcss/node_modules/extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+		"node_modules/raw-body": {
+			"version": "2.5.3",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz",
+			"integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
+				"bytes": "~3.1.2",
+				"http-errors": "~2.0.1",
+				"iconv-lite": "~0.4.24",
+				"unpipe": "~1.0.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.8"
 			}
 		},
-		"node_modules/gulp-postcss/node_modules/is-extendable": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+		"node_modules/raw-body/node_modules/iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-plain-object": "^2.0.4"
+				"safer-buffer": ">= 2.1.2 < 3"
 			},
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/gulp-postcss/node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+		"node_modules/read-pkg": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"isobject": "^3.0.1"
+				"@types/normalize-package-data": "^2.4.0",
+				"normalize-package-data": "^2.5.0",
+				"parse-json": "^5.0.0",
+				"type-fest": "^0.6.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
 			}
 		},
-		"node_modules/gulp-postcss/node_modules/plugin-error": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-			"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+		"node_modules/read-pkg-up": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ansi-colors": "^1.0.1",
-				"arr-diff": "^4.0.0",
-				"arr-union": "^3.1.0",
-				"extend-shallow": "^3.0.2"
+				"find-up": "^4.1.0",
+				"read-pkg": "^5.2.0",
+				"type-fest": "^0.8.1"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/gulp-rename": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
-			"integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
+		"node_modules/read-pkg-up/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
 			"engines": {
-				"node": ">=4"
+				"node": ">=8"
 			}
 		},
-		"node_modules/gulp-sourcemaps": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz",
-			"integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==",
+		"node_modules/read-pkg-up/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@gulp-sourcemaps/identity-map": "^2.0.1",
-				"@gulp-sourcemaps/map-sources": "^1.0.0",
-				"acorn": "^6.4.1",
-				"convert-source-map": "^1.0.0",
-				"css": "^3.0.0",
-				"debug-fabulous": "^1.0.0",
-				"detect-newline": "^2.0.0",
-				"graceful-fs": "^4.0.0",
-				"source-map": "^0.6.0",
-				"strip-bom-string": "^1.0.0",
-				"through2": "^2.0.0"
+				"p-locate": "^4.1.0"
 			},
 			"engines": {
-				"node": ">= 6"
+				"node": ">=8"
 			}
 		},
-		"node_modules/gulp-sourcemaps/node_modules/acorn": {
-			"version": "6.4.2",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-			"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+		"node_modules/read-pkg-up/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
 			"dev": true,
-			"bin": {
-				"acorn": "bin/acorn"
+			"license": "MIT",
+			"dependencies": {
+				"p-try": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=0.4.0"
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/gulp-sourcemaps/node_modules/css": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-			"integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
+		"node_modules/read-pkg-up/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"inherits": "^2.0.4",
-				"source-map": "^0.6.1",
-				"source-map-resolve": "^0.6.0"
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"node_modules/gulp-sourcemaps/node_modules/source-map-resolve": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-			"integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-			"deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+		"node_modules/read-pkg-up/node_modules/type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
 			"dev": true,
-			"dependencies": {
-				"atob": "^2.1.2",
-				"decode-uri-component": "^0.2.0"
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"node_modules/gulp-sourcemaps/node_modules/through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+		"node_modules/read-pkg/node_modules/hosted-git-info": {
+			"version": "2.8.9",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
 			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/read-pkg/node_modules/normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
 			}
 		},
-		"node_modules/gulplog": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-			"integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+		"node_modules/read-pkg/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
 			"dev": true,
-			"dependencies": {
-				"glogg": "^1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.10"
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver"
 			}
 		},
-		"node_modules/hard-rejection": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+		"node_modules/read-pkg/node_modules/type-fest": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
 			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
 			"engines": {
-				"node": ">=6"
+				"node": ">=8"
 			}
 		},
-		"node_modules/has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+		"node_modules/redent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"function-bind": "^1.1.1"
+				"indent-string": "^4.0.0",
+				"strip-indent": "^3.0.0"
 			},
 			"engines": {
-				"node": ">= 0.4.0"
+				"node": ">=8"
 			}
 		},
-		"node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+		"node_modules/require-from-string": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=8"
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/has-symbols": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+		"node_modules/resolve": {
+			"version": "1.22.11",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+			"integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
 			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-core-module": "^2.16.1",
+				"path-parse": "^1.0.7",
+				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -3315,11305 +3123,927 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/has-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+		"node_modules/resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
 			"dev": true,
-			"dependencies": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=4"
 			}
 		},
-		"node_modules/has-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+		"node_modules/reusify": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+			"integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
 			"dev": true,
-			"dependencies": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
-			},
+			"license": "MIT",
 			"engines": {
+				"iojs": ">=1.0.0",
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/has-values/node_modules/is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"node_modules/has-values/node_modules/kind-of": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-			"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+		"node_modules/rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"deprecated": "Rimraf versions prior to v4 are no longer supported",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"is-buffer": "^1.1.5"
+				"glob": "^7.1.3"
 			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/homedir-polyfill": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-			"integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-			"dev": true,
-			"dependencies": {
-				"parse-passwd": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/hosted-git-info": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-			"dev": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/html-tags": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-			"integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/ignore": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-			"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-			"dev": true,
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/import-fresh": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-			"dev": true,
-			"dependencies": {
-				"parent-module": "^1.0.0",
-				"resolve-from": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=6"
+			"bin": {
+				"rimraf": "bin.js"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/import-lazy": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/import-regex": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/import-regex/-/import-regex-1.1.0.tgz",
-			"integrity": "sha1-pVxS5McFx2XKIQ6SQqBrvMiqf2Y=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.8.19"
-			}
-		},
-		"node_modules/indent-string": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+		"node_modules/run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"license": "MIT",
 			"dependencies": {
-				"once": "^1.3.0",
-				"wrappy": "1"
-			}
-		},
-		"node_modules/inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-			"dev": true
-		},
-		"node_modules/ini": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-			"dev": true
-		},
-		"node_modules/interpret": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-			"integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.10"
+				"queue-microtask": "^1.2.2"
 			}
 		},
-		"node_modules/invert-kv": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-			"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+		"node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/ip-regex": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
-			"integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=",
+		"node_modules/safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT"
 		},
-		"node_modules/is-absolute": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-			"integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+		"node_modules/semver": {
+			"version": "7.7.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+			"integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
 			"dev": true,
-			"dependencies": {
-				"is-relative": "^1.0.0",
-				"is-windows": "^1.0.1"
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=10"
 			}
 		},
-		"node_modules/is-accessor-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-			"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+		"node_modules/send": {
+			"version": "0.19.2",
+			"resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz",
+			"integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"kind-of": "^6.0.0"
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"destroy": "1.2.0",
+				"encodeurl": "~2.0.0",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"fresh": "~0.5.2",
+				"http-errors": "~2.0.1",
+				"mime": "1.6.0",
+				"ms": "2.1.3",
+				"on-finished": "~2.4.1",
+				"range-parser": "~1.2.1",
+				"statuses": "~2.0.2"
 			},
 			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-accessor-descriptor/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-			"dev": true
-		},
-		"node_modules/is-binary-path": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-			"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+		"node_modules/send/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"binary-extensions": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
+				"ms": "2.0.0"
 			}
 		},
-		"node_modules/is-core-module": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-			"integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+		"node_modules/send/node_modules/debug/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 			"dev": true,
-			"dependencies": {
-				"has": "^1.0.3"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
+			"license": "MIT"
 		},
-		"node_modules/is-data-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-			"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+		"node_modules/serve-static": {
+			"version": "1.16.3",
+			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz",
+			"integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"kind-of": "^6.0.0"
+				"encodeurl": "~2.0.0",
+				"escape-html": "~1.0.3",
+				"parseurl": "~1.3.3",
+				"send": "~0.19.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/is-data-descriptor/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+		"node_modules/setprototypeof": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "ISC"
 		},
-		"node_modules/is-descriptor": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-			"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+		"node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-accessor-descriptor": "^1.0.0",
-				"is-data-descriptor": "^1.0.0",
-				"kind-of": "^6.0.2"
+				"shebang-regex": "^3.0.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-descriptor/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-extendable": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=8"
 			}
 		},
-		"node_modules/is-fullwidth-code-point": {
+		"node_modules/shebang-regex": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
-		"node_modules/is-glob": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+		"node_modules/side-channel": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+			"integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-extglob": "^2.1.1"
+				"es-errors": "^1.3.0",
+				"object-inspect": "^1.13.3",
+				"side-channel-list": "^1.0.0",
+				"side-channel-map": "^1.0.1",
+				"side-channel-weakmap": "^1.0.2"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/is-negated-glob": {
+		"node_modules/side-channel-list": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-			"integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-number": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+			"resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+			"integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"kind-of": "^3.0.2"
+				"es-errors": "^1.3.0",
+				"object-inspect": "^1.13.3"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/is-number/node_modules/is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"node_modules/is-number/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+		"node_modules/side-channel-map": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+			"integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-buffer": "^1.1.5"
+				"call-bound": "^1.0.2",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.5",
+				"object-inspect": "^1.13.3"
 			},
 			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-plain-obj": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-plain-object": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-			"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-promise": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-			"integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-			"dev": true
-		},
-		"node_modules/is-regexp": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-			"integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/is-relative": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-			"dev": true,
-			"dependencies": {
-				"is-unc-path": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-unc-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-			"dev": true,
-			"dependencies": {
-				"unc-path-regex": "^0.1.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-			"dev": true
-		},
-		"node_modules/is-valid-glob": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-			"integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-windows": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-			"dev": true
-		},
-		"node_modules/isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-			"dev": true
-		},
-		"node_modules/isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"dev": true
-		},
-		"node_modules/js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
-			"dependencies": {
-				"argparse": "^2.0.1"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/json-parse-even-better-errors": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-			"dev": true
-		},
-		"node_modules/json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true
-		},
-		"node_modules/json-stable-stringify-without-jsonify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-			"dev": true
-		},
-		"node_modules/just-debounce": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
-			"integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
-			"dev": true
-		},
-		"node_modules/kind-of": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-			"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/known-css-properties": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
-			"integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==",
-			"dev": true
-		},
-		"node_modules/last-run": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-			"integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-			"dev": true,
-			"dependencies": {
-				"default-resolution": "^2.0.0",
-				"es6-weak-map": "^2.0.1"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/lazystream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-			"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-			"dev": true,
-			"dependencies": {
-				"readable-stream": "^2.0.5"
-			},
-			"engines": {
-				"node": ">= 0.6.3"
-			}
-		},
-		"node_modules/lcid": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-			"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-			"dev": true,
-			"dependencies": {
-				"invert-kv": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/lead": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-			"integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-			"dev": true,
-			"dependencies": {
-				"flush-write-stream": "^1.0.2"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/levn": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-			"dev": true,
-			"dependencies": {
-				"prelude-ls": "^1.2.1",
-				"type-check": "~0.4.0"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/liftoff": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-			"integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-			"dev": true,
-			"dependencies": {
-				"extend": "^3.0.0",
-				"findup-sync": "^3.0.0",
-				"fined": "^1.0.1",
-				"flagged-respawn": "^1.0.0",
-				"is-plain-object": "^2.0.4",
-				"object.map": "^1.0.0",
-				"rechoir": "^0.6.2",
-				"resolve": "^1.1.7"
-			},
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/liftoff/node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/lilconfig": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
-			"integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/lines-and-columns": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-			"dev": true
-		},
-		"node_modules/load-json-file": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-			"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-			"dev": true,
-			"dependencies": {
-				"graceful-fs": "^4.1.2",
-				"parse-json": "^2.2.0",
-				"pify": "^2.0.0",
-				"pinkie-promise": "^2.0.0",
-				"strip-bom": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/load-json-file/node_modules/parse-json": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-			"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-			"dev": true,
-			"dependencies": {
-				"error-ex": "^1.2.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
-			"dependencies": {
-				"p-locate": "^4.1.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/lodash._baseassign": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-			"integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-			"dev": true,
-			"dependencies": {
-				"lodash._basecopy": "^3.0.0",
-				"lodash.keys": "^3.0.0"
-			}
-		},
-		"node_modules/lodash._basecopy": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-			"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-			"dev": true
-		},
-		"node_modules/lodash._bindcallback": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-			"integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
-			"dev": true
-		},
-		"node_modules/lodash._createassigner": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-			"integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
-			"dev": true,
-			"dependencies": {
-				"lodash._bindcallback": "^3.0.0",
-				"lodash._isiterateecall": "^3.0.0",
-				"lodash.restparam": "^3.0.0"
-			}
-		},
-		"node_modules/lodash._getnative": {
-			"version": "3.9.1",
-			"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-			"dev": true
-		},
-		"node_modules/lodash._isiterateecall": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-			"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-			"dev": true
-		},
-		"node_modules/lodash.assign": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
-			"integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
-			"dev": true,
-			"dependencies": {
-				"lodash._baseassign": "^3.0.0",
-				"lodash._createassigner": "^3.0.0",
-				"lodash.keys": "^3.0.0"
-			}
-		},
-		"node_modules/lodash.defaults": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
-			"integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
-			"dev": true,
-			"dependencies": {
-				"lodash.assign": "^3.0.0",
-				"lodash.restparam": "^3.0.0"
-			}
-		},
-		"node_modules/lodash.isarguments": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-			"dev": true
-		},
-		"node_modules/lodash.isarray": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-			"dev": true
-		},
-		"node_modules/lodash.keys": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-			"dev": true,
-			"dependencies": {
-				"lodash._getnative": "^3.0.0",
-				"lodash.isarguments": "^3.0.0",
-				"lodash.isarray": "^3.0.0"
-			}
-		},
-		"node_modules/lodash.memoize": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-			"dev": true
-		},
-		"node_modules/lodash.merge": {
-			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-			"dev": true
-		},
-		"node_modules/lodash.restparam": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-			"integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-			"dev": true
-		},
-		"node_modules/lodash.truncate": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-			"integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-			"dev": true
-		},
-		"node_modules/lodash.uniq": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-			"integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-			"dev": true
-		},
-		"node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/lru-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-			"integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-			"dev": true,
-			"dependencies": {
-				"es5-ext": "~0.10.2"
-			}
-		},
-		"node_modules/make-iterator": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-			"integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-			"dev": true,
-			"dependencies": {
-				"kind-of": "^6.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/make-iterator/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/map-cache": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-			"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/map-obj": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-			"integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/map-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-			"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-			"dev": true,
-			"dependencies": {
-				"object-visit": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/matchdep": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-			"integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-			"dev": true,
-			"dependencies": {
-				"findup-sync": "^2.0.0",
-				"micromatch": "^3.0.4",
-				"resolve": "^1.4.0",
-				"stack-trace": "0.0.10"
-			},
-			"engines": {
-				"node": ">= 0.10.0"
-			}
-		},
-		"node_modules/matchdep/node_modules/findup-sync": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-			"integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-			"dev": true,
-			"dependencies": {
-				"detect-file": "^1.0.0",
-				"is-glob": "^3.1.0",
-				"micromatch": "^3.0.4",
-				"resolve-dir": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/matchdep/node_modules/is-glob": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-			"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-			"dev": true,
-			"dependencies": {
-				"is-extglob": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/mathml-tag-names": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-			"integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-			"dev": true,
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		},
-		"node_modules/mdn-data": {
-			"version": "2.0.14",
-			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-			"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-			"dev": true
-		},
-		"node_modules/memoizee": {
-			"version": "0.4.15",
-			"resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-			"integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
-			"dev": true,
-			"dependencies": {
-				"d": "^1.0.1",
-				"es5-ext": "^0.10.53",
-				"es6-weak-map": "^2.0.3",
-				"event-emitter": "^0.3.5",
-				"is-promise": "^2.2.2",
-				"lru-queue": "^0.1.0",
-				"next-tick": "^1.1.0",
-				"timers-ext": "^0.1.7"
-			}
-		},
-		"node_modules/meow": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-			"dev": true,
-			"dependencies": {
-				"@types/minimist": "^1.2.0",
-				"camelcase-keys": "^6.2.2",
-				"decamelize": "^1.2.0",
-				"decamelize-keys": "^1.1.0",
-				"hard-rejection": "^2.1.0",
-				"minimist-options": "4.1.0",
-				"normalize-package-data": "^3.0.0",
-				"read-pkg-up": "^7.0.1",
-				"redent": "^3.0.0",
-				"trim-newlines": "^3.0.0",
-				"type-fest": "^0.18.0",
-				"yargs-parser": "^20.2.3"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/meow/node_modules/type-fest": {
-			"version": "0.18.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-			"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/micromatch": {
-			"version": "3.1.10",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-			"dev": true,
-			"dependencies": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"braces": "^2.3.1",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"extglob": "^2.0.4",
-				"fragment-cache": "^0.2.1",
-				"kind-of": "^6.0.2",
-				"nanomatch": "^1.2.9",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/micromatch/node_modules/extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"dev": true,
-			"dependencies": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/micromatch/node_modules/is-extendable": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-			"dev": true,
-			"dependencies": {
-				"is-plain-object": "^2.0.4"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/micromatch/node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/micromatch/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/min-indent": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"dev": true,
-			"dependencies": {
-				"brace-expansion": "^1.1.7"
-			},
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/minimist-options": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-			"dev": true,
-			"dependencies": {
-				"arrify": "^1.0.1",
-				"is-plain-obj": "^1.1.0",
-				"kind-of": "^6.0.3"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/minimist-options/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/mixin-deep": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-			"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-			"dev": true,
-			"dependencies": {
-				"for-in": "^1.0.2",
-				"is-extendable": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/mixin-deep/node_modules/is-extendable": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-			"dev": true,
-			"dependencies": {
-				"is-plain-object": "^2.0.4"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/mixin-deep/node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-			"dev": true
-		},
-		"node_modules/mute-stdout": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-			"integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/nan": {
-			"version": "2.14.2",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-			"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-			"dev": true,
-			"optional": true
-		},
-		"node_modules/nanoid": {
-			"version": "3.3.6",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-			"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"bin": {
-				"nanoid": "bin/nanoid.cjs"
-			},
-			"engines": {
-				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-			}
-		},
-		"node_modules/nanomatch": {
-			"version": "1.2.13",
-			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-			"dev": true,
-			"dependencies": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"fragment-cache": "^0.2.1",
-				"is-windows": "^1.0.2",
-				"kind-of": "^6.0.2",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/nanomatch/node_modules/extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"dev": true,
-			"dependencies": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/nanomatch/node_modules/is-extendable": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-			"dev": true,
-			"dependencies": {
-				"is-plain-object": "^2.0.4"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/nanomatch/node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/nanomatch/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-			"dev": true
-		},
-		"node_modules/next-tick": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-			"integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-			"dev": true
-		},
-		"node_modules/node-releases": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
-			"integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==",
-			"dev": true
-		},
-		"node_modules/normalize-package-data": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-			"integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
-			"dev": true,
-			"dependencies": {
-				"hosted-git-info": "^4.0.1",
-				"resolve": "^1.20.0",
-				"semver": "^7.3.4",
-				"validate-npm-package-license": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/normalize-range": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/normalize-selector": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-			"integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-			"dev": true
-		},
-		"node_modules/normalize-url": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-			"integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/now-and-later": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-			"integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-			"dev": true,
-			"dependencies": {
-				"once": "^1.3.2"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/nth-check": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-			"integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-			"dev": true,
-			"dependencies": {
-				"boolbase": "^1.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/fb55/nth-check?sponsor=1"
-			}
-		},
-		"node_modules/number-is-nan": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object-assign": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object-copy": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-			"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-			"dev": true,
-			"dependencies": {
-				"copy-descriptor": "^0.1.0",
-				"define-property": "^0.2.5",
-				"kind-of": "^3.0.3"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object-copy/node_modules/define-property": {
-			"version": "0.2.5",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-			"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-			"dev": true,
-			"dependencies": {
-				"is-descriptor": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object-copy/node_modules/is-accessor-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-			"dev": true,
-			"dependencies": {
-				"kind-of": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object-copy/node_modules/is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"node_modules/object-copy/node_modules/is-data-descriptor": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-			"dev": true,
-			"dependencies": {
-				"kind-of": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object-copy/node_modules/is-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-			"dev": true,
-			"dependencies": {
-				"is-accessor-descriptor": "^0.1.6",
-				"is-data-descriptor": "^0.1.4",
-				"kind-of": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-			"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object-copy/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object-keys": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/object-visit": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-			"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-			"dev": true,
-			"dependencies": {
-				"isobject": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object.assign": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-			"integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-			"dev": true,
-			"dependencies": {
-				"call-bind": "^1.0.0",
-				"define-properties": "^1.1.3",
-				"has-symbols": "^1.0.1",
-				"object-keys": "^1.1.1"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/object.defaults": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-			"integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-			"dev": true,
-			"dependencies": {
-				"array-each": "^1.0.1",
-				"array-slice": "^1.0.0",
-				"for-own": "^1.0.0",
-				"isobject": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object.map": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-			"integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-			"dev": true,
-			"dependencies": {
-				"for-own": "^1.0.0",
-				"make-iterator": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object.pick": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-			"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-			"dev": true,
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/object.reduce": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-			"integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-			"dev": true,
-			"dependencies": {
-				"for-own": "^1.0.0",
-				"make-iterator": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-			"dev": true,
-			"dependencies": {
-				"wrappy": "1"
-			}
-		},
-		"node_modules/optionator": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-			"dev": true,
-			"dependencies": {
-				"deep-is": "^0.1.3",
-				"fast-levenshtein": "^2.0.6",
-				"levn": "^0.4.1",
-				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0",
-				"word-wrap": "^1.2.3"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/ordered-read-streams": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-			"integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-			"dev": true,
-			"dependencies": {
-				"readable-stream": "^2.0.1"
-			}
-		},
-		"node_modules/os-locale": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-			"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-			"dev": true,
-			"dependencies": {
-				"lcid": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
-			"dependencies": {
-				"p-try": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/parent-module": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-			"dev": true,
-			"dependencies": {
-				"callsites": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/parse-filepath": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-			"integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-			"dev": true,
-			"dependencies": {
-				"is-absolute": "^1.0.0",
-				"map-cache": "^0.2.0",
-				"path-root": "^0.1.1"
-			},
-			"engines": {
-				"node": ">=0.8"
-			}
-		},
-		"node_modules/parse-import": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/parse-import/-/parse-import-2.0.0.tgz",
-			"integrity": "sha1-KyR0Aw4AirmNt2xLy/TbWucwb18=",
-			"dev": true,
-			"dependencies": {
-				"get-imports": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/parse-json": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-even-better-errors": "^2.3.0",
-				"lines-and-columns": "^1.1.6"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/parse-node-version": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-			"integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/parse-passwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/pascalcase": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-			"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/path-dirname": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-			"integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-			"dev": true
-		},
-		"node_modules/path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-is-absolute": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-parse": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-			"dev": true
-		},
-		"node_modules/path-root": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-			"integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-			"dev": true,
-			"dependencies": {
-				"path-root-regex": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/path-root-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-			"integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/path-type": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-			"dev": true
-		},
-		"node_modules/picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=8.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/pify": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/pinkie": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-			"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/pinkie-promise": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-			"dev": true,
-			"dependencies": {
-				"pinkie": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/plugin-error": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-			"integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-			"dev": true,
-			"dependencies": {
-				"ansi-cyan": "^0.1.1",
-				"ansi-red": "^0.1.1",
-				"arr-diff": "^1.0.1",
-				"arr-union": "^2.0.1",
-				"extend-shallow": "^1.1.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/plugin-error/node_modules/arr-diff": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-			"integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-			"dev": true,
-			"dependencies": {
-				"arr-flatten": "^1.0.1",
-				"array-slice": "^0.2.3"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/plugin-error/node_modules/array-slice": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-			"integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/plugin-error/node_modules/extend-shallow": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-			"integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-			"dev": true,
-			"dependencies": {
-				"kind-of": "^1.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/plugin-error/node_modules/kind-of": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-			"integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/posix-character-classes": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-			"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/postcss": {
-			"version": "8.4.31",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-			"integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/postcss/"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/postcss"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"dependencies": {
-				"nanoid": "^3.3.6",
-				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14"
-			}
-		},
-		"node_modules/postcss-calc": {
-			"version": "8.2.4",
-			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
-			"integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
-			"dev": true,
-			"dependencies": {
-				"postcss-selector-parser": "^6.0.9",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.2"
-			}
-		},
-		"node_modules/postcss-colormin": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz",
-			"integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==",
-			"dev": true,
-			"dependencies": {
-				"browserslist": "^4.16.6",
-				"caniuse-api": "^3.0.0",
-				"colord": "^2.9.1",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-convert-values": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz",
-			"integrity": "sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==",
-			"dev": true,
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-discard-comments": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz",
-			"integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==",
-			"dev": true,
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-discard-duplicates": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
-			"integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-			"dev": true,
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-discard-empty": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
-			"integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-			"dev": true,
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-discard-overridden": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
-			"integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-			"dev": true,
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-load-config": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
-			"integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
-			"dev": true,
-			"dependencies": {
-				"lilconfig": "^2.0.5",
-				"yaml": "^1.10.2"
-			},
-			"engines": {
-				"node": ">= 10"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/postcss/"
-			},
-			"peerDependencies": {
-				"postcss": ">=8.0.9",
-				"ts-node": ">=9.0.0"
-			},
-			"peerDependenciesMeta": {
-				"postcss": {
-					"optional": true
-				},
-				"ts-node": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/postcss-media-query-parser": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-			"integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
-			"dev": true
-		},
-		"node_modules/postcss-merge-longhand": {
-			"version": "5.1.4",
-			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz",
-			"integrity": "sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA==",
-			"dev": true,
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0",
-				"stylehacks": "^5.1.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-merge-rules": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz",
-			"integrity": "sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==",
-			"dev": true,
-			"dependencies": {
-				"browserslist": "^4.16.6",
-				"caniuse-api": "^3.0.0",
-				"cssnano-utils": "^3.1.0",
-				"postcss-selector-parser": "^6.0.5"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-minify-font-values": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
-			"integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
-			"dev": true,
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-minify-gradients": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
-			"integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
-			"dev": true,
-			"dependencies": {
-				"colord": "^2.9.1",
-				"cssnano-utils": "^3.1.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-minify-params": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz",
-			"integrity": "sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g==",
-			"dev": true,
-			"dependencies": {
-				"browserslist": "^4.16.6",
-				"cssnano-utils": "^3.1.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-minify-selectors": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz",
-			"integrity": "sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==",
-			"dev": true,
-			"dependencies": {
-				"postcss-selector-parser": "^6.0.5"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-charset": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
-			"integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-			"dev": true,
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-display-values": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
-			"integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
-			"dev": true,
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-positions": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz",
-			"integrity": "sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==",
-			"dev": true,
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-repeat-style": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz",
-			"integrity": "sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==",
-			"dev": true,
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-string": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
-			"integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
-			"dev": true,
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-timing-functions": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
-			"integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
-			"dev": true,
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-unicode": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz",
-			"integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==",
-			"dev": true,
-			"dependencies": {
-				"browserslist": "^4.16.6",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-url": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
-			"integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
-			"dev": true,
-			"dependencies": {
-				"normalize-url": "^6.0.1",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-whitespace": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
-			"integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
-			"dev": true,
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-ordered-values": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz",
-			"integrity": "sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==",
-			"dev": true,
-			"dependencies": {
-				"cssnano-utils": "^3.1.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-reduce-initial": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz",
-			"integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==",
-			"dev": true,
-			"dependencies": {
-				"browserslist": "^4.16.6",
-				"caniuse-api": "^3.0.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-reduce-transforms": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
-			"integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
-			"dev": true,
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-resolve-nested-selector": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-			"integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
-			"dev": true
-		},
-		"node_modules/postcss-safe-parser": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-			"integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=12.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/postcss/"
-			},
-			"peerDependencies": {
-				"postcss": "^8.3.3"
-			}
-		},
-		"node_modules/postcss-selector-parser": {
-			"version": "6.0.10",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-			"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-			"dev": true,
-			"dependencies": {
-				"cssesc": "^3.0.0",
-				"util-deprecate": "^1.0.2"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/postcss-sorting": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
-			"integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-			"dev": true,
-			"peerDependencies": {
-				"postcss": "^8.3.9"
-			}
-		},
-		"node_modules/postcss-svgo": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
-			"integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
-			"dev": true,
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0",
-				"svgo": "^2.7.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-unique-selectors": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
-			"integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
-			"dev": true,
-			"dependencies": {
-				"postcss-selector-parser": "^6.0.5"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-value-parser": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
-		},
-		"node_modules/prelude-ls": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/pretty-hrtime": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-			"integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/process-nextick-args": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-			"dev": true
-		},
-		"node_modules/pump": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-			"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-			"dev": true,
-			"dependencies": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
-			}
-		},
-		"node_modules/pumpify": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-			"integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-			"dev": true,
-			"dependencies": {
-				"duplexify": "^3.6.0",
-				"inherits": "^2.0.3",
-				"pump": "^2.0.0"
-			}
-		},
-		"node_modules/punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/queue-microtask": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			]
-		},
-		"node_modules/quick-lru": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-pkg": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-			"dev": true,
-			"dependencies": {
-				"@types/normalize-package-data": "^2.4.0",
-				"normalize-package-data": "^2.5.0",
-				"parse-json": "^5.0.0",
-				"type-fest": "^0.6.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-pkg-up": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-			"dev": true,
-			"dependencies": {
-				"find-up": "^4.1.0",
-				"read-pkg": "^5.2.0",
-				"type-fest": "^0.8.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/read-pkg-up/node_modules/type-fest": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-pkg/node_modules/hosted-git-info": {
-			"version": "2.8.9",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-			"dev": true
-		},
-		"node_modules/read-pkg/node_modules/normalize-package-data": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-			"dev": true,
-			"dependencies": {
-				"hosted-git-info": "^2.1.4",
-				"resolve": "^1.10.0",
-				"semver": "2 || 3 || 4 || 5",
-				"validate-npm-package-license": "^3.0.1"
-			}
-		},
-		"node_modules/read-pkg/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver"
-			}
-		},
-		"node_modules/read-pkg/node_modules/type-fest": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/readable-stream": {
-			"version": "2.3.7",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-			"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-			"dev": true,
-			"dependencies": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.3",
-				"isarray": "~1.0.0",
-				"process-nextick-args": "~2.0.0",
-				"safe-buffer": "~5.1.1",
-				"string_decoder": "~1.1.1",
-				"util-deprecate": "~1.0.1"
-			}
-		},
-		"node_modules/readdirp": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-			"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-			"dev": true,
-			"dependencies": {
-				"graceful-fs": "^4.1.11",
-				"micromatch": "^3.1.10",
-				"readable-stream": "^2.0.2"
-			},
-			"engines": {
-				"node": ">=0.10"
-			}
-		},
-		"node_modules/rechoir": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-			"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-			"dev": true,
-			"dependencies": {
-				"resolve": "^1.1.6"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/redent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-			"dev": true,
-			"dependencies": {
-				"indent-string": "^4.0.0",
-				"strip-indent": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/regex-not": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-			"dev": true,
-			"dependencies": {
-				"extend-shallow": "^3.0.2",
-				"safe-regex": "^1.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/regex-not/node_modules/extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"dev": true,
-			"dependencies": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/regex-not/node_modules/is-extendable": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-			"dev": true,
-			"dependencies": {
-				"is-plain-object": "^2.0.4"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/regex-not/node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/regexpp": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
-			}
-		},
-		"node_modules/remove-bom-buffer": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-			"integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
-			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5",
-				"is-utf8": "^0.2.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/remove-bom-buffer/node_modules/is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"node_modules/remove-bom-stream": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-			"integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
-			"dev": true,
-			"dependencies": {
-				"remove-bom-buffer": "^3.0.0",
-				"safe-buffer": "^5.1.0",
-				"through2": "^2.0.3"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/remove-bom-stream/node_modules/through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-			"dev": true,
-			"dependencies": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
-			}
-		},
-		"node_modules/remove-trailing-separator": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-			"dev": true
-		},
-		"node_modules/repeat-element": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-			"integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/repeat-string": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10"
-			}
-		},
-		"node_modules/replace-ext": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-			"integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/replace-homedir": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-			"integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-			"dev": true,
-			"dependencies": {
-				"homedir-polyfill": "^1.0.1",
-				"is-absolute": "^1.0.0",
-				"remove-trailing-separator": "^1.1.0"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/require-directory": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/require-from-string": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/require-main-filename": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-			"integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-			"dev": true
-		},
-		"node_modules/resolve": {
-			"version": "1.20.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-			"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-			"dev": true,
-			"dependencies": {
-				"is-core-module": "^2.2.0",
-				"path-parse": "^1.0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/resolve-dir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-			"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-			"dev": true,
-			"dependencies": {
-				"expand-tilde": "^2.0.0",
-				"global-modules": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/resolve-from": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/resolve-options": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-			"integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-			"dev": true,
-			"dependencies": {
-				"value-or-function": "^3.0.0"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/resolve-url": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-			"deprecated": "https://github.com/lydell/resolve-url#deprecated",
-			"dev": true
-		},
-		"node_modules/ret": {
-			"version": "0.1.15",
-			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.12"
-			}
-		},
-		"node_modules/reusify": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-			"dev": true,
-			"engines": {
-				"iojs": ">=1.0.0",
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/rework": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
-			"integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
-			"dev": true,
-			"dependencies": {
-				"convert-source-map": "^0.3.3",
-				"css": "^2.0.0"
-			}
-		},
-		"node_modules/rework-import": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/rework-import/-/rework-import-2.1.0.tgz",
-			"integrity": "sha512-ufvoQX6cDhrqYc8ZXvJ+6FqimwyI4qn8cH1ypAiS9Mn41iVPN/9RGwRvscBtUEkHA09w8voTIakRJKslgWcTEQ==",
-			"dev": true,
-			"dependencies": {
-				"css": "^2.0.0",
-				"globby": "^2.0.0",
-				"parse-import": "^2.0.0",
-				"url-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/rework-plugin-function": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/rework-plugin-function/-/rework-plugin-function-1.0.2.tgz",
-			"integrity": "sha1-Es5G+1sptdk1FGaD9rmM9J0jc7k=",
-			"dev": true,
-			"dependencies": {
-				"rework-visit": "^1.0.0"
-			}
-		},
-		"node_modules/rework-plugin-url": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/rework-plugin-url/-/rework-plugin-url-1.1.0.tgz",
-			"integrity": "sha1-q1PosQV7nV7MHIJz/32xhgg3XEU=",
-			"dev": true,
-			"dependencies": {
-				"rework-plugin-function": "^1.0.0"
-			}
-		},
-		"node_modules/rework-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
-			"integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
-			"dev": true
-		},
-		"node_modules/rework/node_modules/convert-source-map": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-			"integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
-			"dev": true
-		},
-		"node_modules/rimraf": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-			"dev": true,
-			"dependencies": {
-				"glob": "^7.1.3"
-			},
-			"bin": {
-				"rimraf": "bin.js"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/rimraf/node_modules/glob": {
-			"version": "7.1.7",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-			"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-			"dev": true,
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/run-parallel": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"dependencies": {
-				"queue-microtask": "^1.2.2"
-			}
-		},
-		"node_modules/safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-			"dev": true
-		},
-		"node_modules/safe-regex": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-			"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-			"dev": true,
-			"dependencies": {
-				"ret": "~0.1.10"
-			}
-		},
-		"node_modules/semver": {
-			"version": "7.5.4",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-			"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-			"dev": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/semver-greatest-satisfied-range": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-			"integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
-			"dev": true,
-			"dependencies": {
-				"sver-compat": "^1.5.0"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/set-blocking": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-			"dev": true
-		},
-		"node_modules/set-value": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-			"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-			"dev": true,
-			"dependencies": {
-				"extend-shallow": "^2.0.1",
-				"is-extendable": "^0.1.1",
-				"is-plain-object": "^2.0.3",
-				"split-string": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/set-value/node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/signal-exit": {
-			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-			"dev": true
-		},
-		"node_modules/slash": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/slice-ansi": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"astral-regex": "^2.0.0",
-				"is-fullwidth-code-point": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/slice-ansi?sponsor=1"
-			}
-		},
-		"node_modules/snapdragon": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-			"dev": true,
-			"dependencies": {
-				"base": "^0.11.1",
-				"debug": "^2.2.0",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"map-cache": "^0.2.2",
-				"source-map": "^0.5.6",
-				"source-map-resolve": "^0.5.0",
-				"use": "^3.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon-node": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-			"dev": true,
-			"dependencies": {
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.0",
-				"snapdragon-util": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon-node/node_modules/define-property": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-			"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-			"dev": true,
-			"dependencies": {
-				"is-descriptor": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon-util": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-			"dev": true,
-			"dependencies": {
-				"kind-of": "^3.2.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon-util/node_modules/is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"node_modules/snapdragon-util/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon/node_modules/debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dev": true,
-			"dependencies": {
-				"ms": "2.0.0"
-			}
-		},
-		"node_modules/snapdragon/node_modules/define-property": {
-			"version": "0.2.5",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-			"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-			"dev": true,
-			"dependencies": {
-				"is-descriptor": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon/node_modules/is-accessor-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-			"dev": true,
-			"dependencies": {
-				"kind-of": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon/node_modules/is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"node_modules/snapdragon/node_modules/is-data-descriptor": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-			"dev": true,
-			"dependencies": {
-				"kind-of": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon/node_modules/is-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-			"dev": true,
-			"dependencies": {
-				"is-accessor-descriptor": "^0.1.6",
-				"is-data-descriptor": "^0.1.4",
-				"kind-of": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon/node_modules/ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-			"dev": true
-		},
-		"node_modules/snapdragon/node_modules/source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map-resolve": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-			"integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-			"dev": true,
-			"dependencies": {
-				"atob": "^2.1.2",
-				"decode-uri-component": "^0.2.0",
-				"resolve-url": "^0.2.1",
-				"source-map-url": "^0.4.0",
-				"urix": "^0.1.0"
-			}
-		},
-		"node_modules/source-map-url": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-			"integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-			"dev": true
-		},
-		"node_modules/sparkles": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-			"integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/spdx-correct": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-			"dev": true,
-			"dependencies": {
-				"spdx-expression-parse": "^3.0.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"node_modules/spdx-exceptions": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-			"dev": true
-		},
-		"node_modules/spdx-expression-parse": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-			"dev": true,
-			"dependencies": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"node_modules/spdx-license-ids": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-			"integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
-			"dev": true
-		},
-		"node_modules/specificity": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
-			"integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
-			"dev": true,
-			"bin": {
-				"specificity": "bin/specificity"
-			}
-		},
-		"node_modules/split-string": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-			"dev": true,
-			"dependencies": {
-				"extend-shallow": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/split-string/node_modules/extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"dev": true,
-			"dependencies": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/split-string/node_modules/is-extendable": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-			"dev": true,
-			"dependencies": {
-				"is-plain-object": "^2.0.4"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/split-string/node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/stable": {
-			"version": "0.1.8",
-			"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-			"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-			"dev": true
-		},
-		"node_modules/stack-trace": {
-			"version": "0.0.10",
-			"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-			"integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-			"dev": true,
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/static-extend": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-			"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-			"dev": true,
-			"dependencies": {
-				"define-property": "^0.2.5",
-				"object-copy": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/static-extend/node_modules/define-property": {
-			"version": "0.2.5",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-			"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-			"dev": true,
-			"dependencies": {
-				"is-descriptor": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/static-extend/node_modules/is-accessor-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-			"dev": true,
-			"dependencies": {
-				"kind-of": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/static-extend/node_modules/is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"node_modules/static-extend/node_modules/is-data-descriptor": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-			"dev": true,
-			"dependencies": {
-				"kind-of": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/static-extend/node_modules/is-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-			"dev": true,
-			"dependencies": {
-				"is-accessor-descriptor": "^0.1.6",
-				"is-data-descriptor": "^0.1.4",
-				"kind-of": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/stream-exhaust": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-			"integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-			"dev": true
-		},
-		"node_modules/stream-shift": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-			"integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-			"dev": true
-		},
-		"node_modules/string_decoder": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-			"dev": true,
-			"dependencies": {
-				"safe-buffer": "~5.1.0"
-			}
-		},
-		"node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-ansi": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"dependencies": {
-				"ansi-regex": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-bom": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-			"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-			"dev": true,
-			"dependencies": {
-				"is-utf8": "^0.2.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/strip-bom-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-			"integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/strip-indent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-			"dev": true,
-			"dependencies": {
-				"min-indent": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-json-comments": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/style-search": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-			"integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
-			"dev": true
-		},
-		"node_modules/stylehacks": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz",
-			"integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==",
-			"dev": true,
-			"dependencies": {
-				"browserslist": "^4.16.6",
-				"postcss-selector-parser": "^6.0.4"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/stylelint": {
-			"version": "14.7.0",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.0.tgz",
-			"integrity": "sha512-vAVPAYaHhcexOiuvym0S64UWIIonMKgYz1Eh+SZgXKkKFLL+wwBzzWGH7Bdnk/HLyH3KlrX+tlisFdEG8ik+Lw==",
-			"dev": true,
-			"dependencies": {
-				"balanced-match": "^2.0.0",
-				"colord": "^2.9.2",
-				"cosmiconfig": "^7.0.1",
-				"css-functions-list": "^3.0.1",
-				"debug": "^4.3.4",
-				"execall": "^2.0.0",
-				"fast-glob": "^3.2.11",
-				"fastest-levenshtein": "^1.0.12",
-				"file-entry-cache": "^6.0.1",
-				"get-stdin": "^8.0.0",
-				"global-modules": "^2.0.0",
-				"globby": "^11.1.0",
-				"globjoin": "^0.1.4",
-				"html-tags": "^3.2.0",
-				"ignore": "^5.2.0",
-				"import-lazy": "^4.0.0",
-				"imurmurhash": "^0.1.4",
-				"is-plain-object": "^5.0.0",
-				"known-css-properties": "^0.24.0",
-				"mathml-tag-names": "^2.1.3",
-				"meow": "^9.0.0",
-				"micromatch": "^4.0.5",
-				"normalize-path": "^3.0.0",
-				"normalize-selector": "^0.2.0",
-				"picocolors": "^1.0.0",
-				"postcss": "^8.4.12",
-				"postcss-media-query-parser": "^0.2.3",
-				"postcss-resolve-nested-selector": "^0.1.1",
-				"postcss-safe-parser": "^6.0.0",
-				"postcss-selector-parser": "^6.0.10",
-				"postcss-value-parser": "^4.2.0",
-				"resolve-from": "^5.0.0",
-				"specificity": "^0.4.1",
-				"string-width": "^4.2.3",
-				"strip-ansi": "^6.0.1",
-				"style-search": "^0.1.0",
-				"supports-hyperlinks": "^2.2.0",
-				"svg-tags": "^1.0.0",
-				"table": "^6.8.0",
-				"v8-compile-cache": "^2.3.0",
-				"write-file-atomic": "^4.0.1"
-			},
-			"bin": {
-				"stylelint": "bin/stylelint.js"
-			},
-			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/stylelint"
-			}
-		},
-		"node_modules/stylelint-order": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
-			"integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
-			"dev": true,
-			"dependencies": {
-				"postcss": "^8.3.11",
-				"postcss-sorting": "^7.0.1"
-			},
-			"peerDependencies": {
-				"stylelint": "^14.0.0"
-			}
-		},
-		"node_modules/stylelint/node_modules/array-union": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/stylelint/node_modules/balanced-match": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-			"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-			"dev": true
-		},
-		"node_modules/stylelint/node_modules/braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-			"dev": true,
-			"dependencies": {
-				"fill-range": "^7.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/stylelint/node_modules/fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-			"dev": true,
-			"dependencies": {
-				"to-regex-range": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/stylelint/node_modules/global-modules": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-			"integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-			"dev": true,
-			"dependencies": {
-				"global-prefix": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/stylelint/node_modules/global-prefix": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-			"integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-			"dev": true,
-			"dependencies": {
-				"ini": "^1.3.5",
-				"kind-of": "^6.0.2",
-				"which": "^1.3.1"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/stylelint/node_modules/globby": {
-			"version": "11.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-			"dev": true,
-			"dependencies": {
-				"array-union": "^2.1.0",
-				"dir-glob": "^3.0.1",
-				"fast-glob": "^3.2.9",
-				"ignore": "^5.2.0",
-				"merge2": "^1.4.1",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/stylelint/node_modules/is-number": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.12.0"
-			}
-		},
-		"node_modules/stylelint/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/stylelint/node_modules/micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-			"dev": true,
-			"dependencies": {
-				"braces": "^3.0.2",
-				"picomatch": "^2.3.1"
-			},
-			"engines": {
-				"node": ">=8.6"
-			}
-		},
-		"node_modules/stylelint/node_modules/resolve-from": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/stylelint/node_modules/to-regex-range": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"dev": true,
-			"dependencies": {
-				"is-number": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8.0"
-			}
-		},
-		"node_modules/stylelint/node_modules/which": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-			"dev": true,
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"which": "bin/which"
-			}
-		},
-		"node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/supports-hyperlinks": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-			"integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0",
-				"supports-color": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/sver-compat": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-			"integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
-			"dev": true,
-			"dependencies": {
-				"es6-iterator": "^2.0.1",
-				"es6-symbol": "^3.1.1"
-			}
-		},
-		"node_modules/svg-tags": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-			"integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
-			"dev": true
-		},
-		"node_modules/svgo": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-			"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-			"dev": true,
-			"dependencies": {
-				"@trysound/sax": "0.2.0",
-				"commander": "^7.2.0",
-				"css-select": "^4.1.3",
-				"css-tree": "^1.1.3",
-				"csso": "^4.2.0",
-				"picocolors": "^1.0.0",
-				"stable": "^0.1.8"
-			},
-			"bin": {
-				"svgo": "bin/svgo"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/table": {
-			"version": "6.8.0",
-			"resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-			"integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
-			"dev": true,
-			"dependencies": {
-				"ajv": "^8.0.1",
-				"lodash.truncate": "^4.4.2",
-				"slice-ansi": "^4.0.0",
-				"string-width": "^4.2.3",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=10.0.0"
-			}
-		},
-		"node_modules/table/node_modules/ajv": {
-			"version": "8.11.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-			"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-			"dev": true,
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/table/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true
-		},
-		"node_modules/text-table": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-			"dev": true
-		},
-		"node_modules/through2": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-			"integrity": "sha1-CEfLxESfNAVXTb3M2buEG4OsNUU=",
-			"dev": true,
-			"dependencies": {
-				"readable-stream": ">=1.1.13-1 <1.2.0-0",
-				"xtend": ">=4.0.0 <4.1.0-0"
-			}
-		},
-		"node_modules/through2-filter": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-			"integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-			"dev": true,
-			"dependencies": {
-				"through2": "~2.0.0",
-				"xtend": "~4.0.0"
-			}
-		},
-		"node_modules/through2-filter/node_modules/through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-			"dev": true,
-			"dependencies": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
-			}
-		},
-		"node_modules/through2/node_modules/isarray": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-			"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-			"dev": true
-		},
-		"node_modules/through2/node_modules/readable-stream": {
-			"version": "1.1.14",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-			"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-			"dev": true,
-			"dependencies": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.1",
-				"isarray": "0.0.1",
-				"string_decoder": "~0.10.x"
-			}
-		},
-		"node_modules/through2/node_modules/string_decoder": {
-			"version": "0.10.31",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-			"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-			"dev": true
-		},
-		"node_modules/time-stamp": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/timers-ext": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-			"integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-			"dev": true,
-			"dependencies": {
-				"es5-ext": "~0.10.46",
-				"next-tick": "1"
-			}
-		},
-		"node_modules/to-absolute-glob": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-			"integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
-			"dev": true,
-			"dependencies": {
-				"is-absolute": "^1.0.0",
-				"is-negated-glob": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/to-object-path": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-			"dev": true,
-			"dependencies": {
-				"kind-of": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/to-object-path/node_modules/is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"node_modules/to-object-path/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-			"dev": true,
-			"dependencies": {
-				"is-buffer": "^1.1.5"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/to-regex": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-			"dev": true,
-			"dependencies": {
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"regex-not": "^1.0.2",
-				"safe-regex": "^1.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/to-regex-range": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-			"dev": true,
-			"dependencies": {
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/to-regex/node_modules/extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"dev": true,
-			"dependencies": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/to-regex/node_modules/is-extendable": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-			"dev": true,
-			"dependencies": {
-				"is-plain-object": "^2.0.4"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/to-regex/node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/to-through": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-			"integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-			"dev": true,
-			"dependencies": {
-				"through2": "^2.0.3"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/to-through/node_modules/through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-			"dev": true,
-			"dependencies": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
-			}
-		},
-		"node_modules/trim-newlines": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/type": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-			"integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-			"dev": true
-		},
-		"node_modules/type-check": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-			"dev": true,
-			"dependencies": {
-				"prelude-ls": "^1.2.1"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/type-fest": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/typedarray": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-			"dev": true
-		},
-		"node_modules/unc-path-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/undertaker": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
-			"integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
-			"dev": true,
-			"dependencies": {
-				"arr-flatten": "^1.0.1",
-				"arr-map": "^2.0.0",
-				"bach": "^1.0.0",
-				"collection-map": "^1.0.0",
-				"es6-weak-map": "^2.0.1",
-				"fast-levenshtein": "^1.0.0",
-				"last-run": "^1.1.0",
-				"object.defaults": "^1.0.0",
-				"object.reduce": "^1.0.0",
-				"undertaker-registry": "^1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/undertaker-registry": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-			"integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/undertaker/node_modules/fast-levenshtein": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
-			"integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
-			"dev": true
-		},
-		"node_modules/union-value": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-			"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-			"dev": true,
-			"dependencies": {
-				"arr-union": "^3.1.0",
-				"get-value": "^2.0.6",
-				"is-extendable": "^0.1.1",
-				"set-value": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/union-value/node_modules/arr-union": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-			"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/unique-stream": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-			"integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
-			"dev": true,
-			"dependencies": {
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"through2-filter": "^3.0.0"
-			}
-		},
-		"node_modules/unset-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-			"dev": true,
-			"dependencies": {
-				"has-value": "^0.3.1",
-				"isobject": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/unset-value/node_modules/has-value": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-			"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-			"dev": true,
-			"dependencies": {
-				"get-value": "^2.0.3",
-				"has-values": "^0.1.4",
-				"isobject": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-			"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-			"dev": true,
-			"dependencies": {
-				"isarray": "1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/unset-value/node_modules/has-values": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-			"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/upath": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-			"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-			"dev": true,
-			"engines": {
-				"node": ">=4",
-				"yarn": "*"
-			}
-		},
-		"node_modules/uri-js": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"dev": true,
-			"dependencies": {
-				"punycode": "^2.1.0"
-			}
-		},
-		"node_modules/urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-			"deprecated": "Please see https://github.com/lydell/urix#deprecated",
-			"dev": true
-		},
-		"node_modules/url-regex": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz",
-			"integrity": "sha512-dQ9cJzMou5OKr6ZzfvwJkCq3rC72PNXhqz0v3EIhF4a3Np+ujr100AhUx2cKx5ei3iymoJpJrPB3sVSEMdqAeg==",
-			"dev": true,
-			"dependencies": {
-				"ip-regex": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/use": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-			"dev": true
-		},
-		"node_modules/v8-compile-cache": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-			"dev": true
-		},
-		"node_modules/v8flags": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-			"integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-			"dev": true,
-			"dependencies": {
-				"homedir-polyfill": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-			"dev": true,
-			"dependencies": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
-			}
-		},
-		"node_modules/value-or-function": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-			"integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/vinyl": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
-			"integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
-			"dev": true,
-			"dependencies": {
-				"clone": "^2.1.1",
-				"clone-buffer": "^1.0.0",
-				"clone-stats": "^1.0.0",
-				"cloneable-readable": "^1.0.0",
-				"remove-trailing-separator": "^1.0.1",
-				"replace-ext": "^1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/vinyl-fs": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-			"integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-			"dev": true,
-			"dependencies": {
-				"fs-mkdirp-stream": "^1.0.0",
-				"glob-stream": "^6.1.0",
-				"graceful-fs": "^4.0.0",
-				"is-valid-glob": "^1.0.0",
-				"lazystream": "^1.0.0",
-				"lead": "^1.0.0",
-				"object.assign": "^4.0.4",
-				"pumpify": "^1.3.5",
-				"readable-stream": "^2.3.3",
-				"remove-bom-buffer": "^3.0.0",
-				"remove-bom-stream": "^1.2.0",
-				"resolve-options": "^1.1.0",
-				"through2": "^2.0.0",
-				"to-through": "^2.0.0",
-				"value-or-function": "^3.0.0",
-				"vinyl": "^2.0.0",
-				"vinyl-sourcemap": "^1.1.0"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/vinyl-fs/node_modules/through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-			"dev": true,
-			"dependencies": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
-			}
-		},
-		"node_modules/vinyl-sourcemap": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-			"integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-			"dev": true,
-			"dependencies": {
-				"append-buffer": "^1.0.2",
-				"convert-source-map": "^1.5.0",
-				"graceful-fs": "^4.1.6",
-				"normalize-path": "^2.1.1",
-				"now-and-later": "^2.0.0",
-				"remove-bom-buffer": "^3.0.0",
-				"vinyl": "^2.0.0"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/vinyl-sourcemap/node_modules/normalize-path": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-			"dev": true,
-			"dependencies": {
-				"remove-trailing-separator": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/vinyl-sourcemaps-apply": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-			"integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
-			"dev": true,
-			"dependencies": {
-				"source-map": "^0.5.1"
-			}
-		},
-		"node_modules/vinyl-sourcemaps-apply/node_modules/source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/which-module": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-			"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-			"dev": true
-		},
-		"node_modules/word-wrap": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/wrap-ansi": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-			"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-			"dev": true,
-			"dependencies": {
-				"string-width": "^1.0.1",
-				"strip-ansi": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/ansi-regex": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-			"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-			"dev": true,
-			"dependencies": {
-				"number-is-nan": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/string-width": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-			"dev": true,
-			"dependencies": {
-				"code-point-at": "^1.0.0",
-				"is-fullwidth-code-point": "^1.0.0",
-				"strip-ansi": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/strip-ansi": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-			"dev": true,
-			"dependencies": {
-				"ansi-regex": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-			"dev": true
-		},
-		"node_modules/write-file-atomic": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-			"integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
-			"dev": true,
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^3.0.7"
-			},
-			"engines": {
-				"node": "^12.13.0 || ^14.15.0 || >=16"
-			}
-		},
-		"node_modules/xtend": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.4"
-			}
-		},
-		"node_modules/y18n": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-			"integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
-			"dev": true
-		},
-		"node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true
-		},
-		"node_modules/yaml": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/yargs": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
-			"integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
-			"dev": true,
-			"dependencies": {
-				"camelcase": "^3.0.0",
-				"cliui": "^3.2.0",
-				"decamelize": "^1.1.1",
-				"get-caller-file": "^1.0.1",
-				"os-locale": "^1.4.0",
-				"read-pkg-up": "^1.0.1",
-				"require-directory": "^2.1.1",
-				"require-main-filename": "^1.0.1",
-				"set-blocking": "^2.0.0",
-				"string-width": "^1.0.2",
-				"which-module": "^1.0.0",
-				"y18n": "^3.2.1",
-				"yargs-parser": "^5.0.1"
-			}
-		},
-		"node_modules/yargs-parser": {
-			"version": "20.2.7",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-			"integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/yargs/node_modules/ansi-regex": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/yargs/node_modules/camelcase": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-			"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/yargs/node_modules/find-up": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-			"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-			"dev": true,
-			"dependencies": {
-				"path-exists": "^2.0.0",
-				"pinkie-promise": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/yargs/node_modules/hosted-git-info": {
-			"version": "2.8.9",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-			"dev": true
-		},
-		"node_modules/yargs/node_modules/is-fullwidth-code-point": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-			"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-			"dev": true,
-			"dependencies": {
-				"number-is-nan": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/yargs/node_modules/normalize-package-data": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-			"dev": true,
-			"dependencies": {
-				"hosted-git-info": "^2.1.4",
-				"resolve": "^1.10.0",
-				"semver": "2 || 3 || 4 || 5",
-				"validate-npm-package-license": "^3.0.1"
-			}
-		},
-		"node_modules/yargs/node_modules/path-exists": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-			"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-			"dev": true,
-			"dependencies": {
-				"pinkie-promise": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/yargs/node_modules/path-type": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-			"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-			"dev": true,
-			"dependencies": {
-				"graceful-fs": "^4.1.2",
-				"pify": "^2.0.0",
-				"pinkie-promise": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/yargs/node_modules/read-pkg": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-			"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-			"dev": true,
-			"dependencies": {
-				"load-json-file": "^1.0.0",
-				"normalize-package-data": "^2.3.2",
-				"path-type": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/yargs/node_modules/read-pkg-up": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-			"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-			"dev": true,
-			"dependencies": {
-				"find-up": "^1.0.0",
-				"read-pkg": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/yargs/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver"
-			}
-		},
-		"node_modules/yargs/node_modules/string-width": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-			"dev": true,
-			"dependencies": {
-				"code-point-at": "^1.0.0",
-				"is-fullwidth-code-point": "^1.0.0",
-				"strip-ansi": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/yargs/node_modules/strip-ansi": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-			"dev": true,
-			"dependencies": {
-				"ansi-regex": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/yargs/node_modules/yargs-parser": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
-			"integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
-			"dev": true,
-			"dependencies": {
-				"camelcase": "^3.0.0",
-				"object.assign": "^4.1.0"
-			}
-		}
-	},
-	"dependencies": {
-		"@babel/code-frame": {
-			"version": "7.12.11",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-			"dev": true,
-			"requires": {
-				"@babel/highlight": "^7.10.4"
-			}
-		},
-		"@babel/helper-validator-identifier": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
-			"integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==",
-			"dev": true
-		},
-		"@babel/highlight": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-			"integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-validator-identifier": "^7.14.5",
-				"chalk": "^2.0.0",
-				"js-tokens": "^4.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"color-convert": {
-					"version": "1.9.3",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-					"dev": true,
-					"requires": {
-						"color-name": "1.1.3"
-					}
-				},
-				"color-name": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-					"dev": true
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
-			}
-		},
-		"@eslint/eslintrc": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
-			"integrity": "sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==",
-			"dev": true,
-			"requires": {
-				"ajv": "^6.12.4",
-				"debug": "^4.3.2",
-				"espree": "^9.3.1",
-				"globals": "^13.9.0",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.0.4",
-				"strip-json-comments": "^3.1.1"
-			}
-		},
-		"@gulp-sourcemaps/identity-map": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
-			"integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==",
-			"dev": true,
-			"requires": {
-				"acorn": "^6.4.1",
-				"normalize-path": "^3.0.0",
-				"postcss": "^7.0.16",
-				"source-map": "^0.6.0",
-				"through2": "^3.0.1"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "6.4.2",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-					"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-					"dev": true
-				},
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"through2": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-					"integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.4",
-						"readable-stream": "2 || 3"
-					}
-				}
-			}
-		},
-		"@gulp-sourcemaps/map-sources": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-			"integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
-			"dev": true,
-			"requires": {
-				"normalize-path": "^2.0.1",
-				"through2": "^2.0.3"
-			},
-			"dependencies": {
-				"normalize-path": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-					"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-					"dev": true,
-					"requires": {
-						"remove-trailing-separator": "^1.0.1"
-					}
-				},
-				"through2": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-					"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "~2.3.6",
-						"xtend": "~4.0.1"
-					}
-				}
-			}
-		},
-		"@humanwhocodes/config-array": {
-			"version": "0.9.5",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-			"integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
-			"dev": true,
-			"requires": {
-				"@humanwhocodes/object-schema": "^1.2.1",
-				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
-			}
-		},
-		"@humanwhocodes/object-schema": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-			"dev": true
-		},
-		"@nodelib/fs.scandir": {
-			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-			"dev": true,
-			"requires": {
-				"@nodelib/fs.stat": "2.0.5",
-				"run-parallel": "^1.1.9"
-			}
-		},
-		"@nodelib/fs.stat": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-			"dev": true
-		},
-		"@nodelib/fs.walk": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-			"dev": true,
-			"requires": {
-				"@nodelib/fs.scandir": "2.1.5",
-				"fastq": "^1.6.0"
-			}
-		},
-		"@trysound/sax": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-			"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-			"dev": true
-		},
-		"@types/minimist": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
-			"integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
-			"dev": true
-		},
-		"@types/normalize-package-data": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-			"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-			"dev": true
-		},
-		"@types/parse-json": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-			"dev": true
-		},
-		"acorn": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-			"dev": true
-		},
-		"acorn-jsx": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true,
-			"requires": {}
-		},
-		"ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
-			"requires": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
-			}
-		},
-		"ansi-cyan": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-			"integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
-			"dev": true,
-			"requires": {
-				"ansi-wrap": "0.1.0"
-			}
-		},
-		"ansi-gray": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-			"integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-			"dev": true,
-			"requires": {
-				"ansi-wrap": "0.1.0"
-			}
-		},
-		"ansi-red": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-			"integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
-			"dev": true,
-			"requires": {
-				"ansi-wrap": "0.1.0"
-			}
-		},
-		"ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-			"dev": true
-		},
-		"ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"requires": {
-				"color-convert": "^2.0.1"
-			}
-		},
-		"ansi-wrap": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-			"integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-			"dev": true
-		},
-		"anymatch": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-			"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-			"dev": true,
-			"requires": {
-				"micromatch": "^3.1.4",
-				"normalize-path": "^2.1.1"
-			},
-			"dependencies": {
-				"normalize-path": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-					"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-					"dev": true,
-					"requires": {
-						"remove-trailing-separator": "^1.0.1"
-					}
-				}
-			}
-		},
-		"append-buffer": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-			"integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-			"dev": true,
-			"requires": {
-				"buffer-equal": "^1.0.0"
-			}
-		},
-		"archy": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-			"integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-			"dev": true
-		},
-		"argparse": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
-		},
-		"arr-diff": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-			"integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-			"dev": true
-		},
-		"arr-filter": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-			"integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
-			"dev": true,
-			"requires": {
-				"make-iterator": "^1.0.0"
-			}
-		},
-		"arr-flatten": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-			"dev": true
-		},
-		"arr-map": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-			"integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
-			"dev": true,
-			"requires": {
-				"make-iterator": "^1.0.0"
-			}
-		},
-		"arr-union": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-			"integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-			"dev": true
-		},
-		"array-each": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-			"integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-			"dev": true
-		},
-		"array-initial": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-			"integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-			"dev": true,
-			"requires": {
-				"array-slice": "^1.0.0",
-				"is-number": "^4.0.0"
-			},
-			"dependencies": {
-				"is-number": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-					"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-					"dev": true
-				}
-			}
-		},
-		"array-last": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-			"integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-			"dev": true,
-			"requires": {
-				"is-number": "^4.0.0"
-			},
-			"dependencies": {
-				"is-number": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-					"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-					"dev": true
-				}
-			}
-		},
-		"array-slice": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-			"integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-			"dev": true
-		},
-		"array-sort": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-			"integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
-			"dev": true,
-			"requires": {
-				"default-compare": "^1.0.0",
-				"get-value": "^2.0.6",
-				"kind-of": "^5.0.2"
-			}
-		},
-		"array-union": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-			"dev": true,
-			"requires": {
-				"array-uniq": "^1.0.1"
-			}
-		},
-		"array-uniq": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-			"dev": true
-		},
-		"array-unique": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-			"dev": true
-		},
-		"arrify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-			"dev": true
-		},
-		"assign-symbols": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-			"dev": true
-		},
-		"astral-regex": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-			"dev": true
-		},
-		"async": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-			"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-			"dev": true
-		},
-		"async-done": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-			"integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
-			"dev": true,
-			"requires": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.2",
-				"process-nextick-args": "^2.0.0",
-				"stream-exhaust": "^1.0.1"
-			}
-		},
-		"async-each": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-			"integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-			"dev": true
-		},
-		"async-settle": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-			"integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-			"dev": true,
-			"requires": {
-				"async-done": "^1.2.2"
-			}
-		},
-		"atob": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-			"dev": true
-		},
-		"autoprefixer": {
-			"version": "10.4.4",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.4.tgz",
-			"integrity": "sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.20.2",
-				"caniuse-lite": "^1.0.30001317",
-				"fraction.js": "^4.2.0",
-				"normalize-range": "^0.1.2",
-				"picocolors": "^1.0.0",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"bach": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-			"integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-			"dev": true,
-			"requires": {
-				"arr-filter": "^1.1.1",
-				"arr-flatten": "^1.0.1",
-				"arr-map": "^2.0.0",
-				"array-each": "^1.0.0",
-				"array-initial": "^1.0.0",
-				"array-last": "^1.1.1",
-				"async-done": "^1.2.2",
-				"async-settle": "^1.0.0",
-				"now-and-later": "^2.0.0"
-			}
-		},
-		"balanced-match": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-			"dev": true
-		},
-		"base": {
-			"version": "0.11.2",
-			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-			"dev": true,
-			"requires": {
-				"cache-base": "^1.0.1",
-				"class-utils": "^0.3.5",
-				"component-emitter": "^1.2.1",
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.1",
-				"mixin-deep": "^1.2.0",
-				"pascalcase": "^0.1.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				}
-			}
-		},
-		"binary-extensions": {
-			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-			"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-			"dev": true
-		},
-		"bindings": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-			"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"file-uri-to-path": "1.0.0"
-			}
-		},
-		"boolbase": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-			"dev": true
-		},
-		"brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"requires": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"braces": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-			"dev": true,
-			"requires": {
-				"arr-flatten": "^1.1.0",
-				"array-unique": "^0.3.2",
-				"extend-shallow": "^2.0.1",
-				"fill-range": "^4.0.0",
-				"isobject": "^3.0.1",
-				"repeat-element": "^1.1.2",
-				"snapdragon": "^0.8.1",
-				"snapdragon-node": "^2.0.1",
-				"split-string": "^3.0.2",
-				"to-regex": "^3.0.1"
-			}
-		},
-		"browserslist": {
-			"version": "4.20.2",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
-			"integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
-			"dev": true,
-			"requires": {
-				"caniuse-lite": "^1.0.30001317",
-				"electron-to-chromium": "^1.4.84",
-				"escalade": "^3.1.1",
-				"node-releases": "^2.0.2",
-				"picocolors": "^1.0.0"
-			}
-		},
-		"buffer-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-			"integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-			"dev": true
-		},
-		"buffer-from": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-			"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-			"dev": true
-		},
-		"cache-base": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-			"dev": true,
-			"requires": {
-				"collection-visit": "^1.0.0",
-				"component-emitter": "^1.2.1",
-				"get-value": "^2.0.6",
-				"has-value": "^1.0.0",
-				"isobject": "^3.0.1",
-				"set-value": "^2.0.0",
-				"to-object-path": "^0.3.0",
-				"union-value": "^1.0.0",
-				"unset-value": "^1.0.0"
-			}
-		},
-		"call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-			"dev": true,
-			"requires": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
-			}
-		},
-		"callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-			"dev": true
-		},
-		"camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-			"dev": true
-		},
-		"camelcase-keys": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-			"dev": true,
-			"requires": {
-				"camelcase": "^5.3.1",
-				"map-obj": "^4.0.0",
-				"quick-lru": "^4.0.1"
-			}
-		},
-		"caniuse-api": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-lite": "^1.0.0",
-				"lodash.memoize": "^4.1.2",
-				"lodash.uniq": "^4.5.0"
-			}
-		},
-		"caniuse-lite": {
-			"version": "1.0.30001332",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
-			"integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
-			"dev": true
-		},
-		"chalk": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-			"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-			"dev": true,
-			"requires": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			}
-		},
-		"chokidar": {
-			"version": "2.1.8",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-			"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-			"dev": true,
-			"requires": {
-				"anymatch": "^2.0.0",
-				"async-each": "^1.0.1",
-				"braces": "^2.3.2",
-				"fsevents": "^1.2.7",
-				"glob-parent": "^3.1.0",
-				"inherits": "^2.0.3",
-				"is-binary-path": "^1.0.0",
-				"is-glob": "^4.0.0",
-				"normalize-path": "^3.0.0",
-				"path-is-absolute": "^1.0.0",
-				"readdirp": "^2.2.1",
-				"upath": "^1.1.1"
-			},
-			"dependencies": {
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^3.1.0",
-						"path-dirname": "^1.0.0"
-					},
-					"dependencies": {
-						"is-glob": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-							"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-							"dev": true,
-							"requires": {
-								"is-extglob": "^2.1.0"
-							}
-						}
-					}
-				}
-			}
-		},
-		"class-utils": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-			"dev": true,
-			"requires": {
-				"arr-union": "^3.1.0",
-				"define-property": "^0.2.5",
-				"isobject": "^3.0.0",
-				"static-extend": "^0.1.1"
-			},
-			"dependencies": {
-				"arr-union": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-					"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-					"dev": true
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "0.1.6",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-					"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "^1.1.5"
-							}
-						}
-					}
-				},
-				"is-buffer": {
-					"version": "1.1.6",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-					"dev": true
-				},
-				"is-data-descriptor": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-					"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "^1.1.5"
-							}
-						}
-					}
-				},
-				"is-descriptor": {
-					"version": "0.1.6",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-					"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^0.1.6",
-						"is-data-descriptor": "^0.1.4",
-						"kind-of": "^5.0.0"
-					}
-				}
-			}
-		},
-		"cliui": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-			"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-			"dev": true,
-			"requires": {
-				"string-width": "^1.0.1",
-				"strip-ansi": "^3.0.1",
-				"wrap-ansi": "^2.0.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
-				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-					"dev": true,
-					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				}
-			}
-		},
-		"clone": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-			"integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-			"dev": true
-		},
-		"clone-buffer": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-			"integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-			"dev": true
-		},
-		"clone-regexp": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
-			"integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
-			"dev": true,
-			"requires": {
-				"is-regexp": "^2.0.0"
-			}
-		},
-		"clone-stats": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-			"integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-			"dev": true
-		},
-		"cloneable-readable": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-			"integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"process-nextick-args": "^2.0.0",
-				"readable-stream": "^2.3.5"
-			}
-		},
-		"code-point-at": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-			"dev": true
-		},
-		"collection-map": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-			"integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-			"dev": true,
-			"requires": {
-				"arr-map": "^2.0.2",
-				"for-own": "^1.0.0",
-				"make-iterator": "^1.0.0"
-			}
-		},
-		"collection-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-			"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-			"dev": true,
-			"requires": {
-				"map-visit": "^1.0.0",
-				"object-visit": "^1.0.0"
-			}
-		},
-		"color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"requires": {
-				"color-name": "~1.1.4"
-			}
-		},
-		"color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
-		"color-support": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-			"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-			"dev": true
-		},
-		"colord": {
-			"version": "2.9.2",
-			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
-			"integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
-			"dev": true
-		},
-		"commander": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-			"dev": true
-		},
-		"component-emitter": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-			"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-			"dev": true
-		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-			"dev": true
-		},
-		"concat-stream": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.2.2",
-				"typedarray": "^0.0.6"
-			}
-		},
-		"confusing-browser-globals": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-			"integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-			"dev": true
-		},
-		"convert-source-map": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-			"integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "~5.1.1"
-			}
-		},
-		"copy-descriptor": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-			"dev": true
-		},
-		"copy-props": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
-			"integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
-			"dev": true,
-			"requires": {
-				"each-props": "^1.3.2",
-				"is-plain-object": "^5.0.0"
-			}
-		},
-		"core-util-is": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-			"dev": true
-		},
-		"cosmiconfig": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-			"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-			"dev": true,
-			"requires": {
-				"@types/parse-json": "^4.0.0",
-				"import-fresh": "^3.2.1",
-				"parse-json": "^5.0.0",
-				"path-type": "^4.0.0",
-				"yaml": "^1.10.0"
-			}
-		},
-		"cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
-			"requires": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			}
-		},
-		"css": {
-			"version": "2.2.4",
-			"resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-			"integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.3",
-				"source-map": "^0.6.1",
-				"source-map-resolve": "^0.5.2",
-				"urix": "^0.1.0"
-			}
-		},
-		"css-declaration-sorter": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz",
-			"integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==",
-			"dev": true,
-			"requires": {}
-		},
-		"css-functions-list": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
-			"integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
-			"dev": true
-		},
-		"css-select": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-			"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-			"dev": true,
-			"requires": {
-				"boolbase": "^1.0.0",
-				"css-what": "^6.0.1",
-				"domhandler": "^4.3.1",
-				"domutils": "^2.8.0",
-				"nth-check": "^2.0.1"
-			}
-		},
-		"css-tree": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-			"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-			"dev": true,
-			"requires": {
-				"mdn-data": "2.0.14",
-				"source-map": "^0.6.1"
-			}
-		},
-		"css-what": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-			"dev": true
-		},
-		"cssesc": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-			"dev": true
-		},
-		"cssnano": {
-			"version": "5.1.7",
-			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.7.tgz",
-			"integrity": "sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg==",
-			"dev": true,
-			"requires": {
-				"cssnano-preset-default": "^5.2.7",
-				"lilconfig": "^2.0.3",
-				"yaml": "^1.10.2"
-			}
-		},
-		"cssnano-preset-default": {
-			"version": "5.2.7",
-			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz",
-			"integrity": "sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==",
-			"dev": true,
-			"requires": {
-				"css-declaration-sorter": "^6.2.2",
-				"cssnano-utils": "^3.1.0",
-				"postcss-calc": "^8.2.3",
-				"postcss-colormin": "^5.3.0",
-				"postcss-convert-values": "^5.1.0",
-				"postcss-discard-comments": "^5.1.1",
-				"postcss-discard-duplicates": "^5.1.0",
-				"postcss-discard-empty": "^5.1.1",
-				"postcss-discard-overridden": "^5.1.0",
-				"postcss-merge-longhand": "^5.1.4",
-				"postcss-merge-rules": "^5.1.1",
-				"postcss-minify-font-values": "^5.1.0",
-				"postcss-minify-gradients": "^5.1.1",
-				"postcss-minify-params": "^5.1.2",
-				"postcss-minify-selectors": "^5.2.0",
-				"postcss-normalize-charset": "^5.1.0",
-				"postcss-normalize-display-values": "^5.1.0",
-				"postcss-normalize-positions": "^5.1.0",
-				"postcss-normalize-repeat-style": "^5.1.0",
-				"postcss-normalize-string": "^5.1.0",
-				"postcss-normalize-timing-functions": "^5.1.0",
-				"postcss-normalize-unicode": "^5.1.0",
-				"postcss-normalize-url": "^5.1.0",
-				"postcss-normalize-whitespace": "^5.1.1",
-				"postcss-ordered-values": "^5.1.1",
-				"postcss-reduce-initial": "^5.1.0",
-				"postcss-reduce-transforms": "^5.1.0",
-				"postcss-svgo": "^5.1.0",
-				"postcss-unique-selectors": "^5.1.1"
-			}
-		},
-		"cssnano-utils": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
-			"integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-			"dev": true,
-			"requires": {}
-		},
-		"csso": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-			"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-			"dev": true,
-			"requires": {
-				"css-tree": "^1.1.2"
-			}
-		},
-		"d": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-			"integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-			"dev": true,
-			"requires": {
-				"es5-ext": "^0.10.50",
-				"type": "^1.0.1"
-			}
-		},
-		"debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-			"dev": true,
-			"requires": {
-				"ms": "2.1.2"
-			}
-		},
-		"debug-fabulous": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
-			"integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
-			"dev": true,
-			"requires": {
-				"debug": "3.X",
-				"memoizee": "0.4.X",
-				"object-assign": "4.X"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.7",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				}
-			}
-		},
-		"decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-			"dev": true
-		},
-		"decamelize-keys": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-			"integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-			"dev": true,
-			"requires": {
-				"decamelize": "^1.1.0",
-				"map-obj": "^1.0.0"
-			},
-			"dependencies": {
-				"map-obj": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-					"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-					"dev": true
-				}
-			}
-		},
-		"decode-uri-component": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-			"integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-			"dev": true
-		},
-		"deep-is": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-			"dev": true
-		},
-		"default-compare": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-			"integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-			"dev": true,
-			"requires": {
-				"kind-of": "^5.0.2"
-			}
-		},
-		"default-resolution": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-			"integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
-			"dev": true
-		},
-		"define-properties": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-			"dev": true,
-			"requires": {
-				"object-keys": "^1.0.12"
-			}
-		},
-		"define-property": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-			"dev": true,
-			"requires": {
-				"is-descriptor": "^1.0.2",
-				"isobject": "^3.0.1"
-			}
-		},
-		"detect-file": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-			"dev": true
-		},
-		"detect-newline": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-			"integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-			"dev": true
-		},
-		"dir-glob": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-			"dev": true,
-			"requires": {
-				"path-type": "^4.0.0"
-			}
-		},
-		"doctrine": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-			"dev": true,
-			"requires": {
-				"esutils": "^2.0.2"
-			}
-		},
-		"dom-serializer": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-			"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^2.0.1",
-				"domhandler": "^4.2.0",
-				"entities": "^2.0.0"
-			}
-		},
-		"domelementtype": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-			"dev": true
-		},
-		"domhandler": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-			"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^2.2.0"
-			}
-		},
-		"domutils": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-			"dev": true,
-			"requires": {
-				"dom-serializer": "^1.0.1",
-				"domelementtype": "^2.2.0",
-				"domhandler": "^4.2.0"
-			}
-		},
-		"duplexify": {
-			"version": "3.7.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-			"dev": true,
-			"requires": {
-				"end-of-stream": "^1.0.0",
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.0",
-				"stream-shift": "^1.0.0"
-			}
-		},
-		"each-props": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-			"integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-			"dev": true,
-			"requires": {
-				"is-plain-object": "^2.0.1",
-				"object.defaults": "^1.1.0"
-			},
-			"dependencies": {
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
-			}
-		},
-		"electron-to-chromium": {
-			"version": "1.4.111",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.111.tgz",
-			"integrity": "sha512-/s3+fwhKf1YK4k7btOImOzCQLpUjS6MaPf0ODTNuT4eTM1Bg4itBpLkydhOzJmpmH6Z9eXFyuuK5czsmzRzwtw==",
-			"dev": true
-		},
-		"emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
-		},
-		"end-of-stream": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-			"dev": true,
-			"requires": {
-				"once": "^1.4.0"
-			}
-		},
-		"entities": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-			"dev": true
-		},
-		"error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"dev": true,
-			"requires": {
-				"is-arrayish": "^0.2.1"
-			}
-		},
-		"es5-ext": {
-			"version": "0.10.53",
-			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-			"integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-			"dev": true,
-			"requires": {
-				"es6-iterator": "~2.0.3",
-				"es6-symbol": "~3.1.3",
-				"next-tick": "~1.0.0"
-			},
-			"dependencies": {
-				"next-tick": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-					"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-					"dev": true
-				}
-			}
-		},
-		"es6-iterator": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-			"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-			"dev": true,
-			"requires": {
-				"d": "1",
-				"es5-ext": "^0.10.35",
-				"es6-symbol": "^3.1.1"
-			}
-		},
-		"es6-symbol": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-			"integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-			"dev": true,
-			"requires": {
-				"d": "^1.0.1",
-				"ext": "^1.1.2"
-			}
-		},
-		"es6-weak-map": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-			"integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-			"dev": true,
-			"requires": {
-				"d": "1",
-				"es5-ext": "^0.10.46",
-				"es6-iterator": "^2.0.3",
-				"es6-symbol": "^3.1.1"
-			}
-		},
-		"escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-			"dev": true
-		},
-		"escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true
-		},
-		"eslint": {
-			"version": "8.13.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz",
-			"integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==",
-			"dev": true,
-			"requires": {
-				"@eslint/eslintrc": "^1.2.1",
-				"@humanwhocodes/config-array": "^0.9.2",
-				"ajv": "^6.10.0",
-				"chalk": "^4.0.0",
-				"cross-spawn": "^7.0.2",
-				"debug": "^4.3.2",
-				"doctrine": "^3.0.0",
-				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^7.1.1",
-				"eslint-utils": "^3.0.0",
-				"eslint-visitor-keys": "^3.3.0",
-				"espree": "^9.3.1",
-				"esquery": "^1.4.0",
-				"esutils": "^2.0.2",
-				"fast-deep-equal": "^3.1.3",
-				"file-entry-cache": "^6.0.1",
-				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.6.0",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.0.0",
-				"imurmurhash": "^0.1.4",
-				"is-glob": "^4.0.0",
-				"js-yaml": "^4.1.0",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"levn": "^0.4.1",
-				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.0.4",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.1",
-				"regexpp": "^3.2.0",
-				"strip-ansi": "^6.0.1",
-				"strip-json-comments": "^3.1.0",
-				"text-table": "^0.2.0",
-				"v8-compile-cache": "^2.0.3"
-			}
-		},
-		"eslint-config-xo": {
-			"version": "0.40.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-xo/-/eslint-config-xo-0.40.0.tgz",
-			"integrity": "sha512-msI1O0JGxeK2bbExg3U6EGaWKcjhOFzEjwzObywG/DC5GSNZTOyJT+b2l9MZGBeZsVdxfIGwdXTNeWXl8cN9iw==",
-			"dev": true,
-			"requires": {
-				"confusing-browser-globals": "1.0.11"
-			}
-		},
-		"eslint-scope": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-			"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-			"dev": true,
-			"requires": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			}
-		},
-		"eslint-utils": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-			"dev": true,
-			"requires": {
-				"eslint-visitor-keys": "^2.0.0"
-			},
-			"dependencies": {
-				"eslint-visitor-keys": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-					"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-					"dev": true
-				}
-			}
-		},
-		"eslint-visitor-keys": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-			"dev": true
-		},
-		"espree": {
-			"version": "9.3.1",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
-			"integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
-			"dev": true,
-			"requires": {
-				"acorn": "^8.7.0",
-				"acorn-jsx": "^5.3.1",
-				"eslint-visitor-keys": "^3.3.0"
-			}
-		},
-		"esquery": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-			"dev": true,
-			"requires": {
-				"estraverse": "^5.1.0"
-			}
-		},
-		"esrecurse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-			"dev": true,
-			"requires": {
-				"estraverse": "^5.2.0"
-			}
-		},
-		"estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true
-		},
-		"esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-			"dev": true
-		},
-		"event-emitter": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-			"dev": true,
-			"requires": {
-				"d": "1",
-				"es5-ext": "~0.10.14"
-			}
-		},
-		"execall": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-			"integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
-			"dev": true,
-			"requires": {
-				"clone-regexp": "^2.1.0"
-			}
-		},
-		"expand-brackets": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-			"dev": true,
-			"requires": {
-				"debug": "^2.3.3",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"posix-character-classes": "^0.1.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "0.1.6",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-					"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "^1.1.5"
-							}
-						}
-					}
-				},
-				"is-buffer": {
-					"version": "1.1.6",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-					"dev": true
-				},
-				"is-data-descriptor": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-					"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "^1.1.5"
-							}
-						}
-					}
-				},
-				"is-descriptor": {
-					"version": "0.1.6",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-					"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^0.1.6",
-						"is-data-descriptor": "^0.1.4",
-						"kind-of": "^5.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				}
-			}
-		},
-		"expand-tilde": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-			"dev": true,
-			"requires": {
-				"homedir-polyfill": "^1.0.1"
-			}
-		},
-		"ext": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-			"integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-			"dev": true,
-			"requires": {
-				"type": "^2.0.0"
-			},
-			"dependencies": {
-				"type": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
-					"integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
-					"dev": true
-				}
-			}
-		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-			"dev": true
-		},
-		"extend-shallow": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-			"dev": true,
-			"requires": {
-				"is-extendable": "^0.1.0"
-			}
-		},
-		"extglob": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-			"dev": true,
-			"requires": {
-				"array-unique": "^0.3.2",
-				"define-property": "^1.0.0",
-				"expand-brackets": "^2.1.4",
-				"extend-shallow": "^2.0.1",
-				"fragment-cache": "^0.2.1",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				}
-			}
-		},
-		"fancy-log": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-			"integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-			"dev": true,
-			"requires": {
-				"ansi-gray": "^0.1.1",
-				"color-support": "^1.1.3",
-				"parse-node-version": "^1.0.0",
-				"time-stamp": "^1.0.0"
-			}
-		},
-		"fast-deep-equal": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-			"dev": true
-		},
-		"fast-glob": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-			"integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
-			"dev": true,
-			"requires": {
-				"@nodelib/fs.stat": "^2.0.2",
-				"@nodelib/fs.walk": "^1.2.3",
-				"glob-parent": "^5.1.2",
-				"merge2": "^1.3.0",
-				"micromatch": "^4.0.4"
-			},
-			"dependencies": {
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"glob-parent": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-					"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.1"
-					}
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
-			}
-		},
-		"fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true
-		},
-		"fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-			"dev": true
-		},
-		"fastest-levenshtein": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-			"integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-			"dev": true
-		},
-		"fastq": {
-			"version": "1.13.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-			"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-			"dev": true,
-			"requires": {
-				"reusify": "^1.0.4"
-			}
-		},
-		"file-entry-cache": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-			"dev": true,
-			"requires": {
-				"flat-cache": "^3.0.4"
-			}
-		},
-		"file-uri-to-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-			"dev": true,
-			"optional": true
-		},
-		"fill-range": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-			"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-			"dev": true,
-			"requires": {
-				"extend-shallow": "^2.0.1",
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1",
-				"to-regex-range": "^2.1.0"
-			}
-		},
-		"find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
-			"requires": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			}
-		},
-		"findup-sync": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-			"integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-			"dev": true,
-			"requires": {
-				"detect-file": "^1.0.0",
-				"is-glob": "^4.0.0",
-				"micromatch": "^3.0.4",
-				"resolve-dir": "^1.0.1"
-			}
-		},
-		"fined": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-			"integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-			"dev": true,
-			"requires": {
-				"expand-tilde": "^2.0.2",
-				"is-plain-object": "^2.0.3",
-				"object.defaults": "^1.1.0",
-				"object.pick": "^1.2.0",
-				"parse-filepath": "^1.0.1"
-			},
-			"dependencies": {
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
-			}
-		},
-		"flagged-respawn": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-			"integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-			"dev": true
-		},
-		"flat-cache": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-			"dev": true,
-			"requires": {
-				"flatted": "^3.1.0",
-				"rimraf": "^3.0.2"
-			}
-		},
-		"flatted": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-			"integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
-			"dev": true
-		},
-		"flush-write-stream": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.3.6"
-			}
-		},
-		"for-in": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-			"dev": true
-		},
-		"for-own": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-			"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-			"dev": true,
-			"requires": {
-				"for-in": "^1.0.1"
-			}
-		},
-		"fraction.js": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-			"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
-			"dev": true
-		},
-		"fragment-cache": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-			"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-			"dev": true,
-			"requires": {
-				"map-cache": "^0.2.2"
-			}
-		},
-		"fs-mkdirp-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-			"integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.11",
-				"through2": "^2.0.3"
-			},
-			"dependencies": {
-				"through2": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-					"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "~2.3.6",
-						"xtend": "~4.0.1"
-					}
-				}
-			}
-		},
-		"fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-			"dev": true
-		},
-		"fsevents": {
-			"version": "1.2.13",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-			"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"bindings": "^1.5.0",
-				"nan": "^2.12.1"
-			}
-		},
-		"function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-			"dev": true
-		},
-		"functional-red-black-tree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-			"dev": true
-		},
-		"get-caller-file": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-			"dev": true
-		},
-		"get-imports": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/get-imports/-/get-imports-1.0.0.tgz",
-			"integrity": "sha1-R8C07piTUWQsVJdxk79Pyqv1N48=",
-			"dev": true,
-			"requires": {
-				"array-uniq": "^1.0.1",
-				"import-regex": "^1.1.0"
-			}
-		},
-		"get-intrinsic": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-			"dev": true,
-			"requires": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.1"
-			}
-		},
-		"get-stdin": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-			"integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-			"dev": true
-		},
-		"get-value": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-			"dev": true
-		},
-		"glob": {
-			"version": "5.0.15",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-			"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-			"dev": true,
-			"requires": {
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "2 || 3",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			}
-		},
-		"glob-parent": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-			"dev": true,
-			"requires": {
-				"is-glob": "^4.0.3"
-			}
-		},
-		"glob-stream": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-			"integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
-			"dev": true,
-			"requires": {
-				"extend": "^3.0.0",
-				"glob": "^7.1.1",
-				"glob-parent": "^3.1.0",
-				"is-negated-glob": "^1.0.0",
-				"ordered-read-streams": "^1.0.0",
-				"pumpify": "^1.3.5",
-				"readable-stream": "^2.1.5",
-				"remove-trailing-separator": "^1.0.1",
-				"to-absolute-glob": "^2.0.0",
-				"unique-stream": "^2.0.2"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.1.7",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-					"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.0.4",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^3.1.0",
-						"path-dirname": "^1.0.0"
-					}
-				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^2.1.0"
-					}
-				}
-			}
-		},
-		"glob-watcher": {
-			"version": "5.0.5",
-			"resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
-			"integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
-			"dev": true,
-			"requires": {
-				"anymatch": "^2.0.0",
-				"async-done": "^1.2.0",
-				"chokidar": "^2.0.0",
-				"is-negated-glob": "^1.0.0",
-				"just-debounce": "^1.0.0",
-				"normalize-path": "^3.0.0",
-				"object.defaults": "^1.1.0"
-			}
-		},
-		"global-modules": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-			"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-			"dev": true,
-			"requires": {
-				"global-prefix": "^1.0.1",
-				"is-windows": "^1.0.1",
-				"resolve-dir": "^1.0.0"
-			}
-		},
-		"global-prefix": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-			"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-			"dev": true,
-			"requires": {
-				"expand-tilde": "^2.0.2",
-				"homedir-polyfill": "^1.0.1",
-				"ini": "^1.3.4",
-				"is-windows": "^1.0.1",
-				"which": "^1.2.14"
-			},
-			"dependencies": {
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"globals": {
-			"version": "13.13.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
-			"integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
-			"dev": true,
-			"requires": {
-				"type-fest": "^0.20.2"
-			}
-		},
-		"globby": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-2.1.0.tgz",
-			"integrity": "sha1-npGSvNM/Srak+JTl5+qLcTITxII=",
-			"dev": true,
-			"requires": {
-				"array-union": "^1.0.1",
-				"async": "^1.2.1",
-				"glob": "^5.0.3",
-				"object-assign": "^3.0.0"
-			},
-			"dependencies": {
-				"object-assign": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-					"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-					"dev": true
-				}
-			}
-		},
-		"globjoin": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-			"integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-			"dev": true
-		},
-		"glogg": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-			"integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-			"dev": true,
-			"requires": {
-				"sparkles": "^1.0.0"
-			}
-		},
-		"graceful-fs": {
-			"version": "4.2.6",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-			"integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
-			"dev": true
-		},
-		"gulp": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-			"integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-			"dev": true,
-			"requires": {
-				"glob-watcher": "^5.0.3",
-				"gulp-cli": "^2.2.0",
-				"undertaker": "^1.2.1",
-				"vinyl-fs": "^3.0.0"
-			}
-		},
-		"gulp-cli": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-			"integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-			"dev": true,
-			"requires": {
-				"ansi-colors": "^1.0.1",
-				"archy": "^1.0.0",
-				"array-sort": "^1.0.0",
-				"color-support": "^1.1.3",
-				"concat-stream": "^1.6.0",
-				"copy-props": "^2.0.1",
-				"fancy-log": "^1.3.2",
-				"gulplog": "^1.0.0",
-				"interpret": "^1.4.0",
-				"isobject": "^3.0.1",
-				"liftoff": "^3.1.0",
-				"matchdep": "^2.0.0",
-				"mute-stdout": "^1.0.0",
-				"pretty-hrtime": "^1.0.0",
-				"replace-homedir": "^1.0.0",
-				"semver-greatest-satisfied-range": "^1.1.0",
-				"v8flags": "^3.2.0",
-				"yargs": "^7.1.0"
-			},
-			"dependencies": {
-				"ansi-colors": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-					"dev": true,
-					"requires": {
-						"ansi-wrap": "^0.1.0"
-					}
-				}
-			}
-		},
-		"gulp-concat-css": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/gulp-concat-css/-/gulp-concat-css-3.1.0.tgz",
-			"integrity": "sha512-iLTBPS+cutlgLyK3bp9DMts+WuS8n2mQpjzQ7p/ZVQc8FO5fvpN+ntg9U6jsuNvPeuii82aKm8XeOzF0nUK+TA==",
-			"dev": true,
-			"requires": {
-				"lodash.defaults": "^3.0.0",
-				"parse-import": "^2.0.0",
-				"plugin-error": "^0.1.2",
-				"rework": "~1.0.0",
-				"rework-import": "^2.0.0",
-				"rework-plugin-url": "^1.0.1",
-				"through2": "~1.1.1",
-				"vinyl": "^2.1.0"
-			}
-		},
-		"gulp-postcss": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-9.0.1.tgz",
-			"integrity": "sha512-9QUHam5JyXwGUxaaMvoFQVT44tohpEFpM8xBdPfdwTYGM0AItS1iTQz0MpsF8Jroh7GF5Jt2GVPaYgvy8qD2Fw==",
-			"dev": true,
-			"requires": {
-				"fancy-log": "^1.3.3",
-				"plugin-error": "^1.0.1",
-				"postcss-load-config": "^3.0.0",
-				"vinyl-sourcemaps-apply": "^0.2.1"
-			},
-			"dependencies": {
-				"ansi-colors": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-					"dev": true,
-					"requires": {
-						"ansi-wrap": "^0.1.0"
-					}
-				},
-				"arr-union": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-					"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-					"dev": true
-				},
-				"extend-shallow": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-					"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-					"dev": true,
-					"requires": {
-						"assign-symbols": "^1.0.0",
-						"is-extendable": "^1.0.1"
-					}
-				},
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				},
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				},
-				"plugin-error": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-					"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-					"dev": true,
-					"requires": {
-						"ansi-colors": "^1.0.1",
-						"arr-diff": "^4.0.0",
-						"arr-union": "^3.1.0",
-						"extend-shallow": "^3.0.2"
-					}
-				}
-			}
-		},
-		"gulp-rename": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
-			"integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
-			"dev": true
-		},
-		"gulp-sourcemaps": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz",
-			"integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==",
-			"dev": true,
-			"requires": {
-				"@gulp-sourcemaps/identity-map": "^2.0.1",
-				"@gulp-sourcemaps/map-sources": "^1.0.0",
-				"acorn": "^6.4.1",
-				"convert-source-map": "^1.0.0",
-				"css": "^3.0.0",
-				"debug-fabulous": "^1.0.0",
-				"detect-newline": "^2.0.0",
-				"graceful-fs": "^4.0.0",
-				"source-map": "^0.6.0",
-				"strip-bom-string": "^1.0.0",
-				"through2": "^2.0.0"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "6.4.2",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-					"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-					"dev": true
-				},
-				"css": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-					"integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.4",
-						"source-map": "^0.6.1",
-						"source-map-resolve": "^0.6.0"
-					}
-				},
-				"source-map-resolve": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-					"integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.2",
-						"decode-uri-component": "^0.2.0"
-					}
-				},
-				"through2": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-					"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "~2.3.6",
-						"xtend": "~4.0.1"
-					}
-				}
-			}
-		},
-		"gulplog": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-			"integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-			"dev": true,
-			"requires": {
-				"glogg": "^1.0.0"
-			}
-		},
-		"hard-rejection": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-			"dev": true
-		},
-		"has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"dev": true,
-			"requires": {
-				"function-bind": "^1.1.1"
-			}
-		},
-		"has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true
-		},
-		"has-symbols": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-			"dev": true
-		},
-		"has-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-			"dev": true,
-			"requires": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
-			}
-		},
-		"has-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-			"dev": true,
-			"requires": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
-			},
-			"dependencies": {
-				"is-buffer": {
-					"version": "1.1.6",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"homedir-polyfill": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-			"integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-			"dev": true,
-			"requires": {
-				"parse-passwd": "^1.0.0"
-			}
-		},
-		"hosted-git-info": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-			"dev": true,
-			"requires": {
-				"lru-cache": "^6.0.0"
-			}
-		},
-		"html-tags": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-			"integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
-			"dev": true
-		},
-		"ignore": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-			"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-			"dev": true
-		},
-		"import-fresh": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-			"dev": true,
-			"requires": {
-				"parent-module": "^1.0.0",
-				"resolve-from": "^4.0.0"
-			}
-		},
-		"import-lazy": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-			"dev": true
-		},
-		"import-regex": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/import-regex/-/import-regex-1.1.0.tgz",
-			"integrity": "sha1-pVxS5McFx2XKIQ6SQqBrvMiqf2Y=",
-			"dev": true
-		},
-		"imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-			"dev": true
-		},
-		"indent-string": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-			"dev": true
-		},
-		"inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-			"dev": true,
-			"requires": {
-				"once": "^1.3.0",
-				"wrappy": "1"
-			}
-		},
-		"inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-			"dev": true
-		},
-		"ini": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-			"dev": true
-		},
-		"interpret": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-			"integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-			"dev": true
-		},
-		"invert-kv": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-			"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-			"dev": true
-		},
-		"ip-regex": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
-			"integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=",
-			"dev": true
-		},
-		"is-absolute": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-			"integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-			"dev": true,
-			"requires": {
-				"is-relative": "^1.0.0",
-				"is-windows": "^1.0.1"
-			}
-		},
-		"is-accessor-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-			"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-			"dev": true,
-			"requires": {
-				"kind-of": "^6.0.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
-			}
-		},
-		"is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-			"dev": true
-		},
-		"is-binary-path": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-			"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-			"dev": true,
-			"requires": {
-				"binary-extensions": "^1.0.0"
-			}
-		},
-		"is-core-module": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-			"integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
-			"dev": true,
-			"requires": {
-				"has": "^1.0.3"
-			}
-		},
-		"is-data-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-			"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-			"dev": true,
-			"requires": {
-				"kind-of": "^6.0.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
-			}
-		},
-		"is-descriptor": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-			"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-			"dev": true,
-			"requires": {
-				"is-accessor-descriptor": "^1.0.0",
-				"is-data-descriptor": "^1.0.0",
-				"kind-of": "^6.0.2"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
-			}
-		},
-		"is-extendable": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-			"dev": true
-		},
-		"is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-			"dev": true
-		},
-		"is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true
-		},
-		"is-glob": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-			"dev": true,
-			"requires": {
-				"is-extglob": "^2.1.1"
-			}
-		},
-		"is-negated-glob": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-			"integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-			"dev": true
-		},
-		"is-number": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
-			"dependencies": {
-				"is-buffer": {
-					"version": "1.1.6",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"is-plain-obj": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-			"dev": true
-		},
-		"is-plain-object": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-			"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-			"dev": true
-		},
-		"is-promise": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-			"integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-			"dev": true
-		},
-		"is-regexp": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-			"integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-			"dev": true
-		},
-		"is-relative": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-			"dev": true,
-			"requires": {
-				"is-unc-path": "^1.0.0"
-			}
-		},
-		"is-unc-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-			"dev": true,
-			"requires": {
-				"unc-path-regex": "^0.1.2"
-			}
-		},
-		"is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-			"dev": true
-		},
-		"is-valid-glob": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-			"integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-			"dev": true
-		},
-		"is-windows": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-			"dev": true
-		},
-		"isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-			"dev": true
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-			"dev": true
-		},
-		"isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-			"dev": true
-		},
-		"js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"dev": true
-		},
-		"js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
-			"requires": {
-				"argparse": "^2.0.1"
-			}
-		},
-		"json-parse-even-better-errors": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-			"dev": true
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true
-		},
-		"json-stable-stringify-without-jsonify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-			"dev": true
-		},
-		"just-debounce": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
-			"integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
-			"dev": true
-		},
-		"kind-of": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-			"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-			"dev": true
-		},
-		"known-css-properties": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
-			"integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==",
-			"dev": true
-		},
-		"last-run": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-			"integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-			"dev": true,
-			"requires": {
-				"default-resolution": "^2.0.0",
-				"es6-weak-map": "^2.0.1"
-			}
-		},
-		"lazystream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-			"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "^2.0.5"
-			}
-		},
-		"lcid": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-			"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-			"dev": true,
-			"requires": {
-				"invert-kv": "^1.0.0"
-			}
-		},
-		"lead": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-			"integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-			"dev": true,
-			"requires": {
-				"flush-write-stream": "^1.0.2"
-			}
-		},
-		"levn": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "^1.2.1",
-				"type-check": "~0.4.0"
-			}
-		},
-		"liftoff": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-			"integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-			"dev": true,
-			"requires": {
-				"extend": "^3.0.0",
-				"findup-sync": "^3.0.0",
-				"fined": "^1.0.1",
-				"flagged-respawn": "^1.0.0",
-				"is-plain-object": "^2.0.4",
-				"object.map": "^1.0.0",
-				"rechoir": "^0.6.2",
-				"resolve": "^1.1.7"
-			},
-			"dependencies": {
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
-			}
-		},
-		"lilconfig": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
-			"integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
-			"dev": true
-		},
-		"lines-and-columns": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-			"dev": true
-		},
-		"load-json-file": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-			"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"parse-json": "^2.2.0",
-				"pify": "^2.0.0",
-				"pinkie-promise": "^2.0.0",
-				"strip-bom": "^2.0.0"
-			},
-			"dependencies": {
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-					"dev": true,
-					"requires": {
-						"error-ex": "^1.2.0"
-					}
-				}
-			}
-		},
-		"locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
-			"requires": {
-				"p-locate": "^4.1.0"
-			}
-		},
-		"lodash._baseassign": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-			"integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-			"dev": true,
-			"requires": {
-				"lodash._basecopy": "^3.0.0",
-				"lodash.keys": "^3.0.0"
-			}
-		},
-		"lodash._basecopy": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-			"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-			"dev": true
-		},
-		"lodash._bindcallback": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-			"integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
-			"dev": true
-		},
-		"lodash._createassigner": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-			"integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
-			"dev": true,
-			"requires": {
-				"lodash._bindcallback": "^3.0.0",
-				"lodash._isiterateecall": "^3.0.0",
-				"lodash.restparam": "^3.0.0"
-			}
-		},
-		"lodash._getnative": {
-			"version": "3.9.1",
-			"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-			"dev": true
-		},
-		"lodash._isiterateecall": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-			"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-			"dev": true
-		},
-		"lodash.assign": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
-			"integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
-			"dev": true,
-			"requires": {
-				"lodash._baseassign": "^3.0.0",
-				"lodash._createassigner": "^3.0.0",
-				"lodash.keys": "^3.0.0"
-			}
-		},
-		"lodash.defaults": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
-			"integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
-			"dev": true,
-			"requires": {
-				"lodash.assign": "^3.0.0",
-				"lodash.restparam": "^3.0.0"
-			}
-		},
-		"lodash.isarguments": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-			"dev": true
-		},
-		"lodash.isarray": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-			"dev": true
-		},
-		"lodash.keys": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-			"dev": true,
-			"requires": {
-				"lodash._getnative": "^3.0.0",
-				"lodash.isarguments": "^3.0.0",
-				"lodash.isarray": "^3.0.0"
-			}
-		},
-		"lodash.memoize": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-			"dev": true
-		},
-		"lodash.merge": {
-			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-			"dev": true
-		},
-		"lodash.restparam": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-			"integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-			"dev": true
-		},
-		"lodash.truncate": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-			"integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-			"dev": true
-		},
-		"lodash.uniq": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-			"integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-			"dev": true
-		},
-		"lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"requires": {
-				"yallist": "^4.0.0"
-			}
-		},
-		"lru-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-			"integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-			"dev": true,
-			"requires": {
-				"es5-ext": "~0.10.2"
-			}
-		},
-		"make-iterator": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-			"integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-			"dev": true,
-			"requires": {
-				"kind-of": "^6.0.2"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
-			}
-		},
-		"map-cache": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-			"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-			"dev": true
-		},
-		"map-obj": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-			"integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
-			"dev": true
-		},
-		"map-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-			"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-			"dev": true,
-			"requires": {
-				"object-visit": "^1.0.0"
-			}
-		},
-		"matchdep": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-			"integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-			"dev": true,
-			"requires": {
-				"findup-sync": "^2.0.0",
-				"micromatch": "^3.0.4",
-				"resolve": "^1.4.0",
-				"stack-trace": "0.0.10"
-			},
-			"dependencies": {
-				"findup-sync": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-					"integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-					"dev": true,
-					"requires": {
-						"detect-file": "^1.0.0",
-						"is-glob": "^3.1.0",
-						"micromatch": "^3.0.4",
-						"resolve-dir": "^1.0.1"
-					}
-				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^2.1.0"
-					}
-				}
-			}
-		},
-		"mathml-tag-names": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-			"integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-			"dev": true
-		},
-		"mdn-data": {
-			"version": "2.0.14",
-			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-			"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-			"dev": true
-		},
-		"memoizee": {
-			"version": "0.4.15",
-			"resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-			"integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
-			"dev": true,
-			"requires": {
-				"d": "^1.0.1",
-				"es5-ext": "^0.10.53",
-				"es6-weak-map": "^2.0.3",
-				"event-emitter": "^0.3.5",
-				"is-promise": "^2.2.2",
-				"lru-queue": "^0.1.0",
-				"next-tick": "^1.1.0",
-				"timers-ext": "^0.1.7"
-			}
-		},
-		"meow": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-			"dev": true,
-			"requires": {
-				"@types/minimist": "^1.2.0",
-				"camelcase-keys": "^6.2.2",
-				"decamelize": "^1.2.0",
-				"decamelize-keys": "^1.1.0",
-				"hard-rejection": "^2.1.0",
-				"minimist-options": "4.1.0",
-				"normalize-package-data": "^3.0.0",
-				"read-pkg-up": "^7.0.1",
-				"redent": "^3.0.0",
-				"trim-newlines": "^3.0.0",
-				"type-fest": "^0.18.0",
-				"yargs-parser": "^20.2.3"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.18.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-					"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-					"dev": true
-				}
-			}
-		},
-		"merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true
-		},
-		"micromatch": {
-			"version": "3.1.10",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-			"dev": true,
-			"requires": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"braces": "^2.3.1",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"extglob": "^2.0.4",
-				"fragment-cache": "^0.2.1",
-				"kind-of": "^6.0.2",
-				"nanomatch": "^1.2.9",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.2"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-					"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-					"dev": true,
-					"requires": {
-						"assign-symbols": "^1.0.0",
-						"is-extendable": "^1.0.1"
-					}
-				},
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				},
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
-			}
-		},
-		"min-indent": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-			"dev": true
-		},
-		"minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"dev": true,
-			"requires": {
-				"brace-expansion": "^1.1.7"
-			}
-		},
-		"minimist-options": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-			"dev": true,
-			"requires": {
-				"arrify": "^1.0.1",
-				"is-plain-obj": "^1.1.0",
-				"kind-of": "^6.0.3"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
-			}
-		},
-		"mixin-deep": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-			"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-			"dev": true,
-			"requires": {
-				"for-in": "^1.0.2",
-				"is-extendable": "^1.0.1"
-			},
-			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				},
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
-			}
-		},
-		"ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-			"dev": true
-		},
-		"mute-stdout": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-			"integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-			"dev": true
-		},
-		"nan": {
-			"version": "2.14.2",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-			"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-			"dev": true,
-			"optional": true
-		},
-		"nanoid": {
-			"version": "3.3.6",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-			"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
-			"dev": true
-		},
-		"nanomatch": {
-			"version": "1.2.13",
-			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-			"dev": true,
-			"requires": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"fragment-cache": "^0.2.1",
-				"is-windows": "^1.0.2",
-				"kind-of": "^6.0.2",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-					"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-					"dev": true,
-					"requires": {
-						"assign-symbols": "^1.0.0",
-						"is-extendable": "^1.0.1"
-					}
-				},
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				},
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
-			}
-		},
-		"natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-			"dev": true
-		},
-		"next-tick": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-			"integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-			"dev": true
-		},
-		"node-releases": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
-			"integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==",
-			"dev": true
-		},
-		"normalize-package-data": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-			"integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
-			"dev": true,
-			"requires": {
-				"hosted-git-info": "^4.0.1",
-				"resolve": "^1.20.0",
-				"semver": "^7.3.4",
-				"validate-npm-package-license": "^3.0.1"
-			}
-		},
-		"normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"dev": true
-		},
-		"normalize-range": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-			"dev": true
-		},
-		"normalize-selector": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-			"integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-			"dev": true
-		},
-		"normalize-url": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-			"integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-			"dev": true
-		},
-		"now-and-later": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-			"integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-			"dev": true,
-			"requires": {
-				"once": "^1.3.2"
-			}
-		},
-		"nth-check": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-			"integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-			"dev": true,
-			"requires": {
-				"boolbase": "^1.0.0"
-			}
-		},
-		"number-is-nan": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-			"dev": true
-		},
-		"object-assign": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-			"dev": true
-		},
-		"object-copy": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-			"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-			"dev": true,
-			"requires": {
-				"copy-descriptor": "^0.1.0",
-				"define-property": "^0.2.5",
-				"kind-of": "^3.0.3"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "0.1.6",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-					"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					}
-				},
-				"is-buffer": {
-					"version": "1.1.6",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-					"dev": true
-				},
-				"is-data-descriptor": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-					"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					}
-				},
-				"is-descriptor": {
-					"version": "0.1.6",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-					"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^0.1.6",
-						"is-data-descriptor": "^0.1.4",
-						"kind-of": "^5.0.0"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"object-keys": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-			"dev": true
-		},
-		"object-visit": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-			"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-			"dev": true,
-			"requires": {
-				"isobject": "^3.0.0"
-			}
-		},
-		"object.assign": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-			"integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.0",
-				"define-properties": "^1.1.3",
-				"has-symbols": "^1.0.1",
-				"object-keys": "^1.1.1"
-			}
-		},
-		"object.defaults": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-			"integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-			"dev": true,
-			"requires": {
-				"array-each": "^1.0.1",
-				"array-slice": "^1.0.0",
-				"for-own": "^1.0.0",
-				"isobject": "^3.0.0"
-			}
-		},
-		"object.map": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-			"integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-			"dev": true,
-			"requires": {
-				"for-own": "^1.0.0",
-				"make-iterator": "^1.0.0"
-			}
-		},
-		"object.pick": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-			"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-			"dev": true,
-			"requires": {
-				"isobject": "^3.0.1"
-			}
-		},
-		"object.reduce": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-			"integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-			"dev": true,
-			"requires": {
-				"for-own": "^1.0.0",
-				"make-iterator": "^1.0.0"
-			}
-		},
-		"once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-			"dev": true,
-			"requires": {
-				"wrappy": "1"
-			}
-		},
-		"optionator": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-			"dev": true,
-			"requires": {
-				"deep-is": "^0.1.3",
-				"fast-levenshtein": "^2.0.6",
-				"levn": "^0.4.1",
-				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0",
-				"word-wrap": "^1.2.3"
-			}
-		},
-		"ordered-read-streams": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-			"integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "^2.0.1"
-			}
-		},
-		"os-locale": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-			"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-			"dev": true,
-			"requires": {
-				"lcid": "^1.0.0"
-			}
-		},
-		"p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
-			"requires": {
-				"p-try": "^2.0.0"
-			}
-		},
-		"p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
-			"requires": {
-				"p-limit": "^2.2.0"
-			}
-		},
-		"p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true
-		},
-		"parent-module": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-			"dev": true,
-			"requires": {
-				"callsites": "^3.0.0"
-			}
-		},
-		"parse-filepath": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-			"integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-			"dev": true,
-			"requires": {
-				"is-absolute": "^1.0.0",
-				"map-cache": "^0.2.0",
-				"path-root": "^0.1.1"
-			}
-		},
-		"parse-import": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/parse-import/-/parse-import-2.0.0.tgz",
-			"integrity": "sha1-KyR0Aw4AirmNt2xLy/TbWucwb18=",
-			"dev": true,
-			"requires": {
-				"get-imports": "^1.0.0"
-			}
-		},
-		"parse-json": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-even-better-errors": "^2.3.0",
-				"lines-and-columns": "^1.1.6"
-			}
-		},
-		"parse-node-version": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-			"integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-			"dev": true
-		},
-		"parse-passwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-			"dev": true
-		},
-		"pascalcase": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-			"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-			"dev": true
-		},
-		"path-dirname": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-			"integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-			"dev": true
-		},
-		"path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true
-		},
-		"path-is-absolute": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-			"dev": true
-		},
-		"path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true
-		},
-		"path-parse": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-			"dev": true
-		},
-		"path-root": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-			"integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-			"dev": true,
-			"requires": {
-				"path-root-regex": "^0.1.0"
-			}
-		},
-		"path-root-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-			"integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-			"dev": true
-		},
-		"path-type": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"dev": true
-		},
-		"picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-			"dev": true
-		},
-		"picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-			"dev": true
-		},
-		"pify": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-			"dev": true
-		},
-		"pinkie": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-			"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-			"dev": true
-		},
-		"pinkie-promise": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-			"dev": true,
-			"requires": {
-				"pinkie": "^2.0.0"
-			}
-		},
-		"plugin-error": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-			"integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-			"dev": true,
-			"requires": {
-				"ansi-cyan": "^0.1.1",
-				"ansi-red": "^0.1.1",
-				"arr-diff": "^1.0.1",
-				"arr-union": "^2.0.1",
-				"extend-shallow": "^1.1.2"
-			},
-			"dependencies": {
-				"arr-diff": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-					"integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.0.1",
-						"array-slice": "^0.2.3"
-					}
-				},
-				"array-slice": {
-					"version": "0.2.3",
-					"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-					"integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-					"dev": true
-				},
-				"extend-shallow": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-					"integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^1.1.0"
-					}
-				},
-				"kind-of": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-					"integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-					"dev": true
-				}
-			}
-		},
-		"posix-character-classes": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-			"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-			"dev": true
-		},
-		"postcss": {
-			"version": "8.4.31",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-			"integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
-			"dev": true,
-			"requires": {
-				"nanoid": "^3.3.6",
-				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
-			}
-		},
-		"postcss-calc": {
-			"version": "8.2.4",
-			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
-			"integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
-			"dev": true,
-			"requires": {
-				"postcss-selector-parser": "^6.0.9",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-colormin": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz",
-			"integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.16.6",
-				"caniuse-api": "^3.0.0",
-				"colord": "^2.9.1",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-convert-values": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz",
-			"integrity": "sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-discard-comments": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz",
-			"integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-discard-duplicates": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
-			"integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-discard-empty": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
-			"integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-discard-overridden": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
-			"integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-load-config": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
-			"integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
-			"dev": true,
-			"requires": {
-				"lilconfig": "^2.0.5",
-				"yaml": "^1.10.2"
-			}
-		},
-		"postcss-media-query-parser": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-			"integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
-			"dev": true
-		},
-		"postcss-merge-longhand": {
-			"version": "5.1.4",
-			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz",
-			"integrity": "sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0",
-				"stylehacks": "^5.1.0"
-			}
-		},
-		"postcss-merge-rules": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz",
-			"integrity": "sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.16.6",
-				"caniuse-api": "^3.0.0",
-				"cssnano-utils": "^3.1.0",
-				"postcss-selector-parser": "^6.0.5"
-			}
-		},
-		"postcss-minify-font-values": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
-			"integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-minify-gradients": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
-			"integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
-			"dev": true,
-			"requires": {
-				"colord": "^2.9.1",
-				"cssnano-utils": "^3.1.0",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-minify-params": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz",
-			"integrity": "sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.16.6",
-				"cssnano-utils": "^3.1.0",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-minify-selectors": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz",
-			"integrity": "sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==",
-			"dev": true,
-			"requires": {
-				"postcss-selector-parser": "^6.0.5"
-			}
-		},
-		"postcss-normalize-charset": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
-			"integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-normalize-display-values": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
-			"integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-positions": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz",
-			"integrity": "sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-repeat-style": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz",
-			"integrity": "sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-string": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
-			"integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-timing-functions": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
-			"integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-unicode": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz",
-			"integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.16.6",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-url": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
-			"integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
-			"dev": true,
-			"requires": {
-				"normalize-url": "^6.0.1",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-whitespace": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
-			"integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-ordered-values": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz",
-			"integrity": "sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==",
-			"dev": true,
-			"requires": {
-				"cssnano-utils": "^3.1.0",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-reduce-initial": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz",
-			"integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.16.6",
-				"caniuse-api": "^3.0.0"
-			}
-		},
-		"postcss-reduce-transforms": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
-			"integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-resolve-nested-selector": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-			"integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
-			"dev": true
-		},
-		"postcss-safe-parser": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-			"integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-selector-parser": {
-			"version": "6.0.10",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-			"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-			"dev": true,
-			"requires": {
-				"cssesc": "^3.0.0",
-				"util-deprecate": "^1.0.2"
-			}
-		},
-		"postcss-sorting": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
-			"integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-svgo": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
-			"integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0",
-				"svgo": "^2.7.0"
-			}
-		},
-		"postcss-unique-selectors": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
-			"integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
-			"dev": true,
-			"requires": {
-				"postcss-selector-parser": "^6.0.5"
-			}
-		},
-		"postcss-value-parser": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
-		},
-		"prelude-ls": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-			"dev": true
-		},
-		"pretty-hrtime": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-			"integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-			"dev": true
-		},
-		"process-nextick-args": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-			"dev": true
-		},
-		"pump": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-			"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-			"dev": true,
-			"requires": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
-			}
-		},
-		"pumpify": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-			"integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-			"dev": true,
-			"requires": {
-				"duplexify": "^3.6.0",
-				"inherits": "^2.0.3",
-				"pump": "^2.0.0"
-			}
-		},
-		"punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-			"dev": true
-		},
-		"queue-microtask": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-			"dev": true
-		},
-		"quick-lru": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-			"dev": true
-		},
-		"read-pkg": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-			"dev": true,
-			"requires": {
-				"@types/normalize-package-data": "^2.4.0",
-				"normalize-package-data": "^2.5.0",
-				"parse-json": "^5.0.0",
-				"type-fest": "^0.6.0"
-			},
-			"dependencies": {
-				"hosted-git-info": {
-					"version": "2.8.9",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-					"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-					"dev": true
-				},
-				"normalize-package-data": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-					"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"resolve": "^1.10.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-					"dev": true
-				},
-				"type-fest": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-					"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-					"dev": true
-				}
-			}
-		},
-		"read-pkg-up": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-			"dev": true,
-			"requires": {
-				"find-up": "^4.1.0",
-				"read-pkg": "^5.2.0",
-				"type-fest": "^0.8.1"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.8.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-					"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-					"dev": true
-				}
-			}
-		},
-		"readable-stream": {
-			"version": "2.3.7",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-			"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-			"dev": true,
-			"requires": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.3",
-				"isarray": "~1.0.0",
-				"process-nextick-args": "~2.0.0",
-				"safe-buffer": "~5.1.1",
-				"string_decoder": "~1.1.1",
-				"util-deprecate": "~1.0.1"
-			}
-		},
-		"readdirp": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-			"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.11",
-				"micromatch": "^3.1.10",
-				"readable-stream": "^2.0.2"
-			}
-		},
-		"rechoir": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-			"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-			"dev": true,
-			"requires": {
-				"resolve": "^1.1.6"
-			}
-		},
-		"redent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-			"dev": true,
-			"requires": {
-				"indent-string": "^4.0.0",
-				"strip-indent": "^3.0.0"
-			}
-		},
-		"regex-not": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-			"dev": true,
-			"requires": {
-				"extend-shallow": "^3.0.2",
-				"safe-regex": "^1.1.0"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-					"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-					"dev": true,
-					"requires": {
-						"assign-symbols": "^1.0.0",
-						"is-extendable": "^1.0.1"
-					}
-				},
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				},
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
-			}
-		},
-		"regexpp": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-			"dev": true
-		},
-		"remove-bom-buffer": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-			"integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
-			"dev": true,
-			"requires": {
-				"is-buffer": "^1.1.5",
-				"is-utf8": "^0.2.1"
-			},
-			"dependencies": {
-				"is-buffer": {
-					"version": "1.1.6",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-					"dev": true
-				}
-			}
-		},
-		"remove-bom-stream": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-			"integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
-			"dev": true,
-			"requires": {
-				"remove-bom-buffer": "^3.0.0",
-				"safe-buffer": "^5.1.0",
-				"through2": "^2.0.3"
-			},
-			"dependencies": {
-				"through2": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-					"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "~2.3.6",
-						"xtend": "~4.0.1"
-					}
-				}
-			}
-		},
-		"remove-trailing-separator": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-			"dev": true
-		},
-		"repeat-element": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-			"integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-			"dev": true
-		},
-		"repeat-string": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-			"dev": true
-		},
-		"replace-ext": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-			"integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-			"dev": true
-		},
-		"replace-homedir": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-			"integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-			"dev": true,
-			"requires": {
-				"homedir-polyfill": "^1.0.1",
-				"is-absolute": "^1.0.0",
-				"remove-trailing-separator": "^1.1.0"
-			}
-		},
-		"require-directory": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-			"dev": true
-		},
-		"require-from-string": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true
-		},
-		"require-main-filename": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-			"integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-			"dev": true
-		},
-		"resolve": {
-			"version": "1.20.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-			"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-			"dev": true,
-			"requires": {
-				"is-core-module": "^2.2.0",
-				"path-parse": "^1.0.6"
-			}
-		},
-		"resolve-dir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-			"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-			"dev": true,
-			"requires": {
-				"expand-tilde": "^2.0.0",
-				"global-modules": "^1.0.0"
-			}
-		},
-		"resolve-from": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-			"dev": true
-		},
-		"resolve-options": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-			"integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-			"dev": true,
-			"requires": {
-				"value-or-function": "^3.0.0"
-			}
-		},
-		"resolve-url": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-			"dev": true
-		},
-		"ret": {
-			"version": "0.1.15",
-			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-			"dev": true
-		},
-		"reusify": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-			"dev": true
-		},
-		"rework": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
-			"integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
-			"dev": true,
-			"requires": {
-				"convert-source-map": "^0.3.3",
-				"css": "^2.0.0"
-			},
-			"dependencies": {
-				"convert-source-map": {
-					"version": "0.3.5",
-					"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-					"integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
-					"dev": true
-				}
-			}
-		},
-		"rework-import": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/rework-import/-/rework-import-2.1.0.tgz",
-			"integrity": "sha512-ufvoQX6cDhrqYc8ZXvJ+6FqimwyI4qn8cH1ypAiS9Mn41iVPN/9RGwRvscBtUEkHA09w8voTIakRJKslgWcTEQ==",
-			"dev": true,
-			"requires": {
-				"css": "^2.0.0",
-				"globby": "^2.0.0",
-				"parse-import": "^2.0.0",
-				"url-regex": "^3.0.0"
-			}
-		},
-		"rework-plugin-function": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/rework-plugin-function/-/rework-plugin-function-1.0.2.tgz",
-			"integrity": "sha1-Es5G+1sptdk1FGaD9rmM9J0jc7k=",
-			"dev": true,
-			"requires": {
-				"rework-visit": "^1.0.0"
-			}
-		},
-		"rework-plugin-url": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/rework-plugin-url/-/rework-plugin-url-1.1.0.tgz",
-			"integrity": "sha1-q1PosQV7nV7MHIJz/32xhgg3XEU=",
-			"dev": true,
-			"requires": {
-				"rework-plugin-function": "^1.0.0"
-			}
-		},
-		"rework-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
-			"integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
-			"dev": true
-		},
-		"rimraf": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-			"dev": true,
-			"requires": {
-				"glob": "^7.1.3"
+				"node": ">= 0.4"
 			},
-			"dependencies": {
-				"glob": {
-					"version": "7.1.7",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-					"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.0.4",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				}
-			}
-		},
-		"run-parallel": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-			"dev": true,
-			"requires": {
-				"queue-microtask": "^1.2.2"
-			}
-		},
-		"safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-			"dev": true
-		},
-		"safe-regex": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-			"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-			"dev": true,
-			"requires": {
-				"ret": "~0.1.10"
-			}
-		},
-		"semver": {
-			"version": "7.5.4",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-			"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-			"dev": true,
-			"requires": {
-				"lru-cache": "^6.0.0"
-			}
-		},
-		"semver-greatest-satisfied-range": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-			"integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
-			"dev": true,
-			"requires": {
-				"sver-compat": "^1.5.0"
-			}
-		},
-		"set-blocking": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-			"dev": true
-		},
-		"set-value": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-			"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-			"dev": true,
-			"requires": {
-				"extend-shallow": "^2.0.1",
-				"is-extendable": "^0.1.1",
-				"is-plain-object": "^2.0.3",
-				"split-string": "^3.0.1"
-			},
-			"dependencies": {
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
-			}
-		},
-		"shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"requires": {
-				"shebang-regex": "^3.0.0"
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true
+		"node_modules/side-channel-weakmap": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+			"integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bound": "^1.0.2",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.5",
+				"object-inspect": "^1.13.3",
+				"side-channel-map": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"signal-exit": {
+		"node_modules/signal-exit": {
 			"version": "3.0.7",
 			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
 			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-			"dev": true
+			"dev": true,
+			"license": "ISC"
 		},
-		"slash": {
+		"node_modules/slash": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
 			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"dev": true
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"slice-ansi": {
+		"node_modules/slice-ansi": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
 			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"ansi-styles": "^4.0.0",
 				"astral-regex": "^2.0.0",
 				"is-fullwidth-code-point": "^3.0.0"
-			}
-		},
-		"snapdragon": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-			"dev": true,
-			"requires": {
-				"base": "^0.11.1",
-				"debug": "^2.2.0",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"map-cache": "^0.2.2",
-				"source-map": "^0.5.6",
-				"source-map-resolve": "^0.5.0",
-				"use": "^3.1.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "0.1.6",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-					"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "^1.1.5"
-							}
-						}
-					}
-				},
-				"is-buffer": {
-					"version": "1.1.6",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-					"dev": true
-				},
-				"is-data-descriptor": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-					"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "^1.1.5"
-							}
-						}
-					}
-				},
-				"is-descriptor": {
-					"version": "0.1.6",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-					"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^0.1.6",
-						"is-data-descriptor": "^0.1.4",
-						"kind-of": "^5.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				}
-			}
-		},
-		"snapdragon-node": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-			"dev": true,
-			"requires": {
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.0",
-				"snapdragon-util": "^3.0.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				}
-			}
-		},
-		"snapdragon-util": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-			"dev": true,
-			"requires": {
-				"kind-of": "^3.2.0"
 			},
-			"dependencies": {
-				"is-buffer": {
-					"version": "1.1.6",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/slice-ansi?sponsor=1"
 			}
 		},
-		"source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"dev": true
-		},
-		"source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-			"dev": true
-		},
-		"source-map-resolve": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-			"integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+		"node_modules/source-map-js": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
 			"dev": true,
-			"requires": {
-				"atob": "^2.1.2",
-				"decode-uri-component": "^0.2.0",
-				"resolve-url": "^0.2.1",
-				"source-map-url": "^0.4.0",
-				"urix": "^0.1.0"
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"source-map-url": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-			"integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-			"dev": true
-		},
-		"sparkles": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-			"integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-			"dev": true
-		},
-		"spdx-correct": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+		"node_modules/spdx-correct": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+			"integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
 			"dev": true,
-			"requires": {
+			"license": "Apache-2.0",
+			"dependencies": {
 				"spdx-expression-parse": "^3.0.0",
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
-		"spdx-exceptions": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-			"dev": true
+		"node_modules/spdx-exceptions": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+			"integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+			"dev": true,
+			"license": "CC-BY-3.0"
 		},
-		"spdx-expression-parse": {
+		"node_modules/spdx-expression-parse": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
 			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"spdx-exceptions": "^2.1.0",
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
-		"spdx-license-ids": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-			"integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
-			"dev": true
-		},
-		"specificity": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
-			"integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
-			"dev": true
-		},
-		"split-string": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-			"dev": true,
-			"requires": {
-				"extend-shallow": "^3.0.0"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-					"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-					"dev": true,
-					"requires": {
-						"assign-symbols": "^1.0.0",
-						"is-extendable": "^1.0.1"
-					}
-				},
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				},
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
-			}
-		},
-		"stable": {
-			"version": "0.1.8",
-			"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-			"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-			"dev": true
-		},
-		"stack-trace": {
-			"version": "0.0.10",
-			"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-			"integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-			"dev": true
-		},
-		"static-extend": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-			"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-			"dev": true,
-			"requires": {
-				"define-property": "^0.2.5",
-				"object-copy": "^0.1.0"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "0.1.6",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-					"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "^1.1.5"
-							}
-						}
-					}
-				},
-				"is-buffer": {
-					"version": "1.1.6",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-					"dev": true
-				},
-				"is-data-descriptor": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-					"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "^1.1.5"
-							}
-						}
-					}
-				},
-				"is-descriptor": {
-					"version": "0.1.6",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-					"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^0.1.6",
-						"is-data-descriptor": "^0.1.4",
-						"kind-of": "^5.0.0"
-					}
-				}
-			}
-		},
-		"stream-exhaust": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-			"integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-			"dev": true
-		},
-		"stream-shift": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-			"integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-			"dev": true
+		"node_modules/spdx-license-ids": {
+			"version": "3.0.22",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz",
+			"integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==",
+			"dev": true,
+			"license": "CC0-1.0"
 		},
-		"string_decoder": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+		"node_modules/statuses": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+			"integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
 			"dev": true,
-			"requires": {
-				"safe-buffer": "~5.1.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"string-width": {
+		"node_modules/string-width": {
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"emoji-regex": "^8.0.0",
 				"is-fullwidth-code-point": "^3.0.0",
 				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"strip-ansi": {
+		"node_modules/strip-ansi": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
 			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"strip-bom": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-			"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-			"dev": true,
-			"requires": {
-				"is-utf8": "^0.2.0"
-			}
-		},
-		"strip-bom-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-			"integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
-			"dev": true
-		},
-		"strip-indent": {
+		"node_modules/strip-indent": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
 			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"min-indent": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"strip-json-comments": {
+		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"style-search": {
+		"node_modules/style-search": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-			"integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
-			"dev": true
-		},
-		"stylehacks": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz",
-			"integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==",
+			"integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.16.6",
-				"postcss-selector-parser": "^6.0.4"
-			}
+			"license": "ISC"
 		},
-		"stylelint": {
-			"version": "14.7.0",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.0.tgz",
-			"integrity": "sha512-vAVPAYaHhcexOiuvym0S64UWIIonMKgYz1Eh+SZgXKkKFLL+wwBzzWGH7Bdnk/HLyH3KlrX+tlisFdEG8ik+Lw==",
+		"node_modules/stylelint": {
+			"version": "14.16.1",
+			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz",
+			"integrity": "sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
+				"@csstools/selector-specificity": "^2.0.2",
 				"balanced-match": "^2.0.0",
-				"colord": "^2.9.2",
-				"cosmiconfig": "^7.0.1",
-				"css-functions-list": "^3.0.1",
+				"colord": "^2.9.3",
+				"cosmiconfig": "^7.1.0",
+				"css-functions-list": "^3.1.0",
 				"debug": "^4.3.4",
-				"execall": "^2.0.0",
-				"fast-glob": "^3.2.11",
-				"fastest-levenshtein": "^1.0.12",
+				"fast-glob": "^3.2.12",
+				"fastest-levenshtein": "^1.0.16",
 				"file-entry-cache": "^6.0.1",
-				"get-stdin": "^8.0.0",
 				"global-modules": "^2.0.0",
 				"globby": "^11.1.0",
 				"globjoin": "^0.1.4",
 				"html-tags": "^3.2.0",
-				"ignore": "^5.2.0",
+				"ignore": "^5.2.1",
 				"import-lazy": "^4.0.0",
 				"imurmurhash": "^0.1.4",
 				"is-plain-object": "^5.0.0",
-				"known-css-properties": "^0.24.0",
+				"known-css-properties": "^0.26.0",
 				"mathml-tag-names": "^2.1.3",
 				"meow": "^9.0.0",
 				"micromatch": "^4.0.5",
 				"normalize-path": "^3.0.0",
-				"normalize-selector": "^0.2.0",
 				"picocolors": "^1.0.0",
-				"postcss": "^8.4.12",
+				"postcss": "^8.4.19",
 				"postcss-media-query-parser": "^0.2.3",
 				"postcss-resolve-nested-selector": "^0.1.1",
 				"postcss-safe-parser": "^6.0.0",
-				"postcss-selector-parser": "^6.0.10",
+				"postcss-selector-parser": "^6.0.11",
 				"postcss-value-parser": "^4.2.0",
 				"resolve-from": "^5.0.0",
-				"specificity": "^0.4.1",
 				"string-width": "^4.2.3",
 				"strip-ansi": "^6.0.1",
 				"style-search": "^0.1.0",
-				"supports-hyperlinks": "^2.2.0",
+				"supports-hyperlinks": "^2.3.0",
 				"svg-tags": "^1.0.0",
-				"table": "^6.8.0",
+				"table": "^6.8.1",
 				"v8-compile-cache": "^2.3.0",
-				"write-file-atomic": "^4.0.1"
+				"write-file-atomic": "^4.0.2"
 			},
-			"dependencies": {
-				"array-union": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-					"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-					"dev": true
-				},
-				"balanced-match": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-					"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-					"dev": true
-				},
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"global-modules": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-					"integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-					"dev": true,
-					"requires": {
-						"global-prefix": "^3.0.0"
-					}
-				},
-				"global-prefix": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-					"integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-					"dev": true,
-					"requires": {
-						"ini": "^1.3.5",
-						"kind-of": "^6.0.2",
-						"which": "^1.3.1"
-					}
-				},
-				"globby": {
-					"version": "11.1.0",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-					"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-					"dev": true,
-					"requires": {
-						"array-union": "^2.1.0",
-						"dir-glob": "^3.0.1",
-						"fast-glob": "^3.2.9",
-						"ignore": "^5.2.0",
-						"merge2": "^1.4.1",
-						"slash": "^3.0.0"
-					}
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				},
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
+			"bin": {
+				"stylelint": "bin/stylelint.js"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/stylelint"
 			}
 		},
-		"stylelint-order": {
+		"node_modules/stylelint-order": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
 			"integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"postcss": "^8.3.11",
 				"postcss-sorting": "^7.0.1"
+			},
+			"peerDependencies": {
+				"stylelint": "^14.0.0"
+			}
+		},
+		"node_modules/stylelint/node_modules/balanced-match": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+			"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/stylelint/node_modules/file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"flat-cache": "^3.0.4"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/stylelint/node_modules/flat-cache": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+			"integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"flatted": "^3.2.9",
+				"keyv": "^4.5.3",
+				"rimraf": "^3.0.2"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/stylelint/node_modules/global-modules": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+			"integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"global-prefix": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/stylelint/node_modules/global-prefix": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+			"integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ini": "^1.3.5",
+				"kind-of": "^6.0.2",
+				"which": "^1.3.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/stylelint/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/which": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"which": "bin/which"
 			}
 		},
-		"supports-color": {
+		"node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"supports-hyperlinks": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-			"integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+		"node_modules/supports-hyperlinks": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+			"integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"has-flag": "^4.0.0",
 				"supports-color": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"sver-compat": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-			"integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+		"node_modules/supports-preserve-symlinks-flag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
 			"dev": true,
-			"requires": {
-				"es6-iterator": "^2.0.1",
-				"es6-symbol": "^3.1.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"svg-tags": {
+		"node_modules/svg-tags": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-			"integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
+			"integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
 			"dev": true
 		},
-		"svgo": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-			"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-			"dev": true,
-			"requires": {
-				"@trysound/sax": "0.2.0",
-				"commander": "^7.2.0",
-				"css-select": "^4.1.3",
-				"css-tree": "^1.1.3",
-				"csso": "^4.2.0",
-				"picocolors": "^1.0.0",
-				"stable": "^0.1.8"
-			}
-		},
-		"table": {
-			"version": "6.8.0",
-			"resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-			"integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+		"node_modules/table": {
+			"version": "6.9.0",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz",
+			"integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==",
 			"dev": true,
-			"requires": {
+			"license": "BSD-3-Clause",
+			"dependencies": {
 				"ajv": "^8.0.1",
 				"lodash.truncate": "^4.4.2",
 				"slice-ansi": "^4.0.0",
 				"string-width": "^4.2.3",
 				"strip-ansi": "^6.0.1"
 			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=10.0.0"
 			}
 		},
-		"text-table": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-			"dev": true
-		},
-		"through2": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-			"integrity": "sha1-CEfLxESfNAVXTb3M2buEG4OsNUU=",
+		"node_modules/table-parser": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/table-parser/-/table-parser-0.1.3.tgz",
+			"integrity": "sha512-LCYeuvqqoPII3lzzYaXKbC3Forb+d2u4bNwhk/9FlivuGRxPE28YEWAYcujeSlLLDlMfvy29+WPybFJZFiKMYg==",
 			"dev": true,
-			"requires": {
-				"readable-stream": ">=1.1.13-1 <1.2.0-0",
-				"xtend": ">=4.0.0 <4.1.0-0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.1.14",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.1",
-						"isarray": "0.0.1",
-						"string_decoder": "~0.10.x"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				}
+				"connected-domain": "^1.0.0"
 			}
 		},
-		"through2-filter": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-			"integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-			"dev": true,
-			"requires": {
-				"through2": "~2.0.0",
-				"xtend": "~4.0.0"
-			},
-			"dependencies": {
-				"through2": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-					"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "~2.3.6",
-						"xtend": "~4.0.1"
-					}
-				}
-			}
-		},
-		"time-stamp": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-			"dev": true
-		},
-		"timers-ext": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-			"integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+		"node_modules/table/node_modules/ajv": {
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+			"integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
 			"dev": true,
-			"requires": {
-				"es5-ext": "~0.10.46",
-				"next-tick": "1"
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
-		"to-absolute-glob": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-			"integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+		"node_modules/table/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 			"dev": true,
-			"requires": {
-				"is-absolute": "^1.0.0",
-				"is-negated-glob": "^1.0.0"
-			}
+			"license": "MIT"
 		},
-		"to-object-path": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+		"node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"is-buffer": {
-					"version": "1.1.6",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"to-regex": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-			"dev": true,
-			"requires": {
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"regex-not": "^1.0.2",
-				"safe-regex": "^1.1.0"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-					"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-					"dev": true,
-					"requires": {
-						"assign-symbols": "^1.0.0",
-						"is-extendable": "^1.0.1"
-					}
-				},
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				},
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
 			}
 		},
-		"to-regex-range": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+		"node_modules/toidentifier": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
 			"dev": true,
-			"requires": {
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1"
-			}
-		},
-		"to-through": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-			"integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-			"dev": true,
-			"requires": {
-				"through2": "^2.0.3"
-			},
-			"dependencies": {
-				"through2": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-					"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "~2.3.6",
-						"xtend": "~4.0.1"
-					}
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.6"
 			}
 		},
-		"trim-newlines": {
+		"node_modules/trim-newlines": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
 			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-			"dev": true
-		},
-		"type": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-			"integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"type-check": {
+		"node_modules/type-check": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
 			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"prelude-ls": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
 			}
 		},
-		"type-fest": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-			"dev": true
-		},
-		"typedarray": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-			"dev": true
-		},
-		"unc-path-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-			"dev": true
-		},
-		"undertaker": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
-			"integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
-			"dev": true,
-			"requires": {
-				"arr-flatten": "^1.0.1",
-				"arr-map": "^2.0.0",
-				"bach": "^1.0.0",
-				"collection-map": "^1.0.0",
-				"es6-weak-map": "^2.0.1",
-				"fast-levenshtein": "^1.0.0",
-				"last-run": "^1.1.0",
-				"object.defaults": "^1.0.0",
-				"object.reduce": "^1.0.0",
-				"undertaker-registry": "^1.0.0"
-			},
-			"dependencies": {
-				"fast-levenshtein": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
-					"integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
-					"dev": true
-				}
+		"node_modules/type-fest": {
+			"version": "0.18.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+			"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"undertaker-registry": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-			"integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-			"dev": true
-		},
-		"union-value": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-			"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+		"node_modules/type-is": {
+			"version": "1.6.18",
+			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
 			"dev": true,
-			"requires": {
-				"arr-union": "^3.1.0",
-				"get-value": "^2.0.6",
-				"is-extendable": "^0.1.1",
-				"set-value": "^2.0.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"arr-union": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-					"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-					"dev": true
-				}
+				"media-typer": "0.3.0",
+				"mime-types": "~2.1.24"
+			},
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"unique-stream": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-			"integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+		"node_modules/unc-path-regex": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+			"integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
 			"dev": true,
-			"requires": {
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"through2-filter": "^3.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"unset-value": {
+		"node_modules/unpipe": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-			"dev": true,
-			"requires": {
-				"has-value": "^0.3.1",
-				"isobject": "^3.0.0"
-			},
-			"dependencies": {
-				"has-value": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-					"dev": true,
-					"requires": {
-						"get-value": "^2.0.3",
-						"has-values": "^0.1.4",
-						"isobject": "^2.0.0"
-					},
-					"dependencies": {
-						"isobject": {
-							"version": "2.1.0",
-							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-							"dev": true,
-							"requires": {
-								"isarray": "1.0.0"
-							}
-						}
-					}
-				},
-				"has-values": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-					"dev": true
-				}
+			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"upath": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-			"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-			"dev": true
-		},
-		"uri-js": {
+		"node_modules/uri-js": {
 			"version": "4.4.1",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
 			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
 			"dev": true,
-			"requires": {
+			"license": "BSD-2-Clause",
+			"dependencies": {
 				"punycode": "^2.1.0"
 			}
 		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-			"dev": true
-		},
-		"url-regex": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz",
-			"integrity": "sha512-dQ9cJzMou5OKr6ZzfvwJkCq3rC72PNXhqz0v3EIhF4a3Np+ujr100AhUx2cKx5ei3iymoJpJrPB3sVSEMdqAeg==",
-			"dev": true,
-			"requires": {
-				"ip-regex": "^1.0.1"
-			}
-		},
-		"use": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+		"node_modules/urlsafe-base64": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz",
+			"integrity": "sha512-RtuPeMy7c1UrHwproMZN9gN6kiZ0SvJwRaEzwZY0j9MypEkFqyBaKv176jvlPtg58Zh36bOkS0NFABXMHvvGCA==",
 			"dev": true
 		},
-		"util-deprecate": {
+		"node_modules/util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-			"dev": true
-		},
-		"v8-compile-cache": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-			"dev": true
+			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"v8flags": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-			"integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+		"node_modules/utils-merge": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
 			"dev": true,
-			"requires": {
-				"homedir-polyfill": "^1.0.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4.0"
 			}
 		},
-		"validate-npm-package-license": {
+		"node_modules/v8-compile-cache": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
+			"integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/validate-npm-package-license": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
 			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
 			"dev": true,
-			"requires": {
+			"license": "Apache-2.0",
+			"dependencies": {
 				"spdx-correct": "^3.0.0",
 				"spdx-expression-parse": "^3.0.0"
 			}
 		},
-		"value-or-function": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-			"integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-			"dev": true
-		},
-		"vinyl": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
-			"integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+		"node_modules/vary": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
 			"dev": true,
-			"requires": {
-				"clone": "^2.1.1",
-				"clone-buffer": "^1.0.0",
-				"clone-stats": "^1.0.0",
-				"cloneable-readable": "^1.0.0",
-				"remove-trailing-separator": "^1.0.1",
-				"replace-ext": "^1.0.0"
-			}
-		},
-		"vinyl-fs": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-			"integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-			"dev": true,
-			"requires": {
-				"fs-mkdirp-stream": "^1.0.0",
-				"glob-stream": "^6.1.0",
-				"graceful-fs": "^4.0.0",
-				"is-valid-glob": "^1.0.0",
-				"lazystream": "^1.0.0",
-				"lead": "^1.0.0",
-				"object.assign": "^4.0.4",
-				"pumpify": "^1.3.5",
-				"readable-stream": "^2.3.3",
-				"remove-bom-buffer": "^3.0.0",
-				"remove-bom-stream": "^1.2.0",
-				"resolve-options": "^1.1.0",
-				"through2": "^2.0.0",
-				"to-through": "^2.0.0",
-				"value-or-function": "^3.0.0",
-				"vinyl": "^2.0.0",
-				"vinyl-sourcemap": "^1.1.0"
-			},
-			"dependencies": {
-				"through2": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-					"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "~2.3.6",
-						"xtend": "~4.0.1"
-					}
-				}
-			}
-		},
-		"vinyl-sourcemap": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-			"integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-			"dev": true,
-			"requires": {
-				"append-buffer": "^1.0.2",
-				"convert-source-map": "^1.5.0",
-				"graceful-fs": "^4.1.6",
-				"normalize-path": "^2.1.1",
-				"now-and-later": "^2.0.0",
-				"remove-bom-buffer": "^3.0.0",
-				"vinyl": "^2.0.0"
-			},
-			"dependencies": {
-				"normalize-path": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-					"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-					"dev": true,
-					"requires": {
-						"remove-trailing-separator": "^1.0.1"
-					}
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"vinyl-sourcemaps-apply": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-			"integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
+		"node_modules/web-push-testing": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.2.2.tgz",
+			"integrity": "sha512-UnrbIfg3Vjounhlqo4Ko30ZKXEdytK9r1a2l0Drrj4CjxqLE7v3nzfTX6aTKhtqwrO3i7uFTgvwY6l0Lr4aXMw==",
 			"dev": true,
-			"requires": {
-				"source-map": "^0.5.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				}
+				"arg": "^5.0.1",
+				"express": "^4.17.2",
+				"http_ece": "^1.1.0",
+				"jsonwebtoken": "^9.0.0",
+				"node-persist": "^2.1.0",
+				"ps-node": "^0.1.6",
+				"urlsafe-base64": "^1.0.0"
+			},
+			"bin": {
+				"web-push-testing": "src/bin/cli.js"
+			},
+			"engines": {
+				"node": ">=20.0.0"
 			}
 		},
-		"which": {
+		"node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 			"dev": true,
-			"requires": {
+			"license": "ISC",
+			"dependencies": {
 				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"which-module": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-			"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-			"dev": true
-		},
-		"word-wrap": {
+		"node_modules/word-wrap": {
 			"version": "1.2.5",
 			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
 			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-			"dev": true
-		},
-		"wrap-ansi": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-			"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
 			"dev": true,
-			"requires": {
-				"string-width": "^1.0.1",
-				"strip-ansi": "^3.0.1"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
-				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-					"dev": true,
-					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"wrappy": {
+		"node_modules/wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-			"dev": true
+			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+			"dev": true,
+			"license": "ISC"
 		},
-		"write-file-atomic": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-			"integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+		"node_modules/write-file-atomic": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
 			"dev": true,
-			"requires": {
+			"license": "ISC",
+			"dependencies": {
 				"imurmurhash": "^0.1.4",
 				"signal-exit": "^3.0.7"
+			},
+			"engines": {
+				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
 			}
 		},
-		"xtend": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-			"dev": true
-		},
-		"y18n": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-			"integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
-			"dev": true
-		},
-		"yallist": {
+		"node_modules/yallist": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
 			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true
+			"dev": true,
+			"license": "ISC"
 		},
-		"yaml": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-			"dev": true
+		"node_modules/yaml": {
+			"version": "1.10.3",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
+			"integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">= 6"
+			}
 		},
-		"yargs": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
-			"integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
-			"dev": true,
-			"requires": {
-				"camelcase": "^3.0.0",
-				"cliui": "^3.2.0",
-				"decamelize": "^1.1.1",
-				"get-caller-file": "^1.0.1",
-				"os-locale": "^1.4.0",
-				"read-pkg-up": "^1.0.1",
-				"require-directory": "^2.1.1",
-				"require-main-filename": "^1.0.1",
-				"set-blocking": "^2.0.0",
-				"string-width": "^1.0.2",
-				"which-module": "^1.0.0",
-				"y18n": "^3.2.1",
-				"yargs-parser": "^5.0.1"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-					"dev": true
-				},
-				"find-up": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-					"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-					"dev": true,
-					"requires": {
-						"path-exists": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"hosted-git-info": {
-					"version": "2.8.9",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-					"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-					"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"resolve": "^1.10.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"path-exists": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-					"dev": true,
-					"requires": {
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"path-type": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-					"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"read-pkg": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-					"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-					"dev": true,
-					"requires": {
-						"load-json-file": "^1.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^1.0.0"
-					}
-				},
-				"read-pkg-up": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-					"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-					"dev": true,
-					"requires": {
-						"find-up": "^1.0.0",
-						"read-pkg": "^1.0.0"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-					"dev": true,
-					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"yargs-parser": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
-					"integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^3.0.0",
-						"object.assign": "^4.1.0"
-					}
-				}
+		"node_modules/yargs-parser": {
+			"version": "20.2.9",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+			"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"yargs-parser": {
-			"version": "20.2.7",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-			"integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-			"dev": true
+		"node_modules/yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		}
 	}
 }
diff --git a/package.json b/package.json
index 932fb51f6d3..7947d041537 100644
--- a/package.json
+++ b/package.json
@@ -6,65 +6,6 @@
 	"directories": {
 		"doc": "docs"
 	},
-	"eslintConfig": {
-		"extends": "xo",
-		"ignorePatterns": [
-			"phpBB/adm/style/admin.js",
-			"phpBB/adm/style/ajax.js",
-			"phpBB/adm/style/permissions.js",
-			"phpBB/adm/style/tooltip.js",
-			"phpBB/assets/javascript/core.js",
-			"phpBB/assets/javascript/cropper.js",
-			"phpBB/assets/javascript/editor.js",
-			"phpBB/assets/javascript/hermite.js",
-			"phpBB/assets/javascript/installer.js",
-			"phpBB/assets/javascript/jquery-cropper.js",
-			"phpBB/assets/javascript/plupload.js",
-			"phpBB/ext/**/*.js",
-			"phpBB/styles/prosilver/template/ajax.js",
-			"phpBB/styles/prosilver/template/forum_fn.js",
-			"phpBB/**/*.min.js",
-			"phpBB/vendor/**/*.js",
-			"phpBB/vendor-ext/**/*.js",
-			"phpBB/phpbb/**/*.js",
-			"phpBB/tests/**/*.js"
-		],
-		"rules": {
-			"quotes": [
-				"error",
-				"single"
-			],
-			"comma-dangle": [
-				"error",
-				"always-multiline"
-			],
-			"block-spacing": "error",
-			"array-bracket-spacing": [
-				"error",
-				"always"
-			],
-			"multiline-comment-style": "off",
-			"computed-property-spacing": "off",
-			"space-before-function-paren": [
-				"error",
-				"never"
-			],
-			"space-in-parens": "off",
-			"capitalized-comments": "off",
-			"object-curly-spacing": [
-				"error",
-				"always"
-			],
-			"no-lonely-if": "off",
-			"unicorn/prefer-module": "off"
-		},
-		"env": {
-			"es6": true,
-			"browser": true,
-			"node": true,
-			"jquery": true
-		}
-	},
 	"browserslist": [
 		"> 1%",
 		"not ie 11",
@@ -99,18 +40,10 @@
 	},
 	"homepage": "https://www.phpbb.com",
 	"devDependencies": {
-		"autoprefixer": "^10.4.4",
-		"cssnano": "^5.1.7",
-		"eslint": "^8.13.0",
-		"eslint-config-xo": "^0.40.0",
-		"gulp": "^4.0.2",
-		"gulp-concat-css": "^3.1.0",
-		"gulp-postcss": "^9.0.1",
-		"gulp-rename": "^2.0.0",
-		"gulp-sourcemaps": "^3.0.0",
-		"postcss": "^8.4.31",
-		"postcss-sorting": "^7.0.1",
+		"eslint": "^9.28.0",
+		"globals": "^17.0.0",
 		"stylelint": "^14.7.0",
-		"stylelint-order": "^5.0.0"
+		"stylelint-order": "^5.0.0",
+		"web-push-testing": "^1.1.1"
 	}
 }
diff --git a/phpBB/.htaccess b/phpBB/.htaccess
index 0be28ab670b..7dc06167b8d 100644
--- a/phpBB/.htaccess
+++ b/phpBB/.htaccess
@@ -20,13 +20,13 @@ RewriteEngine on
 
 #
 # The following 3 lines will rewrite URLs passed through the front controller
-# to not require app.php in the actual URL. In other words, a controller is
-# by default accessed at /app.php/my/controller, but can also be accessed at
+# to not require index.php in the actual URL. In other words, a controller is
+# by default accessed at /index.php/my/controller, but can also be accessed at
 # /my/controller
 #
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^(.*)$ app.php [QSA,L]
+RewriteRule ^(.*)$ index.php [QSA,L]
 
 #
 # If symbolic links are not already being followed,
@@ -60,6 +60,14 @@ RewriteRule ^(.*)$ app.php [QSA,L]
 			Order Allow,Deny
 			Deny from All
 		</Files>
+		<Files "composer.json">
+			Order Allow,Deny
+			Deny from All
+		</Files>
+		<Files "composer.lock">
+			Order Allow,Deny
+			Deny from All
+		</Files>
 	</IfVersion>
 	<IfVersion >= 2.4>
 		<Files "config.php">
@@ -68,6 +76,12 @@ RewriteRule ^(.*)$ app.php [QSA,L]
 		<Files "common.php">
 			Require all denied
 		</Files>
+		<Files "composer.json">
+			Require all denied
+		</Files>
+		<Files "composer.lock">
+			Require all denied
+		</Files>
 	</IfVersion>
 </IfModule>
 <IfModule !mod_version.c>
@@ -80,6 +94,14 @@ RewriteRule ^(.*)$ app.php [QSA,L]
 			Order Allow,Deny
 			Deny from All
 		</Files>
+		<Files "composer.json">
+			Order Allow,Deny
+			Deny from All
+		</Files>
+		<Files "composer.lock">
+			Order Allow,Deny
+			Deny from All
+		</Files>
 	</IfModule>
 	<IfModule mod_authz_core.c>
 		<Files "config.php">
@@ -88,5 +110,11 @@ RewriteRule ^(.*)$ app.php [QSA,L]
 		<Files "common.php">
 			Require all denied
 		</Files>
+		<Files "composer.json">
+			Require all denied
+		</Files>
+		<Files "composer.lock">
+			Require all denied
+		</Files>
 	</IfModule>
 </IfModule>
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 0f9ff7eaee8..25975e04666 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -68,8 +68,8 @@
 	],
 );
 
-$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
-$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
+$template->assign_var('T_ASSETS_PATH', $phpbb_path_helper->update_web_root_path($phpbb_root_path . 'assets'));
+$template->assign_var('T_TEMPLATE_PATH', $phpbb_path_helper->update_web_root_path($phpbb_root_path . 'style'));
 
 // Instantiate new module
 $module = new p_master();
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
index 7601b802de9..5d22fd777ef 100644
--- a/phpBB/adm/style/acp_avatar_options_upload.html
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -6,6 +6,7 @@
 {% INCLUDECSS T_ASSETS_PATH ~ '/css/cropper.min.css' %}
 {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/cropper.min.js' %}
 {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/jquery-cropper.js' %}
+{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/hermite.js' %}
 {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/phpbb-avatars.js' %}
 
 <input type="hidden" id="avatar-cropper-data" name="avatar_cropper_data" value=""
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index 234ec5a42b7..aade2f8aac7 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -14,7 +14,7 @@ <h1>{L_ACP_BBCODES}</h1>
 
 	<fieldset>
 		<legend>{L_BBCODE_USAGE}</legend>
-		<p>{L_BBCODE_USAGE_EXPLAIN}</p>
+		<p>{{ lang('BBCODE_USAGE_EXPLAIN', '<a href="#down">', '</a>') }}</p>
 	<dl>
 		<dt><label for="bbcode_match">{L_EXAMPLES}</label><br /><br /><span>{L_BBCODE_USAGE_EXAMPLE}</span></dt>
 		<dd><textarea id="bbcode_match" name="bbcode_match" cols="60" rows="5">{BBCODE_MATCH}</textarea></dd>
@@ -47,6 +47,17 @@ <h1>{L_ACP_BBCODES}</h1>
 	</dl>
 	</fieldset>
 
+	<fieldset>
+		<legend>{{ lang('APPEARANCE') }}</legend>
+	<dl>
+		<dt><label for="bbcode_font_icon">{{ lang('BBCODE_FONT_ICON') }}</label><br><span>{{ lang('BBCODE_FONT_ICON_EXPLAIN', '<a href="https://fontawesome.com/v6/icons/" target="_blank">', '</a>') }}</span></dt>
+		<dd>
+			<input type="text" name="bbcode_font_icon" id="bbcode_font_icon" value="{{ BBCODE_FONT_ICON }}" />
+			{{ Icon('font', ' ', '', false, '', {'id':'bbcode_icon_preview'}) }}
+		</dd>
+	</dl>
+	</fieldset>
+
 	<!-- EVENT acp_bbcodes_edit_fieldsets_after -->
 
 	<fieldset class="submit-buttons">
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
index b4f8ea50721..8332df7e2b5 100644
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -27,7 +27,9 @@ <h3>{L_WARNING}</h3>
 	</dl>
 	<dl>
 		<dt><label for="bot_style">{L_BOT_STYLE}{L_COLON}</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
-		<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>
+		<dd>
+			{{ FormsSelect(S_STYLE_OPTIONS) }}
+		</dd>
 	</dl>
 	<dl>
 		<dt><label for="{{ LANG_OPTIONS.id }}">{L_BOT_LANG}{L_COLON}</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
@@ -37,7 +39,9 @@ <h3>{L_WARNING}</h3>
 	</dl>
 	<dl>
 		<dt><label for="bot_active">{L_BOT_ACTIVE}{L_COLON}</label></dt>
-		<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>
+		<dd>
+			{{ FormsSelect(S_ACTIVE_OPTIONS) }}
+		</dd>
 	</dl>
 	<dl>
 		<dt><label for="bot_agent">{L_BOT_AGENT}{L_COLON}</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index 4353becd2f4..0c9d3bf0afb 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -1,79 +1,85 @@
-<!-- INCLUDE overall_header.html -->
+{% include 'overall_header.html' %}
 
 <a id="maincontent"></a>
 
-<h1>{L_ACP_VC_SETTINGS}</h1>
+<h1>{{ lang('ACP_VC_SETTINGS') }}</h1>
 
-<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
+<p>{{ lang('ACP_VC_SETTINGS_EXPLAIN') }}</p>
 
-<p>{L_ACP_VC_EXT_GET_MORE}</p>
+<p>{{ lang('ACP_VC_EXT_GET_MORE') }}</p>
 
-<!-- IF ERROR_MSG -->
+{% if ERRORS %}
 <div class="errorbox">
-	<h3>{L_WARNING}</h3>
-	<p>{ERROR_MSG}</p>
+	<h3>{{ lang('WARNING') }}</h3>
+	<p>{{ ERRORS|join('<br>') }}</p>
 </div>
-<!-- ENDIF -->
+{% endif %}
 
-<form id="acp_captcha" method="post" action="{U_ACTION}">
+<form id="acp_captcha" method="post" action="{{ U_ACTION }}">
 
 <fieldset>
-<legend>{L_GENERAL_OPTIONS}</legend>
+<legend>{{ lang('GENERAL_OPTIONS') }}</legend>
 
 <dl>
-	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+	<dt><label for="enable_confirm">{{ lang('VISUAL_CONFIRM_REG') ~ lang('COLON') }}</label><br /><span>{{ lang('VISUAL_CONFIRM_REG_EXPLAIN') }}</span></dt>
+	<dd>
+		<label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"{% if REG_ENABLE %} checked="checked"{% endif %}/> {{ lang('ENABLED') }}</label>
+		<label><input type="radio" class="radio" name="enable_confirm" value="0"{% if not REG_ENABLE %} checked="checked"{% endif %}/> {{ lang('DISABLED') }}</label>
+	</dd>
 </dl>
 <dl>
-	<dt><label for="max_reg_attempts">{L_REG_LIMIT}{L_COLON}</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
-	<dd><input id="max_reg_attempts" type="number" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
+	<dt><label for="max_reg_attempts">{{ lang('REG_LIMIT') ~ lang('COLON') }}</label><br /><span>{{ lang('REG_LIMIT_EXPLAIN') }}</span></dt>
+	<dd><input id="max_reg_attempts" type="number" min="0" max="9999" name="max_reg_attempts" value="{{ REG_LIMIT }}" /></dd>
 </dl>
 <dl>
-	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}{L_COLON}</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
-	<dd><input id="max_login_attempts" type="number" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
+	<dt><label for="max_login_attempts">{{ lang('MAX_LOGIN_ATTEMPTS') ~ lang('COLON') }}</label><br /><span>{{ lang('MAX_LOGIN_ATTEMPTS_EXPLAIN') }}</span></dt>
+	<dd><input id="max_login_attempts" type="number" min="0" max="9999" name="max_login_attempts" value="{{ MAX_LOGIN_ATTEMPTS }}" /></dd>
 </dl>
 <dl>
-	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+	<dt><label for="enable_post_confirm">{{ lang('VISUAL_CONFIRM_POST') ~ lang('COLON') }}</label><br /><span>{{ lang('VISUAL_CONFIRM_POST_EXPLAIN') }}</span></dt>
+	<dd>
+		<label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"{% if POST_ENABLE %} checked="checked"{% endif %}/> {{ lang('ENABLED') }}</label>
+		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"{% if not POST_ENABLE %} checked="checked"{% endif %}/> {{ lang('DISABLED') }}</label>
+	</dd>
 </dl>
 <dl>
-	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+	<dt><label for="confirm_refresh">{{ lang('VISUAL_CONFIRM_REFRESH') ~ lang('COLON') }}</label><br /><span>{{ lang('VISUAL_CONFIRM_REFRESH_EXPLAIN') }}</span></dt>
+	<dd>
+		<label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"{% if CONFIRM_REFRESH %} checked="checked"{% endif %}/> {{ lang('ENABLED') }}</label>
+		<label><input type="radio" class="radio" name="confirm_refresh" value="0"{% if not CONFIRM_REFRESH %} checked="checked"{% endif %}/> {{ lang('DISABLED') }}</label>
+	</dd>
 </dl>
 </fieldset>
 
 <fieldset>
-<legend>{L_AVAILABLE_CAPTCHAS}</legend>
-<dl>
-	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}{L_COLON}</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
-	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>
-</dl>
- <!-- IF S_CAPTCHA_HAS_CONFIG -->
-<dl>
-	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}{L_COLON}</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
-	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>
-</dl>
-<!-- ENDIF -->
+<legend>{{ lang('AVAILABLE_CAPTCHAS') }}</legend>
+	<dl>
+		<dt><label for="captcha_select">{{ lang('CAPTCHA_SELECT') ~ lang('COLON') }}</label><br><span>{{ lang('CAPTCHA_SELECT_EXPLAIN') }}</span></dt>
+		<dd>{{ FormsSelect(CAPTCHA_SELECT | merge({id: 'captcha_select', onchange: "(document.getElementById('acp_captcha')).submit()"})) }}</dd>
+	</dl>
+	{% if S_CAPTCHA_HAS_CONFIG %}
+	<dl>
+		<dt><label for="configure">{{ lang('CAPTCHA_CONFIGURE') ~ lang('COLON') }}</label><br /><span>{{ lang('CAPTCHA_CONFIGURE_EXPLAIN') }}</span></dt>
+		<dd><input class="button2" type="submit" id="configure" name="configure" value="{{ lang('CONFIGURE') }}" /></dd>
+	</dl>
+	{% endif %}
 </fieldset>
 
-<!-- IF CAPTCHA_PREVIEW_TPL -->
+{% if CAPTCHA_PREVIEW_TPL %}
 <fieldset>
-	<legend>{L_PREVIEW}</legend>
-<!-- INCLUDE {CAPTCHA_PREVIEW_TPL} -->
+	<legend>{{ lang('PREVIEW') }}</legend>
+	{% include CAPTCHA_PREVIEW_TPL %}
 </fieldset>
-<!-- ENDIF -->
+{% endif %}
 
 <fieldset>
-	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
+	<legend>{{ lang('ACP_SUBMIT_CHANGES') }}</legend>
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="main_submit" name="main_submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="form_reset" name="reset" value="{L_RESET}" />&nbsp;
+		<input class="button1" type="submit" id="main_submit" name="main_submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+		<input class="button2" type="reset" id="form_reset" name="reset" value="{{ lang('RESET') }}" />&nbsp;
 	</p>
-	{S_FORM_TOKEN}
+	{{ S_FORM_TOKEN }}
 </fieldset>
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+{% include 'overall_footer.html' %}
diff --git a/phpBB/adm/style/acp_ext_delete_data.html b/phpBB/adm/style/acp_ext_delete_data.html
index 2d215064739..96ae8162313 100644
--- a/phpBB/adm/style/acp_ext_delete_data.html
+++ b/phpBB/adm/style/acp_ext_delete_data.html
@@ -11,6 +11,7 @@ <h1>{{ lang('EXTENSIONS_ADMIN') }}</h1>
 		<div class="errorbox">
 			<p><strong>{{ lang('MIGRATION_EXCEPTION_ERROR') }}</strong></p>
 			<p>{{ MIGRATOR_ERROR }}</p>
+			{% if MIGRATOR_ERROR_STACK_TRACE %}<p>{{ MIGRATOR_ERROR_STACK_TRACE|nl2br }}</p>{% endif %}
 			<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
 		</div>
 	{% elseif S_PRE_STEP %}
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 5319b76d3ab..4b2d71cb4cf 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -11,6 +11,7 @@ <h1>{{ lang('EXTENSIONS_ADMIN') }}</h1>
 		<div class="errorbox">
 			<p><strong>{{ lang('MIGRATION_EXCEPTION_ERROR') }}</strong></p>
 			<p>{{ MIGRATOR_ERROR }}</p>
+			{% if MIGRATOR_ERROR_STACK_TRACE %}<p>{{ MIGRATOR_ERROR_STACK_TRACE|nl2br }}</p>{% endif %}
 			<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
 		</div>
 	{% elseif S_PRE_STEP %}
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index bb22ac861c8..e1774577247 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -42,82 +42,95 @@ <h1>{L_EXTENSIONS_ADMIN}</h1>
 		</tr>
 	</thead>
 	<tbody>
-		<!-- IF .enabled -->
-		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong><!-- EVENT acp_ext_list_enabled_title_after --></td>
-		</tr>
-		<!-- BEGIN enabled -->
-		<tr class="ext_enabled row-highlight">
-			<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_enabled_name_after --></td>
-			<td style="text-align: center;">
-				<!-- IF enabled.S_VERSIONCHECK -->
-				<strong class="<!-- IF enabled.S_UP_TO_DATE -->current-ext<!-- ELSE -->outdated-ext<!-- ENDIF -->">{enabled.META_VERSION}</strong>
-				<!-- IF not enabled.S_UP_TO_DATE -->{{ Icon('font', 'circle-exclamation', '', true, 'fas outdated-ext') }}<!-- ENDIF -->
-				<!-- ELSE -->
-				{enabled.META_VERSION}
-				<!-- ENDIF -->
-			</td>
-			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
-			<td style="text-align: center;">
-				<!-- BEGIN actions -->
-					<a href="{enabled.actions.U_ACTION}"<!-- IF enabled.actions.ACTION == 'REMOVE' --> style="color: #bc2a4d;"<!-- ENDIF --><!-- IF enabled.actions.L_ACTION_EXPLAIN --> title="{enabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{enabled.actions.L_ACTION}</a>
-					<!-- IF not enabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
-				<!-- END actions -->
-			</td>
-		</tr>
-		<!-- END enabled -->
-		<!-- ENDIF -->
-
-		<!-- IF .disabled -->
-		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong><!-- EVENT acp_ext_list_disabled_title_after --></td>
-		</tr>
-		<!-- BEGIN disabled -->
-		<tr class="ext_disabled row-highlight">
-			<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_disabled_name_after --></td>
-			<td style="text-align: center;">
-				<!-- IF disabled.S_VERSIONCHECK -->
-				<strong class="<!-- IF disabled.S_UP_TO_DATE -->current-ext<!-- ELSE -->outdated-ext<!-- ENDIF -->">{disabled.META_VERSION}</strong>
-				<!-- IF not disabled.S_UP_TO_DATE -->{{ Icon('font', 'circle-exclamation', '', true, 'fas outdated-ext') }}<!-- ENDIF -->
-				<!-- ELSE -->
-				{disabled.META_VERSION}
-				<!-- ENDIF -->
-			</td>
-			<td style="text-align: center;">
-				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
-			</td>
-			<td style="text-align: center;">
-				<!-- BEGIN actions -->
-					<a href="{disabled.actions.U_ACTION}"<!-- IF disabled.actions.ACTION == 'REMOVE' --> style="color: #bc2a4d;"<!-- ENDIF --><!-- IF disabled.actions.L_ACTION_EXPLAIN --> title="{disabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{disabled.actions.L_ACTION}</a>
-					<!-- IF not disabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
-				<!-- END actions -->
-			</td>
-		</tr>
-		<!-- END disabled -->
-		<!-- ENDIF -->
+		{% for list in ['enabled', 'disabled', 'not_installed'] %}
+			{% set blockname = attribute(loops, list) %}
+			{% if blockname|length %}
+			<tr>
+				<td class="row3" colspan="4"><strong>{{ lang('EXTENSIONS_' ~ list|upper) }}</strong>
+					{% if list == 'enabled' %}
+						{% EVENT acp_ext_list_enabled_title_after %}
+					{% elseif list == 'disabled' %}
+						{% EVENT acp_ext_list_disabled_title_after %}
+					{% elseif list == 'not_installed' %}
+						{% EVENT acp_ext_list_not_installed_title_after %}
+					{% endif %}
+				</td>
+			</tr>
+			{% for data in blockname %}
+			<tr class="ext_{{ list }} row-highlight">
+				<td><strong title="{{ data.NAME }}">{{ data.META_DISPLAY_NAME }}</strong>
+					{% if list == 'enabled' %}
+						{% EVENT acp_ext_list_enabled_name_after %}
+					{% elseif list == 'disabled' %}
+						{% EVENT acp_ext_list_disabled_name_after %}
+					{% elseif list == 'not_installed' %}
+						{% EVENT acp_ext_list_not_installed_name_after %}
+					{% endif %}
+				</td>
+				<td style="text-align: center;">
+					{% if data.S_VERSIONCHECK %}
+					<strong class="{% if data.S_UP_TO_DATE %}current-ext{% else %}outdated-ext{% endif %}">{{ data.META_VERSION }}</strong>
+					{% if not data.S_UP_TO_DATE %}{{ Icon('font', 'circle-exclamation', '', true, 'fas outdated-ext') }}{% endif %}
+					{% else %}
+					{{ data.META_VERSION }}
+					{% endif %}
+				</td>
+				<td style="text-align: center;">
+					{% if data.U_DETAILS %}<a href="{{ data.U_DETAILS }}">{{ lang ('DETAILS') }}</a>{% endif %}
+				</td>
+				<td style="text-align: center;">
+					{% for actions in data.actions %}
+						<a href="{{ actions.U_ACTION }}"{% if actions.L_ACTION_EXPLAIN %} title="{{ actions.L_ACTION_EXPLAIN }}"{% endif %}>{{ actions.L_ACTION }}</a>
+						{% if not actions.S_LAST_ROW %}&nbsp;|&nbsp;{% endif %}
+					{% endfor %}
+				</td>
+			</tr>
+			{% endfor %}
+			{% endif %}
+		{% endfor %}
 	</tbody>
 	</table>
 
 	<table class="table1">
-	<tr>
-		<th>{L_EXTENSION_INSTALL_HEADLINE}</th>
-	</tr>
-	<tr>
-		<td class="row3">{L_EXTENSION_INSTALL_EXPLAIN}</td>
-	</tr>
-	<tr>
-		<th>{L_EXTENSION_UPDATE_HEADLINE}</th>
-	</tr>
-	<tr>
-		<td class="row3">{L_EXTENSION_UPDATE_EXPLAIN}</td>
-	</tr>
-	<tr>
-		<th>{L_EXTENSION_REMOVE_HEADLINE}</th>
-	</tr>
-	<tr>
-		<td class="row3">{L_EXTENSION_REMOVE_EXPLAIN}</td>
-	</tr>
-	</tbody>
+		<tbody>
+			<tr>
+				<th>{L_EXTENSION_INSTALLING_HEADLINE}</th>
+			</tr>
+			<tr>
+				<td class="row3">
+					<ol>
+						<li>{{ lang('EXTENSION_INSTALLING_EXPLAIN_STEP1') }}</li>
+						<li>{{ lang('EXTENSION_INSTALLING_EXPLAIN_STEP2') }}</li>
+						<li>{{ lang('EXTENSION_INSTALLING_EXPLAIN_STEP3') }}</li>
+					</ol>
+				</td>
+			</tr>
+			<tr>
+				<th>{L_EXTENSION_UPDATING_HEADLINE}</th>
+			</tr>
+			<tr>
+				<td class="row3">
+					<ol>
+						<li>{{ lang('EXTENSION_UPDATING_EXPLAIN_STEP1') }}</li>
+						<li>{{ lang('EXTENSION_UPDATING_EXPLAIN_STEP2') }}</li>
+						<li>{{ lang('EXTENSION_UPDATING_EXPLAIN_STEP3') }}</li>
+						<li>{{ lang('EXTENSION_UPDATING_EXPLAIN_STEP4') }}</li>
+					</ol>
+				</td>
+			</tr>
+			<tr>
+				<th>{L_EXTENSION_REMOVING_HEADLINE}</th>
+			</tr>
+			<tr>
+				<td class="row3">
+					<ol>
+						<li>{{ lang('EXTENSION_REMOVING_EXPLAIN_STEP1') }}</li>
+						<li>{{ lang('EXTENSION_REMOVING_EXPLAIN_STEP2') }}</li>
+						<li>{{ lang('EXTENSION_REMOVING_EXPLAIN_STEP3') }}</li>
+					</ol>
+				</td>
+			</tr>
+		</tbody>
 	</table>
 
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 613a054b32a..6ab844a0ec2 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -181,7 +181,14 @@ <h3>{L_WARNING}</h3>
 	<!-- ENDIF -->
 	<dl>
 		<dt><label for="forum_style">{L_FORUM_STYLE}{L_COLON}</label></dt>
-		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
+		<dd>
+			<select id="forum_style" name="forum_style">
+				<option value="0">{{ lang('DEFAULT_STYLE') }}</option>
+			{% for style in S_STYLES_OPTIONS %}
+				<option value="{{ style.value }}"{% if style.selected %} selected="selected"{% endif %}>{{ style.label }}</option>
+			{% endfor %}
+			</select>
+		</dd>
 	</dl>
 	<!-- EVENT acp_forums_main_settings_append -->
 	</fieldset>
@@ -189,11 +196,13 @@ <h3>{L_WARNING}</h3>
 	<div id="forum_cat_options">
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
+		{% EVENT acp_forums_cat_options_prepend %}
 		<dl>
 			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}{L_COLON}</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
+		{% EVENT acp_forums_cat_options_append %}
 		</fieldset>
 	</div>
 
@@ -307,6 +316,7 @@ <h3>{L_WARNING}</h3>
 	<div id="forum_link_options">
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
+		{% EVENT acp_forums_link_options_prepend %}
 		<dl>
 			<dt><label for="link_display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
@@ -321,6 +331,7 @@ <h3>{L_WARNING}</h3>
 			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
+		{% EVENT acp_forums_link_options_append %}
 		</fieldset>
 	</div>
 
diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html
deleted file mode 100644
index 1fcf2f62a44..00000000000
--- a/phpBB/adm/style/acp_forums_copy_perm.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h1>{L_COPY_PERMISSIONS}</h1>
-
-<p>{L_COPY_PERMISSIONS_EXPLAIN}</p>
-<p>{L_ACL_LINK}</p>
-
-<form id="confirm" method="post" action="{S_COPY_ACTION}">
-
-<fieldset>
-	<dl>
-		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
-		<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
-	</dl>
-	<div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
-		<input type="submit" name="update" value="{L_CONTINUE}" class="button2" />&nbsp;
-	</div>
-</fieldset>
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index c526772ae23..99851a5b989 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -113,7 +113,7 @@ <h3>{L_WARNING}</h3>
 		<legend>{L_GROUP_AVATAR}</legend>
 	<dl>
 		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd class="c-avatar-box">{% if AVATAR_HTML %}{{ AVATAR_HTML }}{% else %}<img src="{{ ADMIN_ROOT_PATH ~ 'images/no_avatar.gif' }}" alt="">{% endif %}</dd>
+		<dd class="c-avatar-box">{% include 'avatar.html' with {avatar_data: AVATAR} only %}</dd>
 		<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
 	</dl>
 	<dl>
@@ -225,6 +225,7 @@ <h1>{L_ADD_USERS}</h1>
 
 	<fieldset>
 		<legend>{L_ADD_USERS}</legend>
+	{% EVENT acp_groups_add_user_options_before %}
 	<dl>
 		<dt><label for="leader">{L_USER_GROUP_LEADER}{L_COLON}</label></dt>
 		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
@@ -235,11 +236,13 @@ <h1>{L_ADD_USERS}</h1>
 		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
 			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
+	{% EVENT acp_groups_add_user_usernames_before %}
 	<dl>
 		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
 		<dd><!-- EVENT acp_groups_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_groups_find_username_append --></dd>
 	</dl>
+	{% EVENT acp_groups_add_user_options_after %}
 
 	<p class="quick">
 		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index 25d5cb52070..9a5179419e1 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -105,7 +105,7 @@ <h1>{L_TITLE}</h1>
 	<!-- BEGIN items -->
 		<tr>
 
-		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="{items.TEXT_ALT}" title="{items.TEXT_ALT}" style="max-width: 160px;"><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
+		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="{items.TEXT_ALT}" title="{items.TEXT_ALT}" style="max-width: 160px;"{% if items.WIDTH && items.HEIGHT %} width="{{ items.WIDTH }}" height="{{ items.HEIGHT }}"{% endif %}><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
 		<td style="vertical-align: top;">[{items.IMG}]</td>
 		<!-- IF S_SMILIES -->
 			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
deleted file mode 100644
index 5267062106a..00000000000
--- a/phpBB/adm/style/acp_jabber.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-
-<h1>{L_ACP_JABBER_SETTINGS}</h1>
-
-<p>{L_ACP_JABBER_SETTINGS_EXPLAIN}</p>
-
-<!-- IF S_WARNING -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{WARNING_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<form id="acp_jabber" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_ACP_JABBER_SETTINGS}</legend>
-<!-- IF S_GTALK_NOTE -->
-	<p>{L_JAB_GTALK_NOTE}</p>
-<!-- ENDIF -->
-<dl>
-	<dt><label for="jab_enable">{L_JAB_ENABLE}{L_COLON}</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_host">{L_JAB_SERVER}{L_COLON}</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>
-</dl>
-<dl>
-	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" min="0" max="99999" /></dd>
-</dl>
-<dl>
-	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>
-</dl>
-<dl>
-	<dt><label for="jab_password">{L_JAB_PASSWORD}{L_COLON}</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" autocomplete="off" /></dd>
-</dl>
-<!-- IF S_CAN_USE_SSL -->
-<dl>
-	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}{L_COLON}</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_verify_peer">{L_JAB_VERIFY_PEER}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_verify_peer" name="jab_verify_peer" value="1"<!-- IF JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_verify_peer" value="0"<!-- IF not JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_verify_peer_name">{L_JAB_VERIFY_PEER_NAME}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_NAME_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_verify_peer_name" name="jab_verify_peer_name" value="1"<!-- IF JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_verify_peer_name" value="0"<!-- IF not JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_allow_self_signed">{L_JAB_ALLOW_SELF_SIGNED}{L_COLON}</label><br /><span>{L_JAB_ALLOW_SELF_SIGNED_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_allow_self_signed" name="jab_allow_self_signed" value="1"<!-- IF JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_allow_self_signed" value="0"<!-- IF not JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<!-- ENDIF -->
-<dl>
-	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" min="0" max="99999" /></dd>
-</dl>
-
-</fieldset>
-
-<fieldset>
-	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 05ccd106054..d917380bdeb 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -14,27 +14,40 @@ <h1>{L_WELCOME_PHPBB}</h1>
 
 	<p>{L_ADMIN_INTRO}</p>
 
-	<!-- IF S_UPDATE_INCOMPLETE -->
+	{% if S_UPDATE_INCOMPLETE %}
 		<div class="errorbox">
-			<p>{L_UPDATE_INCOMPLETE} <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
+			<p>{{ lang('UPDATE_INCOMPLETE') }} <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
 		</div>
-	<!-- ELSEIF S_VERSIONCHECK_FAIL -->
+	{% elseif S_VERSIONCHECK_FAIL %}
 		<div class="errorbox notice">
-			<p>{L_VERSIONCHECK_FAIL}</p>
-			<p>{VERSIONCHECK_FAIL_REASON}</p>
-			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
+			<p>{{ lang('VERSIONCHECK_FAIL') }}</p>
+			<p>{{ VERSIONCHECK_FAIL_REASON }}</p>
+			<p><a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a> &middot; <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
 		</div>
-	<!-- ELSEIF not S_VERSION_UP_TO_DATE -->
+	{% elseif not S_VERSION_UP_TO_DATE %}
 		<div class="errorbox">
-			<p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
-			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
+			<p>{{ lang('VERSION_NOT_UP_TO_DATE_TITLE') }}</p>
+			<p><a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a> &middot; <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
 		</div>
-	<!-- ENDIF -->
-	<!-- IF S_VERSION_UPGRADEABLE -->
+	{% elseif S_VERSION_UP_TO_DATE && S_VERSIONCHECK_FORCE %}
+		<div class="successbox">
+			<p>{{ lang('VERSION_UP_TO_DATE_ACP') }}</p>
+		</div>
+	{% endif %}
+	{% if S_VERSION_UPGRADEABLE %}
 		<div class="errorbox notice">
-			<p>{UPGRADE_INSTRUCTIONS}</p>
+			<p>{{ UPGRADE_INSTRUCTIONS }}</p>
 		</div>
-	<!-- ENDIF -->
+	{% endif %}
+	{% if S_CAPTCHA_UNSAFE %}
+		<div class="errorbox">
+			<p>{{ lang('CAPTCHA_UNSAFE_WARNING') }}</p>
+		</div>
+	{% elseif S_CAPTCHA_INCOMPLETE %}
+		<div class="errorbox">
+			<p>{{ lang('CAPTCHA_INCOMPLETE_WARNING') }}</p>
+		</div>
+	{% endif %}
 
 	<!-- IF S_SEARCH_INDEX_MISSING -->
 		<div class="errorbox">
diff --git a/phpBB/adm/style/acp_posting_buttons.html b/phpBB/adm/style/acp_posting_buttons.html
index e5f96b0c223..c0c5aacd747 100644
--- a/phpBB/adm/style/acp_posting_buttons.html
+++ b/phpBB/adm/style/acp_posting_buttons.html
@@ -28,7 +28,7 @@
 	<!-- IF S_LINKS_ALLOWED -->
 		<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
 	<!-- ENDIF -->
-	<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
+	<select name="addbbcode18" onchange="bbfontstyle('[size=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/size]');this.form.addbbcode18.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
 		<option value="50">{L_FONT_TINY}</option>
 		<option value="85">{L_FONT_SMALL}</option>
 		<option value="100" selected="selected">{L_FONT_NORMAL}</option>
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index aac5de6fe7c..aa31db497aa 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -44,7 +44,7 @@ <h1>{L_ACP_MANAGE_RANKS}</h1>
 	<div id="posts"<!-- IF S_SPECIAL_RANK --> style="display: none;"<!-- ENDIF -->>
 	<dl>
 		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt>
-		<dd><input name="min_posts" type="number" id="min_posts" min="0" max="9999999999" value="{MIN_POSTS}" /></dd>
+		<dd><input name="min_posts" type="number" id="min_posts" min="0" max="16777215" value="{MIN_POSTS}" /></dd>
 	</dl>
 	</div>
 
diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html
index 3886f006d12..f3b93020f8b 100644
--- a/phpBB/adm/style/acp_storage.html
+++ b/phpBB/adm/style/acp_storage.html
@@ -16,37 +16,38 @@ <h1>{{ lang('STORAGE_TITLE') }}</h1>
 		</tr>
 	</thead>
 	<tbody>
-	{% for storage in STORAGE_STATS %}
-		<tr>
-			<td>{{ storage.name }}</td>
-			<td>{{ storage.files }}</td>
-			<td>{{ storage.size }}</td>
-			<td>{{ storage.free_space }}</td>
-		</tr>
-	{% endfor %}
+		{% for storage in STORAGE_STATS %}
+			<tr>
+				<td>{{ storage.name }}</td>
+				<td>{{ storage.files }}</td>
+				<td>{{ storage.size }}</td>
+				<td>{{ storage.free_space }}</td>
+			</tr>
+		{% endfor %}
 	</tbody>
 </table>
 
-{% if S_ERROR %}
+{% if ERROR_MESSAGES is not empty %}
 	<div class="errorbox">
 		<h3>{{ lang('WARNING') }}</h3>
-		<p>{{ ERROR_MSG }}</p>
+		{% for ERROR_MESSAGE in ERROR_MESSAGES %}
+			<p>{{ ERROR_MESSAGE }}</p>
+		{% endfor %}
 	</div>
 {% endif %}
 
 <form id="acp_storage" method="post" action="{{ U_ACTION }}">
-
 	{% for storage in STORAGES %}
 		<fieldset>
 			<legend>{{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }}</legend>
 			<dl>
-				<dt><label for="{{ storage.get_name }}">{{ lang('STORAGE_SELECT') }}{{ lang('COLON') }}</label><br /><span>{{ lang('STORAGE_SELECT_DESC') }}</span></dt>
+				<dt><label for="{{ storage.get_name }}">{{ lang('STORAGE_SELECT') ~ lang('COLON') }}</label><br /><span>{{ lang('STORAGE_SELECT_DESC') }}</span></dt>
 				<dd>
 					<select id="{{ storage.get_name }}" name="{{ storage.get_name }}[provider]" data-togglable-settings="true">
 						{% for provider in PROVIDERS %}
 							{% if provider.is_available %}
 								<option value="{{ get_class(provider) }}"{{ attribute(config, 'storage\\' ~ storage.get_name ~ '\\provider') ==  get_class(provider) ? ' selected' : '' }} data-toggle-setting="#{{ storage.get_name }}_{{ provider.get_name }}_settings">
-									{{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }}
+									{{ provider.get_title }}
 								</option>
 							{% endif %}
 						{% endfor %}
@@ -58,36 +59,42 @@ <h3>{{ lang('WARNING') }}</h3>
 		{% for provider in PROVIDERS %}
 			{% if provider.is_available %}
 				<fieldset id="{{ storage.get_name }}_{{ provider.get_name }}_settings">
-					<legend>{{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }}</legend>
+					<legend>{{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ provider.get_title }}</legend>
 					{% for name, options in provider.get_options %}
-						{% set title = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper %}
-						{% set description = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper ~ '_EXPLAIN' %}
-						{% set input_id = storage.get_name ~ '_' ~ provider.get_name ~ '_' ~ name %}
-						{% set input_type = options['type'] %}
-						{% set input_name = storage.get_name ~ '[' ~ name ~ ']' %}
-						{% set input_value = attribute(config, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %}
 						<dl>
 							<dt>
-								<label for="{{ input_id }}}">{{ lang(title) }}{{ lang('COLON') }}</label>
-								{% if lang_defined(description) %}
-									<br /><span>{{ lang(description) }}</span>
+								<label>{{ options.title ~ lang('COLON') }}</label>
+								{% if options.description %}
+									<br /><span>{{ options.description }}</span>
 								{% endif %}
 							</dt>
 							<dd>
-								{% if input_type in ['text', 'password', 'email'] %}
-									<input id="{{ input_id }}" type="{{ input_type }}" name="{{ input_name }}" value="{{ input_value }}" maxlength="{{ options['maxlength'] ?: 255 }}" />
-								{% elseif input_type == 'textarea' %}
-									<textarea id="{{ input_id }}" name="{{ input_name }}">{{ input_value }}</textarea>
-								{% elseif input_type == 'radio' %}
-									{% for option_name, option_value in options['options'] %}
-										<input type="radio" name="{{ input_name }}" value="{{ option_value }}" class="radio"{% if loop.first %} id="{{ input_id }}"{% endif %}{{ (option_value == input_value) ? ' checked="checked"' }}> {{ lang(option_name) }}
+								{% set input_name = storage.get_name ~ '[' ~ name ~ ']' %}
+								{% set input_value = attribute(config, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %}
+								{% set form_macro = options.form_macro %}
+
+								{% if form_macro.tag == 'input' %}
+									{{ FormsInput(form_macro | merge({"name": input_name, "value": input_value})) }}
+								{% elseif form_macro.tag == 'textarea' %}
+									{{ FormsTextarea(form_macro | merge({"name": input_name, "content": input_value})) }}
+								{% elseif form_macro.tag == 'radio' %}
+									{% set buttons = [] %}
+
+									{% for button in form_macro.buttons %}
+										{% set new_button = button | merge({"name": input_name, "checked": button.value == input_value}) %}
+										{% set buttons = buttons | merge([new_button]) %}
+									{% endfor %}
+
+									{{ FormsRadioButtons(form_macro | merge({"buttons": buttons})) }}
+								{% elseif form_macro.tag == 'select' %}
+									{% set select_options = [] %}
+
+									{% for option in form_macro.options %}
+										{% set new_option = option | merge({"selected": option.value == input_value}) %}
+										{% set select_options = select_options | merge([new_option]) %}
 									{% endfor %}
-								{% elseif input_type == 'select' %}
-									<select name="{{ input_name }}" id="{{ input_id }}">
-										{% for option_name, option_value in options['options'] %}
-											<option value="{{ option_value }}"{{ (option_value == input_value) ? ' selected' }}>{{ lang(option_name) }}</option>
-										{% endfor %}
-									</select>
+
+									{{ FormsSelect(form_macro | merge({"name": input_name, "options": select_options})) }}
 								{% endif %}
 							</dd>
 						</dl>
@@ -97,6 +104,17 @@ <h3>{{ lang('WARNING') }}</h3>
 		{% endfor %}
 	{% endfor %}
 
+	<fieldset>
+		<dl>
+			<dt><label for="update_type">{{ lang('STORAGE_UPDATE_TYPE') ~ lang('COLON') }}</label></dt>
+			<dd>
+				<label><input class="radio" name="update_type" value="{{ STORAGE_UPDATE_TYPE_CONFIG }}" type="radio"> {{ lang('STORAGE_UPDATE_TYPE_CONFIG') }}</label>
+				<label><input class="radio" name="update_type" value="{{ STORAGE_UPDATE_TYPE_COPY }}" type="radio"> {{ lang('STORAGE_UPDATE_TYPE_COPY') }}</label>
+				<label><input class="radio" name="update_type" value="{{ STORAGE_UPDATE_TYPE_MOVE }}" type="radio" checked="checked" id="update_type"> {{ lang('STORAGE_UPDATE_TYPE_MOVE') }}</label>
+			</dd>
+		</dl>
+	</fieldset>
+
 	<fieldset class="submit-buttons">
 		<legend>{{ lang('SUBMIT') }}</legend>
 		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
diff --git a/phpBB/adm/style/acp_storage_update_inprogress.html b/phpBB/adm/style/acp_storage_update_inprogress.html
new file mode 100644
index 00000000000..5f7614cb2c7
--- /dev/null
+++ b/phpBB/adm/style/acp_storage_update_inprogress.html
@@ -0,0 +1,32 @@
+{% include 'overall_header.html' %}
+
+<a id="maincontent"></a>
+
+<h1>{{ lang('STORAGE_TITLE') }}</h1>
+
+<p>{{ lang('STORAGE_TITLE_EXPLAIN') }}</p>
+
+<form id="acp_storage_continue" method="post" action="{{ U_ACTION }}">
+	<fieldset>
+		<legend>{{ lang('SUBMIT') }}</legend>
+
+		{% if CONTINUE_PROGRESS %}
+		<div class="centered-text">
+			<br>
+			<progress
+				value="{{ CONTINUE_PROGRESS.VALUE }}"
+				max="{{ CONTINUE_PROGRESS.TOTAL }}"
+				style="height: 2em; width: 20em;"></progress><br>
+			{{ CONTINUE_PROGRESS.PERCENTAGE|number_format(2) ~ ' %' }}
+		</div>
+		{% endif %}
+
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="continue" name="continue" value="{{ lang('SUBMIT') }}" />&nbsp;
+			<input class="button2" type="submit" id="cancel" name="cancel" value="{{ lang('CANCEL') }}" />
+		</p>
+		{{ S_FORM_TOKEN }}
+	</fieldset>
+</form>
+
+{% include 'overall_footer.html' %}
diff --git a/phpBB/adm/style/acp_storage_update_progress.html b/phpBB/adm/style/acp_storage_update_progress.html
new file mode 100644
index 00000000000..17ba67a037f
--- /dev/null
+++ b/phpBB/adm/style/acp_storage_update_progress.html
@@ -0,0 +1,20 @@
+{% include 'overall_header.html' %}
+
+<a id="maincontent"></a>
+
+<div class="successbox">
+	<h3>{{ INDEXING_TITLE }}</h3>
+	<p>
+		{{ INDEXING_EXPLAIN }}
+		{% if INDEXING_PROGRESS_BAR %}
+		<br>
+		<progress
+			value="{{ INDEXING_PROGRESS_BAR.VALUE }}"
+			max="{{ INDEXING_PROGRESS_BAR.TOTAL }}"
+			style="height: 2em; width: 20em;"></progress><br>
+		{{ INDEXING_PROGRESS_BAR.PERCENTAGE|number_format(2) ~ ' %' }}
+		{% endif %}
+	</p>
+</div>
+
+{% include 'overall_footer.html' %}
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 17aef46bd39..3c2556905db 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -5,7 +5,7 @@
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-			<dd class="c-avatar-box">{% if AVATAR_HTML %}{{ AVATAR_HTML }}{% else %}<img src="{{ ADMIN_ROOT_PATH ~ 'images/no_avatar.gif' }}" alt="">{% endif %}</dd>
+			<dd class="c-avatar-box">{% include 'avatar.html' with {avatar_data: AVATAR} only %}</dd>
 			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
 		</dl>
 	</fieldset>
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
index 68420389b42..7dbef95974c 100644
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -29,12 +29,6 @@
 		<dd><label><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
-	<dl>
-		<dt><label for="notifymethod">{L_NOTIFY_METHOD}{L_COLON}</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
-			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
-			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>
-	</dl>
 	<dl>
 		<dt><label for="notifypm">{L_NOTIFY_ON_PM}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
@@ -48,7 +42,9 @@
 	</dl>
 	<dl>
 		<dt><label for="style">{L_BOARD_STYLE}{L_COLON}</label></dt>
-		<dd><select id="style" name="style">{S_STYLE_OPTIONS}</select></dd>
+		<dd>
+			{{ FormsSelect(S_STYLE_OPTIONS) }}
+		</dd>
 	</dl>
 	<!-- INCLUDE timezone_option.html -->
 	<dl>
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 9296638ff6e..54f7245f813 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -3,10 +3,6 @@
 	<fieldset>
 		<legend>{L_USER_PROFILE}</legend>
 	<!-- EVENT acp_users_profile_before -->
-	<dl>
-		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
-		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>
-	</dl>
 	<dl>
 		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
 		<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 290eaffcf8d..c01b0cd3359 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -663,6 +663,7 @@ li {
 
 #menu li span.completed:before {
 	font-family: "Font Awesome 6 Free";
+	font-weight: 900;
 	color: #515f77;
 	margin-right: 1px;
 	margin-left: -8px;
@@ -676,6 +677,7 @@ li {
 
 .rtl #menu li span.completed:before {
 	font-family: "Font Awesome 6 Free";
+	font-weight: 900;
 	color: #515f77;
 	margin-right: -8px;
 	margin-left: 1px;
@@ -2706,6 +2708,38 @@ fieldset.permissions .permissions-switch {
 	padding: 0;
 }
 
+/* Placeholder avatars
+---------------------------------------- */
+.avatar-color-default { background-color: hsl(207, 15%, 80%); }
+.avatar-color-0 { background-color: #d32f2f; }
+.avatar-color-1 { background-color: #c2185b; }
+.avatar-color-2 { background-color: #7b1fa2; }
+.avatar-color-3 { background-color: #512da8; }
+.avatar-color-4 { background-color: #303f9f; }
+
+.avatar-initials {
+	font-size: 36px;
+	font-weight: bold;
+	line-height: 1;
+	color: #ffffff;
+}
+
+.avatar-placeholder {
+	border-radius: 50%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 80px;
+	height: 80px;
+}
+
+.avatar-initials .o-icon {
+	font-size: 36px;
+	vertical-align: baseline !important;
+	width: auto;
+	height: auto;
+}
+
 /* Dropdown menu
 ---------------------------------------- */
 .dropdown {
@@ -2858,12 +2892,14 @@ fieldset.permissions .permissions-switch {
 
 .roles-options > span:after {
 	font-family: "Font Awesome 6 Free";
+	font-weight: 900;
 	float: right;
 	content: "\f107";
 }
 
 .rtl .roles-options > span:after {
 	font-family: "Font Awesome 6 Free";
+	font-weight: 900;
 	float: left;
 	content: "\f107";
 }
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 4f7f5a990b3..85e3fa07165 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -1,7 +1,9 @@
 /* global phpbb */
+/* eslint no-var: 0 */
+/* eslint no-unused-vars: 0 */
 
 /**
-* phpBB3 ACP functions
+* phpBB ACP functions
 */
 
 /**
@@ -10,7 +12,7 @@
 function parse_document(container)
 {
 	var test = document.createElement('div'),
-		oldBrowser = (typeof test.style.borderRadius == 'undefined');
+		oldBrowser = (typeof test.style.borderRadius === 'undefined');
 
 	test.remove();
 
@@ -79,7 +81,7 @@ function parse_document(container)
 					dfn = cell.attr('data-dfn'),
 					text = dfn ? dfn : $.trim(cell.text());
 
-				if (text == '&nbsp;') text = '';
+				if (text === '&nbsp;') text = '';
 				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
 
 				for (i=0; i<colspan; i++) {
@@ -108,7 +110,7 @@ function parse_document(container)
 				cells = row.children('td'),
 				column = 0;
 
-			if (cells.length == 1) {
+			if (cells.length === 1) {
 				row.addClass('big-column');
 				return;
 			}
@@ -123,8 +125,8 @@ function parse_document(container)
 				}
 
 				if ((text.length && text !== '-') || cell.children().length) {
-					if (headers[column] != '') {
-						cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
+					if (headers[column].length) {
+						cell.prepend($('<dfn>').css('display', 'none').text(headers[column]));
 					}
 				}
 				else {
@@ -145,7 +147,7 @@ function parse_document(container)
 	*/
 	container.find('table.responsive > tbody').each(function() {
 		var items = $(this).children('tr');
-		if (items.length == 0)
+		if (!items.length)
 		{
 			$(this).parent('table:first').addClass('responsive-hide');
 		}
@@ -156,10 +158,24 @@ function parse_document(container)
 	*/
 	container.find('fieldset dt > span:last-child').each(function() {
 		var $this = $(this);
-		if ($this.html() == '&nbsp;') {
+		if ($this.html() === '&nbsp;') {
 			$this.addClass('responsive-hide');
 		}
+	});
 
+	/**
+	 * Dynamically control a text field's maxlength (allows emoji to be counted as 1 character)
+	 */
+	container.find('#sitename_short').each(function() {
+		const $this = this;
+		const maxLength = $this.maxLength;
+		$this.maxLength = maxLength * 2;
+		$this.addEventListener('input', () => {
+			const inputChars = Array.from($this.value);
+			if (inputChars.length > maxLength) {
+				$this.value = inputChars.slice(0, maxLength).join('');
+			}
+		});
 	});
 
 	/**
@@ -180,13 +196,13 @@ function parse_document(container)
 		links.each(function() {
 			var link = $(this);
 			maxHeight = Math.max(maxHeight, Math.max(link.outerHeight(true), link.parent().outerHeight(true)));
-		})
+		});
 
 		function check() {
 			var width = $body.width(),
 				height = $this.height();
 
-			if (arguments.length == 0 && (!responsive || width <= lastWidth) && height <= maxHeight) {
+			if (!arguments.length && (!responsive || width <= lastWidth) && height <= maxHeight) {
 				return;
 			}
 
@@ -223,7 +239,7 @@ function parse_document(container)
 			menu.find('a').click(function() { check(true); });
 		}
 
-		phpbb.registerDropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), {visibleClass: 'activetab', verticalDirection: 'down'});
+		phpbb.registerDropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), { visibleClass: 'activetab', verticalDirection: 'down' });
 
 		check(true);
 		$(window).resize(check);
@@ -248,7 +264,7 @@ function parse_document(container)
 		$('#questionnaire-form').css('display', 'none');
 		var $triggerConfiglist = $('#trigger-configlist');
 
-		$triggerConfiglist.on('click', function () {
+		$triggerConfiglist.on('click', function() {
 			var $configlist = $('#configlist');
 			$configlist.closest('.send-stats-data-row').toggleClass('send-stats-data-hidden');
 			$configlist.closest('.send-stats-row').find('.send-stats-data-row:first-child').toggleClass('send-stats-data-only-row');
@@ -258,8 +274,37 @@ function parse_document(container)
 		$('#configlist').closest('.send-stats-data-row').addClass('send-stats-data-hidden');
 
 		// Do not underline actions icons on hover (could not be done via CSS)
-		$('.actions a:has(i.acp-icon)').mouseover(function () {
-			$(this).css("text-decoration", "none");
+		$('.actions a:has(i.acp-icon)').mouseover(function() {
+			$(this).css('text-decoration', 'none');
 		});
+
+		// Live update BBCode font icon preview
+		const updateIconClass = (element, newClass) => {
+			// Ignore invalid class names
+			const faIconRegex = /^(?!-)(?!.*--)[a-z0-9-]+(?<!-)$/;
+			if (!faIconRegex.test(newClass)) {
+				return;
+			}
+
+			element.classList.forEach(className => {
+				if (className.startsWith('fa-') && className !== 'fa-fw') {
+					element.classList.remove(className);
+				}
+			});
+
+			element.classList.add(`fa-${newClass}`);
+		};
+
+		const pageIconFont = document.getElementById('bbcode_font_icon');
+
+		if (pageIconFont) {
+			pageIconFont.addEventListener('keyup', function() {
+				updateIconClass(this.nextElementSibling, this.value);
+			});
+
+			pageIconFont.addEventListener('blur', function() {
+				updateIconClass(this.nextElementSibling, this.value);
+			});
+		}
 	});
 })(jQuery);
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 5949c73920d..ee4f600c646 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -1,16 +1,17 @@
 /* global phpbb, statsData */
+/* eslint no-var: 0 */
 
 (function($) {  // Avoid conflicts with other libraries
 
 'use strict';
 
 
-phpbb.prepareSendStats = function () {
+phpbb.prepareSendStats = function() {
 	var $form = $('#acp_help_phpbb');
 	var $dark = $('#darkenwrapper');
 	var $loadingIndicator;
 
-	$form.on('submit', function (event) {
+	$form.on('submit', function(event) {
 		var $this = $(this),
 			currentTime = Math.floor(new Date().getTime() / 1000),
 			statsTime = parseInt($this.find('input[name=help_send_statistics_time]').val(), 10);
@@ -23,7 +24,7 @@ phpbb.prepareSendStats = function () {
 		if (!$this.find('input[name=help_send_statistics]').is(':checked') ||
 			statsTime > currentTime) {
 			$form.find('input[type=submit]').click();
-			setTimeout(function () {
+			setTimeout(function() {
 				$form.find('input[type=submit]').click();
 			}, 300);
 			return;
@@ -74,7 +75,7 @@ phpbb.prepareSendStats = function () {
 			var $sendStatisticsSuccess = $('<input />', {
 				type: 'hidden',
 				name: 'send_statistics_response',
-				value: JSON.stringify(res)
+				value: JSON.stringify(res),
 			});
 			$sendStatisticsSuccess.appendTo('p.submit-buttons');
 
@@ -90,7 +91,7 @@ phpbb.prepareSendStats = function () {
 			data: statsData,
 			success: returnHandler,
 			error: errorHandler,
-			cache: false
+			cache: false,
 		}).always(function() {
 			if ($loadingIndicator && $loadingIndicator.is(':visible')) {
 				$loadingIndicator.fadeOut(phpbb.alertTime);
@@ -157,6 +158,55 @@ phpbb.addAjaxCallback('row_delete', function(res) {
 	}
 });
 
+/**
+ * This callback generates the VAPID keys for the web push notification service.
+ */
+phpbb.addAjaxCallback('generate_vapid_keys', () => {
+
+	/**
+	 * Generate VAPID keypair with public and private key string
+	 *
+	 * @returns {Promise<{privateKey: string, publicKey: string}|null>}
+	 */
+	async function generateVAPIDKeys() {
+		try {
+			// Generate a new key pair using the Subtle Crypto API
+			const keyPair = await crypto.subtle.generateKey(
+				{
+					name: 'ECDH',
+					namedCurve: 'P-256',
+				},
+				true,
+				[ 'deriveKey', 'deriveBits' ],
+			);
+
+			const privateKeyJwk = await crypto.subtle.exportKey('jwk', keyPair.privateKey);
+			const privateKeyString = privateKeyJwk.d;
+
+			const publicKeyBuffer = await crypto.subtle.exportKey('raw', keyPair.publicKey);
+			const publicKeyString = phpbb.base64UrlEncode(phpbb.rawKeyToBase64(publicKeyBuffer));
+
+			return {
+				privateKey: privateKeyString,
+				publicKey: publicKeyString,
+			};
+		} catch (error) {
+			console.error('Error generating keys with SubtleCrypto:', error);
+			return null;
+		}
+	}
+
+	generateVAPIDKeys().then(keyPair => {
+		if (!keyPair) {
+			return;
+		}
+		const publicKeyInput = document.querySelector('#webpush_vapid_public');
+		const privateKeyInput = document.querySelector('#webpush_vapid_private');
+		publicKeyInput.value = keyPair.publicKey;
+		privateKeyInput.value = keyPair.privateKey;
+	});
+});
+
 /**
  * Handler for submitting permissions form in chunks
  * This call will submit permissions forms in chunks of 5 fieldsets.
@@ -181,7 +231,7 @@ function submitPermissions() {
 		fieldsetList = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id);
 	}
 
-	$.each(fieldsetList, function (key, value) {
+	$.each(fieldsetList, function(key, value) {
 		dataSetIndex = Math.floor(key / 5);
 		var $fieldset = $('fieldset#' + value.id);
 		if (key % 5 === 0) {
@@ -203,7 +253,7 @@ function submitPermissions() {
 	permissionSubmitSize = formDataSets.length;
 
 	// Add each forum ID to forum ID list to preserve selected forums
-	$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
+	$.each($form.find('input[type=hidden][name^=forum_id]'), function(key, value) {
 		if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
 			forumIds.push(value.value);
 		}
@@ -235,14 +285,20 @@ function submitPermissions() {
 				if ($alertBoxLink) {
 					// Remove forum_id[] from URL
 					$alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/g, ''));
-					var previousPageForm = '<form action="' + $alertBoxLink.attr('href') + '" method="post">';
-					$.each(forumIds, function (key, value) {
-						previousPageForm += '<input type="text" name="forum_id[]" value="' + value + '" />';
+					const $previousPageForm = $('<form>').attr({
+						action: $alertBoxLink.attr('href'),
+						method: 'post',
+					});
+
+					$.each(forumIds, function(key, value) {
+						$previousPageForm.append($('<input>').attr({
+							type: 'text',
+							name: 'forum_id[]',
+							value: value,
+						}));
 					});
-					previousPageForm += '</form>';
 
-					$alertBoxLink.on('click', function (e) {
-						var $previousPageForm = $(previousPageForm);
+					$alertBoxLink.on('click', function(e) {
 						$('body').append($previousPageForm);
 						e.preventDefault();
 						$previousPageForm.submit();
@@ -254,20 +310,27 @@ function submitPermissions() {
 				$alert.find('.alert_close').hide();
 
 				if (typeof res.REFRESH_DATA !== 'undefined') {
-					setTimeout(function () {
+					setTimeout(function() {
 						// Create forum to submit using POST. This will prevent
 						// exceeding the maximum length of URLs
-						var form = '<form action="' + res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/g, '') + '" method="post">';
-						$.each(forumIds, function (key, value) {
-							form += '<input type="text" name="forum_id[]" value="' + value + '" />';
+						const $form = $('<form>').attr({
+							action: res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/g, ''),
+							method: 'post',
+						});
+
+						$.each(forumIds, function(key, value) {
+							$form.append($('<input>').attr({
+								type: 'text',
+								name: 'forum_id[]',
+								value: value,
+							}));
 						});
-						form += '</form>';
-						$form = $(form);
+
 						$('body').append($form);
 
 						// Hide the alert even if we refresh the page, in case the user
 						// presses the back button.
-						$dark.fadeOut(phpbb.alertTime, function () {
+						$dark.fadeOut(phpbb.alertTime, function() {
 							if (typeof $alert !== 'undefined') {
 								$alert.hide();
 							}
@@ -293,7 +356,7 @@ function submitPermissions() {
 	}
 
 	// Create AJAX request for each form data set
-	$.each(formDataSets, function (key, formData) {
+	$.each(formDataSets, function(key, formData) {
 		$.ajax({
 			url: $form.action,
 			type: 'POST',
@@ -303,7 +366,7 @@ function submitPermissions() {
 				'&' + $form.children('input[type=hidden]').serialize() +
 				'&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
 			success: handlePermissionReturn,
-			error: handlePermissionReturn
+			error: handlePermissionReturn,
 		});
 	});
 }
@@ -317,7 +380,7 @@ $('[data-ajax]').each(function() {
 		phpbb.ajaxify({
 			selector: this,
 			refresh: $this.attr('data-refresh') !== undefined,
-			callback: fn
+			callback: fn,
 		});
 	}
 });
@@ -326,11 +389,11 @@ $('[data-ajax]').each(function() {
 * Automatically resize textarea
 */
 $(function() {
-	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
+	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), { minHeight: 75 });
 
 	var $setPermissionsForm = $('form#set-permissions');
 	if ($setPermissionsForm.length) {
-		$setPermissionsForm.on('submit', function (e) {
+		$setPermissionsForm.on('submit', function(e) {
 			submitPermissions();
 			e.preventDefault();
 		});
@@ -350,7 +413,7 @@ $(function() {
 			} else {
 				dateoptionInput.value = this.value;
 			}
-		})
+		});
 	}
 
 	if ($('#acp_help_phpbb')) {
diff --git a/phpBB/adm/style/avatar.html b/phpBB/adm/style/avatar.html
new file mode 100644
index 00000000000..902799b0625
--- /dev/null
+++ b/phpBB/adm/style/avatar.html
@@ -0,0 +1,17 @@
+{% if avatar_data.src %}
+	{% if avatar_link %}
+		<a href="{{ avatar_link }}" class="avatar">{{ avatar(avatar_data, lang('USER_AVATAR')) }}</a>
+	{% else %}
+		<span class="avatar">{{ avatar(avatar_data, lang('USER_AVATAR')) }}</span>
+	{% endif %}
+{% elseif avatar_data.id %}
+	{% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %}
+	{% set color_class = not(avatar_data.id starts with 'g') ? color_classes[avatar_data.id % 5] : 'avatar-color-default' %}
+	{% if avatar_link %}<a href="{{ avatar_link }}" class="avatar">{% endif %}
+	<div class="avatar-placeholder {{ color_class }}">
+		{% set username = username ?: avatar_data.username %}
+		{% set initials = username|striptags|trim(' -+_[]', 'left')|slice(0, 1)|upper %}
+		<div class="avatar-initials">{% if initials %}{{ initials }}{% else %}{{ Icon('font', 'user', '', true) }}{% endif %}</div>
+	</div>
+	{% if avatar_link %}</a>{% endif %}
+{% endif %}
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
deleted file mode 100644
index 43d54adc0be..00000000000
--- a/phpBB/adm/style/captcha_gd_acp.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-	<a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-<h1>{L_ACP_VC_SETTINGS}</h1>
-
-<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
-
-
-<form id="acp_captcha" method="post" action="{U_ACTION}">
-
-<fieldset>
-<legend>{L_GENERAL_OPTIONS}</legend>
-
-<dl>
-	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="number" /></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="number" /></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-</dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-</dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label>
-		<label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label>
-		<label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label>
-
-</dd>
-</dl>
-
-</fieldset>
-<fieldset>
-	<legend>{L_PREVIEW}</legend>
-	<!-- IF CAPTCHA_PREVIEW -->
-	<!-- INCLUDE {CAPTCHA_PREVIEW} -->
-	<!-- ENDIF -->
-
-</fieldset>
-
-<fieldset>
-	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
-		<input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />&nbsp;
-	</p>
-
-	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
-	<input type="hidden" name="configure" value="1" />
-
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html
index 26598c7c2bd..1118a1f32e3 100644
--- a/phpBB/adm/style/captcha_qa_acp.html
+++ b/phpBB/adm/style/captcha_qa_acp.html
@@ -18,11 +18,13 @@ <h1>{L_QUESTIONS}</h1>
 	<tr>
 		<th colspan="3">{L_QUESTIONS}</th>
 	</tr>
+	{% if questions %}
 	<tr class="row3">
 		<td style="text-align: center;">{L_QUESTION_TEXT}</td>
 		<td style="width: 5%; text-align: center;">{L_QUESTION_LANG}</td>
 		<td style="vertical-align: top; width: 50px; text-align: center; white-space: nowrap;">{L_ACTION}</td>
 	</tr>
+	{% endif %}
 	</thead>
 
 	<tbody>
@@ -33,6 +35,10 @@ <h1>{L_QUESTIONS}</h1>
 			<td style="text-align: center;">{{ question.QUESTION_LANG }}</td>
 			<td style="text-align: center;"><a href="{{ question.U_EDIT }}">{{ ICON_EDIT }}</a> <a href="{{ question.U_DELETE }}">{{ ICON_DELETE }}</a></td>
 		</tr>
+	{% else %}
+		<tr>
+			<td class="row3 centered-text" colspan="3">{{ lang('QA_NO_QUESTIONS') }}</td>
+		</tr>
 	{% endfor %}
 	</tbody>
 
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
index 563bd988354..fe274d5ca13 100644
--- a/phpBB/adm/style/captcha_recaptcha.html
+++ b/phpBB/adm/style/captcha_recaptcha.html
@@ -1,4 +1,3 @@
-<!-- IF S_RECAPTCHA_AVAILABLE -->
 	<dl>
 	<dd>
 	<noscript>
@@ -7,9 +6,6 @@
 
 		{L_RECAPTCHA_INVISIBLE}
 		<script src="{RECAPTCHA_SERVER}.js?hl={LA_RECAPTCHA_LANG}" async defer></script>
-		<div class="g-recaptcha" data-sitekey="{RECAPTCHA_PUBKEY}" data-size="invisible"></div>
+		<div class="g-recaptcha" data-sitekey="{% if RECAPTCHA_PUBKEY %}{{ RECAPTCHA_PUBKEY }}{% else %}6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI{% endif %}" data-size="invisible"></div>
 	</dd>
 	</dl>
-<!-- ELSE -->
-{L_RECAPTCHA_NOT_AVAILABLE}
-<!-- ENDIF -->
diff --git a/phpBB/adm/style/captcha_turnstile_acp.html b/phpBB/adm/style/captcha_turnstile_acp.html
new file mode 100644
index 00000000000..a187e1e41b1
--- /dev/null
+++ b/phpBB/adm/style/captcha_turnstile_acp.html
@@ -0,0 +1,64 @@
+{% include('overall_header.html') %}
+
+<a id="maincontent"></a>
+
+<h1>{{ lang('ACP_VC_SETTINGS') }}</h1>
+
+<p>{{ lang('ACP_VC_SETTINGS_EXPLAIN') }}</p>
+
+<form id="acp_captcha" method="post" action="{{ U_ACTION }}">
+	<fieldset>
+		<legend>{{ lang('GENERAL_OPTIONS') }}</legend>
+		<dl>
+			<dt>
+				<label for="captcha_turnstile_sitekey">{{ lang('CAPTCHA_TURNSTILE_SITEKEY') ~ lang('COLON') }}</label><br>
+				<span>{{ lang('CAPTCHA_TURNSTILE_SITEKEY_EXPLAIN') }}</span>
+			</dt>
+			<dd><input id="captcha_turnstile_sitekey" name="captcha_turnstile_sitekey" value="{{ CAPTCHA_TURNSTILE_SITEKEY }}" size="50" type="text" /></dd>
+		</dl>
+		<dl>
+			<dt>
+				<label for="captcha_turnstile_secret">{{ lang('CAPTCHA_TURNSTILE_SECRET') ~ lang('COLON') }}</label><br>
+				<span>{{ lang('CAPTCHA_TURNSTILE_SECRET_EXPLAIN') }}</span>
+			</dt>
+			<dd><input id="captcha_turnstile_secret" name="captcha_turnstile_secret" value="{{ CAPTCHA_TURNSTILE_SECRET }}" size="50" type="text" /></dd>
+		</dl>
+		<dl>
+			<dt>
+				<label>{{ lang('CAPTCHA_TURNSTILE_THEME') ~ lang('COLON') }}</label>
+				<br><span>{{ lang('CAPTCHA_TURNSTILE_THEME_EXPLAIN') }}</span>
+			</dt>
+			<dd>
+				{% for theme in CAPTCHA_TURNSTILE_THEMES %}
+				<label>
+					<input class="radio" name="captcha_turnstile_theme" type="radio" value="{{ theme }}"{{ theme == CAPTCHA_TURNSTILE_THEME ? ' checked' }}>
+					<span>{{ lang('CAPTCHA_TURNSTILE_THEME_' ~ theme|upper) }}</span>
+				</label>
+				{% endfor %}
+			</dd>
+		</dl>
+	</fieldset>
+	<fieldset>
+		<legend>{{ lang('PREVIEW') }}</legend>
+		{% if PREVIEW %}
+		<div class="successbox">
+			<h3>{{ lang('WARNING') }}</h3>
+			<p>{{ lang('CAPTCHA_PREVIEW_MSG') }}</p>
+		</div>
+		{% endif %}
+		{% include(CAPTCHA_PREVIEW) %}
+	</fieldset>
+
+	<fieldset>
+		<legend>{{ lang('ACP_SUBMIT_CHANGES') }}</legend>
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />&nbsp;
+		</p>
+		<input type="hidden" name="select_captcha" value="{{ CAPTCHA_NAME }}" />
+		<input type="hidden" name="configure" value="1" />
+		{{ S_FORM_TOKEN }}
+	</fieldset>
+</form>
+
+{% include('overall_footer.html') %}
diff --git a/phpBB/adm/style/captcha_turnstile_acp_demo.html b/phpBB/adm/style/captcha_turnstile_acp_demo.html
new file mode 100644
index 00000000000..757d0a4bcb9
--- /dev/null
+++ b/phpBB/adm/style/captcha_turnstile_acp_demo.html
@@ -0,0 +1,23 @@
+<dl>
+	<dt><div id="captcha_turnstile" data-language="{{ lang('TURNSTILE_LANG') }}"{% if TURNSTILE_THEME %} data-theme="{{ TURNSTILE_THEME }}"{% endif %}></div></dt>
+</dl>
+{% INCLUDEJS U_TURNSTILE_SCRIPT %}
+<script>
+	function domReady(callBack) {
+		if (document.readyState === 'loading') {
+			document.addEventListener('DOMContentLoaded', callBack);
+		} else {
+			callBack();
+		}
+	}
+
+	domReady(() => {
+		/* global turnstile */
+		console.debug('_turnstileCb called');
+
+		turnstile.render('#captcha_turnstile', {
+			sitekey: '1x00000000000000000000AA',
+			theme: 'light',
+		});
+	});
+</script>
diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
index 6d96ed19a9a..4aa47cbf8ac 100644
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -23,7 +23,7 @@
 </script>
 
 <script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.6.0.min.js">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.7.1.min.js">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 
diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html
index a3b8eda8256..39d86da1797 100644
--- a/phpBB/adm/style/installer_header.html
+++ b/phpBB/adm/style/installer_header.html
@@ -20,7 +20,7 @@ <h1>{L_INSTALL_PANEL}</h1>
 		<form method="post" action="#" id="language_selector">
 			<fieldset class="nobg">
 				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
-				<select  id="language" name="language">
+				<select id="language" name="language">
 					<!-- BEGIN language_select_item -->
 					<option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option>
 					<!-- END language_select_item -->
diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html
index 53a91f27002..ae77f6b55ec 100644
--- a/phpBB/adm/style/installer_install.html
+++ b/phpBB/adm/style/installer_install.html
@@ -6,6 +6,9 @@ <h1>{TITLE}</h1>
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
 		<input class="button1" name="install" type="submit" value="{L_INSTALL}" />
+		{% if SHOW_RESTART_BUTTON %}
+		<input class="button2" name="install_restart" type="submit" value="{{ lang('INSTALL_RESTART') }}" />
+		{% endif %}
 	</fieldset>
 </form>
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index b273d1d8a16..ec5e8d864a9 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -41,7 +41,7 @@ <h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
 </div>
 
 <script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.6.0.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.7.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->
diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js
index 04b3fc5c5fd..5f18e792881 100644
--- a/phpBB/adm/style/permissions.js
+++ b/phpBB/adm/style/permissions.js
@@ -1,4 +1,8 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-undef: 0 */
+/* eslint no-unused-vars: 0 */
+/* eslint no-var: 0 */
 
 /**
 * Hide and show all checkboxes
@@ -372,7 +376,7 @@ function match_role_settings(id) {
  * @return {string}			The sorted object as a string
  */
 function sort_and_stringify(obj) {
-	return JSON.stringify(Object.keys(obj).sort().reduce(function (result, key) {
+	return JSON.stringify(Object.keys(obj).sort().reduce(function(result, key) {
 		result[key] = obj[key];
 		return result;
 	}, {}));
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 988622dda1d..e2db057484d 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -17,7 +17,7 @@
 </div>
 
 <script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.6.0.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.7.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 {% if S_ALLOW_CDN %}
 <script>
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
index 562bc99dc36..4fae4e302ae 100644
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -1,4 +1,5 @@
 /* global phpbb */
+/* eslint no-var: 0 */
 
 /*
 javascript for Bubble Tooltips by Alessandro Fulciniti
@@ -24,14 +25,14 @@ var tooltips = [];
  * @param {string} headline Text that should appear on top of tooltip
  * @param {string} [subId] Sub ID that should only be using tooltips (optional)
 */
-phpbb.enableTooltipsSelect = function (id, headline, subId) {
+phpbb.enableTooltipsSelect = function(id, headline, subId) {
 	var $links, hold;
 
 	hold = $('<span />', {
 		id:		'_tooltip_container',
 		css: {
-			position: 'absolute'
-		}
+			position: 'absolute',
+		},
 	});
 
 	$('body').append(hold);
@@ -42,7 +43,7 @@ phpbb.enableTooltipsSelect = function (id, headline, subId) {
 		$links = $('.roles-options li', '#' + id);
 	}
 
-	$links.each(function () {
+	$links.each(function() {
 		var $this = $(this);
 
 		if (subId) {
@@ -61,7 +62,7 @@ phpbb.enableTooltipsSelect = function (id, headline, subId) {
  * @param {jQuery} $element Element to prepare for tooltips
  * @param {string} headText Text heading to display
 */
-phpbb.prepareTooltips = function ($element, headText) {
+phpbb.prepareTooltips = function($element, headText) {
 	var $tooltip, text, $desc, $title;
 
 	text = $element.attr('data-title');
@@ -73,8 +74,8 @@ phpbb.prepareTooltips = function ($element, headText) {
 	$title = $('<span />', {
 		class: 'top',
 		css: {
-			display:	'block'
-		}
+			display:	'block',
+		},
 	})
 		.append(document.createTextNode(headText));
 
@@ -82,15 +83,15 @@ phpbb.prepareTooltips = function ($element, headText) {
 		class: 'bottom',
 		html: text,
 		css: {
-			display: 'block'
-		}
+			display: 'block',
+		},
 	});
 
 	$tooltip = $('<span />', {
 		class: 'tooltip',
 		css: {
-			display: 'block'
-		}
+			display: 'block',
+		},
 	})
 		.append($title)
 		.append($desc);
@@ -105,7 +106,7 @@ phpbb.prepareTooltips = function ($element, headText) {
  *
  * @param {object} $element Element passed by .on()
 */
-phpbb.showTooltip = function ($element) {
+phpbb.showTooltip = function($element) {
 	var $this = $($element.target);
 	$('#_tooltip_container').append(tooltips[$this.attr('data-id')]);
 	phpbb.positionTooltip($this);
@@ -114,7 +115,7 @@ phpbb.showTooltip = function ($element) {
 /**
  * Hide tooltip
 */
-phpbb.hideTooltip = function () {
+phpbb.hideTooltip = function() {
 	var d = document.getElementById('_tooltip_container');
 	if (d.childNodes.length > 0) {
 		d.removeChild(d.firstChild);
@@ -126,7 +127,7 @@ phpbb.hideTooltip = function () {
  *
  * @param {jQuery} $element Tooltip element that should be positioned
 */
-phpbb.positionTooltip = function ($element) {
+phpbb.positionTooltip = function($element) {
 	var offset;
 
 	$element = $element.parent();
@@ -135,12 +136,12 @@ phpbb.positionTooltip = function ($element) {
 	if ($('body').hasClass('rtl')) {
 		$('#_tooltip_container').css({
 			top: offset.top + 30,
-			left: offset.left + 255
+			left: offset.left + 255,
 		});
 	} else {
 		$('#_tooltip_container').css({
 			top: offset.top + 30,
-			left: offset.left - 205
+			left: offset.left - 205,
 		});
 	}
 };
@@ -148,13 +149,13 @@ phpbb.positionTooltip = function ($element) {
 /**
  * Prepare roles drop down select
  */
-phpbb.prepareRolesDropdown = function () {
+phpbb.prepareRolesDropdown = function() {
 	var $options = $('.roles-options li');
 
 	// Display span and hide select
 	$('.roles-options > span').css('display', 'block');
 	$('.roles-options > select').hide();
-	$('.roles-options > input[type=hidden]').each(function () {
+	$('.roles-options > input[type=hidden]').each(function() {
 		var $this = $(this);
 
 		if ($this.attr('data-name') && !$this.attr('name')) {
@@ -163,7 +164,7 @@ phpbb.prepareRolesDropdown = function () {
 	});
 
 	// Prepare highlighting of select options and settings update
-	$options.each(function () {
+	$options.each(function() {
 		var $this = $(this);
 		var $rolesOptions = $this.closest('.roles-options');
 		var $span = $rolesOptions.children('span');
@@ -182,18 +183,18 @@ phpbb.prepareRolesDropdown = function () {
 			}
 
 			// Prepare resetting drop down on form reset
-			$this.closest('form').on('reset', function () {
+			$this.closest('form').on('reset', function() {
 				$span.text($span.attr('data-default'));
 				$rolesOptions.children('input[type=hidden]')
 					.val($span.attr('data-default-val'));
 			});
 		}
 
-		$this.on('mouseover', function () {
+		$this.on('mouseover', function() {
 			var $this = $(this);
 			$options.removeClass('roles-highlight');
 			$this.addClass('roles-highlight');
-		}).on('click', function () {
+		}).on('click', function() {
 			var $this = $(this);
 			var $rolesOptions = $this.closest('.roles-options');
 
diff --git a/phpBB/app.php b/phpBB/app.php
index 4873fb10c3d..53328f8f02a 100644
--- a/phpBB/app.php
+++ b/phpBB/app.php
@@ -11,17 +11,31 @@
 *
 */
 
-/**
-*/
-
 /**
 * @ignore
 */
+
+use Symfony\Component\HttpFoundation\RedirectResponse;
+
 define('IN_PHPBB', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
 
+if (basename($symfony_request->getScriptName()) === 'app.php')
+{
+	$base_path = $symfony_request->getBasePath();
+	$path_info = $symfony_request->getPathInfo();
+	$query_string = $symfony_request->getQueryString();
+
+	$url = $base_path . '/index.php' . $path_info . ($query_string ? '?' . $query_string : '');
+
+	$response = new RedirectResponse($url, 301);
+	$response->send();
+
+	exit;
+}
+
 // Start session management
 $user->session_begin();
 $auth->acl($user->data);
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index d301cc8da87..336275ed697 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1,4 +1,6 @@
 /* global bbfontstyle */
+/* eslint no-var: 0 */
+/* eslint no-unused-vars: 0 */
 
 var phpbb = {};
 phpbb.alertTime = 100;
@@ -13,7 +15,7 @@ var keymap = {
 	ENTER: 13,
 	ESC: 27,
 	ARROW_UP: 38,
-	ARROW_DOWN: 40
+	ARROW_DOWN: 40,
 };
 
 var $dark = $('#darkenwrapper');
@@ -54,7 +56,7 @@ phpbb.loadingIndicator = function() {
 /**
  * Show timeout message
  */
-phpbb.showTimeoutMessage = function () {
+phpbb.showTimeoutMessage = function() {
 	var $alert = $('#phpbb_alert');
 
 	if ($loadingIndicator.is(':visible')) {
@@ -363,7 +365,7 @@ phpbb.ajaxify = function(options) {
 						type: 'POST',
 						data: data + '&confirm=' + res.YES_VALUE + '&' + $('form', '#phpbb_confirm').serialize(),
 						success: returnHandler,
-						error: errorHandler
+						error: errorHandler,
 					});
 				}, false);
 			}
@@ -383,7 +385,7 @@ phpbb.ajaxify = function(options) {
 				submit = $this.find('input[type="submit"][data-clicked]');
 				data.push({
 					name: submit.attr('name'),
-					value: submit.val()
+					value: submit.val(),
 				});
 			}
 		} else if (isText) {
@@ -409,7 +411,7 @@ phpbb.ajaxify = function(options) {
 				data: data,
 				success: returnHandler,
 				error: errorHandler,
-				cache: false
+				cache: false,
 			});
 
 			request.always(function() {
@@ -430,7 +432,7 @@ phpbb.ajaxify = function(options) {
 	});
 
 	if (isForm) {
-		$elements.find('input:submit').click(function () {
+		$elements.find('input:submit').click(function() {
 			var $this = $(this);
 
 			// Remove data-clicked attribute from any submit button of form
@@ -445,10 +447,10 @@ phpbb.ajaxify = function(options) {
 
 phpbb.search = {
 	cache: {
-		data: []
+		data: [],
 	},
 	tpl: [],
-	container: []
+	container: [],
 };
 
 /**
@@ -524,7 +526,7 @@ phpbb.search.getKeyword = function($input, keyword, multiline) {
  * @param {jQuery} $textarea Search textarea.
  * @returns {int} The line number.
  */
-phpbb.search.getKeywordLine = function ($textarea) {
+phpbb.search.getKeywordLine = function($textarea) {
 	var selectionStart = $textarea.get(0).selectionStart;
 	return $textarea.val().substr(0, selectionStart).split('\n').length - 1;
 };
@@ -609,7 +611,7 @@ phpbb.search.filter = function(data, event, sendRequest) {
 				if (cache.results[keyword]) {
 					var response = {
 						keyword: keyword,
-						results: cache.results[keyword]
+						results: cache.results[keyword],
 					};
 					phpbb.search.handleResponse(response, $this, true);
 					proceed = false;
@@ -1079,7 +1081,7 @@ phpbb.addAjaxCallback('toggle_link', function() {
 		$this.attr('href', toggleUrl);
 
 		// Toggle Icon
-		$this.children().first().toggleClass('is-active').next().toggleClass('is-active')
+		$this.children().first().toggleClass('is-active').next().toggleClass('is-active');
 	});
 });
 
@@ -1113,7 +1115,7 @@ phpbb.resizeTextArea = function($items, options) {
 		maxHeight: 500,
 		heightDiff: 200,
 		resizeCallback: function() {},
-		resetCallback: function() {}
+		resetCallback: function() {},
 	};
 
 	if (phpbb.isTouch) {
@@ -1152,7 +1154,7 @@ phpbb.resizeTextArea = function($items, options) {
 
 		var maxHeight = Math.min(
 				Math.max(windowHeight - configuration.heightDiff, configuration.minHeight),
-				configuration.maxHeight
+				configuration.maxHeight,
 			),
 			$item = $(item),
 			height = parseInt($item.innerHeight(), 10),
@@ -1243,9 +1245,9 @@ phpbb.inBBCodeTag = function(textarea, startTags, endTags) {
 */
 phpbb.applyCodeEditor = function(textarea) {
 	// list of allowed start and end bbcode code tags, in lower case
-	var startTags = ['[code]', '[code='],
+	var startTags = [ '[code]', '[code=' ],
 		startTagsEnd = ']',
-		endTags = ['[/code]'];
+		endTags = [ '[/code]' ];
 
 	if (!textarea || typeof textarea.selectionStart !== 'number') {
 		return;
@@ -1353,12 +1355,12 @@ phpbb.showDragNDrop = function(textarea) {
 		return;
 	}
 
-	$('body').on('dragenter dragover', function () {
+	$('body').on('dragenter dragover', function() {
 		$(textarea).addClass('drag-n-drop');
 	}).on('dragleave dragout dragend drop', function() {
 		$(textarea).removeClass('drag-n-drop');
 	});
-	$(textarea).on('dragenter dragover', function () {
+	$(textarea).on('dragenter dragover', function() {
 		$(textarea).addClass('drag-n-drop-highlight');
 	}).on('dragleave dragout dragend drop', function() {
 		$(textarea).removeClass('drag-n-drop-highlight');
@@ -1434,7 +1436,7 @@ phpbb.toggleDropdown = function(event_) {
 				marginLeft: 0,
 				left: 0,
 				marginRight: 0,
-				maxWidth: (windowWidth - 4) + 'px'
+				maxWidth: (windowWidth - 4) + 'px',
 			});
 
 			var offset = $this.offset().left,
@@ -1468,7 +1470,7 @@ phpbb.toggleDropdown = function(event_) {
 				var maxOffset = Math.min(contentWidth, fullFreeSpace) + 'px';
 				options.dropdown.css({
 					width: maxOffset,
-					marginLeft: -maxOffset
+					marginLeft: -maxOffset,
 				});
 			}
 		} else {
@@ -1512,7 +1514,7 @@ phpbb.registerDropdown = function(toggle, dropdown, options) {
 			leftClass: 'dropdown-left', // Class to add to parent item when dropdown opens to left side
 			rightClass: 'dropdown-right', // Class to add to parent item when dropdown opens to right side
 			upClass: 'dropdown-up', // Class to add to parent item when dropdown opens above menu item
-			downClass: 'dropdown-down' // Class to add to parent item when dropdown opens below menu item
+			downClass: 'dropdown-down', // Class to add to parent item when dropdown opens below menu item
 		};
 	if (options) {
 		ops = $.extend(ops, options);
@@ -1666,7 +1668,7 @@ phpbb.toggleSelectSettings = function(el) {
 * @param {string} functionName Function to get.
 * @returns function
 */
-phpbb.getFunctionByName = function (functionName) {
+phpbb.getFunctionByName = function(functionName) {
 	var namespaces = functionName.split('.'),
 		func = namespaces.pop(),
 		context = window;
@@ -1677,6 +1679,33 @@ phpbb.getFunctionByName = function (functionName) {
 	return context[func];
 };
 
+/**
+ * Convert raw key ArrayBuffer to base64 string.
+ *
+ * @param {ArrayBuffer} rawKey Raw key array buffer as exported by SubtleCrypto exportKey()
+ * @returns {string} Base64 encoded raw key string
+ */
+phpbb.rawKeyToBase64 = (rawKey) => {
+	const keyBuffer = new Uint8Array(rawKey);
+	let keyText = '';
+	const keyLength = keyBuffer.byteLength;
+	for (let i = 0; i < keyLength; i++) {
+		keyText += String.fromCharCode(keyBuffer[i]);
+	}
+
+	return window.btoa(keyText);
+};
+
+/**
+ * Base64URL encode base64 encoded string
+ *
+ * @param {string} base64String Base64 encoded string
+ * @returns {string} Base64URL encoded string
+ */
+phpbb.base64UrlEncode = (base64String) => {
+	return base64String.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+};
+
 /**
 * Register page dropdowns.
 */
@@ -1689,7 +1718,7 @@ phpbb.registerPageDropdowns = function() {
 			$contents = $this.find('.dropdown'),
 			options = {
 				direction: 'auto',
-				verticalDirection: 'auto'
+				verticalDirection: 'auto',
 			},
 			data;
 
@@ -1736,7 +1765,7 @@ phpbb.registerPageDropdowns = function() {
  * Handle avatars to be lazy loaded.
  */
 phpbb.lazyLoadAvatars = function loadAvatars() {
-	$('.avatar[data-src]').each(function () {
+	$('.avatar[data-src]').each(function() {
 		var $avatar = $(this);
 
 		$avatar
@@ -1768,7 +1797,7 @@ phpbb.getEditorTextArea = function(formName, textareaName) {
 	}
 
 	return doc.forms[formName].elements[textareaName];
-}
+};
 
 phpbb.recaptcha = {
 	button: null,
@@ -1799,7 +1828,7 @@ phpbb.recaptcha = {
 				if (phpbb.recaptcha.v3.length) {
 					grecaptcha.execute(
 						phpbb.recaptcha.v3.data('recaptcha-v3'),
-						{action: phpbb.recaptcha.v3.val()}
+						{ action: phpbb.recaptcha.v3.val() },
 					).then(function(token) {
 						// Place the token inside the form
 						phpbb.recaptcha.token.val(token);
@@ -1833,7 +1862,7 @@ phpbb.recaptcha = {
 
 			phpbb.recaptcha.form.submit();
 		}
-	}
+	},
 };
 
 // reCAPTCHA v2 doesn't accept callback functions nested inside objects
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js
index 3b86ca380de..f233bc5c730 100644
--- a/phpBB/assets/javascript/editor.js
+++ b/phpBB/assets/javascript/editor.js
@@ -1,4 +1,8 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-undef: 0 */
+/* eslint no-unused-vars: 0 */
+/* eslint no-var: 0 */
 
 /**
 * bbCode control by subBlue design [ www.subBlue.com ]
@@ -100,7 +104,7 @@ function bbfontstyle(bbopen, bbclose) {
 	// IE
 	else if (document.selection) {
 		var range = textarea.createTextRange();
-		range.move("character", new_pos);
+		range.move('character', new_pos);
 		range.select();
 		storeCaret(textarea);
 	}
@@ -271,7 +275,7 @@ function formatAttributeValue(str) {
 		// Return as-is if it contains none of: space, ' " \ or ]
 		return str;
 	}
-	var singleQuoted = "'" + str.replace(/[\\']/g, '\\$&') + "'",
+	var singleQuoted = '\'' + str.replace(/[\\']/g, '\\$&') + '\'',
 		doubleQuoted = '"' + str.replace(/[\\"]/g, '\\$&') + '"';
 
 	return (singleQuoted.length < doubleQuoted.length) ? singleQuoted : doubleQuoted;
@@ -404,7 +408,7 @@ function getCaretPosition(txtarea) {
 			phpbb.showDragNDrop(textarea);
 		}
 
-		$('textarea').on('keydown', function (e) {
+		$('textarea').on('keydown', function(e) {
 			if (e.which === 13 && (e.metaKey || e.ctrlKey)) {
 				$(this).closest('form').find(':submit').click();
 			}
diff --git a/phpBB/assets/javascript/installer.js b/phpBB/assets/javascript/installer.js
index a11b76b8634..26c62889cd9 100644
--- a/phpBB/assets/javascript/installer.js
+++ b/phpBB/assets/javascript/installer.js
@@ -2,6 +2,9 @@
  * Installer's AJAX frontend handler
  */
 
+/* eslint no-prototype-builtins: 0 */
+/* eslint no-var: 0 */
+
 (function($) { // Avoid conflicts with other libraries
 	'use strict';
 
@@ -359,10 +362,10 @@
 		} else {
 			$('#loading_indicator').css('display', 'none');
 			addMessage('error',
-				[{
+				[ {
 					title: installLang.title,
-					description: installLang.msg
-				}]
+					description: installLang.msg,
+				} ],
 			);
 		}
 	}
@@ -372,7 +375,7 @@
 	 */
 	function queryInstallerStatus() {
 		var url = $(location).attr('pathname');
-		var lookUp = 'install/app.php';
+		var lookUp = 'install/index.php';
 		var position = url.indexOf(lookUp);
 
 		if (position === -1) {
@@ -487,7 +490,7 @@
 	function startPolling(xhReq) {
 		resetPolling();
 		transmissionOver = false;
-		pollTimer = setInterval(function () {
+		pollTimer = setInterval(function() {
 			pollContent(xhReq);
 		}, 250);
 	}
@@ -605,11 +608,29 @@
 	function interceptFormSubmit($form) {
 		if (!$form.length) {
 			return;
+		} else if ($form.find('input[name="admin_name"]').length > 0) {
+			setAdminTimezone($form);
 		}
 
-		$form.find(':submit').bind('click', function (event) {
+		$form.find(':submit').bind('click', function(event) {
 			event.preventDefault();
 			submitForm($form, $(this));
 		});
 	}
+
+	/**
+	 * Set admin timezone in form
+	 *
+	 * @param $form
+	 */
+	function setAdminTimezone($form) {
+		// Set admin timezone if it does not exist yet
+		if ($form.find('input[name="admin_timezone"]').length === 0) {
+			const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+			// Add timezone as form entry
+			const timezoneEntry = $('<input type="hidden" name="admin_timezone" value="' + timeZone + '">');
+			$form.append(timezoneEntry);
+		}
+	}
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/assets/javascript/jquery-3.6.0.min.js b/phpBB/assets/javascript/jquery-3.6.0.min.js
deleted file mode 100644
index c4c6022f298..00000000000
--- a/phpBB/assets/javascript/jquery-3.6.0.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&D.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(j),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(j).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var D,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^([^.]*)(?:\.(.+)|)/;function we(){return!0}function Te(){return!1}function Ce(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ee(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ee(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Te;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Se(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n&&n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,we)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=be.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=be.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click",we),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?we:Te,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Te,isPropagationStopped:Te,isImmediatePropagationStopped:Te,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=we,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=we,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=we,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Se(this,e,Ce),!1},trigger:function(){return Se(this,e),!0},_default:function(){return!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return Ee(this,e,t,n,r)},one:function(e,t,n,r){return Ee(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Te),this.each(function(){S.event.remove(this,e,n,t)})}});var ke=/<script|<style|<link/i,Ae=/checked\s*(?:[^=]|=\s*.checked.)/i,Ne=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function He(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Ae.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),He(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),De)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,qe),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(Ne,""),u,l))}return n}function Oe(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Le(o[r],a[r]);else Le(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Oe(this,e,!0)},remove:function(e){return Oe(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return He(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return He(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!ke.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return He(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Pe=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Re=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Me=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ie=new RegExp(ne.join("|"),"i");function We(e,t,n){var r,i,o,a,s=e.style;return(n=n||Re(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Pe.test(a)&&Ie.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function Fe(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,re.removeChild(e)),a}}))}();var Be=["Webkit","Moz","ms"],$e=E.createElement("div").style,_e={};function ze(e){var t=S.cssProps[e]||_e[e];return t||(e in $e?e:_e[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Be.length;while(n--)if((e=Be[n]+t)in $e)return e}(e)||e)}var Ue=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ve={position:"absolute",visibility:"hidden",display:"block"},Ge={letterSpacing:"0",fontWeight:"400"};function Ye(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Qe(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Je(e,t,n){var r=Re(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=We(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Pe.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Qe(e,t,n||(i?"border":"content"),o,r,a)+"px"}function Ke(e,t,n,r,i){return new Ke.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=We(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Xe.test(t),l=e.style;if(u||(t=ze(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Xe.test(t)||(t=ze(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=We(e,t,r)),"normal"===i&&t in Ge&&(i=Ge[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ue.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Je(e,u,n):Me(e,Ve,function(){return Je(e,u,n)})},set:function(e,t,n){var r,i=Re(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Qe(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Qe(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Ye(0,t,s)}}}),S.cssHooks.marginLeft=Fe(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(We(e,"marginLeft"))||e.getBoundingClientRect().left-Me(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Ye)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Re(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=Ke).prototype={constructor:Ke,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=Ke.propHooks[this.prop];return e&&e.get?e.get(this):Ke.propHooks._default.get(this)},run:function(e){var t,n=Ke.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Ke.propHooks._default.set(this),this}}).init.prototype=Ke.prototype,(Ke.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[ze(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=Ke.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=Ke.prototype.init,S.fx.step={};var Ze,et,tt,nt,rt=/^(?:toggle|show|hide)$/,it=/queueHooks$/;function ot(){et&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(ot):C.setTimeout(ot,S.fx.interval),S.fx.tick())}function at(){return C.setTimeout(function(){Ze=void 0}),Ze=Date.now()}function st(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ut(e,t,n){for(var r,i=(lt.tweeners[t]||[]).concat(lt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function lt(o,e,t){var n,a,r=0,i=lt.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=Ze||at(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:Ze||at(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=lt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ut,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(lt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],lt.tweeners[n]=lt.tweeners[n]||[],lt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],rt.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ut(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?lt.prefilters.unshift(e):lt.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=lt(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&it.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(st(r,!0),e,t,n)}}),S.each({slideDown:st("show"),slideUp:st("hide"),slideToggle:st("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(Ze=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),Ze=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){et||(et=!0,ot())},S.fx.stop=function(){et=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},tt=E.createElement("input"),nt=E.createElement("select").appendChild(E.createElement("option")),tt.type="checkbox",y.checkOn=""!==tt.value,y.optSelected=nt.selected,(tt=E.createElement("input")).value="t",tt.type="radio",y.radioValue="t"===tt.value;var ct,ft=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?ct:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ct={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=ft[t]||S.find.attr;ft[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=ft[o],ft[o]=r,r=null!=a(e,t,n)?o:null,ft[o]=i),r}});var pt=/^(?:input|select|textarea|button)$/i,dt=/^(?:a|area)$/i;function ht(e){return(e.match(P)||[]).join(" ")}function gt(e){return e.getAttribute&&e.getAttribute("class")||""}function vt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):pt.test(e.nodeName)||dt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,gt(this)))});if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,gt(this)))});if(!arguments.length)return this.attr("class","");if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,gt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=vt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=gt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+ht(gt(n))+" ").indexOf(t))return!0;return!1}});var yt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(yt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:ht(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var mt=/^(?:focusinfocus|focusoutblur)$/,xt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!mt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,mt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,xt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,xt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var bt=C.location,wt={guid:Date.now()},Tt=/\?/;S.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||S.error("Invalid XML: "+(n?S.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Ct=/\[\]$/,Et=/\r?\n/g,St=/^(?:submit|button|image|reset|file)$/i,kt=/^(?:input|select|textarea|keygen)/i;function At(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||Ct.test(n)?i(n,t):At(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)At(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)At(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&kt.test(this.nodeName)&&!St.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(Et,"\r\n")}}):{name:t.name,value:n.replace(Et,"\r\n")}}).get()}});var Nt=/%20/g,jt=/#.*$/,Dt=/([?&])_=[^&]*/,qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Lt=/^(?:GET|HEAD)$/,Ht=/^\/\//,Ot={},Pt={},Rt="*/".concat("*"),Mt=E.createElement("a");function It(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Wt(t,i,o,a){var s={},u=t===Pt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Ft(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Mt.href=bt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:bt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(bt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Rt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Ft(Ft(e,S.ajaxSettings),t):Ft(S.ajaxSettings,e)},ajaxPrefilter:It(Ot),ajaxTransport:It(Pt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=qt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||bt.href)+"").replace(Ht,bt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Mt.protocol+"//"+Mt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Wt(Ot,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Lt.test(v.type),f=v.url.replace(jt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Nt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Tt.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Dt,"$1"),o=(Tt.test(f)?"&":"?")+"_="+wt.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+Rt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Wt(Pt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&S.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Bt={0:200,1223:204},$t=S.ajaxSettings.xhr();y.cors=!!$t&&"withCredentials"in $t,y.ajax=$t=!!$t,S.ajaxTransport(function(i){var o,a;if(y.cors||$t&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Bt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=ht(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Xt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Xt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Vt=C.jQuery,Gt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Gt),e&&C.jQuery===S&&(C.jQuery=Vt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/phpBB/assets/javascript/jquery-3.7.1.min.js b/phpBB/assets/javascript/jquery-3.7.1.min.js
new file mode 100644
index 00000000000..7f37b5d9912
--- /dev/null
+++ b/phpBB/assets/javascript/jquery-3.7.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}function fe(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}ce.fn=ce.prototype={jquery:t,constructor:ce,length:0,toArray:function(){return ae.call(this)},get:function(e){return null==e?ae.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=ce.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return ce.each(this,e)},map:function(n){return this.pushStack(ce.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(ae.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(ce.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(ce.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:s,sort:oe.sort,splice:oe.splice},ce.extend=ce.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||v(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(ce.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||ce.isPlainObject(n)?n:{},i=!1,a[t]=ce.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},ce.extend({expando:"jQuery"+(t+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==i.call(e))&&(!(t=r(e))||"function"==typeof(n=ue.call(t,"constructor")&&t.constructor)&&o.call(n)===a)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){m(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(c(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},text:function(e){var t,n="",r=0,i=e.nodeType;if(!i)while(t=e[r++])n+=ce.text(t);return 1===i||11===i?e.textContent:9===i?e.documentElement.textContent:3===i||4===i?e.nodeValue:n},makeArray:function(e,t){var n=t||[];return null!=e&&(c(Object(e))?ce.merge(n,"string"==typeof e?[e]:e):s.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:se.call(t,e,n)},isXMLDoc:function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!l.test(t||n&&n.nodeName||"HTML")},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(c(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:le}),"function"==typeof Symbol&&(ce.fn[Symbol.iterator]=oe[Symbol.iterator]),ce.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var pe=oe.pop,de=oe.sort,he=oe.splice,ge="[\\x20\\t\\r\\n\\f]",ve=new RegExp("^"+ge+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ge+"+$","g");ce.contains=function(e,t){var n=t&&t.parentNode;return e===n||!(!n||1!==n.nodeType||!(e.contains?e.contains(n):e.compareDocumentPosition&&16&e.compareDocumentPosition(n)))};var f=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;function p(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e}ce.escapeSelector=function(e){return(e+"").replace(f,p)};var ye=C,me=s;!function(){var e,b,w,o,a,T,r,C,d,i,k=me,S=ce.expando,E=0,n=0,s=W(),c=W(),u=W(),h=W(),l=function(e,t){return e===t&&(a=!0),0},f="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",t="(?:\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",p="\\["+ge+"*("+t+")(?:"+ge+"*([*^$|!~]?=)"+ge+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+t+"))|)"+ge+"*\\]",g=":("+t+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+p+")*)|.*)\\)|)",v=new RegExp(ge+"+","g"),y=new RegExp("^"+ge+"*,"+ge+"*"),m=new RegExp("^"+ge+"*([>+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="<a id='"+S+"' href='' disabled='disabled'></a><select id='"+S+"-\r\\' disabled='disabled'><option selected=''></option></select>",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0<I(t,T,null,[e]).length},I.contains=function(e,t){return(e.ownerDocument||e)!=T&&V(e),ce.contains(e,t)},I.attr=function(e,t){(e.ownerDocument||e)!=T&&V(e);var n=b.attrHandle[t.toLowerCase()],r=n&&ue.call(b.attrHandle,t.toLowerCase())?n(e,t,!C):void 0;return void 0!==r?r:e.getAttribute(t)},I.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},ce.uniqueSort=function(e){var t,n=[],r=0,i=0;if(a=!le.sortStable,o=!le.sortStable&&ae.call(e,0),de.call(e,l),a){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)he.call(e,n[r],1)}return o=null,e},ce.fn.uniqueSort=function(){return this.pushStack(ce.uniqueSort(ae.apply(this)))},(b=ce.expr={cacheLength:50,createPseudo:F,match:D,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(v," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(d,e,t,h,g){var v="nth"!==d.slice(0,3),y="last"!==d.slice(-4),m="of-type"===e;return 1===h&&0===g?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u=v!==y?"nextSibling":"previousSibling",l=e.parentNode,c=m&&e.nodeName.toLowerCase(),f=!n&&!m,p=!1;if(l){if(v){while(u){o=e;while(o=o[u])if(m?fe(o,c):1===o.nodeType)return!1;s=u="only"===d&&!s&&"nextSibling"}return!0}if(s=[y?l.firstChild:l.lastChild],y&&f){p=(a=(r=(i=l[S]||(l[S]={}))[d]||[])[0]===E&&r[1])&&r[2],o=a&&l.childNodes[a];while(o=++a&&o&&o[u]||(p=a=0)||s.pop())if(1===o.nodeType&&++p&&o===e){i[d]=[E,a,p];break}}else if(f&&(p=a=(r=(i=e[S]||(e[S]={}))[d]||[])[0]===E&&r[1]),!1===p)while(o=++a&&o&&o[u]||(p=a=0)||s.pop())if((m?fe(o,c):1===o.nodeType)&&++p&&(f&&((i=o[S]||(o[S]={}))[d]=[E,p]),o===e))break;return(p-=g)===h||p%h==0&&0<=p/h}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||I.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?F(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=se.call(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:F(function(e){var r=[],i=[],s=ne(e.replace(ve,"$1"));return s[S]?F(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:F(function(t){return function(e){return 0<I(t,e).length}}),contains:F(function(t){return t=t.replace(O,P),function(e){return-1<(e.textContent||ce.text(e)).indexOf(t)}}),lang:F(function(n){return A.test(n||"")||I.error("unsupported lang: "+n),n=n.replace(O,P).toLowerCase(),function(e){var t;do{if(t=C?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=ie.location&&ie.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===r},focus:function(e){return e===function(){try{return T.activeElement}catch(e){}}()&&T.hasFocus()&&!!(e.type||e.href||~e.tabIndex)},enabled:z(!1),disabled:z(!0),checked:function(e){return fe(e,"input")&&!!e.checked||fe(e,"option")&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return q.test(e.nodeName)},input:function(e){return N.test(e.nodeName)},button:function(e){return fe(e,"input")&&"button"===e.type||fe(e,"button")},text:function(e){var t;return fe(e,"input")&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:X(function(){return[0]}),last:X(function(e,t){return[t-1]}),eq:X(function(e,t,n){return[n<0?n+t:n]}),even:X(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:X(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:X(function(e,t,n){var r;for(r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:X(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=B(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=_(e);function G(){}function Y(e,t){var n,r,i,o,a,s,u,l=c[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=y.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=m.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(ve," ")}),a=a.slice(n.length)),b.filter)!(r=D[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?I.error(e):c(e,s).slice(0)}function Q(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function J(a,e,t){var s=e.dir,u=e.next,l=u||s,c=t&&"parentNode"===l,f=n++;return e.first?function(e,t,n){while(e=e[s])if(1===e.nodeType||c)return a(e,t,n);return!1}:function(e,t,n){var r,i,o=[E,f];if(n){while(e=e[s])if((1===e.nodeType||c)&&a(e,t,n))return!0}else while(e=e[s])if(1===e.nodeType||c)if(i=e[S]||(e[S]={}),u&&fe(e,u))e=e[s]||e;else{if((r=i[l])&&r[0]===E&&r[1]===f)return o[2]=r[2];if((i[l]=o)[2]=a(e,t,n))return!0}return!1}}function K(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Z(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function ee(d,h,g,v,y,e){return v&&!v[S]&&(v=ee(v)),y&&!y[S]&&(y=ee(y,e)),F(function(e,t,n,r){var i,o,a,s,u=[],l=[],c=t.length,f=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)I(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),p=!d||!e&&h?f:Z(f,u,d,n,r);if(g?g(p,s=y||(e?d:c||v)?[]:t,n,r):s=p,v){i=Z(s,l),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(s[l[o]]=!(p[l[o]]=a))}if(e){if(y||d){if(y){i=[],o=s.length;while(o--)(a=s[o])&&i.push(p[o]=a);y(null,s=[],i,r)}o=s.length;while(o--)(a=s[o])&&-1<(i=y?se.call(e,a):u[o])&&(e[i]=!(t[i]=a))}}else s=Z(s===t?s.splice(c,s.length):s),y?y(null,t,s,r):k.apply(t,s)})}function te(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=J(function(e){return e===i},a,!0),l=J(function(e){return-1<se.call(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!=w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[J(K(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return ee(1<s&&K(c),1<s&&Q(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(ve,"$1"),t,s<n&&te(e.slice(s,n)),n<r&&te(e=e.slice(n)),n<r&&Q(e))}c.push(t)}return K(c)}function ne(e,t){var n,v,y,m,x,r,i=[],o=[],a=u[e+" "];if(!a){t||(t=Y(e)),n=t.length;while(n--)(a=te(t[n]))[S]?i.push(a):o.push(a);(a=u(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=E+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==T||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==T||(V(o),n=!C);while(s=v[a++])if(s(o,t||T,n)){k.call(r,o);break}i&&(E=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=pe.call(r));f=Z(f)}k.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&ce.uniqueSort(r)}return i&&(E=h,w=p),c},m?F(r):r))).selector=e}return a}function re(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&Y(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&C&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(O,P),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=D.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(O,P),H.test(o[0].type)&&U(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&Q(o)))return k.apply(n,r),n;break}}}return(l||ne(e,c))(r,t,!C,n,!t||H.test(e)&&U(t.parentNode)||t),n}G.prototype=b.filters=b.pseudos,b.setFilters=new G,le.sortStable=S.split("").sort(l).join("")===S,V(),le.sortDetached=$(function(e){return 1&e.compareDocumentPosition(T.createElement("fieldset"))}),ce.find=I,ce.expr[":"]=ce.expr.pseudos,ce.unique=ce.uniqueSort,I.compile=ne,I.select=re,I.setDocument=V,I.tokenize=Y,I.escape=ce.escapeSelector,I.getText=ce.text,I.isXML=ce.isXMLDoc,I.selectors=ce.expr,I.support=ce.support,I.uniqueSort=ce.uniqueSort}();var d=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&ce(e).is(n))break;r.push(e)}return r},h=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},b=ce.expr.match.needsContext,w=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1<se.call(n,e)!==r}):ce.filter(n,e,r)}ce.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?ce.find.matchesSelector(r,e)?[r]:[]:ce.find.matches(e,ce.grep(t,function(e){return 1===e.nodeType}))},ce.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(ce(e).filter(function(){for(t=0;t<r;t++)if(ce.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)ce.find(e,i[t],n);return 1<r?ce.uniqueSort(n):n},filter:function(e){return this.pushStack(T(this,e||[],!1))},not:function(e){return this.pushStack(T(this,e||[],!0))},is:function(e){return!!T(this,"string"==typeof e&&b.test(e)?ce(e):e||[],!1).length}});var k,S=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(ce.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&ce(e);if(!b.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&ce.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?ce.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?se.call(ce(e),this[0]):se.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(ce.uniqueSort(ce.merge(this.get(),ce(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),ce.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return d(e,"parentNode")},parentsUntil:function(e,t,n){return d(e,"parentNode",n)},next:function(e){return A(e,"nextSibling")},prev:function(e){return A(e,"previousSibling")},nextAll:function(e){return d(e,"nextSibling")},prevAll:function(e){return d(e,"previousSibling")},nextUntil:function(e,t,n){return d(e,"nextSibling",n)},prevUntil:function(e,t,n){return d(e,"previousSibling",n)},siblings:function(e){return h((e.parentNode||{}).firstChild,e)},children:function(e){return h(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(fe(e,"template")&&(e=e.content||e),ce.merge([],e.childNodes))}},function(r,i){ce.fn[r]=function(e,t){var n=ce.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=ce.filter(t,n)),1<this.length&&(j[r]||ce.uniqueSort(n),E.test(r)&&n.reverse()),this.pushStack(n)}});var D=/[^\x20\t\r\n\f]+/g;function N(e){return e}function q(e){throw e}function L(e,t,n,r){var i;try{e&&v(i=e.promise)?i.call(e).done(t).fail(n):e&&v(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}ce.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},ce.each(e.match(D)||[],function(e,t){n[t]=!0}),n):ce.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){ce.each(e,function(e,t){v(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==x(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return ce.each(arguments,function(e,t){var n;while(-1<(n=ce.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<ce.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},ce.extend({Deferred:function(e){var o=[["notify","progress",ce.Callbacks("memory"),ce.Callbacks("memory"),2],["resolve","done",ce.Callbacks("once memory"),ce.Callbacks("once memory"),0,"resolved"],["reject","fail",ce.Callbacks("once memory"),ce.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return ce.Deferred(function(r){ce.each(o,function(e,t){var n=v(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&v(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,v(t)?s?t.call(e,l(u,o,N,s),l(u,o,q,s)):(u++,t.call(e,l(u,o,N,s),l(u,o,q,s),l(u,o,N,o.notifyWith))):(a!==N&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){ce.Deferred.exceptionHook&&ce.Deferred.exceptionHook(e,t.error),u<=i+1&&(a!==q&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(ce.Deferred.getErrorHook?t.error=ce.Deferred.getErrorHook():ce.Deferred.getStackHook&&(t.error=ce.Deferred.getStackHook()),ie.setTimeout(t))}}return ce.Deferred(function(e){o[0][3].add(l(0,e,v(r)?r:N,e.notifyWith)),o[1][3].add(l(0,e,v(t)?t:N)),o[2][3].add(l(0,e,v(n)?n:q))}).promise()},promise:function(e){return null!=e?ce.extend(e,a):a}},s={};return ce.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=ae.call(arguments),o=ce.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?ae.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(L(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||v(i[t]&&i[t].then)))return o.then();while(t--)L(i[t],a(t),o.reject);return o.promise()}});var H=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;ce.Deferred.exceptionHook=function(e,t){ie.console&&ie.console.warn&&e&&H.test(e.name)&&ie.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},ce.readyException=function(e){ie.setTimeout(function(){throw e})};var O=ce.Deferred();function P(){C.removeEventListener("DOMContentLoaded",P),ie.removeEventListener("load",P),ce.ready()}ce.fn.ready=function(e){return O.then(e)["catch"](function(e){ce.readyException(e)}),this},ce.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--ce.readyWait:ce.isReady)||(ce.isReady=!0)!==e&&0<--ce.readyWait||O.resolveWith(C,[ce])}}),ce.ready.then=O.then,"complete"===C.readyState||"loading"!==C.readyState&&!C.documentElement.doScroll?ie.setTimeout(ce.ready):(C.addEventListener("DOMContentLoaded",P),ie.addEventListener("load",P));var M=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n))for(s in i=!0,n)M(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,v(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(ce(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},R=/^-ms-/,I=/-([a-z])/g;function W(e,t){return t.toUpperCase()}function F(e){return e.replace(R,"ms-").replace(I,W)}var $=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function B(){this.expando=ce.expando+B.uid++}B.uid=1,B.prototype={cache:function(e){var t=e[this.expando];return t||(t={},$(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[F(t)]=n;else for(r in t)i[F(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][F(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(F):(t=F(t))in r?[t]:t.match(D)||[]).length;while(n--)delete r[t[n]]}(void 0===t||ce.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!ce.isEmptyObject(t)}};var _=new B,z=new B,X=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,U=/[A-Z]/g;function V(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(U,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:X.test(i)?JSON.parse(i):i)}catch(e){}z.set(e,t,n)}else n=void 0;return n}ce.extend({hasData:function(e){return z.hasData(e)||_.hasData(e)},data:function(e,t,n){return z.access(e,t,n)},removeData:function(e,t){z.remove(e,t)},_data:function(e,t,n){return _.access(e,t,n)},_removeData:function(e,t){_.remove(e,t)}}),ce.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=z.get(o),1===o.nodeType&&!_.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=F(r.slice(5)),V(o,r,i[r]));_.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){z.set(this,n)}):M(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=z.get(o,n))?t:void 0!==(t=V(o,n))?t:void 0;this.each(function(){z.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){z.remove(this,e)})}}),ce.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=_.get(e,t),n&&(!r||Array.isArray(n)?r=_.access(e,t,ce.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=ce.queue(e,t),r=n.length,i=n.shift(),o=ce._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){ce.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return _.get(e,n)||_.access(e,n,{empty:ce.Callbacks("once memory").add(function(){_.remove(e,[t+"queue",n])})})}}),ce.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?ce.queue(this[0],t):void 0===n?this:this.each(function(){var e=ce.queue(this,t,n);ce._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&ce.dequeue(this,t)})},dequeue:function(e){return this.each(function(){ce.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=ce.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=_.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var G=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Y=new RegExp("^(?:([+-])=|)("+G+")([a-z%]*)$","i"),Q=["Top","Right","Bottom","Left"],J=C.documentElement,K=function(e){return ce.contains(e.ownerDocument,e)},Z={composed:!0};J.getRootNode&&(K=function(e){return ce.contains(e.ownerDocument,e)||e.getRootNode(Z)===e.ownerDocument});var ee=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&K(e)&&"none"===ce.css(e,"display")};function te(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return ce.css(e,t,"")},u=s(),l=n&&n[3]||(ce.cssNumber[t]?"":"px"),c=e.nodeType&&(ce.cssNumber[t]||"px"!==l&&+u)&&Y.exec(ce.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)ce.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,ce.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ne={};function re(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=_.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ee(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ne[s])||(o=a.body.appendChild(a.createElement(s)),u=ce.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ne[s]=u)))):"none"!==n&&(l[c]="none",_.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}ce.fn.extend({show:function(){return re(this,!0)},hide:function(){return re(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ee(this)?ce(this).show():ce(this).hide()})}});var xe,be,we=/^(?:checkbox|radio)$/i,Te=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="<textarea>x</textarea>",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="<option></option>",le.option=!!xe.lastChild;var ke={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n<r;n++)_.set(e[n],"globalEval",!t||_.get(t[n],"globalEval"))}ke.tbody=ke.tfoot=ke.colgroup=ke.caption=ke.thead,ke.th=ke.td,le.option||(ke.optgroup=ke.option=[1,"<select multiple='multiple'>","</select>"]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===x(o))ce.merge(p,o.nodeType?[o]:o);else if(je.test(o)){a=a||f.appendChild(t.createElement("div")),s=(Te.exec(o)||["",""])[1].toLowerCase(),u=ke[s]||ke._default,a.innerHTML=u[1]+ce.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;ce.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<ce.inArray(o,r))i&&i.push(o);else if(l=K(o),a=Se(f.appendChild(o),"script"),l&&Ee(a),n){c=0;while(o=a[c++])Ce.test(o.type||"")&&n.push(o)}return f}var De=/^([^.]*)(?:\.(.+)|)/;function Ne(){return!0}function qe(){return!1}function Le(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Le(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=qe;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return ce().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=ce.guid++)),e.each(function(){ce.event.add(this,t,i,r,n)})}function He(e,r,t){t?(_.set(e,r,!1),ce.event.add(e,r,{namespace:!1,handler:function(e){var t,n=_.get(this,r);if(1&e.isTrigger&&this[r]){if(n)(ce.event.special[r]||{}).delegateType&&e.stopPropagation();else if(n=ae.call(arguments),_.set(this,r,n),this[r](),t=_.get(this,r),_.set(this,r,!1),n!==t)return e.stopImmediatePropagation(),e.preventDefault(),t}else n&&(_.set(this,r,ce.event.trigger(n[0],n.slice(1),this)),e.stopPropagation(),e.isImmediatePropagationStopped=Ne)}})):void 0===_.get(e,r)&&ce.event.add(e,r,Ne)}ce.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=_.get(t);if($(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&ce.find.matchesSelector(J,i),n.guid||(n.guid=ce.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof ce&&ce.event.triggered!==e.type?ce.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(D)||[""]).length;while(l--)d=g=(s=De.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=ce.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=ce.event.special[d]||{},c=ce.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&ce.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),ce.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=_.hasData(e)&&_.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(D)||[""]).length;while(l--)if(d=g=(s=De.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=ce.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||ce.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)ce.event.remove(e,d+t[l],n,r,!0);ce.isEmptyObject(u)&&_.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=ce.event.fix(e),l=(_.get(this,"events")||Object.create(null))[u.type]||[],c=ce.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=ce.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((ce.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<ce(i,this).index(l):ce.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(ce.Event.prototype,t,{enumerable:!0,configurable:!0,get:v(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[ce.expando]?e:new ce.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return we.test(t.type)&&t.click&&fe(t,"input")&&He(t,"click",!0),!1},trigger:function(e){var t=this||e;return we.test(t.type)&&t.click&&fe(t,"input")&&He(t,"click"),!0},_default:function(e){var t=e.target;return we.test(t.type)&&t.click&&fe(t,"input")&&_.get(t,"click")||fe(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},ce.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},ce.Event=function(e,t){if(!(this instanceof ce.Event))return new ce.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ne:qe,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&ce.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[ce.expando]=!0},ce.Event.prototype={constructor:ce.Event,isDefaultPrevented:qe,isPropagationStopped:qe,isImmediatePropagationStopped:qe,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ne,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ne,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ne,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},ce.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},ce.event.addProp),ce.each({focus:"focusin",blur:"focusout"},function(r,i){function o(e){if(C.documentMode){var t=_.get(this,"handle"),n=ce.event.fix(e);n.type="focusin"===e.type?"focus":"blur",n.isSimulated=!0,t(e),n.target===n.currentTarget&&t(n)}else ce.event.simulate(i,e.target,ce.event.fix(e))}ce.event.special[r]={setup:function(){var e;if(He(this,r,!0),!C.documentMode)return!1;(e=_.get(this,i))||this.addEventListener(i,o),_.set(this,i,(e||0)+1)},trigger:function(){return He(this,r),!0},teardown:function(){var e;if(!C.documentMode)return!1;(e=_.get(this,i)-1)?_.set(this,i,e):(this.removeEventListener(i,o),_.remove(this,i))},_default:function(e){return _.get(e.target,r)},delegateType:i},ce.event.special[i]={setup:function(){var e=this.ownerDocument||this.document||this,t=C.documentMode?this:e,n=_.get(t,i);n||(C.documentMode?this.addEventListener(i,o):e.addEventListener(r,o,!0)),_.set(t,i,(n||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=C.documentMode?this:e,n=_.get(t,i)-1;n?_.set(t,i,n):(C.documentMode?this.removeEventListener(i,o):e.removeEventListener(r,o,!0),_.remove(t,i))}}}),ce.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){ce.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||ce.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),ce.fn.extend({on:function(e,t,n,r){return Le(this,e,t,n,r)},one:function(e,t,n,r){return Le(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,ce(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=qe),this.each(function(){ce.event.remove(this,e,n,t)})}});var Oe=/<script|<style|<link/i,Pe=/checked\s*(?:[^=]|=\s*.checked.)/i,Me=/^\s*<!\[CDATA\[|\]\]>\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)ce.event.add(t,i,s[i][n]);z.hasData(e)&&(o=z.access(e),a=ce.extend({},o),z.set(t,a))}}function $e(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=v(d);if(h||1<f&&"string"==typeof d&&!le.checkClone&&Pe.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),$e(t,r,i,o)});if(f&&(t=(e=Ae(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=ce.map(Se(e,"script"),Ie)).length;c<f;c++)u=e,c!==p&&(u=ce.clone(u,!0,!0),s&&ce.merge(a,Se(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,ce.map(a,We),c=0;c<s;c++)u=a[c],Ce.test(u.type||"")&&!_.access(u,"globalEval")&&ce.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?ce._evalUrl&&!u.noModule&&ce._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):m(u.textContent.replace(Me,""),u,l))}return n}function Be(e,t,n){for(var r,i=t?ce.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||ce.cleanData(Se(r)),r.parentNode&&(n&&K(r)&&Ee(Se(r,"script")),r.parentNode.removeChild(r));return e}ce.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=K(e);if(!(le.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||ce.isXMLDoc(e)))for(a=Se(c),r=0,i=(o=Se(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&we.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||Se(e),a=a||Se(c),r=0,i=o.length;r<i;r++)Fe(o[r],a[r]);else Fe(e,c);return 0<(a=Se(c,"script")).length&&Ee(a,!f&&Se(e,"script")),c},cleanData:function(e){for(var t,n,r,i=ce.event.special,o=0;void 0!==(n=e[o]);o++)if($(n)){if(t=n[_.expando]){if(t.events)for(r in t.events)i[r]?ce.event.remove(n,r):ce.removeEvent(n,r,t.handle);n[_.expando]=void 0}n[z.expando]&&(n[z.expando]=void 0)}}}),ce.fn.extend({detach:function(e){return Be(this,e,!0)},remove:function(e){return Be(this,e)},text:function(e){return M(this,function(e){return void 0===e?ce.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return $e(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Re(this,e).appendChild(e)})},prepend:function(){return $e(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Re(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return $e(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return $e(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(ce.cleanData(Se(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return ce.clone(this,e,t)})},html:function(e){return M(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Oe.test(e)&&!ke[(Te.exec(e)||["",""])[1].toLowerCase()]){e=ce.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(ce.cleanData(Se(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return $e(this,arguments,function(e){var t=this.parentNode;ce.inArray(this,n)<0&&(ce.cleanData(Se(this)),t&&t.replaceChild(e,this))},n)}}),ce.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){ce.fn[e]=function(e){for(var t,n=[],r=ce(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),ce(r[o])[a](t),s.apply(n,t.get());return this.pushStack(n)}});var _e=new RegExp("^("+G+")(?!px)[a-z%]+$","i"),ze=/^--/,Xe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=ie),t.getComputedStyle(e)},Ue=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ve=new RegExp(Q.join("|"),"i");function Ge(e,t,n){var r,i,o,a,s=ze.test(t),u=e.style;return(n=n||Xe(e))&&(a=n.getPropertyValue(t)||n[t],s&&a&&(a=a.replace(ve,"$1")||void 0),""!==a||K(e)||(a=ce.style(e,t)),!le.pixelBoxStyles()&&_e.test(a)&&Ve.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=n.width,u.width=r,u.minWidth=i,u.maxWidth=o)),void 0!==a?a+"":a}function Ye(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",J.appendChild(u).appendChild(l);var e=ie.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),J.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=C.createElement("div"),l=C.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",le.clearCloneStyle="content-box"===l.style.backgroundClip,ce.extend(le,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=C.createElement("table"),t=C.createElement("tr"),n=C.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="box-sizing:content-box;border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",J.appendChild(e).appendChild(t).appendChild(n),r=ie.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,J.removeChild(e)),a}}))}();var Qe=["Webkit","Moz","ms"],Je=C.createElement("div").style,Ke={};function Ze(e){var t=ce.cssProps[e]||Ke[e];return t||(e in Je?e:Ke[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Qe.length;while(n--)if((e=Qe[n]+t)in Je)return e}(e)||e)}var et=/^(none|table(?!-c[ea]).+)/,tt={position:"absolute",visibility:"hidden",display:"block"},nt={letterSpacing:"0",fontWeight:"400"};function rt(e,t,n){var r=Y.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function it(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0,l=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(l+=ce.css(e,n+Q[a],!0,i)),r?("content"===n&&(u-=ce.css(e,"padding"+Q[a],!0,i)),"margin"!==n&&(u-=ce.css(e,"border"+Q[a]+"Width",!0,i))):(u+=ce.css(e,"padding"+Q[a],!0,i),"padding"!==n?u+=ce.css(e,"border"+Q[a]+"Width",!0,i):s+=ce.css(e,"border"+Q[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u+l}function ot(e,t,n){var r=Xe(e),i=(!le.boxSizingReliable()||n)&&"border-box"===ce.css(e,"boxSizing",!1,r),o=i,a=Ge(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(_e.test(a)){if(!n)return a;a="auto"}return(!le.boxSizingReliable()&&i||!le.reliableTrDimensions()&&fe(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===ce.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===ce.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+it(e,t,n||(i?"border":"content"),o,r,a)+"px"}function at(e,t,n,r,i){return new at.prototype.init(e,t,n,r,i)}ce.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Ge(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,aspectRatio:!0,borderImageSlice:!0,columnCount:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,scale:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeMiterlimit:!0,strokeOpacity:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=F(t),u=ze.test(t),l=e.style;if(u||(t=Ze(s)),a=ce.cssHooks[t]||ce.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=Y.exec(n))&&i[1]&&(n=te(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(ce.cssNumber[s]?"":"px")),le.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=F(t);return ze.test(t)||(t=Ze(s)),(a=ce.cssHooks[t]||ce.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Ge(e,t,r)),"normal"===i&&t in nt&&(i=nt[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),ce.each(["height","width"],function(e,u){ce.cssHooks[u]={get:function(e,t,n){if(t)return!et.test(ce.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?ot(e,u,n):Ue(e,tt,function(){return ot(e,u,n)})},set:function(e,t,n){var r,i=Xe(e),o=!le.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===ce.css(e,"boxSizing",!1,i),s=n?it(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-it(e,u,"border",!1,i)-.5)),s&&(r=Y.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=ce.css(e,u)),rt(0,t,s)}}}),ce.cssHooks.marginLeft=Ye(le.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Ge(e,"marginLeft"))||e.getBoundingClientRect().left-Ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),ce.each({margin:"",padding:"",border:"Width"},function(i,o){ce.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+Q[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(ce.cssHooks[i+o].set=rt)}),ce.fn.extend({css:function(e,t){return M(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Xe(e),i=t.length;a<i;a++)o[t[a]]=ce.css(e,t[a],!1,r);return o}return void 0!==n?ce.style(e,t,n):ce.css(e,t)},e,t,1<arguments.length)}}),((ce.Tween=at).prototype={constructor:at,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||ce.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(ce.cssNumber[n]?"":"px")},cur:function(){var e=at.propHooks[this.prop];return e&&e.get?e.get(this):at.propHooks._default.get(this)},run:function(e){var t,n=at.propHooks[this.prop];return this.options.duration?this.pos=t=ce.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):at.propHooks._default.set(this),this}}).init.prototype=at.prototype,(at.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=ce.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){ce.fx.step[e.prop]?ce.fx.step[e.prop](e):1!==e.elem.nodeType||!ce.cssHooks[e.prop]&&null==e.elem.style[Ze(e.prop)]?e.elem[e.prop]=e.now:ce.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=at.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},ce.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},ce.fx=at.prototype.init,ce.fx.step={};var st,ut,lt,ct,ft=/^(?:toggle|show|hide)$/,pt=/queueHooks$/;function dt(){ut&&(!1===C.hidden&&ie.requestAnimationFrame?ie.requestAnimationFrame(dt):ie.setTimeout(dt,ce.fx.interval),ce.fx.tick())}function ht(){return ie.setTimeout(function(){st=void 0}),st=Date.now()}function gt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=Q[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function vt(e,t,n){for(var r,i=(yt.tweeners[t]||[]).concat(yt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function yt(o,e,t){var n,a,r=0,i=yt.prefilters.length,s=ce.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=st||ht(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:ce.extend({},e),opts:ce.extend(!0,{specialEasing:{},easing:ce.easing._default},t),originalProperties:e,originalOptions:t,startTime:st||ht(),duration:t.duration,tweens:[],createTween:function(e,t){var n=ce.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=F(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=ce.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=yt.prefilters[r].call(l,o,c,l.opts))return v(n.stop)&&(ce._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return ce.map(c,vt,l),v(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),ce.fx.timer(ce.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}ce.Animation=ce.extend(yt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return te(n.elem,e,Y.exec(t),n),n}]},tweener:function(e,t){v(e)?(t=e,e=["*"]):e=e.match(D);for(var n,r=0,i=e.length;r<i;r++)n=e[r],yt.tweeners[n]=yt.tweeners[n]||[],yt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ee(e),v=_.get(e,"fxshow");for(r in n.queue||(null==(a=ce._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,ce.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ft.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||ce.style(e,r)}if((u=!ce.isEmptyObject(t))||!ce.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=_.get(e,"display")),"none"===(c=ce.css(e,"display"))&&(l?c=l:(re([e],!0),l=e.style.display||l,c=ce.css(e,"display"),re([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===ce.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=_.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&re([e],!0),p.done(function(){for(r in g||re([e]),_.remove(e,"fxshow"),d)ce.style(e,r,d[r])})),u=vt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?yt.prefilters.unshift(e):yt.prefilters.push(e)}}),ce.speed=function(e,t,n){var r=e&&"object"==typeof e?ce.extend({},e):{complete:n||!n&&t||v(e)&&e,duration:e,easing:n&&t||t&&!v(t)&&t};return ce.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in ce.fx.speeds?r.duration=ce.fx.speeds[r.duration]:r.duration=ce.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){v(r.old)&&r.old.call(this),r.queue&&ce.dequeue(this,r.queue)},r},ce.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ee).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=ce.isEmptyObject(t),o=ce.speed(e,n,r),a=function(){var e=yt(this,ce.extend({},t),o);(i||_.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=ce.timers,r=_.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&pt.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||ce.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=_.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=ce.timers,o=n?n.length:0;for(t.finish=!0,ce.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),ce.each(["toggle","show","hide"],function(e,r){var i=ce.fn[r];ce.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(gt(r,!0),e,t,n)}}),ce.each({slideDown:gt("show"),slideUp:gt("hide"),slideToggle:gt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){ce.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),ce.timers=[],ce.fx.tick=function(){var e,t=0,n=ce.timers;for(st=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||ce.fx.stop(),st=void 0},ce.fx.timer=function(e){ce.timers.push(e),ce.fx.start()},ce.fx.interval=13,ce.fx.start=function(){ut||(ut=!0,dt())},ce.fx.stop=function(){ut=null},ce.fx.speeds={slow:600,fast:200,_default:400},ce.fn.delay=function(r,e){return r=ce.fx&&ce.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=ie.setTimeout(e,r);t.stop=function(){ie.clearTimeout(n)}})},lt=C.createElement("input"),ct=C.createElement("select").appendChild(C.createElement("option")),lt.type="checkbox",le.checkOn=""!==lt.value,le.optSelected=ct.selected,(lt=C.createElement("input")).value="t",lt.type="radio",le.radioValue="t"===lt.value;var mt,xt=ce.expr.attrHandle;ce.fn.extend({attr:function(e,t){return M(this,ce.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){ce.removeAttr(this,e)})}}),ce.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?ce.prop(e,t,n):(1===o&&ce.isXMLDoc(e)||(i=ce.attrHooks[t.toLowerCase()]||(ce.expr.match.bool.test(t)?mt:void 0)),void 0!==n?null===n?void ce.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=ce.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!le.radioValue&&"radio"===t&&fe(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(D);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),mt={set:function(e,t,n){return!1===t?ce.removeAttr(e,n):e.setAttribute(n,n),n}},ce.each(ce.expr.match.bool.source.match(/\w+/g),function(e,t){var a=xt[t]||ce.find.attr;xt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=xt[o],xt[o]=r,r=null!=a(e,t,n)?o:null,xt[o]=i),r}});var bt=/^(?:input|select|textarea|button)$/i,wt=/^(?:a|area)$/i;function Tt(e){return(e.match(D)||[]).join(" ")}function Ct(e){return e.getAttribute&&e.getAttribute("class")||""}function kt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(D)||[]}ce.fn.extend({prop:function(e,t){return M(this,ce.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[ce.propFix[e]||e]})}}),ce.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&ce.isXMLDoc(e)||(t=ce.propFix[t]||t,i=ce.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=ce.find.attr(e,"tabindex");return t?parseInt(t,10):bt.test(e.nodeName)||wt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),le.optSelected||(ce.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),ce.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){ce.propFix[this.toLowerCase()]=this}),ce.fn.extend({addClass:function(t){var e,n,r,i,o,a;return v(t)?this.each(function(e){ce(this).addClass(t.call(this,e,Ct(this)))}):(e=kt(t)).length?this.each(function(){if(r=Ct(this),n=1===this.nodeType&&" "+Tt(r)+" "){for(o=0;o<e.length;o++)i=e[o],n.indexOf(" "+i+" ")<0&&(n+=i+" ");a=Tt(n),r!==a&&this.setAttribute("class",a)}}):this},removeClass:function(t){var e,n,r,i,o,a;return v(t)?this.each(function(e){ce(this).removeClass(t.call(this,e,Ct(this)))}):arguments.length?(e=kt(t)).length?this.each(function(){if(r=Ct(this),n=1===this.nodeType&&" "+Tt(r)+" "){for(o=0;o<e.length;o++){i=e[o];while(-1<n.indexOf(" "+i+" "))n=n.replace(" "+i+" "," ")}a=Tt(n),r!==a&&this.setAttribute("class",a)}}):this:this.attr("class","")},toggleClass:function(t,n){var e,r,i,o,a=typeof t,s="string"===a||Array.isArray(t);return v(t)?this.each(function(e){ce(this).toggleClass(t.call(this,e,Ct(this),n),n)}):"boolean"==typeof n&&s?n?this.addClass(t):this.removeClass(t):(e=kt(t),this.each(function(){if(s)for(o=ce(this),i=0;i<e.length;i++)r=e[i],o.hasClass(r)?o.removeClass(r):o.addClass(r);else void 0!==t&&"boolean"!==a||((r=Ct(this))&&_.set(this,"__className__",r),this.setAttribute&&this.setAttribute("class",r||!1===t?"":_.get(this,"__className__")||""))}))},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+Tt(Ct(n))+" ").indexOf(t))return!0;return!1}});var St=/\r/g;ce.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=v(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,ce(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=ce.map(t,function(e){return null==e?"":e+""})),(r=ce.valHooks[this.type]||ce.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=ce.valHooks[t.type]||ce.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(St,""):null==e?"":e:void 0}}),ce.extend({valHooks:{option:{get:function(e){var t=ce.find.attr(e,"value");return null!=t?t:Tt(ce.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!fe(n.parentNode,"optgroup"))){if(t=ce(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=ce.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<ce.inArray(ce.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),ce.each(["radio","checkbox"],function(){ce.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<ce.inArray(ce(e).val(),t)}},le.checkOn||(ce.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Et=ie.location,jt={guid:Date.now()},At=/\?/;ce.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new ie.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||ce.error("Invalid XML: "+(n?ce.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Dt=/^(?:focusinfocus|focusoutblur)$/,Nt=function(e){e.stopPropagation()};ce.extend(ce.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||C],d=ue.call(e,"type")?e.type:e,h=ue.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||C,3!==n.nodeType&&8!==n.nodeType&&!Dt.test(d+ce.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[ce.expando]?e:new ce.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:ce.makeArray(t,[e]),c=ce.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!y(n)){for(s=c.delegateType||d,Dt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||C)&&p.push(a.defaultView||a.parentWindow||ie)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(_.get(o,"events")||Object.create(null))[e.type]&&_.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&$(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!$(n)||u&&v(n[d])&&!y(n)&&((a=n[u])&&(n[u]=null),ce.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Nt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Nt),ce.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=ce.extend(new ce.Event,n,{type:e,isSimulated:!0});ce.event.trigger(r,null,t)}}),ce.fn.extend({trigger:function(e,t){return this.each(function(){ce.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return ce.event.trigger(e,t,n,!0)}});var qt=/\[\]$/,Lt=/\r?\n/g,Ht=/^(?:submit|button|image|reset|file)$/i,Ot=/^(?:input|select|textarea|keygen)/i;function Pt(n,e,r,i){var t;if(Array.isArray(e))ce.each(e,function(e,t){r||qt.test(n)?i(n,t):Pt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==x(e))i(n,e);else for(t in e)Pt(n+"["+t+"]",e[t],r,i)}ce.param=function(e,t){var n,r=[],i=function(e,t){var n=v(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!ce.isPlainObject(e))ce.each(e,function(){i(this.name,this.value)});else for(n in e)Pt(n,e[n],t,i);return r.join("&")},ce.fn.extend({serialize:function(){return ce.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=ce.prop(this,"elements");return e?ce.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!ce(this).is(":disabled")&&Ot.test(this.nodeName)&&!Ht.test(e)&&(this.checked||!we.test(e))}).map(function(e,t){var n=ce(this).val();return null==n?null:Array.isArray(n)?ce.map(n,function(e){return{name:t.name,value:e.replace(Lt,"\r\n")}}):{name:t.name,value:n.replace(Lt,"\r\n")}}).get()}});var Mt=/%20/g,Rt=/#.*$/,It=/([?&])_=[^&]*/,Wt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ft=/^(?:GET|HEAD)$/,$t=/^\/\//,Bt={},_t={},zt="*/".concat("*"),Xt=C.createElement("a");function Ut(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(D)||[];if(v(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Vt(t,i,o,a){var s={},u=t===_t;function l(e){var r;return s[e]=!0,ce.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Gt(e,t){var n,r,i=ce.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&ce.extend(!0,e,r),e}Xt.href=Et.href,ce.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":ce.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Gt(Gt(e,ce.ajaxSettings),t):Gt(ce.ajaxSettings,e)},ajaxPrefilter:Ut(Bt),ajaxTransport:Ut(_t),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=ce.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?ce(y):ce.event,x=ce.Deferred(),b=ce.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Wt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace($t,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(D)||[""],null==v.crossDomain){r=C.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Xt.protocol+"//"+Xt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=ce.param(v.data,v.traditional)),Vt(Bt,v,t,T),h)return T;for(i in(g=ce.event&&v.global)&&0==ce.active++&&ce.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ft.test(v.type),f=v.url.replace(Rt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Mt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(At.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(It,"$1"),o=(At.test(f)?"&":"?")+"_="+jt.guid+++o),v.url=f+o),v.ifModified&&(ce.lastModified[f]&&T.setRequestHeader("If-Modified-Since",ce.lastModified[f]),ce.etag[f]&&T.setRequestHeader("If-None-Match",ce.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+zt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Vt(_t,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=ie.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&ie.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<ce.inArray("script",v.dataTypes)&&ce.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(ce.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(ce.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--ce.active||ce.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return ce.get(e,t,n,"json")},getScript:function(e,t){return ce.get(e,void 0,t,"script")}}),ce.each(["get","post"],function(e,i){ce[i]=function(e,t,n,r){return v(t)&&(r=r||n,n=t,t=void 0),ce.ajax(ce.extend({url:e,type:i,dataType:r,data:t,success:n},ce.isPlainObject(e)&&e))}}),ce.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),ce._evalUrl=function(e,t,n){return ce.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){ce.globalEval(e,t,n)}})},ce.fn.extend({wrapAll:function(e){var t;return this[0]&&(v(e)&&(e=e.call(this[0])),t=ce(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return v(n)?this.each(function(e){ce(this).wrapInner(n.call(this,e))}):this.each(function(){var e=ce(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=v(t);return this.each(function(e){ce(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){ce(this).replaceWith(this.childNodes)}),this}}),ce.expr.pseudos.hidden=function(e){return!ce.expr.pseudos.visible(e)},ce.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},ce.ajaxSettings.xhr=function(){try{return new ie.XMLHttpRequest}catch(e){}};var Yt={0:200,1223:204},Qt=ce.ajaxSettings.xhr();le.cors=!!Qt&&"withCredentials"in Qt,le.ajax=Qt=!!Qt,ce.ajaxTransport(function(i){var o,a;if(le.cors||Qt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Yt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&ie.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),ce.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),ce.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return ce.globalEval(e),e}}}),ce.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),ce.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=ce("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=Tt(e.slice(s)),e=e.slice(0,s)),v(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&ce.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?ce("<div>").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var en=/^[\s\uFEFF\xA0]+|([^\s\uFEFF\xA0])[\s\uFEFF\xA0]+$/g;ce.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),v(e))return r=ae.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(ae.call(arguments)))}).guid=e.guid=e.guid||ce.guid++,i},ce.holdReady=function(e){e?ce.readyWait++:ce.ready(!0)},ce.isArray=Array.isArray,ce.parseJSON=JSON.parse,ce.nodeName=fe,ce.isFunction=v,ce.isWindow=y,ce.camelCase=F,ce.type=x,ce.now=Date.now,ce.isNumeric=function(e){var t=ce.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},ce.trim=function(e){return null==e?"":(e+"").replace(en,"$1")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return ce});var tn=ie.jQuery,nn=ie.$;return ce.noConflict=function(e){return ie.$===ce&&(ie.$=nn),e&&ie.jQuery===ce&&(ie.jQuery=tn),ce},"undefined"==typeof e&&(ie.jQuery=ie.$=ce),ce});
diff --git a/phpBB/assets/javascript/mentions.js b/phpBB/assets/javascript/mentions.js
index efd57bc9731..7adcb1040b7 100644
--- a/phpBB/assets/javascript/mentions.js
+++ b/phpBB/assets/javascript/mentions.js
@@ -20,8 +20,10 @@
 	 */
 	function Mentions() {
 		const $mentionDataContainer = $('[data-mention-url]:first');
+		const $mentionsForm = $mentionDataContainer.closest('form');
 		const mentionURL = $mentionDataContainer.data('mentionUrl');
 		const mentionNamesLimit = $mentionDataContainer.data('mentionNamesLimit');
+		const mentionForumId = $mentionDataContainer.data('forumId');
 		const mentionTopicId = $mentionDataContainer.data('topicId');
 		const mentionUserId = $mentionDataContainer.data('userId');
 		let queryInProgress = null;
@@ -204,6 +206,36 @@
 			return _results;
 		}
 
+		/**
+		 * Get form tokens for request
+		 * @private
+		 * @return {object} Form tokens object
+		 */
+		function getFormTokens() {
+			return {
+				creation_time: $mentionsForm.find('input[name="creation_time"]').val(),
+				form_token: $mentionsForm.find('input[name="form_token"]').val(),
+			};
+		}
+
+		/**
+		 * Update form tokens in form
+		 * @private
+		 * @param {object} request_data Request data object
+		 * @return {void}
+		 */
+		function updateFormTokens(request_data) {
+			if (request_data.hasOwnProperty('form_tokens')) {
+				const form_tokens = request_data.form_tokens;
+				if (form_tokens.hasOwnProperty('form_token')) {
+					$mentionsForm.find('input[name="form_token"]').val(form_tokens.form_token);
+				}
+				if (form_tokens.hasOwnProperty('creation_time')) {
+					$mentionsForm.find('input[name="creation_time"]').val(form_tokens.creation_time);
+				}
+			}
+		}
+
 		/**
 		 * remoteFilter callback filter function
 		 * @param {string} query Query string
@@ -241,14 +273,49 @@
 			queryInProgress = query;
 
 			// eslint-disable-next-line camelcase
-			const parameters = { keyword: query, topic_id: mentionTopicId, _referer: location.href };
-			$.getJSON(mentionURL, parameters, data => {
-				cachedNames[query] = data.names;
-				cachedAll[query] = data.all;
-				callback(data.names);
-			}).always(() => {
-				queryInProgress = null;
-			});
+			const parameters = {
+				keyword: query,
+				topic_id: mentionTopicId,
+				forum_id: mentionForumId,
+				_referer: location.href,
+				...getFormTokens(),
+			};
+
+			$.post(mentionURL, parameters)
+				.done(data => {
+					updateFormTokens(data);
+
+					// Cache results
+					cachedNames[query] = data.names;
+					cachedAll[query] = data.all;
+
+					// Return names to callback
+					callback(data.names);
+				})
+				.fail((jqXHR, textStatus, errorThrown) => {
+					// Handle different error scenarios
+					if (jqXHR.status === 500) {
+						// Server error
+						console.error('Mentions: Server error (500) while fetching names');
+					} else if (jqXHR.status === 403) {
+						// Forbidden - possibly token expired
+						console.error('Mentions: Access forbidden (403) - form token may have expired');
+					} else if (jqXHR.status === 302 || jqXHR.status === 301) {
+						// Redirect - user might have been logged out
+						console.error('Mentions: Redirect detected - user may need to re-login');
+					} else if (jqXHR.status === 0) {
+						// Network error or request aborted
+						console.error('Mentions: Network error or request aborted');
+					} else {
+						console.error('Mentions: Error ' + jqXHR.status + ' - ' + errorThrown);
+					}
+
+					// Return empty array to callback on error
+					callback([]);
+				})
+				.always(() => {
+					queryInProgress = null;
+				});
 		}
 
 		/**
@@ -290,6 +357,9 @@
 				selectClass: 'is-active',
 				itemClass: 'mention-item',
 				menuItemTemplate,
+				noMatchTemplate() {
+					return (typeof mention_no_match_found === 'undefined') ? 'No match found' : mention_no_match_found;
+				},
 				selectTemplate(item) {
 					return '[mention ' + (item.type === 'g' ? 'group_id=' : 'user_id=') + item.id + ']' + item.name + '[/mention]';
 				},
diff --git a/phpBB/assets/javascript/phpbb-avatars.js b/phpBB/assets/javascript/phpbb-avatars.js
index c380f2ef99a..ecb6c506312 100644
--- a/phpBB/assets/javascript/phpbb-avatars.js
+++ b/phpBB/assets/javascript/phpbb-avatars.js
@@ -11,6 +11,9 @@
 		cropper: null,
 		image: null,
 
+		/** @type {jQuery|null} */
+		$originalAvatar: null,
+
 		/** @type {jQuery} */
 		$form: null,
 
@@ -32,30 +35,44 @@
 		/** @type {string} */
 		driverUpload: 'avatar_driver_upload',
 
+		/** @type {{width: {min: number, max: number}, height: {min: number, max: number}}} Allowed avatar sizes */
+		allowedSizes: {
+			width: { min: -1, max: -1 },
+			height: { min: -1, max: -1 },
+		},
+
 		/**
 		 * Initialise avatar cropping.
 		 */
 		init() {
 			// If the cropper library is not available
-			if (!$.isFunction($.fn.cropper)) {
+			if (!$.fn.hasOwnProperty('cropper') || typeof $.fn.cropper !== 'function') {
 				return;
 			}
 
+			// Set allowed sizes from data attributes
+			const data = this.$data.data();
+			this.allowedSizes.width.min = data.minWidth;
+			this.allowedSizes.width.max = data.maxWidth;
+			this.allowedSizes.height.min = data.minHeight;
+			this.allowedSizes.height.max = data.maxHeight;
+
 			// Correctly position the cropper buttons
 			this.$buttons.appendTo(this.$box);
 
-			// Ensure we have an img for the cropping
-			if (this.$box.children('img').length === 0) {
-				const $avatarImg = $('<img src="" alt="">');
-				$avatarImg.setAttribute('width', phpbb.avatars.$data.data().maxWidth);
-				$avatarImg.setAttribute('height', phpbb.avatars.$data.data().maxHeight);
-				$avatarImg.addClass('avatar');
-				this.image = $avatarImg;
-				this.$box.prepend($avatarImg);
-			} else {
-				this.image = this.$box.children('img');
+			// Add image for cropping but track original avatar if it exists
+			const $existingImg = this.$box.find('img');
+			if ($existingImg.length) {
+				this.$originalAvatar = $existingImg;
 			}
 
+			const $avatarImg = $('<img src="" alt="">');
+			$avatarImg.attr('width', this.allowedSizes.width.max);
+			$avatarImg.attr('height', this.allowedSizes.height.max);
+			$avatarImg.addClass('avatar hidden');
+			this.image = $avatarImg;
+			this.$box.prepend($avatarImg);
+
 			this.bindInput();
 			this.bindSelect();
 			this.bindSubmit();
@@ -67,9 +84,11 @@
 		destroy() {
 			this.$buttons.find('[data-cropper-action]').off('click.phpbb.avatars');
 			this.image.off('crop.phpbb.avatars');
+			this.setAvatarVisible(true);
 			this.$form.off('submit');
 
 			this.$data.val('');
+			this.$input.val(null);
 			this.$buttons.hide();
 			this.$box.removeClass('c-cropper-avatar-box');
 
@@ -87,10 +106,14 @@
 		bindSelect() {
 			this.$driver.on('change', function() {
 				if ($(this).val() === phpbb.avatars.driverUpload) {
-					if (phpbb.avatars.$input.val() !== '') {
-						phpbb.avatars.$input.trigger('change');
-					}
+					// Rebind submit after switching back to upload driver
+					phpbb.avatars.bindSubmit();
 				} else {
+					// Show placeholder avatar if it exists and was hidden
+					if (phpbb.avatars.$box.children('.avatar-placeholder').length) {
+						phpbb.avatars.$box.children('.avatar-placeholder').show();
+					}
+
 					phpbb.avatars.destroy();
 				}
 			});
@@ -112,6 +135,7 @@
 					fileReader.addEventListener('load', function() {
 						phpbb.avatars.image.cropper('destroy').attr('src', this.result).addClass('avatar');
 						phpbb.avatars.$box.addClass('c-cropper-avatar-box');
+						phpbb.avatars.setAvatarVisible(false);
 						phpbb.avatars.initCropper();
 						phpbb.avatars.initButtons();
 					});
@@ -121,6 +145,21 @@
 			});
 		},
 
+		/**
+		 * Show or hide the original avatar image.
+		 * @param {boolean} visible
+		 * @return {void}
+		 */
+		setAvatarVisible(visible) {
+			if (this.$originalAvatar !== null) {
+				if (visible) {
+					phpbb.avatars.$originalAvatar.removeClass('hidden');
+				} else {
+					phpbb.avatars.$originalAvatar.addClass('hidden');
+				}
+			}
+		},
+
 		/**
 		 * Bind submit button to be handled by ajax submit
 		 */
@@ -128,7 +167,11 @@
 			const $this = this;
 			$this.$form = this.$input.closest('form');
 			$this.$form.on('submit', () => {
-				const data = phpbb.avatars.$data.data();
+				if ($this.$form.find('#avatar_delete').is(':checked')) {
+					return;
+				}
+
+				const $submitButton = this.$form.find('fieldset > input[type=submit]').first();
 
 				const avatarCanvas = phpbb.avatars.cropper.getCroppedCanvas({
 					maxWidth: 4096, // High values for max quality cropping
@@ -137,12 +180,12 @@
 
 				// eslint-disable-next-line no-undef
 				const hermiteResize = new Hermite_class();
-				hermiteResize.resample_single(avatarCanvas, data.maxWidth, data.maxHeight, true);
+				hermiteResize.resample_single(avatarCanvas, phpbb.avatars.allowedSizes.width.max, phpbb.avatars.allowedSizes.height.max, true);
 
 				avatarCanvas.toBlob(blob => {
 					const formData = new FormData($this.$form[0]);
 					formData.set('avatar_upload_file', blob, $this.getUploadFileName());
-					formData.set('submit', '1');
+					formData.set($submitButton.attr('name'), $submitButton.val());
 
 					const canvasDataUrl = avatarCanvas.toDataURL('image/png');
 
@@ -181,7 +224,9 @@
 
 		/**
 		 * Handle response from avatar submission
-		 * @param {Object} response AJAX response object
+		 * @param {{MESSAGE_TITLE: string, MESSAGE_TEXT: string,
+		 * 			REFRESH_DATA: {time: int, url: string},
+		 * 			error: {title: string, messages: string[]}}} response AJAX response object
 		 * @param {string} canvasDataUrl Uploaded canvas element as data URL
 		 */
 		uploadDone(response, canvasDataUrl) {
@@ -191,6 +236,9 @@
 
 			// Handle errors while deleting file
 			if (typeof response.error === 'undefined') {
+				// Ensure image is visible after upload
+				phpbb.avatars.image.removeClass('hidden');
+
 				const alert = phpbb.alert(response.MESSAGE_TITLE, response.MESSAGE_TEXT);
 
 				setTimeout(() => {
@@ -198,7 +246,14 @@
 					alert.hide();
 				}, response.REFRESH_DATA.time * 1000);
 
-				phpbb.avatars.image.attr('src', canvasDataUrl);
+				// Update original avatar image if it exists or use added image
+				if (phpbb.avatars.$originalAvatar !== null) {
+					phpbb.avatars.$originalAvatar.attr('src', canvasDataUrl);
+					phpbb.avatars.image.addClass('hidden');
+				} else {
+					phpbb.avatars.image.attr('src', canvasDataUrl);
+				}
+
 				phpbb.avatars.destroy();
 			} else {
 				phpbb.alert(response.error.title, response.error.messages.join('<br>'));
@@ -239,9 +294,14 @@
 		 * and registers a callback function for the 'crop' event.
 		 */
 		initCropper() {
+			// Hide placeholder avatar
+			this.$box.children('.avatar-placeholder').hide();
+
 			this.cropper = this.image.cropper({
 				aspectRatio: 1,
 				autoCropArea: 1,
+				minContainerHeight: this.allowedSizes.height.max * 2, // Double max size for better usability
+				minContainerWidth: this.allowedSizes.width.max * 2, // Double max size for better usability
 			}).data('cropper');
 
 			this.image.off('crop.phpbb.avatars').on('crop.phpbb.avatars', phpbb.avatars.onCrop);
@@ -261,12 +321,12 @@
 		 * @param {object} event
 		 */
 		onCrop(event) {
-			const data = phpbb.avatars.$data.data();
 			let { width, height } = event.detail;
+			const allowedSizes = phpbb.avatars.allowedSizes;
 
-			if (width < data.minWidth || height < data.minHeight) {
-				width = Math.max(data.minWidth, Math.min(data.maxWidth, width));
-				height = Math.max(data.minHeight, Math.min(data.maxHeight, height));
+			if (width < allowedSizes.width.min || height < allowedSizes.height.min) {
+				width = Math.max(allowedSizes.width.min, Math.min(allowedSizes.width.max, width));
+				height = Math.max(allowedSizes.height.min, Math.min(allowedSizes.height.max, height));
 				phpbb.avatars.cropper.setData({
 					width,
 					height,
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js
index 8c52aae8198..009be4b366e 100644
--- a/phpBB/assets/javascript/plupload.js
+++ b/phpBB/assets/javascript/plupload.js
@@ -1,4 +1,7 @@
 /* global phpbb, plupload, attachInline */
+/* eslint camelcase: 0 */
+/* eslint no-var: 0 */
+/* eslint no-unused-vars: 0 */
 
 plupload.addI18n(phpbb.plupload.i18n);
 phpbb.plupload.ids = [];
@@ -21,7 +24,7 @@ phpbb.plupload.initialize = function() {
 	// Only execute if Plupload initialized successfully.
 	phpbb.plupload.uploader.bind('Init', function() {
 		phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0];
-		let $attachRowTemplate = $('#attach-row-tpl');
+		const $attachRowTemplate = $('#attach-row-tpl');
 		$attachRowTemplate.removeClass('attach-row-tpl');
 		phpbb.plupload.rowTpl = $attachRowTemplate[0].outerHTML;
 
@@ -300,7 +303,7 @@ phpbb.plupload.deleteFile = function(row, attachId) {
 	$.ajax(phpbb.plupload.config.url, {
 		type: 'POST',
 		data: $.extend(fields, phpbb.plupload.getSerializedData()),
-		headers: phpbb.plupload.config.headers
+		headers: phpbb.plupload.config.headers,
 	})
 	.always(always)
 	.done(done);
@@ -452,7 +455,7 @@ phpbb.plupload.fileError = function(file, error) {
 		.addClass('file-error')
 		.attr({
 			'data-error-title': phpbb.plupload.lang.ERROR,
-			'data-error-message': error
+			'data-error-message': error,
 		});
 };
 
@@ -469,14 +472,14 @@ phpbb.plupload.initialize();
 plupload.addFileFilter('mime_types_max_file_size', function(types, file, callback) {
 	if (file.size !== 'undefined') {
 		$(types).each(function(i, type) {
-			let extensions = [],
+			const extensions = [],
 				extsArray = type.extensions.split(',');
 
 			$(extsArray).each(function(i, extension) {
-				/^\s*\*\s*$/.test(extension) ? extensions.push("\\.*") : extensions.push("\\." + extension.replace(new RegExp("[" + "/^$.*+?|()[]{}\\".replace(/./g, "\\$&") + "]", "g"), "\\$&"));
+				/^\s*\*\s*$/.test(extension) ? extensions.push('\\.*') : extensions.push('\\.' + extension.replace(new RegExp('[' + '/^$.*+?|()[]{}\\'.replace(/./g, '\\$&') + ']', 'g'), '\\$&'));
 			});
 
-			let regex = new RegExp("(" + extensions.join("|") + ")$", "i");
+			const regex = new RegExp('(' + extensions.join('|') + ')$', 'i');
 
 			if (regex.test(file.name)) {
 				if (type.max_file_size !== 'undefined' && type.max_file_size) {
@@ -484,7 +487,7 @@ plupload.addFileFilter('mime_types_max_file_size', function(types, file, callbac
 						phpbb.plupload.uploader.trigger('Error', {
 							code: plupload.FILE_SIZE_ERROR,
 							message: plupload.translate('File size error.'),
-							file: file
+							file: file,
 						});
 
 						callback(false);
@@ -587,9 +590,9 @@ phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
 		up.trigger('FileUploaded', file, {
 			response: JSON.stringify({
 				error: {
-					message: 'Error parsing server response.'
-				}
-			})
+					message: 'Error parsing server response.',
+				},
+			}),
 		});
 	}
 
@@ -603,9 +606,9 @@ phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
 		up.trigger('FileUploaded', file, {
 			response: JSON.stringify({
 				error: {
-					message: json.error.message
-				}
-			})
+					message: json.error.message,
+				},
+			}),
 		});
 	}
 });
@@ -692,7 +695,7 @@ phpbb.plupload.uploader.bind('FileUploaded', function(up, file, response) {
 		row.attr('data-attach-id', file.attachment_data.attach_id);
 		row.find('.file-inline-bbcode').show();
 		row.find('.file-status').addClass('file-uploaded');
-		phpbb.plupload.update(json.data, 'addition', 0, [json.download_url]);
+		phpbb.plupload.update(json.data, 'addition', 0, [ json.download_url ]);
 	}
 });
 
diff --git a/phpBB/assets/javascript/webpush.js b/phpBB/assets/javascript/webpush.js
new file mode 100644
index 00000000000..2391f2f60c2
--- /dev/null
+++ b/phpBB/assets/javascript/webpush.js
@@ -0,0 +1,328 @@
+/* global phpbb */
+
+'use strict';
+
+function PhpbbWebpush() {
+	/** @type {string} URL to service worker */
+	let serviceWorkerUrl = '';
+
+	/** @type {string} URL to subscribe to push */
+	let subscribeUrl = '';
+
+	/** @type {string} URL to unsubscribe from push */
+	let unsubscribeUrl = '';
+
+	/** @type { {creationTime: number, formToken: string} } Form tokens */
+	this.formTokens = {
+		creationTime: 0,
+		formToken: '',
+	};
+
+	/** @type {{endpoint: string, expiration: string}[]} Subscriptions */
+	let subscriptions;
+
+	/** @type {string} Title of error message */
+	let ajaxErrorTitle = '';
+
+	/** @type {string} VAPID public key */
+	let vapidPublicKey = '';
+
+	/** @type {HTMLElement} Subscribe button */
+	let subscribeButton;
+
+	/** @type {HTMLElement} Unsubscribe button */
+	let unsubscribeButton;
+
+	/**
+	 * Init function for phpBB Web Push
+	 * @type {array} options
+	 */
+	this.init = function(options) {
+		serviceWorkerUrl = options.serviceWorkerUrl;
+		subscribeUrl = options.subscribeUrl;
+		unsubscribeUrl = options.unsubscribeUrl;
+		this.formTokens = options.formTokens;
+		subscriptions = options.subscriptions;
+		ajaxErrorTitle = options.ajaxErrorTitle;
+		vapidPublicKey = options.vapidPublicKey;
+
+		subscribeButton = document.querySelector('#subscribe_webpush');
+		unsubscribeButton = document.querySelector('#unsubscribe_webpush');
+
+		// Service workers are only supported in secure context
+		if (window.isSecureContext !== true) {
+			setDisabledState();
+			return;
+		}
+
+		if ('serviceWorker' in navigator && 'PushManager' in window) {
+			navigator.serviceWorker.register(serviceWorkerUrl)
+				.then(() => {
+					subscribeButton.addEventListener('click', subscribeButtonHandler);
+					unsubscribeButton.addEventListener('click', unsubscribeButtonHandler);
+
+					updateButtonState();
+				})
+				.catch(error => {
+					console.info(error);
+					// Service worker could not be registered
+					setDisabledState();
+				});
+		} else {
+			setDisabledState();
+		}
+	};
+
+	/**
+	 * Disable subscribing buttons, update subscribe button text and hide dropdown toggle
+	 *
+	 * @return void
+	 */
+	function setDisabledState() {
+		subscribeButton.disabled = true;
+
+		const notificationList = document.getElementById('notification-menu');
+		const subscribeToggle = notificationList.querySelector('.webpush-subscribe');
+
+		if (subscribeToggle) {
+			subscribeToggle.style.display = 'none';
+		}
+
+		if (subscribeButton.type === 'submit' || subscribeButton.classList.contains('button')) {
+			subscribeButton.value = subscribeButton.getAttribute('data-disabled-msg');
+		}
+	}
+
+	/**
+	 * Update button state depending on notifications state
+	 *
+	 * @return void
+	 */
+	function updateButtonState() {
+		if (Notification.permission === 'granted') {
+			navigator.serviceWorker.getRegistration(serviceWorkerUrl)
+				.then(registration => {
+					if (typeof registration === 'undefined') {
+						return;
+					}
+
+					registration.pushManager.getSubscription()
+						.then(subscribed => {
+							if (isValidSubscription(subscribed)) {
+								setSubscriptionState(true);
+							}
+						});
+				});
+		}
+	}
+
+	/**
+	 * Check whether subscription is valid
+	 *
+	 * @param {PushSubscription} subscription
+	 * @returns {boolean}
+	 */
+	const isValidSubscription = subscription => {
+		if (!subscription) {
+			return false;
+		}
+
+		if (subscription.expirationTime && subscription.expirationTime <= Date.now()) {
+			return false;
+		}
+
+		for (const curSubscription of subscriptions) {
+			if (subscription.endpoint === curSubscription.endpoint) {
+				return true;
+			}
+		}
+
+		// Subscription is not in valid subscription list for user
+		return false;
+	};
+
+	/**
+	 * Set subscription state for buttons
+	 *
+	 * @param {boolean} subscribed True if subscribed, false if not
+	 */
+	function setSubscriptionState(subscribed) {
+		if (subscribed) {
+			subscribeButton.classList.add('hidden');
+			unsubscribeButton.classList.remove('hidden');
+		} else {
+			subscribeButton.classList.remove('hidden');
+			unsubscribeButton.classList.add('hidden');
+		}
+	}
+
+	/**
+	 * Handler for pushing subscribe button
+	 *
+	 * @param {Object} event Subscribe button push event
+	 * @returns {Promise<void>}
+	 */
+	async function subscribeButtonHandler(event) {
+		event.preventDefault();
+
+		subscribeButton.removeEventListener('click', subscribeButtonHandler);
+
+		try {
+			// Prevent the user from clicking the subscribe button multiple times.
+			const result = await Notification.requestPermission();
+			if (result === 'denied') {
+				phpbb.alert(subscribeButton.getAttribute('data-l-err'), subscribeButton.getAttribute('data-l-msg'));
+				return;
+			}
+
+			const registration = await navigator.serviceWorker.getRegistration(serviceWorkerUrl);
+
+			// We might already have a subscription that is unknown to this instance of phpBB.
+			// Unsubscribe before trying to subscribe again.
+			if (typeof registration !== 'undefined') {
+				const subscribed = await registration.pushManager.getSubscription();
+				if (subscribed) {
+					await subscribed.unsubscribe();
+				}
+			}
+
+			const newSubscription = await registration.pushManager.subscribe({
+				userVisibleOnly: true,
+				applicationServerKey: urlB64ToUint8Array(vapidPublicKey),
+			});
+
+			const loadingIndicator = phpbb.loadingIndicator();
+			fetch(subscribeUrl, {
+				method: 'POST',
+				headers: {
+					'X-Requested-With': 'XMLHttpRequest',
+				},
+				body: getFormData(newSubscription),
+			})
+				.then(response => {
+					loadingIndicator.fadeOut(phpbb.alertTime);
+					return response.json();
+				})
+				.then(handleSubscribe)
+				.catch(error => {
+					loadingIndicator.fadeOut(phpbb.alertTime);
+					phpbb.alert(ajaxErrorTitle, error);
+				});
+		} catch (error) {
+			console.info(error);
+			phpbb.alert(subscribeButton.getAttribute('data-l-err'), error.message || subscribeButton.getAttribute('data-disabled-msg'));
+		} finally {
+			subscribeButton.addEventListener('click', subscribeButtonHandler);
+		}
+	}
+
+	/**
+	 * Handler for pushing unsubscribe button
+	 *
+	 * @param {Object} event Unsubscribe button push event
+	 * @returns {Promise<void>}
+	 */
+	async function unsubscribeButtonHandler(event) {
+		event.preventDefault();
+
+		const registration = await navigator.serviceWorker.getRegistration(serviceWorkerUrl);
+		if (typeof registration === 'undefined') {
+			return;
+		}
+
+		const subscription = await registration.pushManager.getSubscription();
+		const loadingIndicator = phpbb.loadingIndicator();
+		fetch(unsubscribeUrl, {
+			method: 'POST',
+			headers: {
+				'X-Requested-With': 'XMLHttpRequest',
+			},
+			body: getFormData({ endpoint: subscription.endpoint }),
+		})
+			.then(() => {
+				loadingIndicator.fadeOut(phpbb.alertTime);
+				return subscription.unsubscribe();
+			})
+			.then(unsubscribed => {
+				if (unsubscribed) {
+					setSubscriptionState(false);
+				}
+			})
+			.catch(error => {
+				loadingIndicator.fadeOut(phpbb.alertTime);
+				phpbb.alert(ajaxErrorTitle, error);
+			});
+	}
+
+	/**
+	 * Handle subscribe response
+	 *
+	 * @param {Object} response Response from subscription endpoint
+	 */
+	function handleSubscribe(response) {
+		if (response.success) {
+			setSubscriptionState(true);
+			if ('form_tokens' in response) {
+				updateFormTokens(response.form_tokens);
+			}
+		}
+	}
+
+	/**
+	 * Get form data object including form tokens
+	 *
+	 * @param {Object} data Data to create form data from
+	 * @returns {FormData} Form data
+	 */
+	function getFormData(data) {
+		const formData = new FormData();
+		formData.append('form_token', phpbb.webpush.formTokens.formToken);
+		formData.append('creation_time', phpbb.webpush.formTokens.creationTime.toString());
+		formData.append('data', JSON.stringify(data));
+
+		return formData;
+	}
+
+	/**
+	 * Update form tokens with supplied ones
+	 *
+	 * @param {Object} formTokens
+	 */
+	function updateFormTokens(formTokens) {
+		phpbb.webpush.formTokens.creationTime = formTokens.creation_time;
+		phpbb.webpush.formTokens.formToken = formTokens.form_token;
+	}
+
+	/**
+	 * Convert a base64 string to Uint8Array
+	 *
+	 * @param base64String
+	 * @returns {Uint8Array}
+	 */
+	function urlB64ToUint8Array(base64String) {
+		const padding = '='.repeat((4 - (base64String.length % 4)) % 4);
+		const base64 = (base64String + padding).replace(/-/g, '+').replace(/_/g, '/');
+		const rawData = window.atob(base64);
+		const outputArray = new Uint8Array(rawData.length);
+		for (let i = 0; i < rawData.length; ++i) {
+			outputArray[i] = rawData.charCodeAt(i);
+		}
+
+		return outputArray;
+	}
+}
+
+function domReady(callBack) {
+	if (document.readyState === 'loading') {
+		document.addEventListener('DOMContentLoaded', callBack);
+	} else {
+		callBack();
+	}
+}
+
+phpbb.webpush = new PhpbbWebpush();
+
+domReady(() => {
+	/* global phpbbWebpushOptions */
+	phpbb.webpush.init(phpbbWebpushOptions);
+});
diff --git a/phpBB/composer.json b/phpBB/composer.json
index da6875f9bc4..515d3dff152 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -26,55 +26,52 @@
 		"phpbb/phpbb-core": "self.version"
 	},
 	"require": {
-		"php": "^8.1",
-		"ext-json": "*",
+		"php": "^8.2",
 		"ext-pdo": "*",
+		"ext-zip": "*",
 		"ext-zlib": "*",
+		"ext-sodium": "*",
 		"bantu/ini-get-wrapper": "~1.0",
 		"carlos-mg89/oauth": "^0.8.15",
-		"chita/topological_sort": "^3.0",
 		"composer/composer": "^2.0",
-		"composer/installers": "^1.9",
+		"composer/installers": "^2.3",
 		"composer/package-versions-deprecated": "^1.11",
-		"doctrine/dbal": "~3.3.6",
+		"doctrine/dbal": "^3.9",
 		"google/recaptcha": "~1.1",
-		"guzzlehttp/guzzle": "~6.3",
+		"guzzlehttp/guzzle": " ^7.0",
 		"marc1706/fast-image-size": "^1.1",
+		"minishlink/web-push": "^8.0",
 		"s9e/text-formatter": "^2.0",
-		"symfony/config": "^6.3",
-		"symfony/console": "^6.3",
-		"symfony/dependency-injection": "^6.3",
-		"symfony/error-handler": "^6.3",
-		"symfony/event-dispatcher": "^6.3",
-		"symfony/filesystem": "^6.3",
-		"symfony/finder": "^6.3",
-		"symfony/http-foundation": "^6.3",
-		"symfony/http-kernel": "^6.3",
+		"symfony/config": "^7.4",
+		"symfony/console": "^7.4",
+		"symfony/dependency-injection": "^7.4",
+		"symfony/error-handler": "^7.4",
+		"symfony/event-dispatcher": "^7.4",
+		"symfony/filesystem": "^7.4",
+		"symfony/finder": "^7.4",
+		"symfony/http-foundation": "^7.4",
+		"symfony/http-kernel": "^7.4",
 		"symfony/polyfill-mbstring": "^1.23",
-		"symfony/mime": "^6.3",
-		"symfony/process": "^6.3",
-		"symfony/proxy-manager-bridge": "^6.3",
-		"symfony/routing": "^6.3",
-		"symfony/twig-bridge": "^6.3",
-		"symfony/yaml": "^6.3",
-		"twig/twig": "^3.0"
+		"symfony/mailer": "^7.4",
+		"symfony/mime": "^7.4",
+		"symfony/process": "^7.4",
+		"symfony/routing": "^7.4",
+		"symfony/twig-bridge": "^7.4",
+		"symfony/yaml": "^7.4",
+		"twig/twig": "^3.14"
 	},
 	"require-dev": {
-		"laravel/homestead": "~14.4",
 		"misantron/dbunit": "~5.0",
 		"phing/phing": "~2.4",
-		"phpunit/phpunit": "^9.0",
-		"squizlabs/php_codesniffer": "~3.4",
-		"symfony/browser-kit": "^6.3",
-		"symfony/css-selector": "^6.3",
-		"symfony/dom-crawler": "^6.3",
-		"symfony/http-client": "^6.3",
-		"vimeo/psalm": "^5.18.0",
+		"phpunit/phpunit": "^10.0",
+		"squizlabs/php_codesniffer": "^4.0",
+		"symfony/browser-kit": "^7.4",
+		"symfony/css-selector": "^7.4",
+		"symfony/dom-crawler": "^7.4",
+		"symfony/http-client": "^7.4",
+		"vimeo/psalm": "^6.13.1",
 		"psalm/plugin-symfony": "^v5.1.0"
 	},
-	"suggest": {
-		"ext-mbstring": "Better performance in search"
-	},
 	"extra": {
 		"branch-alias": {
 			"dev-master": "4.0.x-dev"
@@ -82,7 +79,7 @@
 	},
 	"config": {
 		"platform": {
-			"php": "8.1.0"
+			"php": "8.2.27"
 		},
 		"allow-plugins": {
 			"composer/installers": true
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 36d1379632c..7e5550a19d8 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "75425a269d37301eb11d494437c2f5ff",
+    "content-hash": "96906149986423b8cf69fded01e56c6d",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",
@@ -40,23 +40,86 @@
             },
             "time": "2014-09-15T13:12:35+00:00"
         },
+        {
+            "name": "brick/math",
+            "version": "0.12.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/brick/math.git",
+                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/brick/math/zipball/866551da34e9a618e64a819ee1e01c20d8a588ba",
+                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.2",
+                "phpunit/phpunit": "^10.1",
+                "vimeo/psalm": "6.8.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Brick\\Math\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Arbitrary-precision arithmetic library",
+            "keywords": [
+                "Arbitrary-precision",
+                "BigInteger",
+                "BigRational",
+                "arithmetic",
+                "bigdecimal",
+                "bignum",
+                "bignumber",
+                "brick",
+                "decimal",
+                "integer",
+                "math",
+                "mathematics",
+                "rational"
+            ],
+            "support": {
+                "issues": "https://github.com/brick/math/issues",
+                "source": "https://github.com/brick/math/tree/0.12.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/BenMorel",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-02-28T13:11:00+00:00"
+        },
         {
             "name": "carlos-mg89/oauth",
-            "version": "0.8.15",
+            "version": "0.8.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/carlos-mg89/PHPoAuthLib.git",
-                "reference": "c14c44e4f8993009a10d56a41e61c19291824a29"
+                "reference": "7003d50bbb90383408abc1450d943657d087fc70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/carlos-mg89/PHPoAuthLib/zipball/c14c44e4f8993009a10d56a41e61c19291824a29",
-                "reference": "c14c44e4f8993009a10d56a41e61c19291824a29",
+                "url": "https://api.github.com/repos/carlos-mg89/PHPoAuthLib/zipball/7003d50bbb90383408abc1450d943657d087fc70",
+                "reference": "7003d50bbb90383408abc1450d943657d087fc70",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
+            "replace": {
+                "lusitanian/oauth": "~0.3"
+            },
             "require-dev": {
                 "ext-curl": "*",
                 "ext-dom": "*",
@@ -104,77 +167,34 @@
             ],
             "support": {
                 "issues": "https://github.com/carlos-mg89/PHPoAuthLib/issues",
-                "source": "https://github.com/carlos-mg89/PHPoAuthLib/tree/0.8.15"
-            },
-            "time": "2022-07-15T08:38:14+00:00"
-        },
-        {
-            "name": "chita/topological_sort",
-            "version": "v3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/CHItA/TopologicalSort.git",
-                "reference": "9e0401c712d0c7cf012f264cc105669844d2479e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/CHItA/TopologicalSort/zipball/9e0401c712d0c7cf012f264cc105669844d2479e",
-                "reference": "9e0401c712d0c7cf012f264cc105669844d2479e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "source": "https://github.com/carlos-mg89/PHPoAuthLib/tree/0.8.17"
             },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "CHItA\\TopologicalSort\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Máté Bartus",
-                    "email": "mate.bartus@gmail.com"
-                }
-            ],
-            "description": "Topological sort function",
-            "support": {
-                "issues": "https://github.com/CHItA/TopologicalSort/issues",
-                "source": "https://github.com/CHItA/TopologicalSort/tree/v3.0.1"
-            },
-            "time": "2021-01-04T21:31:59+00:00"
+            "time": "2025-02-08T12:14:07+00:00"
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.4.1",
+            "version": "1.5.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "3ce240142f6d59b808dd65c1f52f7a1c252e6cfd"
+                "reference": "00a2f4201641d5c53f7fc0195e6c8d9fcc321a78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/3ce240142f6d59b808dd65c1f52f7a1c252e6cfd",
-                "reference": "3ce240142f6d59b808dd65c1f52f7a1c252e6cfd",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/00a2f4201641d5c53f7fc0195e6c8d9fcc321a78",
+                "reference": "00a2f4201641d5c53f7fc0195e6c8d9fcc321a78",
                 "shasum": ""
             },
             "require": {
                 "ext-openssl": "*",
                 "ext-pcre": "*",
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.55",
-                "psr/log": "^1.0",
-                "symfony/phpunit-bridge": "^4.2 || ^5",
-                "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^8 || ^9",
+                "psr/log": "^1.0 || ^2.0 || ^3.0",
+                "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0"
             },
             "type": "library",
             "extra": {
@@ -209,7 +229,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.4.1"
+                "source": "https://github.com/composer/ca-bundle/tree/1.5.12"
             },
             "funding": [
                 {
@@ -219,40 +239,36 @@
                 {
                     "url": "https://github.com/composer",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2024-02-23T10:16:52+00:00"
+            "time": "2026-05-19T11:26:22+00:00"
         },
         {
             "name": "composer/class-map-generator",
-            "version": "1.1.0",
+            "version": "1.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/class-map-generator.git",
-                "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9"
+                "reference": "86d8208fc3c649a3a999daf1a63c25201be2990f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/953cc4ea32e0c31f2185549c7d216d7921f03da9",
-                "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9",
+                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/86d8208fc3c649a3a999daf1a63c25201be2990f",
+                "reference": "86d8208fc3c649a3a999daf1a63c25201be2990f",
                 "shasum": ""
             },
             "require": {
                 "composer/pcre": "^2.1 || ^3.1",
                 "php": "^7.2 || ^8.0",
-                "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7"
+                "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7 || ^8"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.6",
-                "phpstan/phpstan-deprecation-rules": "^1",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/filesystem": "^5.4 || ^6",
-                "symfony/phpunit-bridge": "^5"
+                "phpstan/phpstan": "^1.12 || ^2",
+                "phpstan/phpstan-deprecation-rules": "^1 || ^2",
+                "phpstan/phpstan-phpunit": "^1 || ^2",
+                "phpstan/phpstan-strict-rules": "^1.1 || ^2",
+                "phpunit/phpunit": "^8",
+                "symfony/filesystem": "^5.4 || ^6 || ^7 || ^8"
             },
             "type": "library",
             "extra": {
@@ -282,7 +298,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/class-map-generator/issues",
-                "source": "https://github.com/composer/class-map-generator/tree/1.1.0"
+                "source": "https://github.com/composer/class-map-generator/tree/1.7.3"
             },
             "funding": [
                 {
@@ -292,76 +308,75 @@
                 {
                     "url": "https://github.com/composer",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2023-06-30T13:58:57+00:00"
+            "time": "2026-05-05T09:17:07+00:00"
         },
         {
             "name": "composer/composer",
-            "version": "2.7.1",
+            "version": "2.9.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc"
+                "reference": "39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc",
-                "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc",
+                "url": "https://api.github.com/repos/composer/composer/zipball/39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2",
+                "reference": "39ee8baff8e97a1b657bbfcd6a236ff93a5efbb2",
                 "shasum": ""
             },
             "require": {
-                "composer/ca-bundle": "^1.0",
-                "composer/class-map-generator": "^1.0",
+                "composer/ca-bundle": "^1.5",
+                "composer/class-map-generator": "^1.4.0",
                 "composer/metadata-minifier": "^1.0",
-                "composer/pcre": "^2.1 || ^3.1",
-                "composer/semver": "^3.2.5",
+                "composer/pcre": "^2.3 || ^3.3",
+                "composer/semver": "^3.3",
                 "composer/spdx-licenses": "^1.5.7",
                 "composer/xdebug-handler": "^2.0.2 || ^3.0.3",
-                "justinrainbow/json-schema": "^5.2.11",
+                "ext-json": "*",
+                "justinrainbow/json-schema": "^6.5.1",
                 "php": "^7.2.5 || ^8.0",
                 "psr/log": "^1.0 || ^2.0 || ^3.0",
-                "react/promise": "^2.8 || ^3",
+                "react/promise": "^3.3",
                 "seld/jsonlint": "^1.4",
                 "seld/phar-utils": "^1.2",
                 "seld/signal-handler": "^2.0",
-                "symfony/console": "^5.4.11 || ^6.0.11 || ^7",
-                "symfony/filesystem": "^5.4 || ^6.0 || ^7",
-                "symfony/finder": "^5.4 || ^6.0 || ^7",
+                "symfony/console": "^5.4.47 || ^6.4.25 || ^7.1.10 || ^8.0",
+                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.1.10 || ^8.0",
+                "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.1.10 || ^8.0",
                 "symfony/polyfill-php73": "^1.24",
                 "symfony/polyfill-php80": "^1.24",
                 "symfony/polyfill-php81": "^1.24",
-                "symfony/process": "^5.4 || ^6.0 || ^7"
+                "symfony/polyfill-php84": "^1.30",
+                "symfony/process": "^5.4.47 || ^6.4.25 || ^7.1.10 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.9.3",
-                "phpstan/phpstan-deprecation-rules": "^1",
-                "phpstan/phpstan-phpunit": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1",
-                "phpstan/phpstan-symfony": "^1.2.10",
-                "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1"
+                "phpstan/phpstan": "^1.11.8",
+                "phpstan/phpstan-deprecation-rules": "^1.2.0",
+                "phpstan/phpstan-phpunit": "^1.4.0",
+                "phpstan/phpstan-strict-rules": "^1.6.0",
+                "phpstan/phpstan-symfony": "^1.4.0",
+                "symfony/phpunit-bridge": "^6.4.25 || ^7.3.3 || ^8.0"
             },
             "suggest": {
-                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
-                "ext-zip": "Enabling the zip extension allows you to unzip archives",
-                "ext-zlib": "Allow gzip compression of HTTP requests"
+                "ext-curl": "Provides HTTP support (will fallback to PHP streams if missing)",
+                "ext-openssl": "Enables access to repositories and packages over HTTPS",
+                "ext-zip": "Allows direct extraction of ZIP archives (unzip/7z binaries will be used instead if available)",
+                "ext-zlib": "Enables gzip for HTTP requests"
             },
             "bin": [
                 "bin/composer"
             ],
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "2.7-dev"
-                },
                 "phpstan": {
                     "includes": [
                         "phpstan/rules.neon"
                     ]
+                },
+                "branch-alias": {
+                    "dev-main": "2.9-dev"
                 }
             },
             "autoload": {
@@ -396,7 +411,7 @@
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
                 "security": "https://github.com/composer/composer/security/policy",
-                "source": "https://github.com/composer/composer/tree/2.7.1"
+                "source": "https://github.com/composer/composer/tree/2.9.8"
             },
             "funding": [
                 {
@@ -406,49 +421,43 @@
                 {
                     "url": "https://github.com/composer",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2024-02-09T14:26:28+00:00"
+            "time": "2026-05-13T07:28:38+00:00"
         },
         {
             "name": "composer/installers",
-            "version": "v1.12.0",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/installers.git",
-                "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19"
+                "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/installers/zipball/d20a64ed3c94748397ff5973488761b22f6d3f19",
-                "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19",
+                "url": "https://api.github.com/repos/composer/installers/zipball/12fb2dfe5e16183de69e784a7b84046c43d97e8e",
+                "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.0 || ^2.0"
-            },
-            "replace": {
-                "roundcube/plugin-installer": "*",
-                "shama/baton": "*"
+                "composer-plugin-api": "^1.0 || ^2.0",
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "composer/composer": "1.6.* || ^2.0",
-                "composer/semver": "^1 || ^3",
-                "phpstan/phpstan": "^0.12.55",
-                "phpstan/phpstan-phpunit": "^0.12.16",
-                "symfony/phpunit-bridge": "^4.2 || ^5",
-                "symfony/process": "^2.3"
+                "composer/composer": "^1.10.27 || ^2.7",
+                "composer/semver": "^1.7.2 || ^3.4.0",
+                "phpstan/phpstan": "^1.11",
+                "phpstan/phpstan-phpunit": "^1",
+                "symfony/phpunit-bridge": "^7.1.1",
+                "symfony/process": "^5 || ^6 || ^7"
             },
             "type": "composer-plugin",
             "extra": {
                 "class": "Composer\\Installers\\Plugin",
                 "branch-alias": {
-                    "dev-main": "1.x-dev"
-                }
+                    "dev-main": "2.x-dev"
+                },
+                "plugin-modifies-install-path": true
             },
             "autoload": {
                 "psr-4": {
@@ -469,7 +478,6 @@
             "description": "A multi-framework Composer library installer",
             "homepage": "https://composer.github.io/installers/",
             "keywords": [
-                "Craft",
                 "Dolibarr",
                 "Eliasis",
                 "Hurad",
@@ -490,7 +498,6 @@
                 "Whmcs",
                 "WolfCMS",
                 "agl",
-                "aimeos",
                 "annotatecms",
                 "attogram",
                 "bitrix",
@@ -499,6 +506,7 @@
                 "cockpit",
                 "codeigniter",
                 "concrete5",
+                "concreteCMS",
                 "croogo",
                 "dokuwiki",
                 "drupal",
@@ -509,7 +517,6 @@
                 "grav",
                 "installer",
                 "itop",
-                "joomla",
                 "known",
                 "kohana",
                 "laravel",
@@ -518,6 +525,7 @@
                 "magento",
                 "majima",
                 "mako",
+                "matomo",
                 "mediawiki",
                 "miaoxing",
                 "modulework",
@@ -537,9 +545,7 @@
                 "silverstripe",
                 "sydes",
                 "sylius",
-                "symfony",
                 "tastyigniter",
-                "typo3",
                 "wordpress",
                 "yawik",
                 "zend",
@@ -547,7 +553,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/installers/issues",
-                "source": "https://github.com/composer/installers/tree/v1.12.0"
+                "source": "https://github.com/composer/installers/tree/v2.3.0"
             },
             "funding": [
                 {
@@ -563,7 +569,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T08:19:44+00:00"
+            "time": "2024-06-24T20:46:46+00:00"
         },
         {
             "name": "composer/metadata-minifier",
@@ -709,28 +715,36 @@
         },
         {
             "name": "composer/pcre",
-            "version": "3.1.1",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
-                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.4 || ^8.0"
             },
+            "conflict": {
+                "phpstan/phpstan": "<1.11.10"
+            },
             "require-dev": {
-                "phpstan/phpstan": "^1.3",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^5"
+                "phpstan/phpstan": "^1.12 || ^2",
+                "phpstan/phpstan-strict-rules": "^1 || ^2",
+                "phpunit/phpunit": "^8 || ^9"
             },
             "type": "library",
             "extra": {
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                },
                 "branch-alias": {
                     "dev-main": "3.x-dev"
                 }
@@ -760,7 +774,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.1"
+                "source": "https://github.com/composer/pcre/tree/3.3.2"
             },
             "funding": [
                 {
@@ -776,28 +790,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-11T07:11:09+00:00"
+            "time": "2024-11-12T16:29:46+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "3.4.0",
+            "version": "3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
+                "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.4",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^3 || ^7"
             },
             "type": "library",
             "extra": {
@@ -841,7 +855,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.0"
+                "source": "https://github.com/composer/semver/tree/3.4.4"
             },
             "funding": [
                 {
@@ -851,34 +865,30 @@
                 {
                     "url": "https://github.com/composer",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2023-08-31T09:50:34+00:00"
+            "time": "2025-08-20T19:15:30+00:00"
         },
         {
             "name": "composer/spdx-licenses",
-            "version": "1.5.8",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a"
+                "reference": "5ecd0cb4177696f9fd48f1605dda81db3dee7889"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a",
-                "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/5ecd0cb4177696f9fd48f1605dda81db3dee7889",
+                "reference": "5ecd0cb4177696f9fd48f1605dda81db3dee7889",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.55",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^6.4.25 || ^7.3.3 || ^8.0"
             },
             "type": "library",
             "extra": {
@@ -921,7 +931,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/spdx-licenses/issues",
-                "source": "https://github.com/composer/spdx-licenses/tree/1.5.8"
+                "source": "https://github.com/composer/spdx-licenses/tree/1.6.0"
             },
             "funding": [
                 {
@@ -931,26 +941,22 @@
                 {
                     "url": "https://github.com/composer",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2023-11-20T07:44:33+00:00"
+            "time": "2026-04-08T20:18:39+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "3.0.3",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
                 "shasum": ""
             },
             "require": {
@@ -961,7 +967,7 @@
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^6.0"
+                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
             },
             "type": "library",
             "autoload": {
@@ -985,9 +991,9 @@
                 "performance"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
             },
             "funding": [
                 {
@@ -1003,135 +1009,45 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-25T21:32:43+00:00"
-        },
-        {
-            "name": "doctrine/cache",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/cache.git",
-                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb",
-                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb",
-                "shasum": ""
-            },
-            "require": {
-                "php": "~7.1 || ^8.0"
-            },
-            "conflict": {
-                "doctrine/common": ">2.2,<2.4"
-            },
-            "require-dev": {
-                "cache/integration-tests": "dev-master",
-                "doctrine/coding-standard": "^9",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psr/cache": "^1.0 || ^2.0 || ^3.0",
-                "symfony/cache": "^4.4 || ^5.4 || ^6",
-                "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
-            "homepage": "https://www.doctrine-project.org/projects/cache.html",
-            "keywords": [
-                "abstraction",
-                "apcu",
-                "cache",
-                "caching",
-                "couchdb",
-                "memcached",
-                "php",
-                "redis",
-                "xcache"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/cache/issues",
-                "source": "https://github.com/doctrine/cache/tree/2.2.0"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-20T20:07:39+00:00"
+            "time": "2024-05-06T16:37:16+00:00"
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.3.8",
+            "version": "3.10.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "f873a820227bc352d023791775a01f078a30dfe1"
+                "reference": "95d84866bf3c04b2ddca1df7c049714660959aef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/f873a820227bc352d023791775a01f078a30dfe1",
-                "reference": "f873a820227bc352d023791775a01f078a30dfe1",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/95d84866bf3c04b2ddca1df7c049714660959aef",
+                "reference": "95d84866bf3c04b2ddca1df7c049714660959aef",
                 "shasum": ""
             },
             "require": {
                 "composer-runtime-api": "^2",
-                "doctrine/cache": "^1.11|^2.0",
                 "doctrine/deprecations": "^0.5.3|^1",
-                "doctrine/event-manager": "^1.0",
-                "php": "^7.3 || ^8.0",
+                "doctrine/event-manager": "^1|^2",
+                "php": "^7.4 || ^8.0",
                 "psr/cache": "^1|^2|^3",
                 "psr/log": "^1|^2|^3"
             },
+            "conflict": {
+                "doctrine/cache": "< 1.11"
+            },
             "require-dev": {
-                "doctrine/coding-standard": "9.0.0",
-                "jetbrains/phpstorm-stubs": "2022.1",
-                "phpstan/phpstan": "1.8.2",
-                "phpstan/phpstan-strict-rules": "^1.3",
-                "phpunit/phpunit": "9.5.21",
-                "psalm/plugin-phpunit": "0.17.0",
-                "squizlabs/php_codesniffer": "3.7.1",
-                "symfony/cache": "^5.2|^6.0",
-                "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
-                "vimeo/psalm": "4.24.0"
+                "doctrine/cache": "^1.11|^2.0",
+                "doctrine/coding-standard": "14.0.0",
+                "fig/log-test": "^1",
+                "jetbrains/phpstorm-stubs": "2023.1",
+                "phpstan/phpstan": "2.1.30",
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "9.6.34",
+                "slevomat/coding-standard": "8.27.1",
+                "squizlabs/php_codesniffer": "4.0.1",
+                "symfony/cache": "^5.4|^6.0|^7.0|^8.0",
+                "symfony/console": "^4.4|^5.4|^6.0|^7.0|^8.0"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -1191,7 +1107,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.3.8"
+                "source": "https://github.com/doctrine/dbal/tree/3.10.5"
             },
             "funding": [
                 {
@@ -1207,33 +1123,34 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-05T15:35:35+00:00"
+            "time": "2026-02-24T08:03:57+00:00"
         },
         {
             "name": "doctrine/deprecations",
-            "version": "1.1.3",
+            "version": "1.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
+                "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca",
+                "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
+            "conflict": {
+                "phpunit/phpunit": "<=7.5 || >=14"
+            },
             "require-dev": {
-                "doctrine/coding-standard": "^9",
-                "phpstan/phpstan": "1.4.10 || 1.10.15",
-                "phpstan/phpstan-phpunit": "^1.0",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psalm/plugin-phpunit": "0.18.4",
-                "psr/log": "^1 || ^2 || ^3",
-                "vimeo/psalm": "4.30.0 || 5.12.0"
+                "doctrine/coding-standard": "^9 || ^12 || ^14",
+                "phpstan/phpstan": "1.4.10 || 2.1.30",
+                "phpstan/phpstan-phpunit": "^1.0 || ^2",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12.4 || ^13.0",
+                "psr/log": "^1 || ^2 || ^3"
             },
             "suggest": {
                 "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -1241,7 +1158,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                    "Doctrine\\Deprecations\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1252,36 +1169,35 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.6"
             },
-            "time": "2024-01-30T19:34:25+00:00"
+            "time": "2026-02-07T07:09:04+00:00"
         },
         {
             "name": "doctrine/event-manager",
-            "version": "1.2.0",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520"
+                "reference": "dda33921b198841ca8dbad2eaa5d4d34769d18cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520",
-                "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/dda33921b198841ca8dbad2eaa5d4d34769d18cf",
+                "reference": "dda33921b198841ca8dbad2eaa5d4d34769d18cf",
                 "shasum": ""
             },
             "require": {
-                "doctrine/deprecations": "^0.5.3 || ^1",
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "conflict": {
                 "doctrine/common": "<2.9"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^10",
-                "phpstan/phpstan": "~1.4.10 || ^1.8.8",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.24"
+                "doctrine/coding-standard": "^14",
+                "phpdocumentor/guides-cli": "^1.4",
+                "phpstan/phpstan": "^2.1.32",
+                "phpunit/phpunit": "^10.5.58"
             },
             "type": "library",
             "autoload": {
@@ -1330,7 +1246,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/event-manager/issues",
-                "source": "https://github.com/doctrine/event-manager/tree/1.2.0"
+                "source": "https://github.com/doctrine/event-manager/tree/2.1.1"
             },
             "funding": [
                 {
@@ -1346,48 +1262,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-12T20:51:15+00:00"
+            "time": "2026-01-29T07:11:08+00:00"
         },
         {
-            "name": "friendsofphp/proxy-manager-lts",
-            "version": "v1.0.16",
+            "name": "doctrine/lexer",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/FriendsOfPHP/proxy-manager-lts.git",
-                "reference": "ecadbdc9052e4ad08c60c8a02268712e50427f7c"
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/ecadbdc9052e4ad08c60c8a02268712e50427f7c",
-                "reference": "ecadbdc9052e4ad08c60c8a02268712e50427f7c",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
+                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-code": "~3.4.1|^4.0",
-                "php": ">=7.1",
-                "symfony/filesystem": "^4.4.17|^5.0|^6.0|^7.0"
-            },
-            "conflict": {
-                "laminas/laminas-stdlib": "<3.2.1",
-                "zendframework/zend-stdlib": "<3.2.1"
-            },
-            "replace": {
-                "ocramius/proxy-manager": "^2.1"
+                "php": "^8.1"
             },
             "require-dev": {
-                "ext-phar": "*",
-                "symfony/phpunit-bridge": "^5.4|^6.0|^7.0"
+                "doctrine/coding-standard": "^12",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^10.5",
+                "psalm/plugin-phpunit": "^0.18.3",
+                "vimeo/psalm": "^5.21"
             },
             "type": "library",
-            "extra": {
-                "thanks": {
-                    "name": "ocramius/proxy-manager",
-                    "url": "https://github.com/Ocramius/ProxyManager"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "ProxyManager\\": "src/ProxyManager"
+                    "Doctrine\\Common\\Lexer\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1396,81 +1300,155 @@
             ],
             "authors": [
                 {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "https://ocramius.github.io/"
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
                 },
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
                 }
             ],
-            "description": "Adding support for a wider range of PHP versions to ocramius/proxy-manager",
-            "homepage": "https://github.com/FriendsOfPHP/proxy-manager-lts",
+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
             "keywords": [
-                "aop",
-                "lazy loading",
-                "proxy",
-                "proxy pattern",
-                "service proxies"
+                "annotations",
+                "docblock",
+                "lexer",
+                "parser",
+                "php"
             ],
             "support": {
-                "issues": "https://github.com/FriendsOfPHP/proxy-manager-lts/issues",
-                "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.16"
+                "issues": "https://github.com/doctrine/lexer/issues",
+                "source": "https://github.com/doctrine/lexer/tree/3.0.1"
             },
             "funding": [
                 {
-                    "url": "https://github.com/Ocramius",
-                    "type": "github"
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/ocramius/proxy-manager",
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-24T07:17:17+00:00"
+            "time": "2024-02-05T11:56:58+00:00"
         },
         {
-            "name": "google/recaptcha",
-            "version": "1.3.0",
+            "name": "egulias/email-validator",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/google/recaptcha.git",
-                "reference": "d59a801e98a4e9174814a6d71bbc268dff1202df"
+                "url": "https://github.com/egulias/EmailValidator.git",
+                "reference": "d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/google/recaptcha/zipball/d59a801e98a4e9174814a6d71bbc268dff1202df",
-                "reference": "d59a801e98a4e9174814a6d71bbc268dff1202df",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa",
+                "reference": "d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8"
+                "doctrine/lexer": "^2.0 || ^3.0",
+                "php": ">=8.1",
+                "symfony/polyfill-intl-idn": "^1.26"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^3.14",
-                "php-coveralls/php-coveralls": "^2.5",
-                "phpunit/phpunit": "^10"
+                "phpunit/phpunit": "^10.2",
+                "vimeo/psalm": "^5.12"
+            },
+            "suggest": {
+                "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "4.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "ReCaptcha\\": "src/ReCaptcha"
+                    "Egulias\\EmailValidator\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "Client library for reCAPTCHA, a free service that protects websites from spam and abuse.",
-            "homepage": "https://www.google.com/recaptcha/",
+            "authors": [
+                {
+                    "name": "Eduardo Gulias Davis"
+                }
+            ],
+            "description": "A library for validating emails against several RFCs",
+            "homepage": "https://github.com/egulias/EmailValidator",
             "keywords": [
-                "Abuse",
+                "email",
+                "emailvalidation",
+                "emailvalidator",
+                "validation",
+                "validator"
+            ],
+            "support": {
+                "issues": "https://github.com/egulias/EmailValidator/issues",
+                "source": "https://github.com/egulias/EmailValidator/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/egulias",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-03-06T22:45:56+00:00"
+        },
+        {
+            "name": "google/recaptcha",
+            "version": "1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/google/recaptcha.git",
+                "reference": "56522c261d2e8c58ba416c90f81a4cd9f2ed89b9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/google/recaptcha/zipball/56522c261d2e8c58ba416c90f81a4cd9f2ed89b9",
+                "reference": "56522c261d2e8c58ba416c90f81a4cd9f2ed89b9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.14",
+                "php-coveralls/php-coveralls": "^2.5",
+                "phpunit/phpunit": "^10"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "ReCaptcha\\": "src/ReCaptcha"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Client library for reCAPTCHA, a free service that protects websites from spam and abuse.",
+            "homepage": "https://www.google.com/recaptcha/",
+            "keywords": [
+                "Abuse",
                 "captcha",
                 "recaptcha",
                 "spam"
@@ -1480,41 +1458,52 @@
                 "issues": "https://github.com/google/recaptcha/issues",
                 "source": "https://github.com/google/recaptcha"
             },
-            "time": "2023-02-18T17:41:46+00:00"
+            "time": "2025-06-26T22:21:57+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.8",
+            "version": "7.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981"
+                "reference": "47ba23c7a55247e2e1b7407aca90e9bbed0d9d86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981",
-                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/47ba23c7a55247e2e1b7407aca90e9bbed0d9d86",
+                "reference": "47ba23c7a55247e2e1b7407aca90e9bbed0d9d86",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.9",
-                "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.17"
+                "guzzlehttp/promises": "^2.3",
+                "guzzlehttp/psr7": "^2.8",
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-client": "^1.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+            },
+            "provide": {
+                "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.1"
+                "guzzle/client-integration-tests": "3.0.2",
+                "guzzlehttp/test-server": "^0.3.2",
+                "php-http/message-factory": "^1.1",
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34",
+                "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
+                "ext-curl": "Required for CURL handler support",
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "psr/log": "Required for using the Log middleware"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "6.5-dev"
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
                 }
             },
             "autoload": {
@@ -1567,19 +1556,20 @@
                 }
             ],
             "description": "Guzzle is a PHP HTTP client library",
-            "homepage": "http://guzzlephp.org/",
             "keywords": [
                 "client",
                 "curl",
                 "framework",
                 "http",
                 "http client",
+                "psr-18",
+                "psr-7",
                 "rest",
                 "web service"
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/6.5.8"
+                "source": "https://github.com/guzzle/guzzle/tree/7.10.3"
             },
             "funding": [
                 {
@@ -1595,33 +1585,37 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-20T22:16:07+00:00"
+            "time": "2026-05-20T22:59:19+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.3",
+            "version": "2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e"
+                "reference": "09e8a212562fb1fb6a512c4156ed71525969d6c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/09e8a212562fb1fb6a512c4156ed71525969d6c2",
+                "reference": "09e8a212562fb1fb6a512c4156ed71525969d6c2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^4.4 || ^5.1"
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34"
             },
             "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\Promise\\": "src/"
                 }
@@ -1658,7 +1652,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.3"
+                "source": "https://github.com/guzzle/promises/tree/2.4.1"
             },
             "funding": [
                 {
@@ -1674,42 +1668,49 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-21T12:31:43+00:00"
+            "time": "2026-05-20T22:57:30+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.9.1",
+            "version": "2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b"
+                "reference": "73ab136360b5dfd858006eae9795e8fe43c80361"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b",
-                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/73ab136360b5dfd858006eae9795e8fe43c80361",
+                "reference": "73ab136360b5dfd858006eae9795e8fe43c80361",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0",
-                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.1 || ^2.0",
+                "ralouphie/getallheaders": "^3.0"
             },
             "provide": {
+                "psr/http-factory-implementation": "1.0",
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "ext-zlib": "*",
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "http-interop/http-factory-tests": "1.1.0",
+                "jshttp/mime-db": "1.54.0.1",
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\Psr7\\": "src/"
                 }
@@ -1748,6 +1749,11 @@
                     "name": "Tobias Schultze",
                     "email": "webmaster@tubo-world.de",
                     "homepage": "https://github.com/Tobion"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://sagikazarmark.hu"
                 }
             ],
             "description": "PSR-7 message implementation that also provides common utility methods",
@@ -1763,7 +1769,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.9.1"
+                "source": "https://github.com/guzzle/psr7/tree/2.10.1"
             },
             "funding": [
                 {
@@ -1779,29 +1785,34 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-17T16:00:37+00:00"
+            "time": "2026-05-20T09:27:36+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "v5.2.13",
+            "version": "6.8.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
+                "url": "https://github.com/jsonrainbow/json-schema.git",
+                "reference": "2c89ebb95ca9cedc9347f780333f7b25792dcb76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
-                "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
+                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/2c89ebb95ca9cedc9347f780333f7b25792dcb76",
+                "reference": "2c89ebb95ca9cedc9347f780333f7b25792dcb76",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "ext-json": "*",
+                "marc-mabe/php-enum": "^4.4",
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
-                "json-schema/json-schema-test-suite": "1.2.0",
-                "phpunit/phpunit": "^4.8.35"
+                "friendsofphp/php-cs-fixer": "3.3.0",
+                "json-schema/json-schema-test-suite": "dev-main",
+                "marc-mabe/php-enum-phpstan": "^2.0",
+                "phpspec/prophecy": "^1.19",
+                "phpstan/phpstan": "^1.12",
+                "phpunit/phpunit": "^8.5"
             },
             "bin": [
                 "bin/validate-json"
@@ -1809,7 +1820,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0.x-dev"
+                    "dev-master": "6.x-dev"
                 }
             },
             "autoload": {
@@ -1840,105 +1851,115 @@
                 }
             ],
             "description": "A library to validate a json schema.",
-            "homepage": "https://github.com/justinrainbow/json-schema",
+            "homepage": "https://github.com/jsonrainbow/json-schema",
             "keywords": [
                 "json",
                 "schema"
             ],
             "support": {
-                "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
+                "issues": "https://github.com/jsonrainbow/json-schema/issues",
+                "source": "https://github.com/jsonrainbow/json-schema/tree/6.8.2"
             },
-            "time": "2023-09-26T02:20:38+00:00"
+            "time": "2026-05-05T05:39:01+00:00"
         },
         {
-            "name": "laminas/laminas-code",
-            "version": "4.13.0",
+            "name": "marc-mabe/php-enum",
+            "version": "v4.7.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laminas/laminas-code.git",
-                "reference": "7353d4099ad5388e84737dd16994316a04f48dbf"
+                "url": "https://github.com/marc-mabe/php-enum.git",
+                "reference": "bb426fcdd65c60fb3638ef741e8782508fda7eef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-code/zipball/7353d4099ad5388e84737dd16994316a04f48dbf",
-                "reference": "7353d4099ad5388e84737dd16994316a04f48dbf",
+                "url": "https://api.github.com/repos/marc-mabe/php-enum/zipball/bb426fcdd65c60fb3638ef741e8782508fda7eef",
+                "reference": "bb426fcdd65c60fb3638ef741e8782508fda7eef",
                 "shasum": ""
             },
             "require": {
-                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+                "ext-reflection": "*",
+                "php": "^7.1 | ^8.0"
             },
             "require-dev": {
-                "doctrine/annotations": "^2.0.1",
-                "ext-phar": "*",
-                "laminas/laminas-coding-standard": "^2.5.0",
-                "laminas/laminas-stdlib": "^3.17.0",
-                "phpunit/phpunit": "^10.3.3",
-                "psalm/plugin-phpunit": "^0.18.4",
-                "vimeo/psalm": "^5.15.0"
-            },
-            "suggest": {
-                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
-                "laminas/laminas-stdlib": "Laminas\\Stdlib component"
+                "phpbench/phpbench": "^0.16.10 || ^1.0.4",
+                "phpstan/phpstan": "^1.3.1",
+                "phpunit/phpunit": "^7.5.20 | ^8.5.22 | ^9.5.11",
+                "vimeo/psalm": "^4.17.0 | ^5.26.1"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-3.x": "3.2-dev",
+                    "dev-master": "4.7-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "Laminas\\Code\\": "src/"
-                }
+                    "MabeEnum\\": "src/"
+                },
+                "classmap": [
+                    "stubs/Stringable.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Extensions to the PHP Reflection API, static code scanning, and code generation",
-            "homepage": "https://laminas.dev",
+            "authors": [
+                {
+                    "name": "Marc Bennewitz",
+                    "email": "dev@mabe.berlin",
+                    "homepage": "https://mabe.berlin/",
+                    "role": "Lead"
+                }
+            ],
+            "description": "Simple and fast implementation of enumerations with native PHP",
+            "homepage": "https://github.com/marc-mabe/php-enum",
             "keywords": [
-                "code",
-                "laminas",
-                "laminasframework"
+                "enum",
+                "enum-map",
+                "enum-set",
+                "enumeration",
+                "enumerator",
+                "enummap",
+                "enumset",
+                "map",
+                "set",
+                "type",
+                "type-hint",
+                "typehint"
             ],
             "support": {
-                "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-code/",
-                "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-code/issues",
-                "rss": "https://github.com/laminas/laminas-code/releases.atom",
-                "source": "https://github.com/laminas/laminas-code"
+                "issues": "https://github.com/marc-mabe/php-enum/issues",
+                "source": "https://github.com/marc-mabe/php-enum/tree/v4.7.2"
             },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2023-10-18T10:00:55+00:00"
+            "time": "2025-09-14T11:18:39+00:00"
         },
         {
             "name": "marc1706/fast-image-size",
-            "version": "v1.1.7",
+            "version": "v1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/marc1706/fast-image-size.git",
-                "reference": "aea6934a273182208bced600953f19a3d2eaeca0"
+                "reference": "35c193f56d3a3abaf441918ea4eda7cd5d89d443"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/aea6934a273182208bced600953f19a3d2eaeca0",
-                "reference": "aea6934a273182208bced600953f19a3d2eaeca0",
+                "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/35c193f56d3a3abaf441918ea4eda7cd5d89d443",
+                "reference": "35c193f56d3a3abaf441918ea4eda7cd5d89d443",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": ">=5.3.0"
+                "php": ">=7.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
@@ -1970,9 +1991,241 @@
             ],
             "support": {
                 "issues": "https://github.com/marc1706/fast-image-size/issues",
-                "source": "https://github.com/marc1706/fast-image-size/tree/v1.1.7"
+                "source": "https://github.com/marc1706/fast-image-size/tree/v1.3.1"
+            },
+            "time": "2026-03-28T15:26:03+00:00"
+        },
+        {
+            "name": "minishlink/web-push",
+            "version": "v8.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/web-push-libs/web-push-php.git",
+                "reference": "ec034f1e287cd1e74235e349bd017d71a61e9d8d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/web-push-libs/web-push-php/zipball/ec034f1e287cd1e74235e349bd017d71a61e9d8d",
+                "reference": "ec034f1e287cd1e74235e349bd017d71a61e9d8d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-openssl": "*",
+                "guzzlehttp/guzzle": "^7.0.1|^6.2",
+                "php": ">=8.0",
+                "spomky-labs/base64url": "^2.0",
+                "web-token/jwt-key-mgmt": "^2.0|^3.0.2",
+                "web-token/jwt-signature": "^2.0|^3.0.2",
+                "web-token/jwt-signature-algorithm-ecdsa": "^2.0|^3.0.2",
+                "web-token/jwt-util-ecc": "^2.0|^3.0.2"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^v3.13.2",
+                "phpstan/phpstan": "^1.9.8",
+                "phpunit/phpunit": "^9.5.27"
+            },
+            "suggest": {
+                "ext-gmp": "Optional for performance."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Minishlink\\WebPush\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Louis Lagrange",
+                    "email": "lagrange.louis@gmail.com",
+                    "homepage": "https://github.com/Minishlink"
+                }
+            ],
+            "description": "Web Push library for PHP",
+            "homepage": "https://github.com/web-push-libs/web-push-php",
+            "keywords": [
+                "Push API",
+                "WebPush",
+                "notifications",
+                "push",
+                "web"
+            ],
+            "support": {
+                "issues": "https://github.com/web-push-libs/web-push-php/issues",
+                "source": "https://github.com/web-push-libs/web-push-php/tree/v8.0.0"
+            },
+            "time": "2023-01-10T17:14:44+00:00"
+        },
+        {
+            "name": "paragonie/constant_time_encoding",
+            "version": "v3.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/constant_time_encoding.git",
+                "reference": "d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77",
+                "reference": "d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8"
+            },
+            "require-dev": {
+                "infection/infection": "^0",
+                "nikic/php-fuzzer": "^0",
+                "phpunit/phpunit": "^9|^10|^11",
+                "vimeo/psalm": "^4|^5|^6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "ParagonIE\\ConstantTime\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Steve 'Sc00bz' Thomas",
+                    "email": "steve@tobtu.com",
+                    "homepage": "https://www.tobtu.com",
+                    "role": "Original Developer"
+                }
+            ],
+            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
+            "keywords": [
+                "base16",
+                "base32",
+                "base32_decode",
+                "base32_encode",
+                "base64",
+                "base64_decode",
+                "base64_encode",
+                "bin2hex",
+                "encoding",
+                "hex",
+                "hex2bin",
+                "rfc4648"
+            ],
+            "support": {
+                "email": "info@paragonie.com",
+                "issues": "https://github.com/paragonie/constant_time_encoding/issues",
+                "source": "https://github.com/paragonie/constant_time_encoding"
+            },
+            "time": "2025-09-24T15:06:41+00:00"
+        },
+        {
+            "name": "paragonie/sodium_compat",
+            "version": "v2.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/sodium_compat.git",
+                "reference": "4714da6efdc782c06690bc72ce34fae7941c2d9f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/4714da6efdc782c06690bc72ce34fae7941c2d9f",
+                "reference": "4714da6efdc782c06690bc72ce34fae7941c2d9f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1",
+                "php-64bit": "*"
+            },
+            "require-dev": {
+                "infection/infection": "^0",
+                "nikic/php-fuzzer": "^0",
+                "phpunit/phpunit": "^7|^8|^9|^10|^11",
+                "vimeo/psalm": "^4|^5|^6"
+            },
+            "suggest": {
+                "ext-sodium": "Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "autoload.php"
+                ],
+                "psr-4": {
+                    "ParagonIE\\Sodium\\": "namespaced/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com"
+                },
+                {
+                    "name": "Frank Denis",
+                    "email": "jedisct1@pureftpd.org"
+                }
+            ],
+            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+            "keywords": [
+                "Authentication",
+                "BLAKE2b",
+                "ChaCha20",
+                "ChaCha20-Poly1305",
+                "Chapoly",
+                "Curve25519",
+                "Ed25519",
+                "EdDSA",
+                "Edwards-curve Digital Signature Algorithm",
+                "Elliptic Curve Diffie-Hellman",
+                "Poly1305",
+                "Pure-PHP cryptography",
+                "RFC 7748",
+                "RFC 8032",
+                "Salpoly",
+                "Salsa20",
+                "X25519",
+                "XChaCha20-Poly1305",
+                "XSalsa20-Poly1305",
+                "Xchacha20",
+                "Xsalsa20",
+                "aead",
+                "cryptography",
+                "ecdh",
+                "elliptic curve",
+                "elliptic curve cryptography",
+                "encryption",
+                "libsodium",
+                "php",
+                "public-key cryptography",
+                "secret-key cryptography",
+                "side-channel resistant"
+            ],
+            "support": {
+                "issues": "https://github.com/paragonie/sodium_compat/issues",
+                "source": "https://github.com/paragonie/sodium_compat/tree/v2.5.0"
             },
-            "time": "2022-01-12T16:29:39+00:00"
+            "time": "2025-12-30T16:12:18+00:00"
         },
         {
             "name": "psr/cache",
@@ -2023,6 +2276,54 @@
             },
             "time": "2021-02-03T23:26:27+00:00"
         },
+        {
+            "name": "psr/clock",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/clock.git",
+                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Clock\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for reading the clock.",
+            "homepage": "https://github.com/php-fig/clock",
+            "keywords": [
+                "clock",
+                "now",
+                "psr",
+                "psr-20",
+                "time"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/clock/issues",
+                "source": "https://github.com/php-fig/clock/tree/1.0.0"
+            },
+            "time": "2022-11-25T14:36:26+00:00"
+        },
         {
             "name": "psr/container",
             "version": "2.0.2",
@@ -2127,31 +2428,32 @@
             "time": "2019-01-08T18:20:26+00:00"
         },
         {
-            "name": "psr/http-message",
-            "version": "1.1",
+            "name": "psr/http-client",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": "^7.0 || ^8.0",
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
+                    "Psr\\Http\\Client\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2161,36 +2463,142 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
             "keywords": [
                 "http",
-                "http-message",
+                "http-client",
                 "psr",
-                "psr-7",
-                "request",
-                "response"
+                "psr-18"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/1.1"
+                "source": "https://github.com/php-fig/http-client"
             },
-            "time": "2023-04-04T09:50:52+00:00"
+            "time": "2023-09-23T14:17:50+00:00"
         },
         {
-            "name": "psr/log",
-            "version": "3.0.0",
+            "name": "psr/http-factory",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory"
+            },
+            "time": "2024-04-15T12:06:14+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
+            },
+            "time": "2023-04-04T09:54:51+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
                 "shasum": ""
             },
             "require": {
@@ -2225,9 +2633,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.0"
+                "source": "https://github.com/php-fig/log/tree/3.0.2"
             },
-            "time": "2021-07-14T16:46:02+00:00"
+            "time": "2024-09-11T13:17:53+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -2275,23 +2683,23 @@
         },
         {
             "name": "react/promise",
-            "version": "v3.1.0",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/promise.git",
-                "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c"
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/e563d55d1641de1dea9f5e84f3cccc66d2bfe02c",
-                "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/23444f53a813a3296c1368bb104793ce8d88f04a",
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "1.10.39 || 1.4.10",
+                "phpstan/phpstan": "1.12.28 || 1.4.10",
                 "phpunit/phpunit": "^9.6 || ^7.5"
             },
             "type": "library",
@@ -2336,7 +2744,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/promise/issues",
-                "source": "https://github.com/reactphp/promise/tree/v3.1.0"
+                "source": "https://github.com/reactphp/promise/tree/v3.3.0"
             },
             "funding": [
                 {
@@ -2344,7 +2752,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-11-16T16:21:57+00:00"
+            "time": "2025-08-19T18:57:03+00:00"
         },
         {
             "name": "s9e/regexp-builder",
@@ -2390,16 +2798,16 @@
         },
         {
             "name": "s9e/sweetdom",
-            "version": "3.4.0",
+            "version": "3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/s9e/SweetDOM.git",
-                "reference": "b07ae8f5fe4ac40a0b734e0e23dbadcc26a161e3"
+                "reference": "ef3a7d2745b30b4ad0d1d3d60be391a3604c69dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/s9e/SweetDOM/zipball/b07ae8f5fe4ac40a0b734e0e23dbadcc26a161e3",
-                "reference": "b07ae8f5fe4ac40a0b734e0e23dbadcc26a161e3",
+                "url": "https://api.github.com/repos/s9e/SweetDOM/zipball/ef3a7d2745b30b4ad0d1d3d60be391a3604c69dd",
+                "reference": "ef3a7d2745b30b4ad0d1d3d60be391a3604c69dd",
                 "shasum": ""
             },
             "require": {
@@ -2407,6 +2815,7 @@
                 "php": "^8.1"
             },
             "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.52",
                 "phpunit/phpunit": "^10.0",
                 "s9e/repdoc": "dev-wip"
             },
@@ -2429,22 +2838,22 @@
             ],
             "support": {
                 "issues": "https://github.com/s9e/SweetDOM/issues",
-                "source": "https://github.com/s9e/SweetDOM/tree/3.4.0"
+                "source": "https://github.com/s9e/SweetDOM/tree/3.4.1"
             },
-            "time": "2024-01-01T17:22:53+00:00"
+            "time": "2024-03-23T14:03:01+00:00"
         },
         {
             "name": "s9e/text-formatter",
-            "version": "2.16.0",
+            "version": "2.19.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/s9e/TextFormatter.git",
-                "reference": "a78b8f9bc169d0b6dd81ffff3c97479875bd673d"
+                "reference": "aee579c12d05ca3053f9b9abdb8c479c0f2fbe69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/a78b8f9bc169d0b6dd81ffff3c97479875bd673d",
-                "reference": "a78b8f9bc169d0b6dd81ffff3c97479875bd673d",
+                "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/aee579c12d05ca3053f9b9abdb8c479c0f2fbe69",
+                "reference": "aee579c12d05ca3053f9b9abdb8c479c0f2fbe69",
                 "shasum": ""
             },
             "require": {
@@ -2457,6 +2866,7 @@
             },
             "require-dev": {
                 "code-lts/doctum": "*",
+                "friendsofphp/php-cs-fixer": "^3.52",
                 "matthiasmullie/minify": "*",
                 "phpunit/phpunit": "^9.5"
             },
@@ -2471,7 +2881,7 @@
             },
             "type": "library",
             "extra": {
-                "version": "2.16.0"
+                "version": "2.19.3"
             },
             "autoload": {
                 "psr-4": {
@@ -2503,29 +2913,29 @@
             ],
             "support": {
                 "issues": "https://github.com/s9e/TextFormatter/issues",
-                "source": "https://github.com/s9e/TextFormatter/tree/2.16.0"
+                "source": "https://github.com/s9e/TextFormatter/tree/2.19.3"
             },
-            "time": "2024-01-07T00:41:30+00:00"
+            "time": "2025-11-14T21:26:59+00:00"
         },
         {
             "name": "seld/jsonlint",
-            "version": "1.10.2",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259"
+                "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9bb7db07b5d66d90f6ebf542f09fc67d800e5259",
-                "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/1748aaf847fc731cfad7725aec413ee46f0cc3a2",
+                "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.5",
+                "phpstan/phpstan": "^1.11",
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13"
             },
             "bin": [
@@ -2557,7 +2967,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/jsonlint/issues",
-                "source": "https://github.com/Seldaek/jsonlint/tree/1.10.2"
+                "source": "https://github.com/Seldaek/jsonlint/tree/1.11.0"
             },
             "funding": [
                 {
@@ -2569,7 +2979,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-07T12:57:50+00:00"
+            "time": "2024-07-11T14:55:45+00:00"
         },
         {
             "name": "seld/phar-utils",
@@ -2680,36 +3090,211 @@
             },
             "time": "2023-09-03T09:24:00+00:00"
         },
+        {
+            "name": "spomky-labs/base64url",
+            "version": "v2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Spomky-Labs/base64url.git",
+                "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Spomky-Labs/base64url/zipball/7752ce931ec285da4ed1f4c5aa27e45e097be61d",
+                "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^0.11|^0.12",
+                "phpstan/phpstan-beberlei-assert": "^0.11|^0.12",
+                "phpstan/phpstan-deprecation-rules": "^0.11|^0.12",
+                "phpstan/phpstan-phpunit": "^0.11|^0.12",
+                "phpstan/phpstan-strict-rules": "^0.11|^0.12"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Base64Url\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky-Labs/base64url/contributors"
+                }
+            ],
+            "description": "Base 64 URL Safe Encoding/Decoding PHP Library",
+            "homepage": "https://github.com/Spomky-Labs/base64url",
+            "keywords": [
+                "base64",
+                "rfc4648",
+                "safe",
+                "url"
+            ],
+            "support": {
+                "issues": "https://github.com/Spomky-Labs/base64url/issues",
+                "source": "https://github.com/Spomky-Labs/base64url/tree/v2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Spomky",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2020-11-03T09:10:25+00:00"
+        },
+        {
+            "name": "spomky-labs/pki-framework",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Spomky-Labs/pki-framework.git",
+                "reference": "aa576cbd07128075bef97ac2f8af9854e67513d8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/aa576cbd07128075bef97ac2f8af9854e67513d8",
+                "reference": "aa576cbd07128075bef97ac2f8af9854e67513d8",
+                "shasum": ""
+            },
+            "require": {
+                "brick/math": "^0.10|^0.11|^0.12|^0.13|^0.14|^0.15|^0.16|^0.17",
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "psr/clock": "^1.0"
+            },
+            "require-dev": {
+                "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0",
+                "ext-gmp": "*",
+                "ext-openssl": "*",
+                "infection/infection": "^0.28|^0.29|^0.31|^0.32",
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpstan/extension-installer": "^1.3|^2.0",
+                "phpstan/phpstan": "^1.8|^2.0",
+                "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
+                "phpstan/phpstan-phpunit": "^1.1|^2.0",
+                "phpstan/phpstan-strict-rules": "^1.3|^2.0",
+                "phpunit/phpunit": "^10.1|^11.0|^12.0|^13.0",
+                "rector/rector": "^1.0|^2.0",
+                "roave/security-advisories": "dev-latest",
+                "symfony/string": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0",
+                "symplify/easy-coding-standard": "^12.0|^13.0"
+            },
+            "suggest": {
+                "ext-bcmath": "For better performance (or GMP)",
+                "ext-gmp": "For better performance (or BCMath)",
+                "ext-openssl": "For OpenSSL based cyphering"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SpomkyLabs\\Pki\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Joni Eskelinen",
+                    "email": "jonieske@gmail.com",
+                    "role": "Original developer"
+                },
+                {
+                    "name": "Florent Morselli",
+                    "email": "florent.morselli@spomky-labs.com",
+                    "role": "Spomky-Labs PKI Framework developer"
+                }
+            ],
+            "description": "A PHP framework for managing Public Key Infrastructures. It comprises X.509 public key certificates, attribute certificates, certification requests and certification path validation.",
+            "homepage": "https://github.com/spomky-labs/pki-framework",
+            "keywords": [
+                "DER",
+                "Private Key",
+                "ac",
+                "algorithm identifier",
+                "asn.1",
+                "asn1",
+                "attribute certificate",
+                "certificate",
+                "certification request",
+                "cryptography",
+                "csr",
+                "decrypt",
+                "ec",
+                "encrypt",
+                "pem",
+                "pkcs",
+                "public key",
+                "rsa",
+                "sign",
+                "signature",
+                "verify",
+                "x.509",
+                "x.690",
+                "x509",
+                "x690"
+            ],
+            "support": {
+                "issues": "https://github.com/Spomky-Labs/pki-framework/issues",
+                "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Spomky",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2026-03-23T22:56:56+00:00"
+        },
         {
             "name": "symfony/config",
-            "version": "v6.4.3",
+            "version": "v7.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "206482ff3ed450495b1d5b7bad1bc3a852def96f"
+                "reference": "d91b6c7cd2a8c9a9c2b8d26c8f5ed48edf99ef57"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/206482ff3ed450495b1d5b7bad1bc3a852def96f",
-                "reference": "206482ff3ed450495b1d5b7bad1bc3a852def96f",
+                "url": "https://api.github.com/repos/symfony/config/zipball/d91b6c7cd2a8c9a9c2b8d26c8f5ed48edf99ef57",
+                "reference": "d91b6c7cd2a8c9a9c2b8d26c8f5ed48edf99ef57",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/filesystem": "^5.4|^6.0|^7.0",
+                "symfony/filesystem": "^7.1|^8.0",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "symfony/finder": "<5.4",
+                "symfony/finder": "<6.4",
                 "symfony/service-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-                "symfony/finder": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0|^8.0",
+                "symfony/finder": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/yaml": "^5.4|^6.0|^7.0"
+                "symfony/yaml": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -2737,7 +3322,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v6.4.3"
+                "source": "https://github.com/symfony/config/tree/v7.4.10"
             },
             "funding": [
                 {
@@ -2748,56 +3333,60 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T13:26:27+00:00"
+            "time": "2026-05-03T14:20:49+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.3",
+            "version": "v7.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e"
+                "reference": "ed0107e43ab452aa77ae99e005b95e56b556e075"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e",
-                "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/ed0107e43ab452aa77ae99e005b95e56b556e075",
+                "reference": "ed0107e43ab452aa77ae99e005b95e56b556e075",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^5.4|^6.0|^7.0"
+                "symfony/string": "^7.2|^8.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<5.4",
-                "symfony/process": "<5.4"
+                "symfony/dependency-injection": "<6.4",
+                "symfony/dotenv": "<6.4",
+                "symfony/event-dispatcher": "<6.4",
+                "symfony/lock": "<6.4",
+                "symfony/process": "<6.4"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/lock": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/event-dispatcher": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/lock": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/stopwatch": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -2831,7 +3420,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.3"
+                "source": "https://github.com/symfony/console/tree/v7.4.11"
             },
             "funding": [
                 {
@@ -2842,49 +3431,52 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-05-13T12:04:42+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v6.4.3",
+            "version": "v7.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "6871811c5a5c5e180244ddb689746446db02c05b"
+                "reference": "4eb0d9dfa9d4f7c59216baf49b3ed6b1fb72293d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6871811c5a5c5e180244ddb689746446db02c05b",
-                "reference": "6871811c5a5c5e180244ddb689746446db02c05b",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/4eb0d9dfa9d4f7c59216baf49b3ed6b1fb72293d",
+                "reference": "4eb0d9dfa9d4f7c59216baf49b3ed6b1fb72293d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/container": "^1.1|^2.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/service-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^6.2.10|^7.0"
+                "symfony/service-contracts": "^3.6",
+                "symfony/var-exporter": "^6.4.20|^7.2.5|^8.0"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2",
-                "symfony/config": "<6.1",
-                "symfony/finder": "<5.4",
-                "symfony/proxy-manager-bridge": "<6.3",
-                "symfony/yaml": "<5.4"
+                "symfony/config": "<6.4",
+                "symfony/finder": "<6.4",
+                "symfony/yaml": "<6.4"
             },
             "provide": {
                 "psr/container-implementation": "1.1|2.0",
                 "symfony/service-implementation": "1.1|2.0|3.0"
             },
             "require-dev": {
-                "symfony/config": "^6.1|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/yaml": "^5.4|^6.0|^7.0"
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/yaml": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -2912,7 +3504,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v6.4.3"
+                "source": "https://github.com/symfony/dependency-injection/tree/v7.4.10"
             },
             "funding": [
                 {
@@ -2923,25 +3515,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-30T08:32:12+00:00"
+            "time": "2026-05-06T11:55:30+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.4.0",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+                "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/50f59d1f3ca46d41ac911f97a78626b6756af35b",
+                "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b",
                 "shasum": ""
             },
             "require": {
@@ -2949,12 +3545,12 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -2979,7 +3575,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -2990,40 +3586,47 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2026-04-13T15:52:40+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.3",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "6dc3c76a278b77f01d864a6005d640822c6f26a6"
+                "reference": "8dd79d8af777ee6cba2fd4d98da6ffb839f3c0fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/6dc3c76a278b77f01d864a6005d640822c6f26a6",
-                "reference": "6dc3c76a278b77f01d864a6005d640822c6f26a6",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/8dd79d8af777ee6cba2fd4d98da6ffb839f3c0fa",
+                "reference": "8dd79d8af777ee6cba2fd4d98da6ffb839f3c0fa",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/polyfill-php85": "^1.32",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0"
             },
             "conflict": {
                 "symfony/deprecation-contracts": "<2.5",
                 "symfony/http-kernel": "<6.4"
             },
             "require-dev": {
+                "symfony/console": "^6.4|^7.0|^8.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/serializer": "^5.4|^6.0|^7.0"
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^6.4|^7.0|^8.0",
+                "symfony/webpack-encore-bundle": "^1.0|^2.0"
             },
             "bin": [
                 "Resources/bin/patch-type-declarations"
@@ -3054,7 +3657,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.3"
+                "source": "https://github.com/symfony/error-handler/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -3065,33 +3668,37 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T15:40:36+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.4.3",
+            "version": "v7.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef"
+                "reference": "e4a2e29753c7801f7a8340e066cfa788f3bc8101"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae9d3a6f3003a6caf56acd7466d8d52378d44fef",
-                "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e4a2e29753c7801f7a8340e066cfa788f3bc8101",
+                "reference": "e4a2e29753c7801f7a8340e066cfa788f3bc8101",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
+                "symfony/dependency-injection": "<6.4",
                 "symfony/service-contracts": "<2.5"
             },
             "provide": {
@@ -3100,13 +3707,14 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/error-handler": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/framework-bundle": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0"
+                "symfony/stopwatch": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -3134,7 +3742,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.3"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.9"
             },
             "funding": [
                 {
@@ -3145,25 +3753,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-04-18T13:18:21+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.4.0",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
+                "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/ccba7060602b7fed0b03c85bf025257f76d9ef32",
+                "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32",
                 "shasum": ""
             },
             "require": {
@@ -3172,12 +3784,12 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -3210,7 +3822,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -3221,32 +3833,39 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2026-01-05T13:30:16+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.4.3",
+            "version": "v7.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb"
+                "reference": "d721ea61b4a5fba8c5b6e7c1feda19efea144b50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
-                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/d721ea61b4a5fba8c5b6e7c1feda19efea144b50",
+                "reference": "d721ea61b4a5fba8c5b6e7c1feda19efea144b50",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.8"
             },
+            "require-dev": {
+                "symfony/process": "^6.4|^7.0|^8.0"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -3273,7 +3892,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.4.3"
+                "source": "https://github.com/symfony/filesystem/tree/v7.4.11"
             },
             "funding": [
                 {
@@ -3284,32 +3903,36 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-05-11T16:38:44+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.0",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce"
+                "reference": "e0be088d22278583a82da281886e8c3592fbf149"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce",
-                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/e0be088d22278583a82da281886e8c3592fbf149",
+                "reference": "e0be088d22278583a82da281886e8c3592fbf149",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "symfony/filesystem": "^6.0|^7.0"
+                "symfony/filesystem": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -3337,7 +3960,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.0"
+                "source": "https://github.com/symfony/finder/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -3348,50 +3971,71 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-31T17:30:12+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
-            "name": "symfony/http-foundation",
-            "version": "v6.4.3",
+            "name": "symfony/http-client",
+            "version": "v7.4.9",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "5677bdf7cade4619cb17fc9e1e7b31ec392244a9"
+                "url": "https://github.com/symfony/http-client.git",
+                "reference": "7e941c6abf4e3bf7dca160bf0e11ef36a9f832f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5677bdf7cade4619cb17fc9e1e7b31ec392244a9",
-                "reference": "5677bdf7cade4619cb17fc9e1e7b31ec392244a9",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/7e941c6abf4e3bf7dca160bf0e11ef36a9f832f6",
+                "reference": "7e941c6abf4e3bf7dca160bf0e11ef36a9f832f6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
+                "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/polyfill-mbstring": "~1.1",
-                "symfony/polyfill-php83": "^1.27"
+                "symfony/http-client-contracts": "~3.4.4|^3.5.2",
+                "symfony/polyfill-php83": "^1.29",
+                "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/cache": "<6.3"
+                "amphp/amp": "<2.5",
+                "amphp/socket": "<1.1",
+                "php-http/discovery": "<1.15",
+                "symfony/http-foundation": "<6.4"
+            },
+            "provide": {
+                "php-http/async-client-implementation": "*",
+                "php-http/client-implementation": "*",
+                "psr/http-client-implementation": "1.0",
+                "symfony/http-client-implementation": "3.0"
             },
             "require-dev": {
-                "doctrine/dbal": "^2.13.1|^3|^4",
-                "predis/predis": "^1.1|^2.0",
-                "symfony/cache": "^6.3|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
-                "symfony/mime": "^5.4|^6.0|^7.0",
-                "symfony/rate-limiter": "^5.4|^6.0|^7.0"
+                "amphp/http-client": "^4.2.1|^5.0",
+                "amphp/http-tunnel": "^1.0|^2.0",
+                "guzzlehttp/promises": "^1.4|^2.0",
+                "nyholm/psr7": "^1.0",
+                "php-http/httplug": "^1.0|^2.0",
+                "psr/http-client": "^1.0",
+                "symfony/amphp-http-client-meta": "^1.0|^2.0",
+                "symfony/cache": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/rate-limiter": "^6.4|^7.0|^8.0",
+                "symfony/stopwatch": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\HttpFoundation\\": ""
+                    "Symfony\\Component\\HttpClient\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -3403,18 +4047,21 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Defines an object-oriented layer for the HTTP specification",
+            "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "http"
+            ],
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.3"
+                "source": "https://github.com/symfony/http-client/tree/v7.4.9"
             },
             "funding": [
                 {
@@ -3425,81 +4072,251 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-04-29T13:25:15+00:00"
+        },
+        {
+            "name": "symfony/http-client-contracts",
+            "version": "v3.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-client-contracts.git",
+                "reference": "4a2d00c37651c0bdc2b9e1c773487a8bf4edb12d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/4a2d00c37651c0bdc2b9e1c773487a8bf4edb12d",
+                "reference": "4a2d00c37651c0bdc2b9e1c773487a8bf4edb12d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\HttpClient\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to HTTP clients",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.7.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-03-06T13:17:50+00:00"
+        },
+        {
+            "name": "symfony/http-foundation",
+            "version": "v7.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-foundation.git",
+                "reference": "9381209597ec66c25be154cbf2289076e64d1eab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9381209597ec66c25be154cbf2289076e64d1eab",
+                "reference": "9381209597ec66c25be154cbf2289076e64d1eab",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "^1.1"
+            },
+            "conflict": {
+                "doctrine/dbal": "<3.6",
+                "symfony/cache": "<6.4.12|>=7.0,<7.1.5"
+            },
+            "require-dev": {
+                "doctrine/dbal": "^3.6|^4",
+                "predis/predis": "^1.1|^2.0",
+                "symfony/cache": "^6.4.12|^7.1.5|^8.0",
+                "symfony/clock": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/mime": "^6.4|^7.0|^8.0",
+                "symfony/rate-limiter": "^6.4|^7.0|^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\HttpFoundation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Defines an object-oriented layer for the HTTP specification",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/http-foundation/tree/v7.4.8"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.3",
+            "version": "v7.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "9c6ec4e543044f7568a53a76ab1484ecd30637a2"
+                "reference": "7922b53e70d2ba2027af8bb6a59d91eb3541ea4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9c6ec4e543044f7568a53a76ab1484ecd30637a2",
-                "reference": "9c6ec4e543044f7568a53a76ab1484ecd30637a2",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7922b53e70d2ba2027af8bb6a59d91eb3541ea4d",
+                "reference": "7922b53e70d2ba2027af8bb6a59d91eb3541ea4d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/error-handler": "^6.4|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/error-handler": "^6.4|^7.0|^8.0",
+                "symfony/event-dispatcher": "^7.3|^8.0",
+                "symfony/http-foundation": "^7.4|^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
-                "symfony/browser-kit": "<5.4",
-                "symfony/cache": "<5.4",
-                "symfony/config": "<6.1",
-                "symfony/console": "<5.4",
+                "symfony/browser-kit": "<6.4",
+                "symfony/cache": "<6.4",
+                "symfony/config": "<6.4",
+                "symfony/console": "<6.4",
                 "symfony/dependency-injection": "<6.4",
-                "symfony/doctrine-bridge": "<5.4",
-                "symfony/form": "<5.4",
-                "symfony/http-client": "<5.4",
+                "symfony/doctrine-bridge": "<6.4",
+                "symfony/flex": "<2.10",
+                "symfony/form": "<6.4",
+                "symfony/http-client": "<6.4",
                 "symfony/http-client-contracts": "<2.5",
-                "symfony/mailer": "<5.4",
-                "symfony/messenger": "<5.4",
-                "symfony/translation": "<5.4",
+                "symfony/mailer": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/translation": "<6.4",
                 "symfony/translation-contracts": "<2.5",
-                "symfony/twig-bridge": "<5.4",
+                "symfony/twig-bridge": "<6.4",
                 "symfony/validator": "<6.4",
-                "symfony/var-dumper": "<6.3",
-                "twig/twig": "<2.13"
+                "symfony/var-dumper": "<6.4",
+                "twig/twig": "<3.12"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/cache": "^1.0|^2.0|^3.0",
-                "symfony/browser-kit": "^5.4|^6.0|^7.0",
-                "symfony/clock": "^6.2|^7.0",
-                "symfony/config": "^6.1|^7.0",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/css-selector": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/dom-crawler": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/browser-kit": "^6.4|^7.0|^8.0",
+                "symfony/clock": "^6.4|^7.0|^8.0",
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/css-selector": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4.1|^7.0.1|^8.0",
+                "symfony/dom-crawler": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/finder": "^6.4|^7.0|^8.0",
                 "symfony/http-client-contracts": "^2.5|^3",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/property-access": "^5.4.5|^6.0.5|^7.0",
-                "symfony/routing": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.3|^7.0",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0",
-                "symfony/translation": "^5.4|^6.0|^7.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/property-access": "^7.1|^8.0",
+                "symfony/routing": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^7.1|^8.0",
+                "symfony/stopwatch": "^6.4|^7.0|^8.0",
+                "symfony/translation": "^6.4|^7.0|^8.0",
                 "symfony/translation-contracts": "^2.5|^3",
-                "symfony/uid": "^5.4|^6.0|^7.0",
-                "symfony/validator": "^6.4|^7.0",
-                "symfony/var-exporter": "^6.2|^7.0",
-                "twig/twig": "^2.13|^3.0.4"
+                "symfony/uid": "^6.4|^7.0|^8.0",
+                "symfony/validator": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0",
+                "symfony/var-exporter": "^6.4|^7.0|^8.0",
+                "twig/twig": "^3.12"
             },
             "type": "library",
             "autoload": {
@@ -3527,7 +4344,91 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.3"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.4.12"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-05-20T09:27:11+00:00"
+        },
+        {
+            "name": "symfony/mailer",
+            "version": "v7.4.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/mailer.git",
+                "reference": "5cefb712a25f320579615ba9e1942abaeade7dff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/5cefb712a25f320579615ba9e1942abaeade7dff",
+                "reference": "5cefb712a25f320579615ba9e1942abaeade7dff",
+                "shasum": ""
+            },
+            "require": {
+                "egulias/email-validator": "^2.1.10|^3|^4",
+                "php": ">=8.2",
+                "psr/event-dispatcher": "^1",
+                "psr/log": "^1|^2|^3",
+                "symfony/event-dispatcher": "^6.4|^7.0|^8.0",
+                "symfony/mime": "^7.2|^8.0",
+                "symfony/service-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/http-client-contracts": "<2.5",
+                "symfony/http-kernel": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/mime": "<6.4",
+                "symfony/twig-bridge": "<6.4"
+            },
+            "require-dev": {
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/http-client": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
+                "symfony/twig-bridge": "^6.4|^7.0|^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mailer\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Helps sending emails",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/mailer/tree/v7.4.12"
             },
             "funding": [
                 {
@@ -3538,48 +4439,53 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-31T07:21:29+00:00"
+            "time": "2026-05-20T07:20:23+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.3",
+            "version": "v7.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "5017e0a9398c77090b7694be46f20eb796262a34"
+                "reference": "b198dd66c211c97119bcaaff7c13431dbbb5e470"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/5017e0a9398c77090b7694be46f20eb796262a34",
-                "reference": "5017e0a9398c77090b7694be46f20eb796262a34",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/b198dd66c211c97119bcaaff7c13431dbbb5e470",
+                "reference": "b198dd66c211c97119bcaaff7c13431dbbb5e470",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-intl-idn": "^1.10",
                 "symfony/polyfill-mbstring": "^1.0"
             },
             "conflict": {
                 "egulias/email-validator": "~3.0.0",
-                "phpdocumentor/reflection-docblock": "<3.2.2",
-                "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/mailer": "<5.4",
-                "symfony/serializer": "<6.3.2"
+                "phpdocumentor/reflection-docblock": "<5.2|>=7",
+                "phpdocumentor/type-resolver": "<1.5.1",
+                "symfony/mailer": "<6.4",
+                "symfony/serializer": "<6.4.3|>7.0,<7.0.3"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3.1|^4",
                 "league/html-to-markdown": "^5.0",
-                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/property-access": "^5.4|^6.0|^7.0",
-                "symfony/property-info": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.3.2|^7.0"
+                "phpdocumentor/reflection-docblock": "^5.2|^6.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/property-access": "^6.4|^7.0|^8.0",
+                "symfony/property-info": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^6.4.3|^7.0.3|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -3611,7 +4517,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.3"
+                "source": "https://github.com/symfony/mime/tree/v7.4.12"
             },
             "funding": [
                 {
@@ -3622,29 +4528,33 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-30T08:32:12+00:00"
+            "time": "2026-05-20T07:20:23+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.29.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/141046a8f9477948ff284fa65be2095baafb94f2",
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -3655,8 +4565,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3690,7 +4600,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -3701,29 +4611,33 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.29.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
+                "reference": "4864388bfbd3001ce88e234fab652acd91fdc57e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/4864388bfbd3001ce88e234fab652acd91fdc57e",
+                "reference": "4864388bfbd3001ce88e234fab652acd91fdc57e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -3731,8 +4645,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3768,7 +4682,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -3779,31 +4693,34 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2026-04-26T13:13:48+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.29.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919"
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919",
-                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3",
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php72": "^1.10"
+                "php": ">=7.2",
+                "symfony/polyfill-intl-normalizer": "^1.10"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -3811,8 +4728,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3852,7 +4769,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -3863,29 +4780,33 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-10T14:38:51+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.29.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -3893,8 +4814,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3933,7 +4854,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -3944,29 +4865,34 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.29.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+                "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6a21eb99c6973357967f6ce3708cd55a6bec6315",
+                "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "ext-iconv": "*",
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-mbstring": "*"
@@ -3977,8 +4903,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4013,7 +4939,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -4024,35 +4950,39 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2026-04-10T17:25:58+00:00"
         },
         {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.29.0",
+            "name": "symfony/polyfill-php73",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25"
+                "url": "https://github.com/symfony/polyfill-php73.git",
+                "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25",
-                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
+                "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4060,8 +4990,11 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                }
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -4077,7 +5010,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -4086,7 +5019,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -4097,35 +5030,39 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
-            "name": "symfony/polyfill-php73",
-            "version": "v1.29.0",
+            "name": "symfony/polyfill-php80",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
-                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
+                "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4133,7 +5070,7 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
+                    "Symfony\\Polyfill\\Php80\\": ""
                 },
                 "classmap": [
                     "Resources/stubs"
@@ -4144,6 +5081,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
                 {
                     "name": "Nicolas Grekas",
                     "email": "p@tchwork.com"
@@ -4153,7 +5094,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -4162,7 +5103,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -4173,35 +5114,39 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.29.0",
+            "name": "symfony/polyfill-php81",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4209,7 +5154,7 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
+                    "Symfony\\Polyfill\\Php81\\": ""
                 },
                 "classmap": [
                     "Resources/stubs"
@@ -4220,10 +5165,6 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
                 {
                     "name": "Nicolas Grekas",
                     "email": "p@tchwork.com"
@@ -4233,7 +5174,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -4242,7 +5183,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -4253,35 +5194,39 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
-            "name": "symfony/polyfill-php81",
-            "version": "v1.29.0",
+            "name": "symfony/polyfill-php83",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
+                "url": "https://github.com/symfony/polyfill-php83.git",
+                "reference": "3600c2cb22399e25bb226e4a135ce91eeb2a6149"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
-                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/3600c2cb22399e25bb226e4a135ce91eeb2a6149",
+                "reference": "3600c2cb22399e25bb226e4a135ce91eeb2a6149",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4289,7 +5234,7 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
+                    "Symfony\\Polyfill\\Php83\\": ""
                 },
                 "classmap": [
                     "Resources/stubs"
@@ -4309,7 +5254,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -4318,7 +5263,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -4329,36 +5274,39 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2026-04-10T17:25:58+00:00"
         },
         {
-            "name": "symfony/polyfill-php83",
-            "version": "v1.29.0",
+            "name": "symfony/polyfill-php84",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff"
+                "url": "https://github.com/symfony/polyfill-php84.git",
+                "reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff",
-                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/88486db2c389b290bf87ff1de7ebc1e13e42bb06",
+                "reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-php80": "^1.14"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4366,7 +5314,7 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php83\\": ""
+                    "Symfony\\Polyfill\\Php84\\": ""
                 },
                 "classmap": [
                     "Resources/stubs"
@@ -4386,7 +5334,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -4395,7 +5343,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -4406,37 +5354,50 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2026-04-10T18:47:49+00:00"
         },
         {
-            "name": "symfony/process",
-            "version": "v6.4.3",
+            "name": "symfony/polyfill-php85",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "31642b0818bfcff85930344ef93193f8c607e0a3"
+                "url": "https://github.com/symfony/polyfill-php85.git",
+                "reference": "fcfa4973a9917cef23f2e38774da74a2b7d115ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/31642b0818bfcff85930344ef93193f8c607e0a3",
-                "reference": "31642b0818bfcff85930344ef93193f8c607e0a3",
+                "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/fcfa4973a9917cef23f2e38774da74a2b7d115ee",
+                "reference": "fcfa4973a9917cef23f2e38774da74a2b7d115ee",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.2"
             },
             "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
+                    "Symfony\\Polyfill\\Php85\\": ""
                 },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4445,18 +5406,24 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Executes commands in sub-processes",
+            "description": "Symfony polyfill backporting some PHP 8.5+ features to lower PHP versions",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.3"
+                "source": "https://github.com/symfony/polyfill-php85/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -4467,40 +5434,38 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-04-26T13:10:57+00:00"
         },
         {
-            "name": "symfony/proxy-manager-bridge",
-            "version": "v6.4.3",
+            "name": "symfony/process",
+            "version": "v7.4.11",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/proxy-manager-bridge.git",
-                "reference": "c3f1b7d8f0b567eb960c540567f24219cb759e0a"
+                "url": "https://github.com/symfony/process.git",
+                "reference": "d9593c9efa40499eb078b81144de42cbc28a31f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/c3f1b7d8f0b567eb960c540567f24219cb759e0a",
-                "reference": "c3f1b7d8f0b567eb960c540567f24219cb759e0a",
+                "url": "https://api.github.com/repos/symfony/process/zipball/d9593c9efa40499eb078b81144de42cbc28a31f0",
+                "reference": "d9593c9efa40499eb078b81144de42cbc28a31f0",
                 "shasum": ""
             },
             "require": {
-                "friendsofphp/proxy-manager-lts": "^1.0.2",
-                "php": ">=8.1",
-                "symfony/dependency-injection": "^6.3|^7.0",
-                "symfony/deprecation-contracts": "^2.5|^3"
-            },
-            "require-dev": {
-                "symfony/config": "^6.1|^7.0"
+                "php": ">=8.2"
             },
-            "type": "symfony-bridge",
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Bridge\\ProxyManager\\": ""
+                    "Symfony\\Component\\Process\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -4520,10 +5485,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides integration for ProxyManager with various Symfony components",
+            "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/proxy-manager-bridge/tree/v6.4.3"
+                "source": "https://github.com/symfony/process/tree/v7.4.11"
             },
             "funding": [
                 {
@@ -4534,45 +5499,47 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-05-11T16:55:21+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.3",
+            "version": "v7.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842"
+                "reference": "3b04a5ec4887a8135a12ebf0f4cbc5b8fc8ee204"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/3b2957ad54902f0f544df83e3d58b38d7e8e5842",
-                "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/3b04a5ec4887a8135a12ebf0f4cbc5b8fc8ee204",
+                "reference": "3b04a5ec4887a8135a12ebf0f4cbc5b8fc8ee204",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
-                "doctrine/annotations": "<1.12",
-                "symfony/config": "<6.2",
-                "symfony/dependency-injection": "<5.4",
-                "symfony/yaml": "<5.4"
+                "symfony/config": "<6.4",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/yaml": "<6.4"
             },
             "require-dev": {
-                "doctrine/annotations": "^1.12|^2",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.2|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^5.4|^6.0|^7.0",
-                "symfony/yaml": "^5.4|^6.0|^7.0"
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
+                "symfony/yaml": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -4606,7 +5573,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.3"
+                "source": "https://github.com/symfony/routing/tree/v7.4.12"
             },
             "funding": [
                 {
@@ -4617,42 +5584,47 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-30T13:55:02+00:00"
+            "time": "2026-05-20T07:20:23+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.4.1",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
+                "reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d25d82433a80eba6aa0e6c24b61d7370d99e444a",
+                "reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "psr/container": "^1.1|^2.0"
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -4688,7 +5660,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -4699,31 +5671,36 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2026-03-28T09:44:51+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.3",
+            "version": "v7.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "7a14736fb179876575464e4658fce0c304e8c15b"
+                "reference": "965f7306a43383d02c6aca1e3f3bd2f0ea5dee15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/7a14736fb179876575464e4658fce0c304e8c15b",
-                "reference": "7a14736fb179876575464e4658fce0c304e8c15b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/965f7306a43383d02c6aca1e3f3bd2f0ea5dee15",
+                "reference": "965f7306a43383d02c6aca1e3f3bd2f0ea5dee15",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-grapheme": "~1.33",
                 "symfony/polyfill-intl-normalizer": "~1.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
@@ -4731,11 +5708,11 @@
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/http-client": "^5.4|^6.0|^7.0",
-                "symfony/intl": "^6.2|^7.0",
+                "symfony/emoji": "^7.1|^8.0",
+                "symfony/http-client": "^6.4|^7.0|^8.0",
+                "symfony/intl": "^6.4|^7.0|^8.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -4774,7 +5751,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.3"
+                "source": "https://github.com/symfony/string/tree/v7.4.11"
             },
             "funding": [
                 {
@@ -4785,25 +5762,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-25T09:26:29+00:00"
+            "time": "2026-05-13T12:04:42+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.4.1",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "06450585bf65e978026bda220cdebca3f867fde7"
+                "reference": "0ab302977a952b42fd51475c4ebac81f8da0a95d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7",
-                "reference": "06450585bf65e978026bda220cdebca3f867fde7",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/0ab302977a952b42fd51475c4ebac81f8da0a95d",
+                "reference": "0ab302977a952b42fd51475c4ebac81f8da0a95d",
                 "shasum": ""
             },
             "require": {
@@ -4811,12 +5792,12 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -4852,7 +5833,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -4863,77 +5844,83 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2026-01-05T13:30:16+00:00"
         },
         {
             "name": "symfony/twig-bridge",
-            "version": "v6.4.3",
+            "version": "v7.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/twig-bridge.git",
-                "reference": "bf6b411a5d9a0ce6ea43cca0fcf5f05f5196a957"
+                "reference": "81663873d946531129c76c65e80b681ce99c0e89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/bf6b411a5d9a0ce6ea43cca0fcf5f05f5196a957",
-                "reference": "bf6b411a5d9a0ce6ea43cca0fcf5f05f5196a957",
+                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/81663873d946531129c76c65e80b681ce99c0e89",
+                "reference": "81663873d946531129c76c65e80b681ce99c0e89",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/translation-contracts": "^2.5|^3",
-                "twig/twig": "^2.13|^3.0.4"
+                "twig/twig": "^3.21"
             },
             "conflict": {
-                "phpdocumentor/reflection-docblock": "<3.2.2",
-                "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/console": "<5.4",
-                "symfony/form": "<6.3",
-                "symfony/http-foundation": "<5.4",
+                "phpdocumentor/reflection-docblock": "<5.2|>=7",
+                "phpdocumentor/type-resolver": "<1.5.1",
+                "symfony/console": "<6.4",
+                "symfony/form": "<6.4.32|>7,<7.3.10|>7.4,<7.4.4|>8.0,<8.0.4",
+                "symfony/http-foundation": "<6.4",
                 "symfony/http-kernel": "<6.4",
-                "symfony/mime": "<6.2",
+                "symfony/mime": "<6.4.37|>7,<7.4.9|>8.0,<8.0.9",
                 "symfony/serializer": "<6.4",
-                "symfony/translation": "<5.4",
-                "symfony/workflow": "<5.4"
+                "symfony/translation": "<6.4",
+                "symfony/workflow": "<6.4"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3|^4",
                 "league/html-to-markdown": "^5.0",
-                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "symfony/asset": "^5.4|^6.0|^7.0",
-                "symfony/asset-mapper": "^6.3|^7.0",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/finder": "^5.4|^6.0|^7.0",
-                "symfony/form": "^6.4|^7.0",
-                "symfony/html-sanitizer": "^6.1|^7.0",
-                "symfony/http-foundation": "^5.4|^6.0|^7.0",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/intl": "^5.4|^6.0|^7.0",
-                "symfony/mime": "^6.2|^7.0",
+                "phpdocumentor/reflection-docblock": "^5.2|^6.0",
+                "symfony/asset": "^6.4|^7.0|^8.0",
+                "symfony/asset-mapper": "^6.4|^7.0|^8.0",
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/emoji": "^7.1|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/finder": "^6.4|^7.0|^8.0",
+                "symfony/form": "^6.4.32|~7.3.10|^7.4.4|^8.0.4",
+                "symfony/html-sanitizer": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^7.3|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/intl": "^6.4|^7.0|^8.0",
+                "symfony/mime": "^6.4.37|^7.4.9|^8.0.9",
                 "symfony/polyfill-intl-icu": "~1.0",
-                "symfony/property-info": "^5.4|^6.0|^7.0",
-                "symfony/routing": "^5.4|^6.0|^7.0",
+                "symfony/property-info": "^6.4|^7.0|^8.0",
+                "symfony/routing": "^6.4|^7.0|^8.0",
                 "symfony/security-acl": "^2.8|^3.0",
-                "symfony/security-core": "^5.4|^6.0|^7.0",
-                "symfony/security-csrf": "^5.4|^6.0|^7.0",
-                "symfony/security-http": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.4.3|^7.0.3",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0",
-                "symfony/translation": "^6.1|^7.0",
-                "symfony/web-link": "^5.4|^6.0|^7.0",
-                "symfony/workflow": "^5.4|^6.0|^7.0",
-                "symfony/yaml": "^5.4|^6.0|^7.0",
-                "twig/cssinliner-extra": "^2.12|^3",
-                "twig/inky-extra": "^2.12|^3",
-                "twig/markdown-extra": "^2.12|^3"
+                "symfony/security-core": "^6.4|^7.0|^8.0",
+                "symfony/security-csrf": "^6.4|^7.0|^8.0",
+                "symfony/security-http": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^6.4.3|^7.0.3|^8.0",
+                "symfony/stopwatch": "^6.4|^7.0|^8.0",
+                "symfony/translation": "^6.4|^7.0|^8.0",
+                "symfony/validator": "^6.4|^7.0|^8.0",
+                "symfony/web-link": "^6.4|^7.0|^8.0",
+                "symfony/workflow": "^6.4|^7.0|^8.0",
+                "symfony/yaml": "^6.4|^7.0|^8.0",
+                "twig/cssinliner-extra": "^3",
+                "twig/inky-extra": "^3",
+                "twig/markdown-extra": "^3"
             },
             "type": "symfony-bridge",
             "autoload": {
@@ -4961,7 +5948,7 @@
             "description": "Provides integration for Twig with various Symfony components",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/twig-bridge/tree/v6.4.3"
+                "source": "https://github.com/symfony/twig-bridge/tree/v7.4.12"
             },
             "funding": [
                 {
@@ -4972,43 +5959,45 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-30T08:32:12+00:00"
+            "time": "2026-04-29T17:13:54+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.3",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "0435a08f69125535336177c29d56af3abc1f69da"
+                "reference": "9510c3966f749a1d1ff0059e1eabef6cc621e7fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0435a08f69125535336177c29d56af3abc1f69da",
-                "reference": "0435a08f69125535336177c29d56af3abc1f69da",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9510c3966f749a1d1ff0059e1eabef6cc621e7fd",
+                "reference": "9510c3966f749a1d1ff0059e1eabef6cc621e7fd",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/console": "<5.4"
+                "symfony/console": "<6.4"
             },
             "require-dev": {
-                "ext-iconv": "*",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/error-handler": "^6.3|^7.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/uid": "^5.4|^6.0|^7.0",
-                "twig/twig": "^2.13|^3.0.4"
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/uid": "^6.4|^7.0|^8.0",
+                "twig/twig": "^3.12"
             },
             "bin": [
                 "Resources/bin/var-dump-server"
@@ -5046,7 +6035,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.3"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -5057,33 +6046,39 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:53:30+00:00"
+            "time": "2026-03-30T13:44:50+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v6.4.3",
+            "version": "v7.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8"
+                "reference": "22e03a49c95ef054a43601cd159b222bfab1c701"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/a8c12b5448a5ac685347f5eeb2abf6a571ec16b8",
-                "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/22e03a49c95ef054a43601cd159b222bfab1c701",
+                "reference": "22e03a49c95ef054a43601cd159b222bfab1c701",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3"
             },
             "require-dev": {
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/property-access": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -5121,7 +6116,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v6.4.3"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.4.9"
             },
             "funding": [
                 {
@@ -5132,37 +6127,41 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-04-18T13:18:21+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v6.4.3",
+            "version": "v7.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "d75715985f0f94f978e3a8fa42533e10db921b90"
+                "reference": "8b6952b56ca6417f25f7a65758cadd0ce02edc51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/d75715985f0f94f978e3a8fa42533e10db921b90",
-                "reference": "d75715985f0f94f978e3a8fa42533e10db921b90",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/8b6952b56ca6417f25f7a65758cadd0ce02edc51",
+                "reference": "8b6952b56ca6417f25f7a65758cadd0ce02edc51",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
-                "symfony/console": "<5.4"
+                "symfony/console": "<6.4"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0"
+                "symfony/console": "^6.4|^7.0|^8.0"
             },
             "bin": [
                 "Resources/bin/yaml-lint"
@@ -5193,7 +6192,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v6.4.3"
+                "source": "https://github.com/symfony/yaml/tree/v7.4.12"
             },
             "funding": [
                 {
@@ -5204,39 +6203,51 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-05-20T07:20:23+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v3.8.0",
+            "version": "v3.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d"
+                "reference": "1fcae487b180d78e6351f4e0afa91f9eab96a2bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
-                "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/1fcae487b180d78e6351f4e0afa91f9eab96a2bc",
+                "reference": "1fcae487b180d78e6351f4e0afa91f9eab96a2bc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1.0",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-ctype": "^1.8",
-                "symfony/polyfill-mbstring": "^1.3",
-                "symfony/polyfill-php80": "^1.22"
+                "symfony/polyfill-mbstring": "^1.3"
             },
             "require-dev": {
+                "php-cs-fixer/shim": "^3.0@stable",
+                "phpstan/phpstan": "^2.0@stable",
                 "psr/container": "^1.0|^2.0",
-                "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0"
+                "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
+                "files": [
+                    "src/Resources/core.php",
+                    "src/Resources/debug.php",
+                    "src/Resources/escaper.php",
+                    "src/Resources/string_loader.php"
+                ],
                 "psr-4": {
                     "Twig\\": "src/"
                 }
@@ -5269,7 +6280,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.8.0"
+                "source": "https://github.com/twigphp/Twig/tree/v3.26.0"
             },
             "funding": [
                 {
@@ -5281,137 +6292,122 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-21T18:54:41+00:00"
-        }
-    ],
-    "packages-dev": [
+            "time": "2026-05-20T07:31:59+00:00"
+        },
         {
-            "name": "amphp/amp",
-            "version": "v2.6.2",
+            "name": "web-token/jwt-key-mgmt",
+            "version": "3.4.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/amphp/amp.git",
-                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb"
+                "url": "https://github.com/web-token/jwt-key-mgmt.git",
+                "reference": "4d2a5a1a86477dd50b89aff76962816ddbd64590"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
-                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
+                "url": "https://api.github.com/repos/web-token/jwt-key-mgmt/zipball/4d2a5a1a86477dd50b89aff76962816ddbd64590",
+                "reference": "4d2a5a1a86477dd50b89aff76962816ddbd64590",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1",
-                "ext-json": "*",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^7 | ^8 | ^9",
-                "psalm/phar": "^3.11@dev",
-                "react/promise": "^2"
+                "ext-openssl": "*",
+                "php": ">=8.1",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0",
+                "web-token/jwt-library": "^3.3"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "lib/functions.php",
-                    "lib/Internal/functions.php"
-                ],
-                "psr-4": {
-                    "Amp\\": "lib"
-                }
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
                 {
-                    "name": "Daniel Lowrey",
-                    "email": "rdlowrey@php.net"
-                },
-                {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
-                },
-                {
-                    "name": "Bob Weinand",
-                    "email": "bobwei9@hotmail.com"
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
                 },
                 {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
+                    "name": "All contributors",
+                    "homepage": "https://github.com/web-token/jwt-framework/contributors"
                 }
             ],
-            "description": "A non-blocking concurrency framework for PHP applications.",
-            "homepage": "https://amphp.org/amp",
+            "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
+            "homepage": "https://github.com/web-token",
             "keywords": [
-                "async",
-                "asynchronous",
-                "awaitable",
-                "concurrency",
-                "event",
-                "event-loop",
-                "future",
-                "non-blocking",
-                "promise"
+                "JOSE",
+                "JWE",
+                "JWK",
+                "JWKSet",
+                "JWS",
+                "Jot",
+                "RFC7515",
+                "RFC7516",
+                "RFC7517",
+                "RFC7518",
+                "RFC7519",
+                "RFC7520",
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/amphp",
-                "issues": "https://github.com/amphp/amp/issues",
-                "source": "https://github.com/amphp/amp/tree/v2.6.2"
+                "source": "https://github.com/web-token/jwt-key-mgmt/tree/3.4.8"
             },
             "funding": [
                 {
-                    "url": "https://github.com/amphp",
-                    "type": "github"
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
                 }
             ],
-            "time": "2022-02-20T17:52:18+00:00"
+            "abandoned": "web-token/jwt-library",
+            "time": "2024-02-22T07:19:34+00:00"
         },
         {
-            "name": "amphp/byte-stream",
-            "version": "v1.8.1",
+            "name": "web-token/jwt-library",
+            "version": "3.4.9",
             "source": {
                 "type": "git",
-                "url": "https://github.com/amphp/byte-stream.git",
-                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd"
+                "url": "https://github.com/web-token/jwt-library.git",
+                "reference": "8fe1650bf3a73673a9c520feff8f9a0e9cbbcd8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd",
-                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd",
+                "url": "https://api.github.com/repos/web-token/jwt-library/zipball/8fe1650bf3a73673a9c520feff8f9a0e9cbbcd8f",
+                "reference": "8fe1650bf3a73673a9c520feff8f9a0e9cbbcd8f",
                 "shasum": ""
             },
             "require": {
-                "amphp/amp": "^2",
-                "php": ">=7.1"
+                "brick/math": "^0.9|^0.10|^0.11|^0.12",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "paragonie/constant_time_encoding": "^2.6|^3.0",
+                "paragonie/sodium_compat": "^1.20|^2.0",
+                "php": ">=8.1",
+                "psr/cache": "^2.0|^3.0",
+                "psr/clock": "^1.0",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0",
+                "spomky-labs/pki-framework": "^1.2.1",
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/http-client": "^5.4|^6.0|^7.0",
+                "symfony/polyfill-mbstring": "^1.12"
             },
-            "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1.4",
-                "friendsofphp/php-cs-fixer": "^2.3",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^6 || ^7 || ^8",
-                "psalm/phar": "^3.11.4"
+            "conflict": {
+                "spomky-labs/jose": "*"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
+            "suggest": {
+                "ext-bcmath": "GMP or BCMath is highly recommended to improve the library performance",
+                "ext-gmp": "GMP or BCMath is highly recommended to improve the library performance",
+                "ext-openssl": "For key management (creation, optimization, etc.) and some algorithms (AES, RSA, ECDSA, etc.)",
+                "ext-sodium": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys",
+                "paragonie/sodium_compat": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys",
+                "spomky-labs/aes-key-wrap": "For all Key Wrapping algorithms (A128KW, A192KW, A256KW, A128GCMKW, A192GCMKW, A256GCMKW, PBES2-HS256+A128KW, PBES2-HS384+A192KW, PBES2-HS512+A256KW...)",
+                "symfony/http-client": "To enable JKU/X5U support."
             },
+            "type": "library",
             "autoload": {
-                "files": [
-                    "lib/functions.php"
-                ],
                 "psr-4": {
-                    "Amp\\ByteStream\\": "lib"
+                    "Jose\\Component\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5420,105 +6416,806 @@
             ],
             "authors": [
                 {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
                 },
                 {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
+                    "name": "All contributors",
+                    "homepage": "https://github.com/web-token/jwt-framework/contributors"
                 }
             ],
-            "description": "A stream abstraction to make working with non-blocking I/O simple.",
-            "homepage": "http://amphp.org/byte-stream",
+            "description": "JWT library",
+            "homepage": "https://github.com/web-token",
             "keywords": [
-                "amp",
-                "amphp",
-                "async",
-                "io",
-                "non-blocking",
-                "stream"
+                "JOSE",
+                "JWE",
+                "JWK",
+                "JWKSet",
+                "JWS",
+                "Jot",
+                "RFC7515",
+                "RFC7516",
+                "RFC7517",
+                "RFC7518",
+                "RFC7519",
+                "RFC7520",
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/amphp",
-                "issues": "https://github.com/amphp/byte-stream/issues",
-                "source": "https://github.com/amphp/byte-stream/tree/v1.8.1"
+                "issues": "https://github.com/web-token/jwt-library/issues",
+                "source": "https://github.com/web-token/jwt-library/tree/3.4.9"
             },
             "funding": [
                 {
-                    "url": "https://github.com/amphp",
+                    "url": "https://github.com/Spomky",
                     "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
                 }
             ],
-            "time": "2021-03-30T17:13:30+00:00"
+            "time": "2025-11-17T20:20:37+00:00"
         },
         {
-            "name": "dnoegel/php-xdg-base-dir",
-            "version": "v0.1.1",
+            "name": "web-token/jwt-signature",
+            "version": "3.4.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd"
+                "url": "https://github.com/web-token/jwt-signature.git",
+                "reference": "eccfd59e658d4118414cf6d14229aa52eec387e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
+                "url": "https://api.github.com/repos/web-token/jwt-signature/zipball/eccfd59e658d4118414cf6d14229aa52eec387e7",
+                "reference": "eccfd59e658d4118414cf6d14229aa52eec387e7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35"
+                "php": ">=8.1",
+                "web-token/jwt-library": "^3.3"
             },
             "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "XdgBaseDir\\": "src/"
-                }
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "description": "implementation of xdg base directory specification for php",
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/web-token/jwt-framework/contributors"
+                }
+            ],
+            "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
+            "homepage": "https://github.com/web-token",
+            "keywords": [
+                "JOSE",
+                "JWE",
+                "JWK",
+                "JWKSet",
+                "JWS",
+                "Jot",
+                "RFC7515",
+                "RFC7516",
+                "RFC7517",
+                "RFC7518",
+                "RFC7519",
+                "RFC7520",
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
+            ],
             "support": {
-                "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
-                "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
+                "source": "https://github.com/web-token/jwt-signature/tree/3.4.8"
             },
-            "time": "2019-12-04T15:06:13+00:00"
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "abandoned": "web-token/jwt-library",
+            "time": "2024-02-22T07:19:34+00:00"
         },
         {
-            "name": "doctrine/instantiator",
-            "version": "2.0.0",
+            "name": "web-token/jwt-signature-algorithm-ecdsa",
+            "version": "3.4.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
+                "url": "https://github.com/web-token/jwt-signature-algorithm-ecdsa.git",
+                "reference": "28516e170f6ee6d13766d9e2b912c2853e1ac5e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
-                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-ecdsa/zipball/28516e170f6ee6d13766d9e2b912c2853e1ac5e4",
+                "reference": "28516e170f6ee6d13766d9e2b912c2853e1ac5e4",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1"
+                "ext-openssl": "*",
+                "php": ">=8.1",
+                "web-token/jwt-library": "^3.3"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/web-token/jwt-framework/contributors"
+                }
+            ],
+            "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
+            "homepage": "https://github.com/web-token",
+            "keywords": [
+                "JOSE",
+                "JWE",
+                "JWK",
+                "JWKSet",
+                "JWS",
+                "Jot",
+                "RFC7515",
+                "RFC7516",
+                "RFC7517",
+                "RFC7518",
+                "RFC7519",
+                "RFC7520",
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
+            ],
+            "support": {
+                "source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.4.8"
+            },
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "abandoned": "web-token/jwt-library",
+            "time": "2024-02-22T07:19:34+00:00"
+        },
+        {
+            "name": "web-token/jwt-util-ecc",
+            "version": "3.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/web-token/jwt-util-ecc.git",
+                "reference": "667934c5c6e37238f4e67d51aa3ba55abc703e1a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/web-token/jwt-util-ecc/zipball/667934c5c6e37238f4e67d51aa3ba55abc703e1a",
+                "reference": "667934c5c6e37238f4e67d51aa3ba55abc703e1a",
+                "shasum": ""
+            },
+            "require": {
+                "brick/math": "^0.9|^0.10|^0.11|^0.12",
+                "php": ">=8.1",
+                "web-token/jwt-library": "^3.3"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/web-token/jwt-framework/contributors"
+                }
+            ],
+            "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
+            "homepage": "https://github.com/web-token",
+            "keywords": [
+                "JOSE",
+                "JWE",
+                "JWK",
+                "JWKSet",
+                "JWS",
+                "Jot",
+                "RFC7515",
+                "RFC7516",
+                "RFC7517",
+                "RFC7518",
+                "RFC7519",
+                "RFC7520",
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
+            ],
+            "support": {
+                "source": "https://github.com/web-token/jwt-util-ecc/tree/3.4.8"
+            },
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "abandoned": "web-token/jwt-library",
+            "time": "2024-02-22T07:19:34+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "amphp/amp",
+            "version": "v3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/amp.git",
+                "reference": "fa0ab33a6f47a82929c38d03ca47ebb71086a93f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/amp/zipball/fa0ab33a6f47a82929c38d03ca47ebb71086a93f",
+                "reference": "fa0ab33a6f47a82929c38d03ca47ebb71086a93f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "revolt/event-loop": "^1 || ^0.2"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "5.23.1"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php",
+                    "src/Future/functions.php",
+                    "src/Internal/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Bob Weinand",
+                    "email": "bobwei9@hotmail.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                },
+                {
+                    "name": "Daniel Lowrey",
+                    "email": "rdlowrey@php.net"
+                }
+            ],
+            "description": "A non-blocking concurrency framework for PHP applications.",
+            "homepage": "https://amphp.org/amp",
+            "keywords": [
+                "async",
+                "asynchronous",
+                "awaitable",
+                "concurrency",
+                "event",
+                "event-loop",
+                "future",
+                "non-blocking",
+                "promise"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/amp/issues",
+                "source": "https://github.com/amphp/amp/tree/v3.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-08-27T21:42:00+00:00"
+        },
+        {
+            "name": "amphp/byte-stream",
+            "version": "v2.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/byte-stream.git",
+                "reference": "55a6bd071aec26fa2a3e002618c20c35e3df1b46"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/55a6bd071aec26fa2a3e002618c20c35e3df1b46",
+                "reference": "55a6bd071aec26fa2a3e002618c20c35e3df1b46",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/parser": "^1.1",
+                "amphp/pipeline": "^1",
+                "amphp/serialization": "^1",
+                "amphp/sync": "^2",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1 || ^0.2.3"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "5.22.1"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php",
+                    "src/Internal/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\ByteStream\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "A stream abstraction to make working with non-blocking I/O simple.",
+            "homepage": "https://amphp.org/byte-stream",
+            "keywords": [
+                "amp",
+                "amphp",
+                "async",
+                "io",
+                "non-blocking",
+                "stream"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/byte-stream/issues",
+                "source": "https://github.com/amphp/byte-stream/tree/v2.1.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-03-16T17:10:27+00:00"
+        },
+        {
+            "name": "amphp/cache",
+            "version": "v2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/cache.git",
+                "reference": "46912e387e6aa94933b61ea1ead9cf7540b7797c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/cache/zipball/46912e387e6aa94933b61ea1ead9cf7540b7797c",
+                "reference": "46912e387e6aa94933b61ea1ead9cf7540b7797c",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/serialization": "^1",
+                "amphp/sync": "^2",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1 || ^0.2"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "^5.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Amp\\Cache\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                },
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Daniel Lowrey",
+                    "email": "rdlowrey@php.net"
+                }
+            ],
+            "description": "A fiber-aware cache API based on Amp and Revolt.",
+            "homepage": "https://amphp.org/cache",
+            "support": {
+                "issues": "https://github.com/amphp/cache/issues",
+                "source": "https://github.com/amphp/cache/tree/v2.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-04-19T03:38:06+00:00"
+        },
+        {
+            "name": "amphp/dns",
+            "version": "v2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/dns.git",
+                "reference": "78eb3db5fc69bf2fc0cb503c4fcba667bc223c71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/dns/zipball/78eb3db5fc69bf2fc0cb503c4fcba667bc223c71",
+                "reference": "78eb3db5fc69bf2fc0cb503c4fcba667bc223c71",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/byte-stream": "^2",
+                "amphp/cache": "^2",
+                "amphp/parser": "^1",
+                "amphp/process": "^2",
+                "daverandom/libdns": "^2.0.2",
+                "ext-filter": "*",
+                "ext-json": "*",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1 || ^0.2"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "5.20"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\Dns\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Wright",
+                    "email": "addr@daverandom.com"
+                },
+                {
+                    "name": "Daniel Lowrey",
+                    "email": "rdlowrey@php.net"
+                },
+                {
+                    "name": "Bob Weinand",
+                    "email": "bobwei9@hotmail.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                },
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                }
+            ],
+            "description": "Async DNS resolution for Amp.",
+            "homepage": "https://github.com/amphp/dns",
+            "keywords": [
+                "amp",
+                "amphp",
+                "async",
+                "client",
+                "dns",
+                "resolve"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/dns/issues",
+                "source": "https://github.com/amphp/dns/tree/v2.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-01-19T15:43:40+00:00"
+        },
+        {
+            "name": "amphp/parallel",
+            "version": "v2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/parallel.git",
+                "reference": "37f5b2754fadc229c00f9416bd68fb8d04529a81"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/parallel/zipball/37f5b2754fadc229c00f9416bd68fb8d04529a81",
+                "reference": "37f5b2754fadc229c00f9416bd68fb8d04529a81",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/byte-stream": "^2",
+                "amphp/cache": "^2",
+                "amphp/parser": "^1",
+                "amphp/pipeline": "^1",
+                "amphp/process": "^2",
+                "amphp/serialization": "^1",
+                "amphp/socket": "^2",
+                "amphp/sync": "^2",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "6.16.1"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/Context/functions.php",
+                    "src/Context/Internal/functions.php",
+                    "src/Ipc/functions.php",
+                    "src/Worker/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\Parallel\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                },
+                {
+                    "name": "Stephen Coakley",
+                    "email": "me@stephencoakley.com"
+                }
+            ],
+            "description": "Parallel processing component for Amp.",
+            "homepage": "https://github.com/amphp/parallel",
+            "keywords": [
+                "async",
+                "asynchronous",
+                "concurrent",
+                "multi-processing",
+                "multi-threading"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/parallel/issues",
+                "source": "https://github.com/amphp/parallel/tree/v2.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-05-16T16:54:01+00:00"
+        },
+        {
+            "name": "amphp/parser",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/parser.git",
+                "reference": "3cf1f8b32a0171d4b1bed93d25617637a77cded7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/parser/zipball/3cf1f8b32a0171d4b1bed93d25617637a77cded7",
+                "reference": "3cf1f8b32a0171d4b1bed93d25617637a77cded7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "^5.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Amp\\Parser\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "A generator parser to make streaming parsers simple.",
+            "homepage": "https://github.com/amphp/parser",
+            "keywords": [
+                "async",
+                "non-blocking",
+                "parser",
+                "stream"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/parser/issues",
+                "source": "https://github.com/amphp/parser/tree/v1.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-21T19:16:53+00:00"
+        },
+        {
+            "name": "amphp/pipeline",
+            "version": "v1.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/pipeline.git",
+                "reference": "a044733e080940d1483f56caff0c412ad6982776"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/pipeline/zipball/a044733e080940d1483f56caff0c412ad6982776",
+                "reference": "a044733e080940d1483f56caff0c412ad6982776",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "6.16.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Amp\\Pipeline\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "Asynchronous iterators and operators.",
+            "homepage": "https://amphp.org/pipeline",
+            "keywords": [
+                "amp",
+                "amphp",
+                "async",
+                "io",
+                "iterator",
+                "non-blocking"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/pipeline/issues",
+                "source": "https://github.com/amphp/pipeline/tree/v1.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-05-06T05:37:57+00:00"
+        },
+        {
+            "name": "amphp/process",
+            "version": "v2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/process.git",
+                "reference": "52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/process/zipball/52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d",
+                "reference": "52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/byte-stream": "^2",
+                "amphp/sync": "^2",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1 || ^0.2"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^11",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^1.2",
-                "phpstan/phpstan": "^1.9.4",
-                "phpstan/phpstan-phpunit": "^1.3",
-                "phpunit/phpunit": "^9.5.27",
-                "vimeo/psalm": "^5.4"
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "^5.4"
             },
             "type": "library",
             "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
                 "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                    "Amp\\Process\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5527,94 +7224,403 @@
             ],
             "authors": [
                 {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "https://ocramius.github.io/"
+                    "name": "Bob Weinand",
+                    "email": "bobwei9@hotmail.com"
+                },
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "A fiber-aware process manager based on Amp and Revolt.",
+            "homepage": "https://amphp.org/process",
+            "support": {
+                "issues": "https://github.com/amphp/process/issues",
+                "source": "https://github.com/amphp/process/tree/v2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-04-19T03:13:44+00:00"
+        },
+        {
+            "name": "amphp/serialization",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/serialization.git",
+                "reference": "fdf2834d78cebb0205fb2672676c1b1eb84371f0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/serialization/zipball/fdf2834d78cebb0205fb2672676c1b1eb84371f0",
+                "reference": "fdf2834d78cebb0205fb2672676c1b1eb84371f0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "ext-json": "*",
+                "ext-zlib": "*",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "6.16.1"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\Serialization\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
                 }
             ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
+            "description": "Serialization tools for IPC and data storage in PHP.",
+            "homepage": "https://github.com/amphp/serialization",
             "keywords": [
-                "constructor",
-                "instantiate"
+                "async",
+                "asynchronous",
+                "serialization",
+                "serialize"
             ],
             "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
+                "issues": "https://github.com/amphp/serialization/issues",
+                "source": "https://github.com/amphp/serialization/tree/v1.1.0"
             },
             "funding": [
                 {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-04-05T15:59:53+00:00"
+        },
+        {
+            "name": "amphp/socket",
+            "version": "v2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/socket.git",
+                "reference": "dadb63c5d3179fd83803e29dfeac27350e619314"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/socket/zipball/dadb63c5d3179fd83803e29dfeac27350e619314",
+                "reference": "dadb63c5d3179fd83803e29dfeac27350e619314",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/byte-stream": "^2",
+                "amphp/dns": "^2",
+                "ext-openssl": "*",
+                "kelunik/certificate": "^1.1",
+                "league/uri": "^7",
+                "league/uri-interfaces": "^7",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "amphp/process": "^2",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "6.16.1"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php",
+                    "src/Internal/functions.php",
+                    "src/SocketAddress/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\Socket\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Daniel Lowrey",
+                    "email": "rdlowrey@gmail.com"
                 },
                 {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "Non-blocking socket connection / server implementations based on Amp and Revolt.",
+            "homepage": "https://github.com/amphp/socket",
+            "keywords": [
+                "amp",
+                "async",
+                "encryption",
+                "non-blocking",
+                "sockets",
+                "tcp",
+                "tls"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/socket/issues",
+                "source": "https://github.com/amphp/socket/tree/v2.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-04-19T15:09:56+00:00"
+        },
+        {
+            "name": "amphp/sync",
+            "version": "v2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/sync.git",
+                "reference": "217097b785130d77cfcc58ff583cf26cd1770bf1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/sync/zipball/217097b785130d77cfcc58ff583cf26cd1770bf1",
+                "reference": "217097b785130d77cfcc58ff583cf26cd1770bf1",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^3",
+                "amphp/pipeline": "^1",
+                "amphp/serialization": "^1",
+                "php": ">=8.1",
+                "revolt/event-loop": "^1 || ^0.2"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "^2",
+                "amphp/phpunit-util": "^3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "5.23"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\Sync\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                },
+                {
+                    "name": "Stephen Coakley",
+                    "email": "me@stephencoakley.com"
+                }
+            ],
+            "description": "Non-blocking synchronization primitives for PHP based on Amp and Revolt.",
+            "homepage": "https://github.com/amphp/sync",
+            "keywords": [
+                "async",
+                "asynchronous",
+                "mutex",
+                "semaphore",
+                "synchronization"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/sync/issues",
+                "source": "https://github.com/amphp/sync/tree/v2.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-08-03T19:31:26+00:00"
+        },
+        {
+            "name": "danog/advanced-json-rpc",
+            "version": "v3.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/danog/php-advanced-json-rpc.git",
+                "reference": "ae703ea7b4811797a10590b6078de05b3b33dd91"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/danog/php-advanced-json-rpc/zipball/ae703ea7b4811797a10590b6078de05b3b33dd91",
+                "reference": "ae703ea7b4811797a10590b6078de05b3b33dd91",
+                "shasum": ""
+            },
+            "require": {
+                "netresearch/jsonmapper": "^5",
+                "php": ">=8.1",
+                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0 || ^6"
+            },
+            "replace": {
+                "felixfbecker/php-advanced-json-rpc": "^3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "AdvancedJsonRpc\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Felix Becker",
+                    "email": "felix.b@outlook.com"
+                },
+                {
+                    "name": "Daniil Gentili",
+                    "email": "daniil@daniil.it"
+                }
+            ],
+            "description": "A more advanced JSONRPC implementation",
+            "support": {
+                "issues": "https://github.com/danog/php-advanced-json-rpc/issues",
+                "source": "https://github.com/danog/php-advanced-json-rpc/tree/v3.2.3"
+            },
+            "time": "2026-01-12T21:07:10+00:00"
+        },
+        {
+            "name": "daverandom/libdns",
+            "version": "v2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/DaveRandom/LibDNS.git",
+                "reference": "b84c94e8fe6b7ee4aecfe121bfe3b6177d303c8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/DaveRandom/LibDNS/zipball/b84c94e8fe6b7ee4aecfe121bfe3b6177d303c8a",
+                "reference": "b84c94e8fe6b7ee4aecfe121bfe3b6177d303c8a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "Required for IDN support"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "LibDNS\\": "src/"
                 }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "DNS protocol implementation written in pure PHP",
+            "keywords": [
+                "dns"
             ],
-            "time": "2022-12-30T00:23:10+00:00"
+            "support": {
+                "issues": "https://github.com/DaveRandom/LibDNS/issues",
+                "source": "https://github.com/DaveRandom/LibDNS/tree/v2.1.0"
+            },
+            "time": "2024-04-12T12:12:48+00:00"
         },
         {
-            "name": "felixfbecker/advanced-json-rpc",
-            "version": "v3.2.1",
+            "name": "dnoegel/php-xdg-base-dir",
+            "version": "v0.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
+                "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
+                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
+                "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
+                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
                 "shasum": ""
             },
             "require": {
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
-                "php": "^7.1 || ^8.0",
-                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
+                "php": ">=5.3.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0 || ^8.0"
+                "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "AdvancedJsonRpc\\": "lib/"
+                    "XdgBaseDir\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "ISC"
-            ],
-            "authors": [
-                {
-                    "name": "Felix Becker",
-                    "email": "felix.b@outlook.com"
-                }
+                "MIT"
             ],
-            "description": "A more advanced JSONRPC implementation",
+            "description": "implementation of xdg base directory specification for php",
             "support": {
-                "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
-                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1"
+                "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
+                "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
             },
-            "time": "2021-06-11T22:34:44+00:00"
+            "time": "2019-12-04T15:06:13+00:00"
         },
         {
             "name": "felixfbecker/language-server-protocol",
-            "version": "v1.5.2",
+            "version": "v1.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842"
+                "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842",
+                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/a9e113dbc7d849e35b8776da39edaf4313b7b6c9",
+                "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9",
                 "shasum": ""
             },
             "require": {
@@ -5655,22 +7661,22 @@
             ],
             "support": {
                 "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
-                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2"
+                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.3"
             },
-            "time": "2022-03-02T22:36:06+00:00"
+            "time": "2024-04-30T00:40:11+00:00"
         },
         {
             "name": "fidry/cpu-core-counter",
-            "version": "1.1.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theofidry/cpu-core-counter.git",
-                "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42"
+                "reference": "db9508f7b1474469d9d3c53b86f817e344732678"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42",
-                "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42",
+                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/db9508f7b1474469d9d3c53b86f817e344732678",
+                "reference": "db9508f7b1474469d9d3c53b86f817e344732678",
                 "shasum": ""
             },
             "require": {
@@ -5680,10 +7686,10 @@
                 "fidry/makefile": "^0.2.0",
                 "fidry/php-cs-fixer-config": "^1.1.2",
                 "phpstan/extension-installer": "^1.2.0",
-                "phpstan/phpstan": "^1.9.2",
-                "phpstan/phpstan-deprecation-rules": "^1.0.0",
-                "phpstan/phpstan-phpunit": "^1.2.2",
-                "phpstan/phpstan-strict-rules": "^1.4.4",
+                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan-deprecation-rules": "^2.0.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
                 "phpunit/phpunit": "^8.5.31 || ^9.5.26",
                 "webmozarts/strict-phpunit": "^7.5"
             },
@@ -5710,7 +7716,7 @@
             ],
             "support": {
                 "issues": "https://github.com/theofidry/cpu-core-counter/issues",
-                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0"
+                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.3.0"
             },
             "funding": [
                 {
@@ -5718,39 +7724,111 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-07T09:43:46+00:00"
+            "time": "2025-08-14T07:29:31+00:00"
         },
         {
-            "name": "laravel/homestead",
-            "version": "v14.5.0",
+            "name": "kelunik/certificate",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laravel/homestead.git",
-                "reference": "78d44a2f38d27f057d87c7dcff5ed2f67e07f898"
+                "url": "https://github.com/kelunik/certificate.git",
+                "reference": "7e00d498c264d5eb4f78c69f41c8bd6719c0199e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/homestead/zipball/78d44a2f38d27f057d87c7dcff5ed2f67e07f898",
-                "reference": "78d44a2f38d27f057d87c7dcff5ed2f67e07f898",
+                "url": "https://api.github.com/repos/kelunik/certificate/zipball/7e00d498c264d5eb4f78c69f41c8bd6719c0199e",
+                "reference": "7e00d498c264d5eb4f78c69f41c8bd6719c0199e",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.0 || <8.3",
-                "symfony/console": "^5.0 || ^6.0",
-                "symfony/process": "^5.0 || ^6.0",
-                "symfony/yaml": "^5.0 || ^6.0"
+                "ext-openssl": "*",
+                "php": ">=7.0"
             },
             "require-dev": {
-                "dms/phpunit-arraysubset-asserts": "^0.2.1",
-                "phpunit/phpunit": "^9.5"
+                "amphp/php-cs-fixer-config": "^2",
+                "phpunit/phpunit": "^6 | 7 | ^8 | ^9"
             },
-            "bin": [
-                "bin/homestead"
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Kelunik\\Certificate\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "Access certificate details and transform between different formats.",
+            "keywords": [
+                "DER",
+                "certificate",
+                "certificates",
+                "openssl",
+                "pem",
+                "x509"
             ],
+            "support": {
+                "issues": "https://github.com/kelunik/certificate/issues",
+                "source": "https://github.com/kelunik/certificate/tree/v1.1.3"
+            },
+            "time": "2023-02-03T21:26:53+00:00"
+        },
+        {
+            "name": "league/uri",
+            "version": "7.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/uri.git",
+                "reference": "08cf38e3924d4f56238125547b5720496fac8fd4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/uri/zipball/08cf38e3924d4f56238125547b5720496fac8fd4",
+                "reference": "08cf38e3924d4f56238125547b5720496fac8fd4",
+                "shasum": ""
+            },
+            "require": {
+                "league/uri-interfaces": "^7.8.1",
+                "php": "^8.1",
+                "psr/http-factory": "^1"
+            },
+            "conflict": {
+                "league/uri-schemes": "^1.0"
+            },
+            "suggest": {
+                "ext-bcmath": "to improve IPV4 host parsing",
+                "ext-dom": "to convert the URI into an HTML anchor tag",
+                "ext-fileinfo": "to create Data URI from file contennts",
+                "ext-gmp": "to improve IPV4 host parsing",
+                "ext-intl": "to handle IDN host with the best performance",
+                "ext-uri": "to use the PHP native URI class",
+                "jeremykendall/php-domain-parser": "to further parse the URI host and resolve its Public Suffix and Top Level Domain",
+                "league/uri-components": "to provide additional tools to manipulate URI objects components",
+                "league/uri-polyfill": "to backport the PHP URI extension for older versions of PHP",
+                "php-64bit": "to improve IPV4 host parsing",
+                "rowbot/url": "to handle URLs using the WHATWG URL Living Standard specification",
+                "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
+            },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "Laravel\\Homestead\\": "src/"
+                    "League\\Uri\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5759,33 +7837,147 @@
             ],
             "authors": [
                 {
-                    "name": "Taylor Otwell",
-                    "email": "taylor@laravel.com"
-                },
+                    "name": "Ignace Nyamagana Butera",
+                    "email": "nyamsprod@gmail.com",
+                    "homepage": "https://nyamsprod.com"
+                }
+            ],
+            "description": "URI manipulation library",
+            "homepage": "https://uri.thephpleague.com",
+            "keywords": [
+                "URN",
+                "data-uri",
+                "file-uri",
+                "ftp",
+                "hostname",
+                "http",
+                "https",
+                "middleware",
+                "parse_str",
+                "parse_url",
+                "psr-7",
+                "query-string",
+                "querystring",
+                "rfc2141",
+                "rfc3986",
+                "rfc3987",
+                "rfc6570",
+                "rfc8141",
+                "uri",
+                "uri-template",
+                "url",
+                "ws"
+            ],
+            "support": {
+                "docs": "https://uri.thephpleague.com",
+                "forum": "https://thephpleague.slack.com",
+                "issues": "https://github.com/thephpleague/uri-src/issues",
+                "source": "https://github.com/thephpleague/uri/tree/7.8.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/nyamsprod",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-03-15T20:22:25+00:00"
+        },
+        {
+            "name": "league/uri-interfaces",
+            "version": "7.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/uri-interfaces.git",
+                "reference": "85d5c77c5d6d3af6c54db4a78246364908f3c928"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/85d5c77c5d6d3af6c54db4a78246364908f3c928",
+                "reference": "85d5c77c5d6d3af6c54db4a78246364908f3c928",
+                "shasum": ""
+            },
+            "require": {
+                "ext-filter": "*",
+                "php": "^8.1",
+                "psr/http-message": "^1.1 || ^2.0"
+            },
+            "suggest": {
+                "ext-bcmath": "to improve IPV4 host parsing",
+                "ext-gmp": "to improve IPV4 host parsing",
+                "ext-intl": "to handle IDN host with the best performance",
+                "php-64bit": "to improve IPV4 host parsing",
+                "rowbot/url": "to handle URLs using the WHATWG URL Living Standard specification",
+                "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Uri\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
                 {
-                    "name": "Joe Ferguson",
-                    "email": "joe@joeferguson.me"
+                    "name": "Ignace Nyamagana Butera",
+                    "email": "nyamsprod@gmail.com",
+                    "homepage": "https://nyamsprod.com"
                 }
             ],
-            "description": "A virtual machine for web artisans.",
+            "description": "Common tools for parsing and resolving RFC3987/RFC3986 URI",
+            "homepage": "https://uri.thephpleague.com",
+            "keywords": [
+                "data-uri",
+                "file-uri",
+                "ftp",
+                "hostname",
+                "http",
+                "https",
+                "parse_str",
+                "parse_url",
+                "psr-7",
+                "query-string",
+                "querystring",
+                "rfc3986",
+                "rfc3987",
+                "rfc6570",
+                "uri",
+                "url",
+                "ws"
+            ],
             "support": {
-                "issues": "https://github.com/laravel/homestead/issues",
-                "source": "https://github.com/laravel/homestead/tree/v14.5.0"
+                "docs": "https://uri.thephpleague.com",
+                "forum": "https://thephpleague.slack.com",
+                "issues": "https://github.com/thephpleague/uri-src/issues",
+                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.8.1"
             },
-            "time": "2023-10-06T03:16:47+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/nyamsprod",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-03-08T20:05:35+00:00"
         },
         {
             "name": "masterminds/html5",
-            "version": "2.8.1",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf"
+                "reference": "fcf91eb64359852f00d921887b219479b4f21251"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f47dcf3c70c584de14f21143c55d9939631bc6cf",
-                "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fcf91eb64359852f00d921887b219479b4f21251",
+                "reference": "fcf91eb64359852f00d921887b219479b4f21251",
                 "shasum": ""
             },
             "require": {
@@ -5793,7 +7985,7 @@
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8"
+                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9"
             },
             "type": "library",
             "extra": {
@@ -5837,34 +8029,34 @@
             ],
             "support": {
                 "issues": "https://github.com/Masterminds/html5-php/issues",
-                "source": "https://github.com/Masterminds/html5-php/tree/2.8.1"
+                "source": "https://github.com/Masterminds/html5-php/tree/2.10.0"
             },
-            "time": "2023-05-10T11:58:31+00:00"
+            "time": "2025-07-25T09:04:22+00:00"
         },
         {
             "name": "misantron/dbunit",
-            "version": "5.3.0",
+            "version": "5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/misantron/dbunit.git",
-                "reference": "e2154eefcd82f02ad364c724b074f749065147b1"
+                "reference": "4e9ff0274b7076036639f054587f5bc489167c38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/misantron/dbunit/zipball/e2154eefcd82f02ad364c724b074f749065147b1",
-                "reference": "e2154eefcd82f02ad364c724b074f749065147b1",
+                "url": "https://api.github.com/repos/misantron/dbunit/zipball/4e9ff0274b7076036639f054587f5bc489167c38",
+                "reference": "4e9ff0274b7076036639f054587f5bc489167c38",
                 "shasum": ""
             },
             "require": {
                 "ext-pdo": "*",
                 "php": "^7.4 || ^8.0",
-                "phpunit/phpunit": "^9.5 || ^10.2",
+                "phpunit/phpunit": "^9.5 || ^10.2 || ^11.1",
                 "symfony/polyfill-php80": "^1.27",
-                "symfony/yaml": "^5.4 || ^6.0"
+                "symfony/yaml": "^5.4 || ^6.4 || ^7.0"
             },
             "require-dev": {
                 "phpstan/extension-installer": "^1.3",
-                "phpstan/phpstan": "^1.10",
+                "phpstan/phpstan": "^1.10 || ^2.0",
                 "symplify/easy-coding-standard": "^12.0"
             },
             "type": "library",
@@ -5884,7 +8076,7 @@
                     "role": "Developer"
                 }
             ],
-            "description": "DbUnit fork supporting PHPUnit 9/10",
+            "description": "DbUnit fork supporting PHPUnit 9/10/11",
             "keywords": [
                 "database",
                 "dbUnit",
@@ -5892,22 +8084,22 @@
             ],
             "support": {
                 "issues": "https://github.com/misantron/dbunit/issues",
-                "source": "https://github.com/misantron/dbunit/tree/5.3.0"
+                "source": "https://github.com/misantron/dbunit/tree/5.4.0"
             },
-            "time": "2023-08-17T17:40:54+00:00"
+            "time": "2025-02-03T20:32:22+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.13.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
                 "shasum": ""
             },
             "require": {
@@ -5915,11 +8107,12 @@
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -5945,7 +8138,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
             },
             "funding": [
                 {
@@ -5953,20 +8146,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2025-08-01T08:46:24+00:00"
         },
         {
             "name": "netresearch/jsonmapper",
-            "version": "v4.4.1",
+            "version": "v5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0"
+                "reference": "980674efdda65913492d29a8fd51c82270dd37bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0",
-                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/980674efdda65913492d29a8fd51c82270dd37bb",
+                "reference": "980674efdda65913492d29a8fd51c82270dd37bb",
                 "shasum": ""
             },
             "require": {
@@ -6002,31 +8195,33 @@
             "support": {
                 "email": "cweiske@cweiske.de",
                 "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1"
+                "source": "https://github.com/cweiske/jsonmapper/tree/v5.0.1"
             },
-            "time": "2024-01-31T06:18:54+00:00"
+            "time": "2026-02-22T16:28:03+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.18.0",
+            "version": "v5.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
+                "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dca41cd15c2ac9d055ad70dbfd011130757d1f82",
+                "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82",
                 "shasum": ""
             },
             "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.4"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -6034,7 +8229,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.9-dev"
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
@@ -6058,26 +8253,27 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.7.0"
             },
-            "time": "2023-12-10T21:03:43+00:00"
+            "time": "2025-12-06T11:56:16+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -6118,9 +8314,15 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
             "name": "phar-io/version",
@@ -6340,28 +8542,36 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
+            "version": "6.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
+                "reference": "7bae67520aa9f5ecc506d646810bd40d9da54582"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/7bae67520aa9f5ecc506d646810bd40d9da54582",
+                "reference": "7bae67520aa9f5ecc506d646810bd40d9da54582",
                 "shasum": ""
             },
             "require": {
+                "doctrine/deprecations": "^1.1",
                 "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
+                "php": "^7.4 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
+                "phpdocumentor/type-resolver": "^2.0",
+                "phpstan/phpdoc-parser": "^2.0",
+                "webmozart/assert": "^1.9.1 || ^2"
             },
             "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
+                "mockery/mockery": "~1.3.5 || ~1.6.0",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-webmozart-assert": "^1.2",
+                "phpunit/phpunit": "^9.5",
+                "psalm/phar": "^5.26",
+                "shipmonk/dead-code-detector": "^0.5.1"
             },
             "type": "library",
             "extra": {
@@ -6385,50 +8595,50 @@
                 },
                 {
                     "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
+                    "email": "opensource@ijaap.nl"
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
             "support": {
                 "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/6.0.3"
             },
-            "time": "2021-10-19T17:43:47+00:00"
+            "time": "2026-03-18T20:49:53+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.8.2",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c"
+                "reference": "327a05bbee54120d4786a0dc67aad30226ad4cf9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/327a05bbee54120d4786a0dc67aad30226ad4cf9",
+                "reference": "327a05bbee54120d4786a0dc67aad30226ad4cf9",
                 "shasum": ""
             },
             "require": {
                 "doctrine/deprecations": "^1.0",
-                "php": "^7.3 || ^8.0",
+                "php": "^7.4 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0",
-                "phpstan/phpdoc-parser": "^1.13"
+                "phpstan/phpdoc-parser": "^2.0"
             },
             "require-dev": {
                 "ext-tokenizer": "*",
                 "phpbench/phpbench": "^1.2",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-phpunit": "^1.1",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-phpunit": "^2.0",
                 "phpunit/phpunit": "^9.5",
-                "rector/rector": "^0.13.9",
-                "vimeo/psalm": "^4.25"
+                "psalm/phar": "^4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-1.x": "1.x-dev"
+                    "dev-1.x": "1.x-dev",
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
@@ -6449,36 +8659,36 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/2.0.0"
             },
-            "time": "2024-02-23T11:10:43+00:00"
+            "time": "2026-01-06T21:53:42+00:00"
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.26.0",
+            "version": "2.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "231e3186624c03d7e7c890ec662b81e6b0405227"
+                "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227",
-                "reference": "231e3186624c03d7e7c890ec662b81e6b0405227",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a004701b11273a26cd7955a61d67a7f1e525a45a",
+                "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "doctrine/annotations": "^2.0",
-                "nikic/php-parser": "^4.15",
+                "nikic/php-parser": "^5.3.0",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
                 "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^1.5",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.0",
-                "phpunit/phpunit": "^9.5",
+                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpunit/phpunit": "^9.6",
                 "symfony/process": "^5.2"
             },
             "type": "library",
@@ -6496,41 +8706,41 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.2"
             },
-            "time": "2024-02-23T16:05:55+00:00"
+            "time": "2026-01-25T14:56:51+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.30",
+            "version": "10.1.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089"
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089",
-                "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77",
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
-                "theseer/tokenizer": "^1.2.0"
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
+                "php": ">=8.1",
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "sebastian/code-unit-reverse-lookup": "^3.0.0",
+                "sebastian/complexity": "^3.2.0",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/lines-of-code": "^2.0.2",
+                "sebastian/version": "^4.0.1",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.1"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -6539,7 +8749,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.2-dev"
+                    "dev-main": "10.1.x-dev"
                 }
             },
             "autoload": {
@@ -6568,7 +8778,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16"
             },
             "funding": [
                 {
@@ -6576,32 +8786,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-22T06:47:57+00:00"
+            "time": "2024-08-22T04:31:57+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.6",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -6628,7 +8838,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
             },
             "funding": [
                 {
@@ -6636,28 +8847,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-02T12:48:52+00:00"
+            "time": "2023-08-31T06:24:48+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.1.1",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
                 "ext-pcntl": "*",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "suggest": {
                 "ext-pcntl": "*"
@@ -6665,7 +8876,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -6691,7 +8902,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
             },
             "funding": [
                 {
@@ -6699,32 +8910,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:58:55+00:00"
+            "time": "2023-02-03T06:56:09+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "2.0.4",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -6750,7 +8961,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
             },
             "funding": [
                 {
@@ -6758,32 +8970,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T05:33:50+00:00"
+            "time": "2023-08-31T14:07:24+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "5.0.3",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -6809,7 +9021,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
             },
             "funding": [
                 {
@@ -6817,54 +9029,52 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:16:10+00:00"
+            "time": "2023-02-03T06:57:52+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.17",
+            "version": "10.5.63",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd"
+                "reference": "33198268dad71e926626b618f3ec3966661e4d90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a156980d78a6666721b7e8e8502fe210b587fcd",
-                "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/33198268dad71e926626b618f3ec3966661e4d90",
+                "reference": "33198268dad71e926626b618f3ec3966661e4d90",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
-                "php": ">=7.3",
-                "phpunit/php-code-coverage": "^9.2.28",
-                "phpunit/php-file-iterator": "^3.0.5",
-                "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.3",
-                "phpunit/php-timer": "^5.0.2",
-                "sebastian/cli-parser": "^1.0.1",
-                "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.8",
-                "sebastian/diff": "^4.0.3",
-                "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.5",
-                "sebastian/global-state": "^5.0.1",
-                "sebastian/object-enumerator": "^4.0.3",
-                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.2",
-                "sebastian/version": "^3.0.2"
+                "myclabs/deep-copy": "^1.13.4",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
+                "php": ">=8.1",
+                "phpunit/php-code-coverage": "^10.1.16",
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-invoker": "^4.0.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "phpunit/php-timer": "^6.0.0",
+                "sebastian/cli-parser": "^2.0.1",
+                "sebastian/code-unit": "^2.0.0",
+                "sebastian/comparator": "^5.0.5",
+                "sebastian/diff": "^5.1.1",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/exporter": "^5.1.4",
+                "sebastian/global-state": "^6.0.2",
+                "sebastian/object-enumerator": "^5.0.0",
+                "sebastian/recursion-context": "^5.0.1",
+                "sebastian/type": "^4.0.0",
+                "sebastian/version": "^4.0.1"
             },
             "suggest": {
-                "ext-soap": "To be able to generate mocks based on WSDL files",
-                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
+                "ext-soap": "To be able to generate mocks based on WSDL files"
             },
             "bin": [
                 "phpunit"
@@ -6872,7 +9082,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.6-dev"
+                    "dev-main": "10.5-dev"
                 }
             },
             "autoload": {
@@ -6904,7 +9114,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.17"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.63"
             },
             "funding": [
                 {
@@ -6915,43 +9125,52 @@
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-23T13:14:51+00:00"
+            "time": "2026-01-27T05:48:37+00:00"
         },
         {
             "name": "psalm/plugin-symfony",
-            "version": "v5.1.0",
+            "version": "v5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/psalm/psalm-plugin-symfony.git",
-                "reference": "f23ec3439743fb24f5c1101e52d032f23d5befa6"
+                "reference": "df874ff48ae3b1833ea17fba7c21b31a4d682614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/f23ec3439743fb24f5c1101e52d032f23d5befa6",
-                "reference": "f23ec3439743fb24f5c1101e52d032f23d5befa6",
+                "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/df874ff48ae3b1833ea17fba7c21b31a4d682614",
+                "reference": "df874ff48ae3b1833ea17fba7c21b31a4d682614",
                 "shasum": ""
             },
             "require": {
                 "ext-simplexml": "*",
-                "php": "^7.4 || ^8.0",
-                "symfony/framework-bundle": "^5.0 || ^6.0 || ^7.0",
-                "vimeo/psalm": "^5.1"
+                "php": ">=8.1",
+                "symfony/expression-language": "^5.0 || ^6.0 || ^7.0 || ^8.0",
+                "symfony/framework-bundle": "^5.0 || ^6.0 || ^7.0 || ^8.0",
+                "vimeo/psalm": "^6 || dev-master"
             },
             "require-dev": {
                 "doctrine/annotations": "^1.8|^2",
-                "doctrine/orm": "^2.9",
+                "doctrine/orm": "^2.9 || ^3.6",
                 "phpunit/phpunit": "~7.5 || ~9.5",
-                "symfony/cache-contracts": "^1.0 || ^2.0",
+                "symfony/cache-contracts": "^1.0 || ^2.0 || ^3.0",
                 "symfony/console": "*",
-                "symfony/form": "^5.0 || ^6.0 || ^7.0",
-                "symfony/messenger": "^5.0 || ^6.0 || ^7.0",
-                "symfony/security-guard": "*",
-                "symfony/serializer": "^5.0 || ^6.0 || ^7.0",
+                "symfony/form": "^5.0 || ^6.0 || ^7.0 || ^8.0",
+                "symfony/messenger": "^5.0 || ^6.0 || ^7.0 || ^8.0",
+                "symfony/security-core": "*",
+                "symfony/serializer": "^5.0 || ^6.0 || ^7.0 || ^8.0",
                 "symfony/validator": "*",
                 "twig/twig": "^2.10 || ^3.0",
                 "weirdan/codeception-psalm-module": "dev-master"
@@ -6983,34 +9202,106 @@
             "description": "Psalm Plugin for Symfony",
             "support": {
                 "issues": "https://github.com/psalm/psalm-plugin-symfony/issues",
-                "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.1.0"
+                "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.3.0"
+            },
+            "time": "2026-02-12T11:24:16+00:00"
+        },
+        {
+            "name": "revolt/event-loop",
+            "version": "v1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/revoltphp/event-loop.git",
+                "reference": "44061cf513e53c6200372fc935ac42271566295d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/revoltphp/event-loop/zipball/44061cf513e53c6200372fc935ac42271566295d",
+                "reference": "44061cf513e53c6200372fc935ac42271566295d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "ext-json": "*",
+                "jetbrains/phpstorm-stubs": "^2019.3",
+                "phpunit/phpunit": "^9",
+                "psalm/phar": "6.16.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Revolt\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "ceesjank@gmail.com"
+                },
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "Rock-solid event loop for concurrent PHP applications.",
+            "keywords": [
+                "async",
+                "asynchronous",
+                "concurrency",
+                "event",
+                "event-loop",
+                "non-blocking",
+                "scheduler"
+            ],
+            "support": {
+                "issues": "https://github.com/revoltphp/event-loop/issues",
+                "source": "https://github.com/revoltphp/event-loop/tree/v1.0.9"
             },
-            "time": "2023-11-12T10:04:27+00:00"
+            "time": "2026-05-16T17:55:38+00:00"
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "1.0.1",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -7033,7 +9324,8 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+                "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
             },
             "funding": [
                 {
@@ -7041,32 +9333,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:08:49+00:00"
+            "time": "2024-03-02T07:12:49+00:00"
         },
         {
             "name": "sebastian/code-unit",
-            "version": "1.0.8",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503",
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -7089,7 +9381,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0"
             },
             "funding": [
                 {
@@ -7097,32 +9389,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:08:54+00:00"
+            "time": "2023-02-03T06:58:43+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.3",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -7144,7 +9436,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0"
             },
             "funding": [
                 {
@@ -7152,34 +9444,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:30:19+00:00"
+            "time": "2023-02-03T06:59:15+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.8",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
+                "reference": "55dfef806eb7dfeb6e7a6935601fef866f8ca48d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55dfef806eb7dfeb6e7a6935601fef866f8ca48d",
+                "reference": "55dfef806eb7dfeb6e7a6935601fef866f8ca48d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/diff": "^4.0",
-                "sebastian/exporter": "^4.0"
+                "ext-dom": "*",
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/diff": "^5.0",
+                "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -7218,41 +9512,54 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
+                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.5"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2022-09-14T12:41:17+00:00"
+            "time": "2026-01-24T09:25:16+00:00"
         },
         {
             "name": "sebastian/complexity",
-            "version": "2.0.3",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
+                "reference": "68ff824baeae169ec9f2137158ee529584553799"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
-                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
+                "reference": "68ff824baeae169ec9f2137158ee529584553799",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.2-dev"
                 }
             },
             "autoload": {
@@ -7275,7 +9582,8 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
+                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
             },
             "funding": [
                 {
@@ -7283,33 +9591,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-22T06:19:30+00:00"
+            "time": "2023-12-21T08:37:17+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.5",
+            "version": "5.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3",
-                "symfony/process": "^4.2 || ^5"
+                "phpunit/phpunit": "^10.0",
+                "symfony/process": "^6.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -7341,7 +9649,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
+                "security": "https://github.com/sebastianbergmann/diff/security/policy",
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
             },
             "funding": [
                 {
@@ -7349,27 +9658,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-07T05:35:17+00:00"
+            "time": "2024-03-02T07:15:17+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.5",
+            "version": "6.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
-                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -7377,7 +9686,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.1-dev"
+                    "dev-main": "6.1-dev"
                 }
             },
             "autoload": {
@@ -7396,7 +9705,7 @@
                 }
             ],
             "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "homepage": "https://github.com/sebastianbergmann/environment",
             "keywords": [
                 "Xdebug",
                 "environment",
@@ -7404,7 +9713,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
+                "security": "https://github.com/sebastianbergmann/environment/security/policy",
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
             },
             "funding": [
                 {
@@ -7412,34 +9722,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:03:51+00:00"
+            "time": "2024-03-23T08:47:14+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.5",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
+                "reference": "0735b90f4da94969541dac1da743446e276defa6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0735b90f4da94969541dac1da743446e276defa6",
+                "reference": "0735b90f4da94969541dac1da743446e276defa6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/recursion-context": "^4.0"
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -7481,46 +9791,56 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
+                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.4"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2022-09-14T06:03:37+00:00"
+            "time": "2025-09-24T06:09:11+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.6",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bde739e7565280bda77be70044ac1047bc007e34"
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
-                "reference": "bde739e7565280bda77be70044ac1047bc007e34",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
                 "ext-dom": "*",
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-uopz": "*"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -7539,13 +9859,14 @@
                 }
             ],
             "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "homepage": "https://www.github.com/sebastianbergmann/global-state",
             "keywords": [
                 "global state"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
+                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
             },
             "funding": [
                 {
@@ -7553,33 +9874,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-02T09:26:13+00:00"
+            "time": "2024-03-02T07:19:19+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "1.0.4",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
-                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -7602,7 +9923,8 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
+                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
             },
             "funding": [
                 {
@@ -7610,34 +9932,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-22T06:20:34+00:00"
+            "time": "2023-12-21T08:38:20+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "4.0.4",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906",
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -7659,7 +9981,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0"
             },
             "funding": [
                 {
@@ -7667,32 +9989,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:12:34+00:00"
+            "time": "2023-02-03T07:08:32+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "2.0.4",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957",
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -7714,7 +10036,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0"
             },
             "funding": [
                 {
@@ -7722,32 +10044,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:14:26+00:00"
+            "time": "2023-02-03T07:06:18+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.5",
+            "version": "5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
+                "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
-                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/47e34210757a2f37a97dcd207d032e1b01e64c7a",
+                "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -7777,95 +10099,53 @@
             "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
+                "security": "https://github.com/sebastianbergmann/recursion-context/security/policy",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
-                }
-            ],
-            "time": "2023-02-03T06:07:39+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
+                },
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
-            },
-            "funding": [
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
                 {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2020-09-28T06:45:17+00:00"
+            "time": "2025-08-10T07:50:56+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "3.2.1",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
-                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf",
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.5"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -7888,7 +10168,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
+                "source": "https://github.com/sebastianbergmann/type/tree/4.0.0"
             },
             "funding": [
                 {
@@ -7896,29 +10176,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:13:03+00:00"
+            "time": "2023-02-03T07:10:45+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "3.0.2",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17",
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -7941,7 +10221,7 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+                "source": "https://github.com/sebastianbergmann/version/tree/4.0.1"
             },
             "funding": [
                 {
@@ -7949,20 +10229,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:39:44+00:00"
+            "time": "2023-02-07T11:34:05+00:00"
         },
         {
             "name": "spatie/array-to-xml",
-            "version": "3.2.3",
+            "version": "3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/array-to-xml.git",
-                "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab"
+                "reference": "88b2f3852a922dd73177a68938f8eb2ec70c7224"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/c95fd4db94ec199f798d4b5b4a81757bd20d88ab",
-                "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab",
+                "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/88b2f3852a922dd73177a68938f8eb2ec70c7224",
+                "reference": "88b2f3852a922dd73177a68938f8eb2ec70c7224",
                 "shasum": ""
             },
             "require": {
@@ -7975,6 +10255,11 @@
                 "spatie/pest-plugin-snapshots": "^1.1"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Spatie\\ArrayToXml\\": "src"
@@ -8000,7 +10285,7 @@
                 "xml"
             ],
             "support": {
-                "source": "https://github.com/spatie/array-to-xml/tree/3.2.3"
+                "source": "https://github.com/spatie/array-to-xml/tree/3.4.4"
             },
             "funding": [
                 {
@@ -8012,41 +10297,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-07T10:39:02+00:00"
+            "time": "2025-12-15T09:00:41+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.9.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
+                "reference": "0525c73950de35ded110cffafb9892946d7771b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0525c73950de35ded110cffafb9892946d7771b5",
+                "reference": "0525c73950de35ded110cffafb9892946d7771b5",
                 "shasum": ""
             },
             "require": {
                 "ext-simplexml": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlwriter": "*",
-                "php": ">=5.4.0"
+                "php": ">=7.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
+                "phpunit/phpunit": "^8.4.0 || ^9.3.4 || ^10.5.32 || 11.3.3 - 11.5.28 || ^11.5.31"
             },
             "bin": [
                 "bin/phpcbf",
                 "bin/phpcs"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
@@ -8065,7 +10345,7 @@
                     "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
                 }
             ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "description": "PHP_CodeSniffer tokenizes PHP files and detects violations of a defined set of coding standards.",
             "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
             "keywords": [
                 "phpcs",
@@ -8090,33 +10370,38 @@
                 {
                     "url": "https://opencollective.com/php_codesniffer",
                     "type": "open_collective"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/phpcsstandards",
+                    "type": "thanks_dev"
                 }
             ],
-            "time": "2024-02-16T15:06:51+00:00"
+            "time": "2025-11-10T16:43:36+00:00"
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v6.4.3",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "495ffa2e6d17e199213f93768efa01af32bbf70e"
+                "reference": "41850d8f8ddef9a9cd7314fa9f4902cf48885521"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/495ffa2e6d17e199213f93768efa01af32bbf70e",
-                "reference": "495ffa2e6d17e199213f93768efa01af32bbf70e",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/41850d8f8ddef9a9cd7314fa9f4902cf48885521",
+                "reference": "41850d8f8ddef9a9cd7314fa9f4902cf48885521",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/dom-crawler": "^5.4|^6.0|^7.0"
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/dom-crawler": "^6.4|^7.0|^8.0"
             },
             "require-dev": {
-                "symfony/css-selector": "^5.4|^6.0|^7.0",
-                "symfony/http-client": "^5.4|^6.0|^7.0",
-                "symfony/mime": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0"
+                "symfony/css-selector": "^6.4|^7.0|^8.0",
+                "symfony/http-client": "^6.4|^7.0|^8.0",
+                "symfony/mime": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -8144,7 +10429,7 @@
             "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/browser-kit/tree/v6.4.3"
+                "source": "https://github.com/symfony/browser-kit/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -8155,40 +10440,47 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/cache",
-            "version": "v6.4.3",
+            "version": "v7.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "49f8cdee544a621a621cd21b6cda32a38926d310"
+                "reference": "902d621e0b6ef0ebeaa133770b5c339a19328589"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/49f8cdee544a621a621cd21b6cda32a38926d310",
-                "reference": "49f8cdee544a621a621cd21b6cda32a38926d310",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/902d621e0b6ef0ebeaa133770b5c339a19328589",
+                "reference": "902d621e0b6ef0ebeaa133770b5c339a19328589",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/cache": "^2.0|^3.0",
                 "psr/log": "^1.1|^2|^3",
-                "symfony/cache-contracts": "^2.5|^3",
+                "symfony/cache-contracts": "^3.6",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/var-exporter": "^6.3.6|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0|^8.0"
             },
             "conflict": {
-                "doctrine/dbal": "<2.13.1",
-                "symfony/dependency-injection": "<5.4",
-                "symfony/http-kernel": "<5.4",
-                "symfony/var-dumper": "<5.4"
+                "doctrine/dbal": "<3.6",
+                "ext-redis": "<6.1",
+                "ext-relay": "<0.12.1",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/http-kernel": "<6.4",
+                "symfony/var-dumper": "<6.4"
             },
             "provide": {
                 "psr/cache-implementation": "2.0|3.0",
@@ -8197,15 +10489,16 @@
             },
             "require-dev": {
                 "cache/integration-tests": "dev-master",
-                "doctrine/dbal": "^2.13.1|^3|^4",
+                "doctrine/dbal": "^3.6|^4",
                 "predis/predis": "^1.1|^2.0",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/filesystem": "^5.4|^6.0|^7.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/clock": "^6.4|^7.0|^8.0",
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/filesystem": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -8240,7 +10533,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v6.4.3"
+                "source": "https://github.com/symfony/cache/tree/v7.4.12"
             },
             "funding": [
                 {
@@ -8251,25 +10544,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-05-20T07:20:23+00:00"
         },
         {
             "name": "symfony/cache-contracts",
-            "version": "v3.4.0",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "1d74b127da04ffa87aa940abe15446fa89653778"
+                "reference": "225e8a254166bd3442e370c6f50145465db63831"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778",
-                "reference": "1d74b127da04ffa87aa940abe15446fa89653778",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/225e8a254166bd3442e370c6f50145465db63831",
+                "reference": "225e8a254166bd3442e370c6f50145465db63831",
                 "shasum": ""
             },
             "require": {
@@ -8278,12 +10575,12 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -8316,7 +10613,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/cache-contracts/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -8327,29 +10624,33 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-09-25T12:52:38+00:00"
+            "time": "2026-05-05T15:33:14+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.4.3",
+            "version": "v7.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229"
+                "reference": "b75663ed96cf4756e28e3105476f220f92886cc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/ee0f7ed5cf298cc019431bb3b3977ebc52b86229",
-                "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/b75663ed96cf4756e28e3105476f220f92886cc4",
+                "reference": "b75663ed96cf4756e28e3105476f220f92886cc4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "type": "library",
             "autoload": {
@@ -8381,7 +10682,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.4.3"
+                "source": "https://github.com/symfony/css-selector/tree/v7.4.9"
             },
             "funding": [
                 {
@@ -8392,35 +10693,40 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-04-18T13:18:21+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v6.4.3",
+            "version": "v7.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "6db31849011fefe091e94d0bb10cba26f7919894"
+                "reference": "b59b59122690976550fd142c23fab62c84738db6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/6db31849011fefe091e94d0bb10cba26f7919894",
-                "reference": "6db31849011fefe091e94d0bb10cba26f7919894",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b59b59122690976550fd142c23fab62c84738db6",
+                "reference": "b59b59122690976550fd142c23fab62c84738db6",
                 "shasum": ""
             },
             "require": {
                 "masterminds/html5": "^2.6",
-                "php": ">=8.1",
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
-                "symfony/css-selector": "^5.4|^6.0|^7.0"
+                "symfony/css-selector": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -8448,7 +10754,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.3"
+                "source": "https://github.com/symfony/dom-crawler/tree/v7.4.12"
             },
             "funding": [
                 {
@@ -8459,121 +10765,41 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2026-05-20T07:20:23+00:00"
         },
         {
-            "name": "symfony/framework-bundle",
-            "version": "v6.4.3",
+            "name": "symfony/expression-language",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/framework-bundle.git",
-                "reference": "fb413ac4483803954411966a39f3a9204835848e"
+                "url": "https://github.com/symfony/expression-language.git",
+                "reference": "87ff95687748f4af65e4d5a6e917d448ec52aa83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/fb413ac4483803954411966a39f3a9204835848e",
-                "reference": "fb413ac4483803954411966a39f3a9204835848e",
+                "url": "https://api.github.com/repos/symfony/expression-language/zipball/87ff95687748f4af65e4d5a6e917d448ec52aa83",
+                "reference": "87ff95687748f4af65e4d5a6e917d448ec52aa83",
                 "shasum": ""
             },
             "require": {
-                "composer-runtime-api": ">=2.1",
-                "ext-xml": "*",
-                "php": ">=8.1",
-                "symfony/cache": "^5.4|^6.0|^7.0",
-                "symfony/config": "^6.1|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
+                "php": ">=8.2",
+                "symfony/cache": "^6.4|^7.0|^8.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/error-handler": "^6.1|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-                "symfony/filesystem": "^5.4|^6.0|^7.0",
-                "symfony/finder": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
-                "symfony/http-kernel": "^6.4",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/routing": "^6.4|^7.0"
-            },
-            "conflict": {
-                "doctrine/annotations": "<1.13.1",
-                "doctrine/persistence": "<1.3",
-                "phpdocumentor/reflection-docblock": "<3.2.2",
-                "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/asset": "<5.4",
-                "symfony/asset-mapper": "<6.4",
-                "symfony/clock": "<6.3",
-                "symfony/console": "<5.4|>=7.0",
-                "symfony/dom-crawler": "<6.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/form": "<5.4",
-                "symfony/http-client": "<6.3",
-                "symfony/lock": "<5.4",
-                "symfony/mailer": "<5.4",
-                "symfony/messenger": "<6.3",
-                "symfony/mime": "<6.4",
-                "symfony/property-access": "<5.4",
-                "symfony/property-info": "<5.4",
-                "symfony/scheduler": "<6.4.3|>=7.0.0,<7.0.3",
-                "symfony/security-core": "<5.4",
-                "symfony/security-csrf": "<5.4",
-                "symfony/serializer": "<6.4",
-                "symfony/stopwatch": "<5.4",
-                "symfony/translation": "<6.4",
-                "symfony/twig-bridge": "<5.4",
-                "symfony/twig-bundle": "<5.4",
-                "symfony/validator": "<6.4",
-                "symfony/web-profiler-bundle": "<6.4",
-                "symfony/workflow": "<6.4"
-            },
-            "require-dev": {
-                "doctrine/annotations": "^1.13.1|^2",
-                "doctrine/persistence": "^1.3|^2|^3",
-                "dragonmantank/cron-expression": "^3.1",
-                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "seld/jsonlint": "^1.10",
-                "symfony/asset": "^5.4|^6.0|^7.0",
-                "symfony/asset-mapper": "^6.4|^7.0",
-                "symfony/browser-kit": "^5.4|^6.0|^7.0",
-                "symfony/clock": "^6.2|^7.0",
-                "symfony/console": "^5.4.9|^6.0.9|^7.0",
-                "symfony/css-selector": "^5.4|^6.0|^7.0",
-                "symfony/dom-crawler": "^6.4|^7.0",
-                "symfony/dotenv": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/form": "^5.4|^6.0|^7.0",
-                "symfony/html-sanitizer": "^6.1|^7.0",
-                "symfony/http-client": "^6.3|^7.0",
-                "symfony/lock": "^5.4|^6.0|^7.0",
-                "symfony/mailer": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^6.3|^7.0",
-                "symfony/mime": "^6.4|^7.0",
-                "symfony/notifier": "^5.4|^6.0|^7.0",
-                "symfony/polyfill-intl-icu": "~1.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/property-info": "^5.4|^6.0|^7.0",
-                "symfony/rate-limiter": "^5.4|^6.0|^7.0",
-                "symfony/scheduler": "^6.4.3|^7.0.3",
-                "symfony/security-bundle": "^5.4|^6.0|^7.0",
-                "symfony/semaphore": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.4|^7.0",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0",
-                "symfony/string": "^5.4|^6.0|^7.0",
-                "symfony/translation": "^6.4|^7.0",
-                "symfony/twig-bundle": "^5.4|^6.0|^7.0",
-                "symfony/uid": "^5.4|^6.0|^7.0",
-                "symfony/validator": "^6.4|^7.0",
-                "symfony/web-link": "^5.4|^6.0|^7.0",
-                "symfony/workflow": "^6.4|^7.0",
-                "symfony/yaml": "^5.4|^6.0|^7.0",
-                "twig/twig": "^2.10|^3.0"
+                "symfony/service-contracts": "^2.5|^3"
             },
-            "type": "symfony-bundle",
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Bundle\\FrameworkBundle\\": ""
+                    "Symfony\\Component\\ExpressionLanguage\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -8593,10 +10819,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework",
+            "description": "Provides an engine that can compile and evaluate expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/framework-bundle/tree/v6.4.3"
+                "source": "https://github.com/symfony/expression-language/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -8607,63 +10833,131 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T15:02:55+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
-            "name": "symfony/http-client",
-            "version": "v6.4.3",
+            "name": "symfony/framework-bundle",
+            "version": "v7.4.11",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/http-client.git",
-                "reference": "a9034bc119fab8238f76cf49c770f3135f3ead86"
+                "url": "https://github.com/symfony/framework-bundle.git",
+                "reference": "637f5cac1ac2698a012b41610215bf366004295f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/a9034bc119fab8238f76cf49c770f3135f3ead86",
-                "reference": "a9034bc119fab8238f76cf49c770f3135f3ead86",
+                "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/637f5cac1ac2698a012b41610215bf366004295f",
+                "reference": "637f5cac1ac2698a012b41610215bf366004295f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "psr/log": "^1|^2|^3",
+                "composer-runtime-api": ">=2.1",
+                "ext-xml": "*",
+                "php": ">=8.2",
+                "symfony/cache": "^6.4.12|^7.0|^8.0",
+                "symfony/config": "^7.4.4|^8.0.4",
+                "symfony/dependency-injection": "^7.4.4|^8.0.4",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/http-client-contracts": "^3",
-                "symfony/service-contracts": "^2.5|^3"
+                "symfony/error-handler": "^7.3|^8.0",
+                "symfony/event-dispatcher": "^6.4|^7.0|^8.0",
+                "symfony/filesystem": "^7.1|^8.0",
+                "symfony/finder": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^7.4|^8.0",
+                "symfony/http-kernel": "^7.4|^8.0",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php85": "^1.32",
+                "symfony/routing": "^7.4|^8.0"
             },
             "conflict": {
-                "php-http/discovery": "<1.15",
-                "symfony/http-foundation": "<6.3"
-            },
-            "provide": {
-                "php-http/async-client-implementation": "*",
-                "php-http/client-implementation": "*",
-                "psr/http-client-implementation": "1.0",
-                "symfony/http-client-implementation": "3.0"
+                "doctrine/persistence": "<1.3",
+                "phpdocumentor/reflection-docblock": "<5.2|>=7",
+                "phpdocumentor/type-resolver": "<1.5.1",
+                "symfony/asset": "<6.4",
+                "symfony/asset-mapper": "<6.4",
+                "symfony/clock": "<6.4",
+                "symfony/console": "<6.4",
+                "symfony/dom-crawler": "<6.4",
+                "symfony/dotenv": "<6.4",
+                "symfony/form": "<7.4",
+                "symfony/http-client": "<6.4",
+                "symfony/lock": "<6.4",
+                "symfony/mailer": "<6.4",
+                "symfony/messenger": "<7.4",
+                "symfony/mime": "<6.4.37|>=7.0,<7.4.9|>=8.0,<8.0.9",
+                "symfony/property-access": "<6.4",
+                "symfony/property-info": "<6.4",
+                "symfony/runtime": "<6.4.13|>=7.0,<7.1.6",
+                "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4",
+                "symfony/security-core": "<6.4",
+                "symfony/security-csrf": "<7.2",
+                "symfony/serializer": "<7.2.5",
+                "symfony/stopwatch": "<6.4",
+                "symfony/translation": "<7.3",
+                "symfony/twig-bridge": "<6.4",
+                "symfony/twig-bundle": "<6.4",
+                "symfony/validator": "<6.4",
+                "symfony/web-profiler-bundle": "<6.4",
+                "symfony/webhook": "<7.2",
+                "symfony/workflow": "<7.4"
             },
             "require-dev": {
-                "amphp/amp": "^2.5",
-                "amphp/http-client": "^4.2.1",
-                "amphp/http-tunnel": "^1.0",
-                "amphp/socket": "^1.1",
-                "guzzlehttp/promises": "^1.4",
-                "nyholm/psr7": "^1.0",
-                "php-http/httplug": "^1.0|^2.0",
-                "psr/http-client": "^1.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0"
+                "doctrine/persistence": "^1.3|^2|^3",
+                "dragonmantank/cron-expression": "^3.1",
+                "phpdocumentor/reflection-docblock": "^5.2|^6.0",
+                "seld/jsonlint": "^1.10",
+                "symfony/asset": "^6.4|^7.0|^8.0",
+                "symfony/asset-mapper": "^6.4|^7.0|^8.0",
+                "symfony/browser-kit": "^6.4|^7.0|^8.0",
+                "symfony/clock": "^6.4|^7.0|^8.0",
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/css-selector": "^6.4|^7.0|^8.0",
+                "symfony/dom-crawler": "^6.4|^7.0|^8.0",
+                "symfony/dotenv": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/form": "^7.4|^8.0",
+                "symfony/html-sanitizer": "^6.4|^7.0|^8.0",
+                "symfony/http-client": "^6.4|^7.0|^8.0",
+                "symfony/json-streamer": "^7.3|^8.0",
+                "symfony/lock": "^6.4|^7.0|^8.0",
+                "symfony/mailer": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^7.4|^8.0",
+                "symfony/mime": "^6.4.37|^7.4.9|^8.0.9",
+                "symfony/notifier": "^6.4|^7.0|^8.0",
+                "symfony/object-mapper": "^7.3|^8.0",
+                "symfony/polyfill-intl-icu": "~1.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/property-info": "^6.4|^7.0|^8.0",
+                "symfony/rate-limiter": "^6.4|^7.0|^8.0",
+                "symfony/runtime": "^6.4.13|^7.1.6|^8.0",
+                "symfony/scheduler": "^6.4.4|^7.0.4|^8.0",
+                "symfony/security-bundle": "^6.4|^7.0|^8.0",
+                "symfony/semaphore": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^7.2.5|^8.0",
+                "symfony/stopwatch": "^6.4|^7.0|^8.0",
+                "symfony/string": "^6.4|^7.0|^8.0",
+                "symfony/translation": "^7.3|^8.0",
+                "symfony/twig-bundle": "^6.4|^7.0|^8.0",
+                "symfony/type-info": "^7.1.8|^8.0",
+                "symfony/uid": "^6.4|^7.0|^8.0",
+                "symfony/validator": "^7.4|^8.0",
+                "symfony/web-link": "^6.4|^7.0|^8.0",
+                "symfony/webhook": "^7.2|^8.0",
+                "symfony/workflow": "^7.4|^8.0",
+                "symfony/yaml": "^7.3|^8.0",
+                "twig/twig": "^3.12"
             },
-            "type": "library",
+            "type": "symfony-bundle",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\HttpClient\\": ""
+                    "Symfony\\Bundle\\FrameworkBundle\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -8675,21 +10969,18 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
+            "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework",
             "homepage": "https://symfony.com",
-            "keywords": [
-                "http"
-            ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.4.3"
+                "source": "https://github.com/symfony/framework-bundle/tree/v7.4.11"
             },
             "funding": [
                 {
@@ -8701,81 +10992,7 @@
                     "type": "github"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-01-29T15:01:07+00:00"
-        },
-        {
-            "name": "symfony/http-client-contracts",
-            "version": "v3.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "1ee70e699b41909c209a0c930f11034b93578654"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654",
-                "reference": "1ee70e699b41909c209a0c930f11034b93578654",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\HttpClient\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Test/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to HTTP clients",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
+                    "url": "https://github.com/nicolas-grekas",
                     "type": "github"
                 },
                 {
@@ -8783,20 +11000,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-30T20:28:31+00:00"
+            "time": "2026-05-13T12:04:42+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.2",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
+                "reference": "b7489ce515e168639d17feec34b8847c326b0b3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
-                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c",
+                "reference": "b7489ce515e168639d17feec34b8847c326b0b3c",
                 "shasum": ""
             },
             "require": {
@@ -8825,7 +11042,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
+                "source": "https://github.com/theseer/tokenizer/tree/1.3.1"
             },
             "funding": [
                 {
@@ -8833,28 +11050,30 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-20T00:12:19+00:00"
+            "time": "2025-11-17T20:03:58+00:00"
         },
         {
             "name": "vimeo/psalm",
-            "version": "5.22.2",
+            "version": "6.16.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "d768d914152dbbf3486c36398802f74e80cfde48"
+                "reference": "f1f5de594dc76faf8784e02d3dc4716c91c6f6ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/d768d914152dbbf3486c36398802f74e80cfde48",
-                "reference": "d768d914152dbbf3486c36398802f74e80cfde48",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/f1f5de594dc76faf8784e02d3dc4716c91c6f6ac",
+                "reference": "f1f5de594dc76faf8784e02d3dc4716c91c6f6ac",
                 "shasum": ""
             },
             "require": {
-                "amphp/amp": "^2.4.2",
-                "amphp/byte-stream": "^1.5",
+                "amphp/amp": "^3",
+                "amphp/byte-stream": "^2",
+                "amphp/parallel": "^2.3",
                 "composer-runtime-api": "^2",
                 "composer/semver": "^1.4 || ^2.0 || ^3.0",
                 "composer/xdebug-handler": "^2.0 || ^3.0",
+                "danog/advanced-json-rpc": "^3.1",
                 "dnoegel/php-xdg-base-dir": "^0.1.1",
                 "ext-ctype": "*",
                 "ext-dom": "*",
@@ -8863,27 +11082,26 @@
                 "ext-mbstring": "*",
                 "ext-simplexml": "*",
                 "ext-tokenizer": "*",
-                "felixfbecker/advanced-json-rpc": "^3.1",
-                "felixfbecker/language-server-protocol": "^1.5.2",
+                "felixfbecker/language-server-protocol": "^1.5.3",
                 "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0",
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
-                "nikic/php-parser": "^4.16",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-                "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
+                "netresearch/jsonmapper": "^5.0",
+                "nikic/php-parser": "^5.0.0",
+                "php": "~8.1.31 || ~8.2.27 || ~8.3.16 || ~8.4.3 || ~8.5.0",
+                "sebastian/diff": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
                 "spatie/array-to-xml": "^2.17.0 || ^3.0",
-                "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0",
-                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0"
-            },
-            "conflict": {
-                "nikic/php-parser": "4.17.0"
+                "symfony/console": "^6.0 || ^7.0 || ^8.0",
+                "symfony/filesystem": "~6.3.12 || ~6.4.3 || ^7.0.3 || ^8.0",
+                "symfony/polyfill-php84": "^1.31.0"
             },
             "provide": {
                 "psalm/psalm": "self.version"
             },
             "require-dev": {
-                "amphp/phpunit-util": "^2.0",
+                "amphp/phpunit-util": "^3",
                 "bamarni/composer-bin-plugin": "^1.4",
                 "brianium/paratest": "^6.9",
+                "danog/class-finder": "^0.4.8",
+                "dg/bypass-finals": "^1.5",
                 "ext-curl": "*",
                 "mockery/mockery": "^1.5",
                 "nunomaduro/mock-final-classes": "^1.1",
@@ -8891,10 +11109,10 @@
                 "phpstan/phpdoc-parser": "^1.6",
                 "phpunit/phpunit": "^9.6",
                 "psalm/plugin-mockery": "^1.1",
-                "psalm/plugin-phpunit": "^0.18",
+                "psalm/plugin-phpunit": "^0.19",
                 "slevomat/coding-standard": "^8.4",
                 "squizlabs/php_codesniffer": "^3.6",
-                "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0"
+                "symfony/process": "^6.0 || ^7.0 || ^8.0"
             },
             "suggest": {
                 "ext-curl": "In order to send data to shepherd",
@@ -8905,16 +11123,19 @@
                 "psalm-language-server",
                 "psalm-plugin",
                 "psalm-refactor",
+                "psalm-review",
                 "psalter"
             ],
             "type": "project",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.x-dev",
-                    "dev-4.x": "4.x-dev",
-                    "dev-3.x": "3.x-dev",
+                    "dev-1.x": "1.x-dev",
                     "dev-2.x": "2.x-dev",
-                    "dev-1.x": "1.x-dev"
+                    "dev-3.x": "3.x-dev",
+                    "dev-4.x": "4.x-dev",
+                    "dev-5.x": "5.x-dev",
+                    "dev-6.x": "6.x-dev",
+                    "dev-master": "7.x-dev"
                 }
             },
             "autoload": {
@@ -8929,6 +11150,10 @@
             "authors": [
                 {
                     "name": "Matthew Brown"
+                },
+                {
+                    "name": "Daniil Gentili",
+                    "email": "daniil@daniil.it"
                 }
             ],
             "description": "A static analysis tool for finding errors in PHP applications",
@@ -8943,37 +11168,41 @@
                 "issues": "https://github.com/vimeo/psalm/issues",
                 "source": "https://github.com/vimeo/psalm"
             },
-            "time": "2024-02-22T23:39:07+00:00"
+            "time": "2026-03-19T10:56:09+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.11.0",
+            "version": "2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
+                "reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/9007ea6f45ecf352a9422b36644e4bfc039b9155",
+                "reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155",
                 "shasum": ""
             },
             "require": {
                 "ext-ctype": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
+                "ext-date": "*",
+                "ext-filter": "*",
+                "php": "^8.2"
             },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
+            "suggest": {
+                "ext-intl": "",
+                "ext-simplexml": "",
+                "ext-spl": ""
             },
             "type": "library",
             "extra": {
+                "psalm": {
+                    "pluginClass": "Webmozart\\Assert\\PsalmPlugin"
+                },
                 "branch-alias": {
-                    "dev-master": "1.10-dev"
+                    "dev-master": "2.0-dev",
+                    "dev-feature/2-0": "2.0-dev"
                 }
             },
             "autoload": {
@@ -8989,6 +11218,10 @@
                 {
                     "name": "Bernhard Schussek",
                     "email": "bschussek@gmail.com"
+                },
+                {
+                    "name": "Woody Gilk",
+                    "email": "woody.gilk@gmail.com"
                 }
             ],
             "description": "Assertions to validate method input/output with nice error messages.",
@@ -8999,25 +11232,26 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
+                "source": "https://github.com/webmozarts/assert/tree/2.4.0"
             },
-            "time": "2022-06-03T18:03:27+00:00"
+            "time": "2026-05-20T13:07:01+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.1",
-        "ext-json": "*",
+        "php": "^8.2",
         "ext-pdo": "*",
-        "ext-zlib": "*"
+        "ext-zip": "*",
+        "ext-zlib": "*",
+        "ext-sodium": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
-        "php": "8.1.0"
+        "php": "8.2.27"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }
diff --git a/phpBB/config/default/container/parameters.yml b/phpBB/config/default/container/parameters.yml
index 8fcb4019146..29502123ed5 100644
--- a/phpBB/config/default/container/parameters.yml
+++ b/phpBB/config/default/container/parameters.yml
@@ -20,3 +20,5 @@ parameters:
         - passwords.driver.bcrypt
         - passwords.driver.salted_md5
         - passwords.driver.phpass
+
+    packages.public_key: 'auJX0pGetfYatE7t/rX5hAkCLZv9s78TwKkLfR3YGuQ='
diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml
index d34a1ded9f3..3f42684e567 100644
--- a/phpBB/config/default/container/services.yml
+++ b/phpBB/config/default/container/services.yml
@@ -15,10 +15,13 @@ imports:
     - { resource: services_files.yml }
     - { resource: services_filesystem.yml }
     - { resource: services_finder.yml }
+    - { resource: services_forum.yml }
     - { resource: services_help.yml }
     - { resource: services_http.yml }
     - { resource: services_language.yml }
+    - { resource: services_members.yml }
     - { resource: services_mention.yml }
+    - { resource: services_messenger.yml }
     - { resource: services_migrator.yml }
     - { resource: services_mimetype_guesser.yml }
     - { resource: services_module.yml }
@@ -36,6 +39,7 @@ imports:
     - { resource: services_twig.yml }
     - { resource: services_twig_extensions.yml }
     - { resource: services_ucp.yml }
+    - { resource: services_updater.yml }
     - { resource: services_user.yml }
 
     - { resource: tables.yml }
@@ -126,16 +130,25 @@ services:
         arguments:
             - '%core.root_path%'
 
+    form_helper:
+        class: phpbb\form\form_helper
+        arguments:
+            - '@config'
+            - '@request'
+            - '@user'
+
     group_helper:
         class: phpbb\group\helper
         arguments:
             - '@auth'
             - '@avatar.helper'
+            - '@dbal.conn'
             - '@cache'
             - '@config'
             - '@language'
             - '@event_dispatcher'
             - '@path_helper'
+            - '@template'
             - '@user'
 
     log:
@@ -150,6 +163,13 @@ services:
             - '%core.php_ext%'
             - '%tables.log%'
 
+    manifest.controller:
+        class: phpbb\manifest
+        arguments:
+            - '@config'
+            - '@event_dispatcher'
+            - '@user'
+
     path_helper:
         class: phpbb\path_helper
         arguments:
diff --git a/phpBB/config/default/container/services_auth.yml b/phpBB/config/default/container/services_auth.yml
index 2276f4a4f3c..3902e17c941 100644
--- a/phpBB/config/default/container/services_auth.yml
+++ b/phpBB/config/default/container/services_auth.yml
@@ -55,6 +55,7 @@ services:
             - '@event_dispatcher'
             - '@language'
             - '@request'
+            - '@routing.helper'
             - '@auth.provider.oauth.service_collection'
             - '@user'
             - '%tables.auth_provider_oauth_token_storage%'
diff --git a/phpBB/config/default/container/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml
index e8048278c7b..a7c93869cc9 100644
--- a/phpBB/config/default/container/services_avatar.yml
+++ b/phpBB/config/default/container/services_avatar.yml
@@ -56,11 +56,11 @@ services:
         class: phpbb\avatar\driver\upload
         arguments:
             - '@config'
-            - '@controller.helper'
             - '%core.root_path%'
             - '%core.php_ext%'
             - '@storage.avatar'
             - '@path_helper'
+            - '@routing.helper'
             - '@event_dispatcher'
             - '@files.factory'
             - '@php_ini'
diff --git a/phpBB/config/default/container/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml
index ba102640930..ea41fefe805 100644
--- a/phpBB/config/default/container/services_captcha.yml
+++ b/phpBB/config/default/container/services_captcha.yml
@@ -14,27 +14,20 @@ services:
         tags:
             - { name: service_collection, tag: captcha.plugins }
 
-    core.captcha.plugins.gd:
-        class: phpbb\captcha\plugins\gd
-        shared: false
-        calls:
-            - [set_name, [core.captcha.plugins.gd]]
-        tags:
-            - { name: captcha.plugins }
-
-    core.captcha.plugins.gd_wave:
-        class: phpbb\captcha\plugins\gd_wave
-        shared: false
-        calls:
-            - [set_name, [core.captcha.plugins.gd_wave]]
-        tags:
-            - { name: captcha.plugins }
-
-    core.captcha.plugins.nogd:
-        class: phpbb\captcha\plugins\nogd
+    core.captcha.plugins.incomplete:
+        class: phpbb\captcha\plugins\incomplete
         shared: false
+        arguments:
+            - '@config'
+            - '@dbal.conn'
+            - '@language'
+            - '@request'
+            - '@template'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         calls:
-            - [set_name, [core.captcha.plugins.nogd]]
+            - [ set_name, [ core.captcha.plugins.incomplete ] ]
         tags:
             - { name: captcha.plugins }
 
@@ -65,3 +58,19 @@ services:
             - ['set_name', ['core.captcha.plugins.recaptcha_v3']]
         tags:
             - { name: captcha.plugins }
+
+    core.captcha.plugins.turnstile:
+        class: phpbb\captcha\plugins\turnstile
+        shared: false
+        arguments:
+            - '@config'
+            - '@dbal.conn'
+            - '@language'
+            - '@log'
+            - '@request'
+            - '@template'
+            - '@user'
+        calls:
+            - ['set_name', ['core.captcha.plugins.turnstile']]
+        tags:
+            - { name: captcha.plugins }
diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml
index 038aa360e4a..8b2605ed33b 100644
--- a/phpBB/config/default/container/services_console.yml
+++ b/phpBB/config/default/container/services_console.yml
@@ -284,20 +284,22 @@ services:
     console.command.thumbnail.delete:
         class: phpbb\console\command\thumbnail\delete
         arguments:
-            - '@config'
             - '@user'
             - '@dbal.conn'
-            - '%core.root_path%'
+            - '@language'
+            - '@storage.attachment'
         tags:
             - { name: console.command }
 
     console.command.thumbnail.generate:
         class: phpbb\console\command\thumbnail\generate
         arguments:
-            - '@config'
             - '@user'
             - '@dbal.conn'
             - '@cache'
+            - '@language'
+            - '@storage.attachment'
+            - '@filesystem.temp'
             - '%core.root_path%'
             - '%core.php_ext%'
         tags:
@@ -307,6 +309,7 @@ services:
         class: phpbb\console\command\thumbnail\recreate
         arguments:
             - '@user'
+            - '@language'
         tags:
             - { name: console.command }
 
@@ -327,6 +330,7 @@ services:
             - '@config'
             - '@language'
             - '@log'
+            - '@messenger.method.email'
             - '@notification_manager'
             - '@user_loader'
             - '%core.root_path%'
@@ -341,6 +345,7 @@ services:
             - '@dbal.conn'
             - '@config'
             - '@language'
+            - '@messenger.method.email'
             - '@passwords.manager'
             - '%core.root_path%'
             - '%core.php_ext%'
@@ -359,6 +364,22 @@ services:
         tags:
             - { name: console.command }
 
+    console.command.user.delete_id:
+        class: phpbb\console\command\user\delete_id
+        arguments:
+            - '@dbal.conn'
+            - '@language'
+            - '@log'
+            - '@user'
+            - '@user_loader'
+            - '%tables.bots%'
+            - '%tables.user_group%'
+            - '%tables.users%'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+        tags:
+            - { name: console.command }
+
     console.command.user.reclean:
         class: phpbb\console\command\user\reclean
         arguments:
diff --git a/phpBB/config/default/container/services_content.yml b/phpBB/config/default/container/services_content.yml
index d290974ff7b..f1ff60c9574 100644
--- a/phpBB/config/default/container/services_content.yml
+++ b/phpBB/config/default/container/services_content.yml
@@ -32,6 +32,7 @@ services:
             - '@config'
             - '@config_text'
             - '@dbal.conn'
+            - '@controller.helper'
             - '@user'
             - '@event_dispatcher'
             - '%core.root_path%'
@@ -43,6 +44,7 @@ services:
             - '@auth'
             - '@config'
             - '@dbal.conn'
+            - '@controller.helper'
             - '@user'
             - '%core.root_path%'
             - '%core.php_ext%'
@@ -53,6 +55,7 @@ services:
             - '@auth'
             - '@config'
             - '@dbal.conn'
+            - '@controller.helper'
             - '@user'
             - '%core.root_path%'
             - '%core.php_ext%'
@@ -65,6 +68,13 @@ services:
             - '@controller.helper'
             - '@event_dispatcher'
 
+    posting.lock:
+        class: phpbb\lock\posting
+        shared: false
+        arguments:
+            - '@cache.driver'
+            - '@config'
+
     viewonline_helper:
         class: phpbb\viewonline_helper
         arguments:
diff --git a/phpBB/config/default/container/services_cron.yml b/phpBB/config/default/container/services_cron.yml
index a19ed9900d4..b016950e99b 100644
--- a/phpBB/config/default/container/services_cron.yml
+++ b/phpBB/config/default/container/services_cron.yml
@@ -86,10 +86,9 @@ services:
     cron.task.core.queue:
         class: phpbb\cron\task\core\queue
         arguments:
-            - '%core.root_path%'
-            - '%core.php_ext%'
             - '@config'
-            - '%core.cache_dir%'
+            - '@messenger.queue'
+            - '%core.messenger_queue_file%'
         calls:
             - [set_name, [cron.task.core.queue]]
         tags:
@@ -148,6 +147,17 @@ services:
         tags:
             - { name: cron.task }
 
+    cron.task.core.purge_oauth_states:
+        class: phpbb\cron\task\core\purge_oauth_states
+        arguments:
+            - '@config'
+            - '@dbal.conn'
+            - '%tables.auth_provider_oauth_states%'
+        calls:
+            - [set_name, [cron.task.core.purge_oauth_states]]
+        tags:
+            - { name: cron.task }
+
     cron.task.core.tidy_warnings:
         class: phpbb\cron\task\core\tidy_warnings
         arguments:
diff --git a/phpBB/config/default/container/services_feed.yml b/phpBB/config/default/container/services_feed.yml
index 80caf546df4..14c82f6125b 100644
--- a/phpBB/config/default/container/services_feed.yml
+++ b/phpBB/config/default/container/services_feed.yml
@@ -15,6 +15,17 @@ services:
             - '@language'
             - '%core.php_ext%'
 
+    feed.http_auth_subscriber:
+        class: phpbb\feed\event\http_auth_subscriber
+        arguments:
+            - '@auth'
+            - '@config'
+            - '@language'
+            - '@request'
+            - '@user'
+        tags:
+            - { name: kernel.event_subscriber }
+
     feed.helper:
         class: phpbb\feed\helper
         arguments:
diff --git a/phpBB/config/default/container/services_forum.yml b/phpBB/config/default/container/services_forum.yml
new file mode 100644
index 00000000000..befbca270b5
--- /dev/null
+++ b/phpBB/config/default/container/services_forum.yml
@@ -0,0 +1,27 @@
+services:
+
+    phpbb.birthday.helper:
+        class: phpbb\forum\birthday_helper
+        arguments:
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@dispatcher'
+            - '@language'
+            - '@template'
+            - '@user'
+
+    forum.controller.index:
+        class: phpbb\forum\controller\index
+        arguments:
+            - '@auth'
+            - '@phpbb.birthday.helper'
+            - '@config'
+            - '@controller.helper'
+            - '@dispatcher'
+            - '@group_helper'
+            - '@language'
+            - '@user'
+            - '@template'
+            - '%core.root_path%'
+            - '%core.php_ext%'
diff --git a/phpBB/config/default/container/services_members.yml b/phpBB/config/default/container/services_members.yml
new file mode 100644
index 00000000000..4a39991ea00
--- /dev/null
+++ b/phpBB/config/default/container/services_members.yml
@@ -0,0 +1,72 @@
+services:
+
+# Controllers
+    members.controller.online:
+        class: phpbb\members\controller\online
+        arguments:
+            - '@auth'
+            - '@config'
+            - '@dispatcher'
+            - '@group_helper'
+            - '@viewonline_helper'
+            - '@controller.helper'
+            - '@language'
+            - '@pagination'
+            - '@request'
+            - '@template'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+
+    members.controller.online_whois:
+        class: phpbb\members\controller\online_whois
+        arguments:
+            - '@auth'
+            - '@dbal.conn'
+            - '@controller.helper'
+            - '@language'
+            - '@template'
+            - '@user'
+            - '%tables.users%'
+            - '%tables.sessions%'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+
+    members.controller.team:
+        class: phpbb\members\controller\team
+        arguments:
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@dispatcher'
+            - '@group_helper'
+            - '@controller.helper'
+            - '@language'
+            - '@template'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '%tables.forums%'
+            - '%tables.groups%'
+            - '%tables.teampage%'
+            - '%tables.user_group%'
+            - '%tables.users%'
+
+# Helpers
+    viewonline_helper:
+        class: phpbb\members\viewonline_helper
+        arguments:
+            - '@dbal.conn'
+            - '@config'
+            - '@event_dispatcher'
+            - '@router'
+            - '@controller.helper'
+            - '@language'
+            - '@auth'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '%core.adm_relative_path%'
+            - '%tables.users%'
+            - '%tables.sessions%'
+            - '%tables.topics%'
+            - '%tables.forums%'
diff --git a/phpBB/config/default/container/services_mention.yml b/phpBB/config/default/container/services_mention.yml
index e2861b984cd..0372fe60a38 100644
--- a/phpBB/config/default/container/services_mention.yml
+++ b/phpBB/config/default/container/services_mention.yml
@@ -3,8 +3,13 @@ services:
     mention.controller:
         class: phpbb\mention\controller\mention
         arguments:
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@form_helper'
             - '@mention.source_collection'
             - '@request'
+            - '@controller.helper'
             - '%core.root_path%'
             - '%core.php_ext%'
 
diff --git a/phpBB/config/default/container/services_messenger.yml b/phpBB/config/default/container/services_messenger.yml
new file mode 100644
index 00000000000..14bdf18df25
--- /dev/null
+++ b/phpBB/config/default/container/services_messenger.yml
@@ -0,0 +1,48 @@
+parameters:
+    core.messenger_queue_file: '%core.cache_dir%queue.%core.php_ext%'
+
+services:
+    messenger.method_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - '@service_container'
+        tags:
+            - { name: service_collection, tag: messenger.method, class_name_aware: true }
+
+    messenger.method.base:
+        class: phpbb\messenger\method\base
+        shared: false
+        arguments:
+            - '@assets.bag'
+            - '@config'
+            - '@dispatcher'
+            - '@language'
+            - '@messenger.queue'
+            - '@path_helper'
+            - '@request'
+            - '@template.twig.extensions.collection'
+            - '@template.twig.lexer'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.template.cache_path%'
+            - '@?ext.manager'
+            - '@?log'
+
+    messenger.method.email:
+        class: phpbb\messenger\method\email
+        shared: false
+        parent: messenger.method.base
+        calls:
+            - [init, []]
+            - [set_transport, []]
+        tags:
+            - { name: messenger.method }
+
+    messenger.queue:
+        class: phpbb\messenger\queue
+        shared: false
+        arguments:
+            - '@config'
+            - '@dispatcher'
+            - '@messenger.method_collection'
+            - '%core.messenger_queue_file%'
diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml
index a037ad73526..98482a2b042 100644
--- a/phpBB/config/default/container/services_notification.yml
+++ b/phpBB/config/default/container/services_notification.yml
@@ -26,6 +26,8 @@ services:
     notification.type.base:
         abstract: true
         arguments:
+            - '@avatar.helper'
+            - '@controller.helper'
             - '@dbal.conn'
             - '@language'
             - '@user'
@@ -229,17 +231,33 @@ services:
             - '%core.root_path%'
             - '%core.php_ext%'
             - '%tables.notification_emails%'
+            - '@messenger.method_collection'
         tags:
             - { name: notification.method }
 
-    notification.method.jabber:
-        class: phpbb\notification\method\jabber
+    notification.method.webpush:
+        class: phpbb\notification\method\webpush
         shared: false
         arguments:
+            - '@config'
+            - '@dbal.conn'
+            - '@log'
             - '@user_loader'
             - '@user'
-            - '@config'
             - '%core.root_path%'
             - '%core.php_ext%'
+            - '%tables.notification_push%'
+            - '%tables.push_subscriptions%'
         tags:
             - { name: notification.method }
+
+# ----- Notification's controllers -----
+    notification.controller.mark_read:
+        class: phpbb\notification\controller\mark_read
+        arguments:
+            - '@event_dispatcher'
+            - '@language'
+            - '@notification_manager'
+            - '@request'
+            - '@user'
+            - '%core.root_path%'
diff --git a/phpBB/config/default/container/services_report.yml b/phpBB/config/default/container/services_report.yml
index 0ccfd9cde26..5b44b18feba 100644
--- a/phpBB/config/default/container/services_report.yml
+++ b/phpBB/config/default/container/services_report.yml
@@ -7,6 +7,7 @@ services:
             - '@user'
             - '@template'
             - '@controller.helper'
+            - '@language'
             - '@request'
             - '@captcha.factory'
             - '@phpbb.report.handler_factory'
diff --git a/phpBB/config/default/container/services_storage.yml b/phpBB/config/default/container/services_storage.yml
index 4ef28ccf3b6..98a44fae1f0 100644
--- a/phpBB/config/default/container/services_storage.yml
+++ b/phpBB/config/default/container/services_storage.yml
@@ -4,33 +4,27 @@ services:
     storage.attachment:
         class: phpbb\storage\storage
         arguments:
-            - '@dbal.conn'
-            - '@cache.driver'
             - '@storage.adapter.factory'
+            - '@storage.file_tracker'
             - 'attachment'
-            - '%tables.storage%'
         tags:
             - { name: storage }
 
     storage.avatar:
         class: phpbb\storage\storage
         arguments:
-            - '@dbal.conn'
-            - '@cache.driver'
             - '@storage.adapter.factory'
+            - '@storage.file_tracker'
             - 'avatar'
-            - '%tables.storage%'
         tags:
             - { name: storage }
 
     storage.backup:
         class: phpbb\storage\storage
         arguments:
-            - '@dbal.conn'
-            - '@cache.driver'
             - '@storage.adapter.factory'
+            - '@storage.file_tracker'
             - 'backup'
-            - '%tables.storage%'
         tags:
             - { name: storage }
 
@@ -70,8 +64,6 @@ services:
         shared: false
         arguments:
             - '@filesystem'
-            - '@upload_imagesize'
-            - '@mimetype.guesser'
             - '%core.root_path%'
         tags:
             - { name: storage.adapter }
@@ -80,6 +72,7 @@ services:
     storage.provider.local:
         class: phpbb\storage\provider\local
         arguments:
+            - '@language'
         tags:
             - { name: storage.provider }
 
@@ -90,6 +83,7 @@ services:
             - '@cache'
             - '@config'
             - '@dbal.conn'
+            - '@mimetype.extension_guesser'
             - '@storage.avatar'
             - '@symfony_request'
 
@@ -102,8 +96,34 @@ services:
             - '@content.visibility'
             - '@dbal.conn'
             - '@event_dispatcher'
+            - '@mimetype.extension_guesser'
             - '@language'
             - '@request'
             - '@storage.attachment'
             - '@symfony_request'
             - '@user'
+
+# Helpers
+    storage.state_helper:
+        class: phpbb\storage\state_helper
+        arguments:
+            - '@config'
+            - '@config_text'
+            - '@storage.provider_collection'
+
+    storage.helper:
+        class: phpbb\storage\helper
+        arguments:
+            - '@config'
+            - '@storage.adapter.factory'
+            - '@storage.state_helper'
+            - '@storage.provider_collection'
+            - '@storage.adapter_collection'
+
+    storage.file_tracker:
+        class: phpbb\storage\file_tracker
+        arguments:
+            - '@cache.driver'
+            - '@dbal.conn'
+            - '%tables.storage%'
+
diff --git a/phpBB/config/default/container/services_text_formatter.yml b/phpBB/config/default/container/services_text_formatter.yml
index 182a2afa467..8c0f5c2d923 100644
--- a/phpBB/config/default/container/services_text_formatter.yml
+++ b/phpBB/config/default/container/services_text_formatter.yml
@@ -88,7 +88,7 @@ services:
             - [configure_mention_helper, ['@text_formatter.s9e.mention_helper']]
             - [configure_quote_helper, ['@text_formatter.s9e.quote_helper']]
             - [configure_smilies_path, ['@config', '@path_helper']]
-            - [configure_user, ['@user', '@config', '@auth']]
+            - [configure_user, ['@auth', '@config', '@user']]
 
     text_formatter.s9e.utils:
         class: phpbb\textformatter\s9e\utils
diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml
index 17ca9c75038..e7a7155deba 100644
--- a/phpBB/config/default/container/services_twig.yml
+++ b/phpBB/config/default/container/services_twig.yml
@@ -45,6 +45,8 @@ services:
 
     template.twig.extensions.avatar:
         class: phpbb\template\twig\extension\avatar
+        arguments:
+            - '@avatar.helper'
         tags:
             - { name: twig.extension }
 
diff --git a/phpBB/config/default/container/services_ucp.yml b/phpBB/config/default/container/services_ucp.yml
index 69ef5ffbf88..14a023d1b53 100644
--- a/phpBB/config/default/container/services_ucp.yml
+++ b/phpBB/config/default/container/services_ucp.yml
@@ -1,4 +1,31 @@
 services:
+    phpbb.ucp.controller.delete_cookies:
+        class: phpbb\ucp\controller\delete_cookies
+        arguments:
+            - '@config'
+            - '@dispatcher'
+            - '@controller.helper'
+            - '@language'
+            - '@request'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+
+    phpbb.ucp.controller.oauth:
+        class: phpbb\ucp\controller\oauth
+        arguments:
+            - '@auth.provider_collection'
+            - '@captcha.factory'
+            - '@config'
+            - '@dispatcher'
+            - '@controller.helper'
+            - '@language'
+            - '@request'
+            - '@template'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+
     phpbb.ucp.controller.reset_password:
         class: phpbb\ucp\controller\reset_password
         arguments:
@@ -8,6 +35,7 @@ services:
             - '@controller.helper'
             - '@language'
             - '@log'
+            - '@messenger.method.email'
             - '@passwords.manager'
             - '@request'
             - '@template'
@@ -15,3 +43,21 @@ services:
             - '%tables.users%'
             - '%core.root_path%'
             - '%core.php_ext%'
+
+    phpbb.ucp.controller.webpush:
+        class: phpbb\ucp\controller\webpush
+        arguments:
+            - '@config'
+            - '@controller.helper'
+            - '@dbal.conn'
+            - '@event_dispatcher'
+            - '@form_helper'
+            - '@language'
+            - '@notification_manager'
+            - '@path_helper'
+            - '@request'
+            - '@user_loader'
+            - '@user'
+            - '@template.twig.environment'
+            - '%tables.notification_push%'
+            - '%tables.push_subscriptions%'
diff --git a/phpBB/config/default/container/services_updater.yml b/phpBB/config/default/container/services_updater.yml
new file mode 100644
index 00000000000..918c4de4076
--- /dev/null
+++ b/phpBB/config/default/container/services_updater.yml
@@ -0,0 +1,14 @@
+services:
+    updater.get_updates:
+        class: phpbb\update\get_updates
+        arguments:
+            - '@filesystem'
+            - '%packages.public_key%'
+            - '%core.root_path%'
+
+    updater.controller:
+        class: phpbb\update\controller
+        arguments:
+            - '@filesystem'
+            - '@updater.get_updates'
+            - '%core.root_path%'
diff --git a/phpBB/config/default/container/tables.yml b/phpBB/config/default/container/tables.yml
index 005f3ba9277..8e38c63a4b4 100644
--- a/phpBB/config/default/container/tables.yml
+++ b/phpBB/config/default/container/tables.yml
@@ -38,6 +38,7 @@ parameters:
     tables.modules: '%core.table_prefix%modules'
     tables.notification_emails: '%core.table_prefix%notification_emails'
     tables.notification_types: '%core.table_prefix%notification_types'
+    tables.notification_push: '%core.table_prefix%notification_push'
     tables.notifications: '%core.table_prefix%notifications'
     tables.poll_options: '%core.table_prefix%poll_options'
     tables.poll_votes: '%core.table_prefix%poll_votes'
@@ -50,6 +51,7 @@ parameters:
     tables.profile_fields_data: '%core.table_prefix%profile_fields_data'
     tables.profile_fields_options_language: '%core.table_prefix%profile_fields_lang'
     tables.profile_fields_language: '%core.table_prefix%profile_lang'
+    tables.push_subscriptions: '%core.table_prefix%push_subscriptions'
     tables.ranks: '%core.table_prefix%ranks'
     tables.reports: '%core.table_prefix%reports'
     tables.reports_reasons: '%core.table_prefix%reports_reasons'
diff --git a/phpBB/config/default/routing/members.yml b/phpBB/config/default/routing/members.yml
new file mode 100644
index 00000000000..f6021422d7d
--- /dev/null
+++ b/phpBB/config/default/routing/members.yml
@@ -0,0 +1,14 @@
+phpbb_members_online:
+    path: /online
+    defaults:
+        _controller: members.controller.online:handle
+
+phpbb_members_online_whois:
+    path: /online/whois/{session_id}
+    defaults:
+        _controller: members.controller.online_whois:handle
+
+phpbb_members_team:
+    path:             /team
+    defaults:
+        _controller:  members.controller.team:handle
diff --git a/phpBB/config/default/routing/notifications.yml b/phpBB/config/default/routing/notifications.yml
new file mode 100644
index 00000000000..4a0f3d56ad4
--- /dev/null
+++ b/phpBB/config/default/routing/notifications.yml
@@ -0,0 +1,6 @@
+phpbb_notifications_mark_read:
+    path:             /mark-read/{id}
+    defaults:
+        _controller:  notification.controller.mark_read:handle
+    requirements:
+        id:         \d+
diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml
index 7fff9204f0f..513702afe39 100644
--- a/phpBB/config/default/routing/routing.yml
+++ b/phpBB/config/default/routing/routing.yml
@@ -4,10 +4,14 @@
 #     path: /foo
 #     defaults: { _controller: foo_sevice:method }
 #
-# The above will be accessed via app.php?controller=foo and it will
+# The above will be accessed via index.php?controller=foo and it will
 # instantiate the 'foo_service' service and call the 'method' method.
 #
 
+phpbb_index_controller:
+    path: /
+    defaults: { _controller: forum.controller.index:handle }
+
 phpbb_cron_routing:
     resource: cron.yml
     prefix: /cron
@@ -24,11 +28,23 @@ phpbb_help_routing:
     resource: help.yml
     prefix: /help
 
+phpbb_manifest_controller:
+    path: /manifest
+    defaults: { _controller: manifest.controller:handle }
+
+phpbb_members_routing:
+    resource: members.yml
+    prefix: /members
+
 phpbb_mention_controller:
     path: /mention
     methods: [GET, POST]
     defaults: { _controller: mention.controller:handle }
 
+phpbb_notifications:
+    resource: notifications.yml
+    prefix: /notifications
+
 phpbb_report_routing:
     resource: report.yml
 
diff --git a/phpBB/config/default/routing/ucp.yml b/phpBB/config/default/routing/ucp.yml
index 06bd7c3a58f..98a12ce3804 100644
--- a/phpBB/config/default/routing/ucp.yml
+++ b/phpBB/config/default/routing/ucp.yml
@@ -1,3 +1,19 @@
+phpbb_ucp_delete_cookies_controller:
+    path: /delete_cookies
+    defaults: { _controller: phpbb.ucp.controller.delete_cookies:handle }
+
+phpbb_ucp_oauth_authenticate_controller:
+    path: /oauth/authenticate/{oauth_service}
+    defaults: { _controller: phpbb.ucp.controller.oauth:authenticate }
+
+phpbb_ucp_oauth_link_account_controller:
+    path: /oauth/link_account
+    defaults: { _controller: phpbb.ucp.controller.oauth:link_account }
+
+phpbb_ucp_oauth_login_controller:
+    path: /oauth/login/{oauth_service}
+    defaults: { _controller: phpbb.ucp.controller.oauth:login }
+
 phpbb_ucp_reset_password_controller:
     path: /reset_password
     defaults: { _controller: phpbb.ucp.controller.reset_password:reset }
@@ -5,3 +21,19 @@ phpbb_ucp_reset_password_controller:
 phpbb_ucp_forgot_password_controller:
     path: /forgot_password
     defaults: { _controller: phpbb.ucp.controller.reset_password:request }
+
+phpbb_ucp_push_get_notification_controller:
+    path: /push/notification
+    defaults: { _controller: phpbb.ucp.controller.webpush:notification }
+
+phpbb_ucp_push_worker_controller:
+    path: /push/worker
+    defaults: { _controller: phpbb.ucp.controller.webpush:worker }
+
+phpbb_ucp_push_subscribe_controller:
+    path: /push/subscribe
+    defaults: { _controller: phpbb.ucp.controller.webpush:subscribe }
+
+phpbb_ucp_push_unsubscribe_controller:
+    path: /push/unsubscribe
+    defaults: { _controller: phpbb.ucp.controller.webpush:unsubscribe }
diff --git a/phpBB/config/installer/container/services.yml b/phpBB/config/installer/container/services.yml
index b4e731306d5..40e890e01ce 100644
--- a/phpBB/config/installer/container/services.yml
+++ b/phpBB/config/installer/container/services.yml
@@ -1,12 +1,15 @@
 imports:
     - { resource: services_installer.yml }
+    - { resource: services_avatar.yml }
     - { resource: ../../default/container/services_event.yml }
     - { resource: ../../default/container/services_filesystem.yml }
     - { resource: ../../default/container/services_http.yml }
     - { resource: ../../default/container/services_language.yml }
+    - { resource: ../../default/container/services_messenger.yml }
     - { resource: ../../default/container/services_php.yml }
     - { resource: ../../default/container/services_routing.yml }
     - { resource: ../../default/container/services_twig.yml }
+    - { resource: ../../default/container/services_twig_extensions.yml }
 
 services:
     assets.bag:
diff --git a/phpBB/config/installer/container/services_avatar.yml b/phpBB/config/installer/container/services_avatar.yml
new file mode 100644
index 00000000000..31d28e77fb5
--- /dev/null
+++ b/phpBB/config/installer/container/services_avatar.yml
@@ -0,0 +1,25 @@
+services:
+    avatar.manager:
+        class: phpbb\avatar\manager
+        arguments:
+            - '@config'
+            - '@dispatcher'
+            - '@avatar.driver_collection'
+
+    avatar.helper:
+        class: phpbb\avatar\helper
+        arguments:
+            - '@config'
+            - '@dispatcher'
+            - '@language'
+            - '@avatar.manager'
+            - '@path_helper'
+            - '@user'
+
+    # ----- Avatar drivers -----
+    avatar.driver_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - '@service_container'
+        tags:
+            - { name: service_collection, tag: avatar.driver }
diff --git a/phpBB/config/installer/container/services_install_finish.yml b/phpBB/config/installer/container/services_install_finish.yml
index b200118e113..9eb05b8a44a 100644
--- a/phpBB/config/installer/container/services_install_finish.yml
+++ b/phpBB/config/installer/container/services_install_finish.yml
@@ -24,7 +24,6 @@ services:
             - '@installer.helper.config'
             - '@installer.helper.iohandler'
             - '%core.root_path%'
-            - '%core.php_ext%'
         tags:
             - { name: install_finish, order: 3 }
 
diff --git a/phpBB/develop/add_permissions.php b/phpBB/develop/add_permissions.php
index 6b8913de8c8..1531e67de64 100644
--- a/phpBB/develop/add_permissions.php
+++ b/phpBB/develop/add_permissions.php
@@ -140,7 +140,6 @@
 	'u_sendemail'	=> array(0, 1),
 	'u_readpm'		=> array(0, 1),
 	'u_sendpm'		=> array(0, 1),
-	'u_sendim'		=> array(0, 1),
 	'u_hideonline'	=> array(0, 1),
 	'u_viewonline'	=> array(0, 1),
 	'u_viewprofile'	=> array(0, 1),
@@ -247,7 +246,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 	{
 		if (!isset($group_ids[$ug_id]))
 		{
-			$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " 
+			$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . "
 				WHERE group_name = '" . strtoupper($ug_id) . "'";
 			$result = $db->sql_query_limit($sql, 1);
 			$id = (int) $db->sql_fetchfield('group_id', 0, $result);
@@ -340,7 +339,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 				case ACL_NO:
 					if (isset($cur_auth[$forum][$auth_option_id]))
 					{
-						$sql_ary['delete'][] = "DELETE FROM $table 
+						$sql_ary['delete'][] = "DELETE FROM $table
 							WHERE forum_id = $forum
 								AND auth_option_id = $auth_option_id
 								AND $id_field = $ug_id";
@@ -354,10 +353,10 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 					}
 					else if ($cur_auth[$forum][$auth_option_id] != $setting)
 					{
-						$sql_ary['update'][] = "UPDATE " . $table . " 
-							SET auth_setting = $setting 
-							WHERE $id_field = $ug_id 
-								AND forum_id = $forum 
+						$sql_ary['update'][] = "UPDATE " . $table . "
+							SET auth_setting = $setting
+							WHERE $id_field = $ug_id
+								AND forum_id = $forum
 								AND auth_option_id = $auth_option_id";
 					}
 			}
diff --git a/phpBB/develop/adjust_avatars.php b/phpBB/develop/adjust_avatars.php
index a6b326109dd..f470305e5eb 100644
--- a/phpBB/develop/adjust_avatars.php
+++ b/phpBB/develop/adjust_avatars.php
@@ -4,6 +4,9 @@
 *
 * You should make a backup from your users table and the avatar directory in case something goes wrong
 */
+
+use phpbb\storage\provider\local;
+
 die("Please read the first lines of this script for instructions on how to enable it");
 
 set_time_limit(0);
@@ -30,7 +33,7 @@
 	die('database not up to date');
 }
 
-if (!isset($config['storage\\avatar\\config\\path']) || $config['storage\\avatar\\config\\path'] !== 'phpbb\\storage\\provider\\local')
+if (!isset($config['storage\\avatar\\provider']) || $config['storage\\avatar\\provider'] !== local::class)
 {
 	die('use local provider');
 }
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index e7c44a7f34e..7766faaf672 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -18,6 +18,8 @@
 * If you overwrite the original schema files please make sure you save the file with UNIX linefeeds.
 */
 
+use Symfony\Component\Yaml\Yaml;
+
 $schema_path = __DIR__ . '/../install/schemas/';
 $supported_dbms = array(
 	'mssql',
@@ -56,10 +58,38 @@
 $ref = new ReflectionClass(\Doctrine\DBAL\Connection::class);
 $db_doctrine = $ref->newInstanceWithoutConstructor();
 
+// Create a mock SchemaManager that returns an empty array for listTableNames()
+$schema_manager_mock = new class extends \Doctrine\DBAL\Schema\SqliteSchemaManager {
+	public function listTableNames() {
+		return [];
+	}
+
+	public function __construct()
+	{
+		//parent::__construct($connection, $platform);
+	}
+};
+
+$schema_manager_factory_mock = new class($schema_manager_mock) implements \Doctrine\DBAL\Schema\SchemaManagerFactory {
+	private $schema_manager;
+	public function __construct($schema_manager) {
+		$this->schema_manager = $schema_manager;
+	}
+	public function createSchemaManager($connection): \Doctrine\DBAL\Schema\AbstractSchemaManager
+	{
+		return $this->schema_manager;
+	}
+};
+
+$schema_manager_factory = new \ReflectionProperty($db_doctrine, 'schemaManagerFactory');
+$schema_manager_factory->setAccessible(true);
+$schema_manager_factory->setValue($db_doctrine, new $schema_manager_factory_mock($schema_manager_mock));
+
 $factory = new \phpbb\db\tools\factory();
 $db_tools = $factory->get($db_doctrine, true);
+$db_tools->set_table_prefix($table_prefix);
 
-$tables_data = \Symfony\Component\Yaml\Yaml::parseFile($phpbb_root_path . '/config/default/container/tables.yml');
+$tables_data = Yaml::parseFile($phpbb_root_path . '/config/default/container/tables.yml', Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
 $tables = [];
 
 foreach ($tables_data['parameters'] as $parameter => $table)
diff --git a/phpBB/develop/export_events_for_bbcode.php b/phpBB/develop/export_events_for_bbcode.php
index e30027bf94d..fc8c604f800 100644
--- a/phpBB/develop/export_events_for_bbcode.php
+++ b/phpBB/develop/export_events_for_bbcode.php
@@ -65,7 +65,8 @@ function validate_argument_count($arguments, $count)
 require __DIR__ . '/../phpbb/event/rst_exporter.' . $phpEx;
 require __DIR__ . '/../includes/functions.' . $phpEx;
 require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx;
-require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx;
 
 switch ($action)
 {
diff --git a/phpBB/develop/export_events_for_rst.php b/phpBB/develop/export_events_for_rst.php
index 908d4298d65..9ca58e6e69f 100644
--- a/phpBB/develop/export_events_for_rst.php
+++ b/phpBB/develop/export_events_for_rst.php
@@ -68,7 +68,8 @@ function validate_argument_count($arguments, $count)
 require __DIR__ . '/../phpbb/event/rst_exporter.' . $phpEx;
 require __DIR__ . '/../includes/functions.' . $phpEx;
 require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx;
-require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx;
 
 switch ($action)
 {
diff --git a/phpBB/develop/export_events_for_wiki.php b/phpBB/develop/export_events_for_wiki.php
index 128d6f3c570..cf8bc3c61ce 100644
--- a/phpBB/develop/export_events_for_wiki.php
+++ b/phpBB/develop/export_events_for_wiki.php
@@ -67,7 +67,8 @@ function validate_argument_count($arguments, $count)
 require __DIR__ . '/../phpbb/event/md_exporter.' . $phpEx;
 require __DIR__ . '/../includes/functions.' . $phpEx;
 require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx;
-require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx;
+require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx;
 
 switch ($action)
 {
diff --git a/phpBB/develop/imageset_to_css.php b/phpBB/develop/imageset_to_css.php
deleted file mode 100644
index de66875d285..00000000000
--- a/phpBB/develop/imageset_to_css.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-
-/*
-	Converts imageset to CSS code
-
-	Change style name and path below, open in browser.
-*/
-
-$phpbb_root_path = '../';
-$style = 'prosilver';
-
-$imageset_path = $phpbb_root_path . 'styles/' . $style . '/imageset';
-$theme_path = $phpbb_root_path . 'styles/' . $style . '/theme';
-
-// Start output buffering
-ob_start();
-
-// Get global and English images
-$images_global = get_imageset($imageset_path);
-if ($images_global === false)
-{
-	echo 'imageset.cfg was not found.';
-	echo ob_get_clean();
-	return;
-}
-$images_en = get_imageset($imageset_path, 'en');
-if ($images_en === false)
-{
-	echo 'English imageset.cfg was not found.';
-	echo ob_get_clean();
-	return;
-}
-
-// Remove duplicate images
-foreach ($images_en as $key => $row)
-{
-	unset($images_global[$key]);
-}
-
-// CSS replacements
-$not_compatible = array(
-	'{T_TEMPLATE_PATH}',
-	'{T_IMAGESET_PATH}',
-	'{T_IMAGESET_LANG_PATH}',
-	'{T_STYLESHEET_NAME}',
-	'{S_USER_LANG}'
-);
-$replace = array(
-	'{T_THEME_PATH}'	=> '.',
-);
-// Enable/disable one of lines below to enable/disable replacement of English buttons
-// $replace = array_merge($replace, get_replacements($images_global));
-$replace = array_merge($replace, get_replacements($images_global), get_replacements($images_en));
-
-// BIDI code
-$bidi_code = css($images_global, './images/', true);
-
-// Get all CSS files, parse them
-$files = list_files($theme_path, 'css');
-if ($files === false || !count($files))
-{
-	echo 'No CSS files found in theme directory.<br />';
-}
-else for ($i=0; $i<count($files); $i++)
-{
-	$file = $theme_path . '/' . $files[$i];
-	$data = file_get_contents($file);
-	$hash = md5($data);
-	$data = strtr($data, $replace);
-	$errors = false;
-	for($j=0; $j<count($not_compatible); $j++)
-	{
-		if (strpos($data, $not_compatible[$j]) !== false)
-		{
-			echo 'Error: ', $file, ' contains ', $not_compatible[$j], '. That variable cannot be converted.<br />';
-			continue;
-		}
-	}
-	if (basename($file) == 'bidi.css' && strpos($data, '/* Former imageset */') === false && strlen($bidi_code))
-	{
-		// Add bidi data
-		$data .= "\n/* Former imageset */\n" . $bidi_code;
-		$bidi_code = '';
-		echo 'Note: RTL imageset entries were added at the end of file below:<br />';
-	}
-	if (md5($data) == $hash)
-	{
-		echo 'Nothing to replace in ', $file, '<br />';
-	}
-	else
-	{
-		echo 'Updated ', $file, ':', dump_code($data, $files[$i]);
-	}
-}
-
-// Check if there are invalid images in imageset
-$list = array_merge($images_global, $images_en);
-foreach ($list as $key => $row)
-{
-	if ($row['skip'])
-	{
-		echo 'Unable to generate code to add to CSS files because some images are missing or invalid. See errors above.';
-		echo ob_get_clean();
-		return;
-	}
-}
-
-// Code to add to CSS files
-$code = '
-/* Former imageset */
-span.imageset {
-	display: inline-block;
-	background: transparent none 0 0 no-repeat;
-	margin: 0;
-	padding: 0;
-	width: 0;
-	height: 0;
-	overflow: hidden;
-}
-
-/* Global imageset items */
-' . css($images_global, './images/') . '
-
-/* English images for fallback */
-' . css($images_en, './en/');
-if (strlen($bidi_code))
-{
-	$code .= "\n/* RTL imageset entries */\n" . $bidi_code;
-}
-echo 'Code to add to CSS file:', dump_code($code, 'imageset.css');
-
-
-$list = list_languages($imageset_path);
-for ($i=0; $i<count($list); $i++)
-{
-	$lang = $list[$i];
-	$images = get_imageset($imageset_path . '/' . $lang);
-	if (!count($images))
-	{
-		continue;
-	}
-	$code = '/* ' . strtoupper($lang) . ' Language Pack */
-' . css($images, './');
-	echo 'New CSS file: ', $theme_path, '/', $lang, '/stylesheet.css', dump_code($code, 'stylesheet_' . $lang . '.css');
-}
-
-echo ob_get_clean();
-
-/*
-	Functions
-*/
-function get_imageset($path, $lang = '')
-{
-	$cfg = $path . ($lang ? '/' . $lang : '') . '/imageset.cfg';
-	if (!@file_exists($cfg))
-	{
-		return false;
-	}
-	$data = file($cfg);
-	$result = array();
-	for ($i=0; $i<count($data); $i++)
-	{
-		$str = trim($data[$i]);
-		if (substr($str, 0, 4) != 'img_')
-		{
-			continue;
-		}
-		$list = explode('=', $data[$i]);
-		if (count($list) != 2)
-		{
-			continue;
-		}
-		$key = trim($list[0]);
-		$row = explode('*', trim($list[1]));
-		$file = trim($row[0]);
-		$height = isset($row[1]) && intval($row[1]) ? intval($row[1]) : false;
-		$width = isset($row[2]) && intval($row[2]) ? intval($row[2]) : false;
-		$skip = false;
-		if (strlen($file) && (!$width || !$height))
-		{
-			// Try to detect width/height
-			$filename = $path . ($lang ? '/' . $lang : '') . '/' . $file;
-			if (!@file_exists($filename))
-			{
-				echo 'Error: file ', $filename, ' does not exist and its dimensions are not available in imageset.cfg<br />';
-				$skip = true;
-			}
-			else
-			{
-				$size = @getimagesize($filename);
-				if ($size === false)
-				{
-					echo 'Error: file ', $filename, ' is not a valid image<br />';
-					$skip = true;
-				}
-				else
-				{
-					if(!$width) $width = intval($size[0]);
-					if(!$height) $height = intval($size[1]);
-				}
-			}
-		}
-		$result[$key] = array(
-			'lang'  => $lang,
-			'file'  => $file,
-			'height'	=> $height,
-			'width' => $width,
-			'skip'  => $skip
-		);
-	}
-	return $result;
-}
-
-function get_replacements($list)
-{
-	$result = array();
-	foreach ($list as $key => $row)
-	{
-		$key = '{' . strtoupper($key);
-		$result[$key . '_SRC}'] = strlen($row['file']) ? ($row['lang'] ? './' . $row['lang'] : './images') . '/' . $row['file'] : '';
-		$result[$key . '_WIDTH}'] = intval($row['width']);
-		$result[$key . '_HEIGHT}'] = intval($row['height']);
-	}
-	return $result;
-}
-
-function list_files($dir, $ext)
-{
-	$res = @opendir($dir);
-	if ($res === false)
-	{
-		return false;
-	}
-	$files = array();
-	while (($file = readdir($res)) !== false)
-	{
-		$list = explode('.', $file);
-		if(count($list) > 1 && strtolower($list[count($list) - 1]) == $ext)
-		{
-			$files[] = $file;
-		}
-	}
-	closedir($res);
-	return $files;
-}
-
-function list_languages($dir)
-{
-	$res = @opendir($dir);
-	if ($res === false)
-	{
-		return array();
-	}
-	$files = array();
-	while (($file = readdir($res)) !== false)
-	{
-		if (substr($file, 0, 1) == '.')
-		{
-			continue;
-		}
-		$filename = $dir . '/' . $file;
-		if (is_dir($filename) && file_exists($filename . '/imageset.cfg'))
-		{
-			$files[] = $file;
-		}
-	}
-	closedir($res);
-	return $files;
-}
-
-function dump_code($code, $filename = 'file.txt')
-{
-	$hash = md5($code);
-	if (isset($_GET['download']) && $_GET['download'] === $hash)
-	{
-		// Download file
-		ob_end_clean();
-		header('Pragma: public');
-		header('Expires: 0');
-		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-		header('Content-Type: application/force-download');
-		header('Content-Disposition: attachment; filename="' . $filename . '";');
-		header('Content-Transfer-Encoding: binary');
-		header('Content-Length: ' . strlen($code));
-		echo $code;
-		exit;
-	}
-	$list = explode("\n", $code);
-	$height = 15 * count($list);
-	echo ' [ <a href="?download=', $hash, '">download</a> <a href="javascript:void(0);" onclick="document.getElementById(\'code-', $hash, '\').style.height = \'', $height, 'px\'; this.style.display = \'none\'; return false;">expand</a> ]<br />';
-	echo '<textarea id="code-', $hash, '" onfocus="this.select();" style="width: 98%; height: 200px;">', htmlspecialchars($code, ENT_COMPAT), '</textarea><br />';
-}
-
-function css($list, $path = './', $bidi = false)
-{
-	$code = '';
-	// Change value to true if you want images to be grouped up by size
-	$group = $bidi;
-	if ($group)
-	{
-		// group up images by size
-		$groups = array();
-		foreach ($list as $key => $row)
-		{
-			if (!strlen($row['file']))
-			{
-				continue;
-			}
-			$groups[$row['width'] . '*' . $row['height']][] = $key;
-		}
-		foreach ($groups as $size => $keys)
-		{
-			$extra = '';
-			for ($i=0; $i<count($keys); $i++)
-			{
-				$code .= ($i == 0 ? '' : ', ') . ($bidi ? '.rtl ' : '') . '.imageset.' . substr($keys[$i], 4);
-				if (!$bidi)
-				{
-					$extra .= '.imageset.' . substr($keys[$i], 4) . ' { background-image: url("' . $path . $list[$keys[$i]]['file'] . "\"); }\n";
-				}
-			}
-			$row = $list[$keys[0]];
-			$code .= ' {';
-			if ($bidi)
-			{
-				$code .= '
-	padding-right: ' . $row['width'] . 'px;
-	padding-left: 0;
-}
-';
-			}
-			else
-			{
-				$code .= '
-	padding-left: ' . $row['width'] . 'px;
-	padding-top: ' . $row['height'] . 'px;
-}
-' . $extra;
-			}
-		}
-	}
-	else
-	{
-		foreach ($list as $key => $row)
-		{
-			if (!strlen($row['file']))
-			{
-				continue;
-			}
-			$code .= ($bidi ? '.rtl ' : '') . '.imageset.' . substr($key, 4) . ' {';
-			if ($bidi)
-			{
-				$code .= '
-	padding-right: ' . $row['width'] . 'px;
-	padding-left: 0;
-}
-';
-			}
-			else
-			{
-				$code .= '
-	background-image: url("' . $path . $row['file'] . '");
-	padding-left: ' . $row['width'] . 'px;
-	padding-top: ' . $row['height'] . 'px;
-}
-';
-			}
-		}
-	}
-	return $code;
-}
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index b0e774b29e3..ecbc2d5011d 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.3.x Changelog" />
+<meta name="description" content="phpBB Changelog" />
 <title>phpBB &bull; Changelog</title>
 
 <link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@@ -21,7 +21,7 @@
 
 			<div id="doc-description">
 				<a href="../index.php" id="logo"><span class="site_logo"></span></a>
-				<h1>phpBB 3.3.x Changelog</h1>
+				<h1>phpBB Changelog</h1>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>
 
@@ -36,7 +36,7 @@ <h1>phpBB 3.3.x Changelog</h1>
 <!-- BEGIN DOCUMENT -->
 
 <p class="paragraph main-description">
-	This is a non-exhaustive (but still near complete) changelog for phpBB 3.3.x including release candidate versions.
+	This is a non-exhaustive (but still near complete) changelog for phpBB including release candidate versions.
 	Our thanks to all those people who've contributed bug reports and code fixes.
 </p>
 
@@ -50,6 +50,19 @@ <h1>Changelog</h1>
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ul>
+		<li><a href="#v400a1">Changes since 4.0.0-a1</a></li>
+		<li><a href="#v33x">Changes since 3.3.x</a></li>
+		<li><a href="#v3316">Changes since 3.3.16</a></li>
+		<li><a href="#v3316rc1">Changes since 3.3.16-RC1</a></li>
+		<li><a href="#v3315">Changes since 3.3.15</a></li>
+		<li><a href="#v3315rc1">Changes since 3.3.15-RC1</a></li>
+		<li><a href="#v3314">Changes since 3.3.14</a></li>
+		<li><a href="#v3314rc1">Changes since 3.3.14-RC1</a></li>
+		<li><a href="#v3313">Changes since 3.3.13</a></li>
+		<li><a href="#v3313rc1">Changes since 3.3.13-RC1</a></li>
+		<li><a href="#v3312">Changes since 3.3.12</a></li>
+		<li><a href="#v3312rc1">Changes since 3.3.12-RC1</a></li>
+		<li><a href="#v3311">Changes since 3.3.11</a></li>
 		<li><a href="#v3310">Changes since 3.3.10</a></li>
 		<li><a href="#v3310rc1">Changes since 3.3.10-RC1</a></li>
 		<li><a href="#v339">Changes since 3.3.9</a></li>
@@ -167,6 +180,812 @@ <h1>Changelog</h1>
 		<div class="inner">
 
 		<div class="content">
+			<a name="v400a1"></a><h3>Changes since 4.0.0-a1</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15085">PHPBB-15085</a>] - HTTP authentication from feeds served via controller</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17477">PHPBB-17477</a>] - Problem with Whois lookups returning incorrect information due to ARIN/RIPE changes</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17552">PHPBB-17552</a>] - extensions.php lang file uses plural rule structure for different purpose</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17553">PHPBB-17553</a>] - Remove jabber notification entries instead of trying to convert them</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17554">PHPBB-17554</a>] - Feature tests for Extensions Catalog are making external HTTP calls</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17557">PHPBB-17557</a>] - Error suppression is missing for migrating avatars in 4.0</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17560">PHPBB-17560</a>] - Diff engine causes PHP fatal error</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17562">PHPBB-17562</a>] - base.css file contains font-size declaration overridden in common.css</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17563">PHPBB-17563</a>] - CodeSniffer ruleset (PPSSE) not fully compatible with CS 4</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17564">PHPBB-17564</a>] - Header profile contrast in navbar can result in hard to read username</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17565">PHPBB-17565</a>] - Incorrect exporting PM as CSV for Excel</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17567">PHPBB-17567</a>] - Page width exceeds the screen width in responsive mode</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17569">PHPBB-17569</a>] - Responsive bug in footer navbar</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17571">PHPBB-17571</a>] - pm inline attachment not showing</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17573">PHPBB-17573</a>] - Allow to run phpunit in local again</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17575">PHPBB-17575</a>] - Web Manifest scope path is likely invalid</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17580">PHPBB-17580</a>] - Downloading files with a byte range of 8192 bytes causes fatal error</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17581">PHPBB-17581</a>] - PHP warning on viewing a topic page with avatars as bot</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17582">PHPBB-17582</a>] - Not working lang vars in acp_ext_list.html</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17585">PHPBB-17585</a>] - Some extensions with modules can't be uninstalled</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17589">PHPBB-17589</a>] - QA captcha appears on every other login attempt</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17594">PHPBB-17594</a>] - Improved error handling of web push subscriber</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17596">PHPBB-17596</a>] - Logout link in ACP does not work</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17622">PHPBB-17622</a>] - Version helper may return update from newer branch</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17624">PHPBB-17624</a>] - Datetime edge case tests fail when local timezone is ahead of UTC</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-13481">PHPBB-13481</a>] - Explain in ACP Attachment settings images get resized (at client-side)</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15007">PHPBB-15007</a>] - Add Restart link to installer</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17447">PHPBB-17447</a>] - Attachments controller: Use BinaryFileResponse when adapter is local</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17524">PHPBB-17524</a>] - Add possibility to use index key length in migrations</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17536">PHPBB-17536</a>] - Add event to Edit forum in ACP to modify template</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17539">PHPBB-17539</a>] - Increase default password complexity</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17541">PHPBB-17541</a>] - Ext Catalog is using variables in loops incorrectly</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17555">PHPBB-17555</a>] - Improve running of tests on windows runners in GitHub Actions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17556">PHPBB-17556</a>] - Upgrade to Symfony 7.4</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17559">PHPBB-17559</a>] - Extension Catalog can be installed without repositories</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17561">PHPBB-17561</a>] - Extension Catalog Installs Incompatible Extensions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17570">PHPBB-17570</a>] - Replace an old CSS accessibility hack with a modern, recommended and W3C compliant method</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17572">PHPBB-17572</a>] - meta apple-mobile-web-app-capable depreciated</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17587">PHPBB-17587</a>] - Move mark notification read to controller</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17588">PHPBB-17588</a>] - Move index page to controller</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17590">PHPBB-17590</a>] - Use index.php as frontend controller</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17592">PHPBB-17592</a>] - Translate &quot;No match found!!!&quot; if no mention entry was found</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17598">PHPBB-17598</a>] - Deny access to composer files in apache</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17603">PHPBB-17603</a>] - Remove unused gulp</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17604">PHPBB-17604</a>] - Disable all extension during phpBB4 install/update</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17605">PHPBB-17605</a>] - Fix homestead and use a fork since is no longer maintained</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17619">PHPBB-17619</a>] - Fix UnusedUseSniff to detect property type declarations</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17620">PHPBB-17620</a>] - Skip whois test when daily rate-limit is reached</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17621">PHPBB-17621</a>] - Change U_WARN to use new warn_allowed variable</li>
+			</ul>
+			<h4>New Feature</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17566">PHPBB-17566</a>] - Add default avatars based on username</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17597">PHPBB-17597</a>] - Use avatar twig function instead of html generated in PHP</li>
+			</ul>
+			<h4>Task</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15823">PHPBB-15823</a>] - Move viewonline.php to controller</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16005">PHPBB-16005</a>] - Remove phpBB2 converter</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17545">PHPBB-17545</a>] - Improve handling of DDoS/brute force attacks on login form</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17584">PHPBB-17584</a>] - Exclude tests from PSR1 code sniffs</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17591">PHPBB-17591</a>] - Update to Code Sniffer 4</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17593">PHPBB-17593</a>] - Allow functional tests on a secure local server</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17595">PHPBB-17595</a>] - Ext Catalog should load packages from titania's 4.0 branch</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17599">PHPBB-17599</a>] - Update composer and node dependencies</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17602">PHPBB-17602</a>] - Clean up avatar code and avatar tests</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17612">PHPBB-17612</a>] - Remove imageset to css converter</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17613">PHPBB-17613</a>] - Remove support for retired WebPI packages</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17628">PHPBB-17628</a>] - Update composer and node dependencies</li>
+			</ul>
+			<h4>Security Issue</h4>
+			<ul>
+				<li>[SECURITY-285] - Password Reset Link Poisoning</li>
+				<li>[SECURITY-286] - IDOR when composing PMs</li>
+				<li>[SECURITY-287] - CSRF on report submission</li>
+				<li>[SECURITY-288] - Blind POST SSRF via Web Push Notification</li>
+				<li>[SECURITY-289] - Hardening against non-rasterized image uploads</li>
+				<li>[SECURITY-290] - Cross-User Notification Read State Manipulation</li>
+				<li>[SECURITY-291] - Improper access control in mention controller</li>
+			</ul>
+
+			<a name="v33x"></a><h3>Changes since 3.3.x</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-11449">PHPBB-11449</a>] - Get rid of recursive calls in class phpbb_notification_manager</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12479">PHPBB-12479</a>] - Remove deprecated functions from bc file</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-13276">PHPBB-13276</a>] - INCLUDEJS and INCLUDECSS do not obey PHPBB_USE_BOARD_URL_PATH</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14401">PHPBB-14401</a>] - Sphinx: Remove ending slash from binlog_path</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14404">PHPBB-14404</a>] - Set board_timezone for admin on install</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14601">PHPBB-14601</a>] - Fix composer.lock on master</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14782">PHPBB-14782</a>] - Quick Links &gt; Your Posts gives mysql error</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14936">PHPBB-14936</a>] - Missing language variable INST_ERR_DB</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15099">PHPBB-15099</a>] - Remove not needed attribute from includeCSS and includeJS</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15154">PHPBB-15154</a>] - Missing constants during CLI installation</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15198">PHPBB-15198</a>] - Fix phpBB and PHP version info displayed in the ACP</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15233">PHPBB-15233</a>] - Avatars return should be standardized to not return html</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15234">PHPBB-15234</a>] - notification menu gr/avatar sizes are wrong</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15255">PHPBB-15255</a>] - Language variables of filesystem exception should moved</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15285">PHPBB-15285</a>] - Travis tests are failing due to trusty changes</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15314">PHPBB-15314</a>] - Wrong class constructor definition for convertor component</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15319">PHPBB-15319</a>] - Database update v310\style_update_p2 fails to drop sequences</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15336">PHPBB-15336</a>] - bidi.css causing travis failure on master</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15339">PHPBB-15339</a>] - Missing acp_send_statistics -&gt; Upgrading to 3.2.0 fails for phpBB 3.0.5</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15357">PHPBB-15357</a>] - phpBB core should provide composer/installers to extensions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15369">PHPBB-15369</a>] - Bump composer dependency version</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15400">PHPBB-15400</a>] - app.php urls aren't working in vagrant because of nginx</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15411">PHPBB-15411</a>] - Use lowercase in hex color code</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15415">PHPBB-15415</a>] - Styling typo in ucp_notifications.html</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15491">PHPBB-15491</a>] - Outdated linkes in installer support page</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15500">PHPBB-15500</a>] - Docs outdated for new PHP 5.4.7 requirement</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15502">PHPBB-15502</a>] - Errors in migrations in 3.2.2 release</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15507">PHPBB-15507</a>] - PHP 7.2 Warning</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15512">PHPBB-15512</a>] - Avoid reparsing non-existent polls</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15525">PHPBB-15525</a>] - composer.json License is Invalid/Deprecated</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15526">PHPBB-15526</a>] - Cast bbcode ID to integer</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15527">PHPBB-15527</a>] - Cannot interpret the BBCode definition</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15532">PHPBB-15532</a>] - Update pull request template</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15533">PHPBB-15533</a>] - Typo in viewtopic_topic_tools.html</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15536">PHPBB-15536</a>] - When using the catalog, extensions are installed in vendor-ext/ instead of ext/</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15559">PHPBB-15559</a>] - phpbb\report\report_handler_pm.php:56</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15600">PHPBB-15600</a>] - Ban reasons are not escaped in mcp_ban.html template</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15647">PHPBB-15647</a>] - post content line-height was not large enough</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15679">PHPBB-15679</a>] - notifications ucp front-page looks like shit due to poor cp styling</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15684">PHPBB-15684</a>] - Fix Broken Migration</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15686">PHPBB-15686</a>] - Update homestead for vagrant</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15688">PHPBB-15688</a>] - Event location in attachments download</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15720">PHPBB-15720</a>] - Redirections dont need to escape ampersands</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15725">PHPBB-15725</a>] - Testing framework fails to install extensions because of outdated assertion</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15755">PHPBB-15755</a>] - Broken events in /phpbb/attachment/delete.php</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15760">PHPBB-15760</a>] - write_stream never close connection</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15765">PHPBB-15765</a>] - Add debug.url_generator</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15795">PHPBB-15795</a>] - Broken Migration</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15846">PHPBB-15846</a>] - Wrong id for downloadable extension group</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15892">PHPBB-15892</a>] - Undefined $storage_attachment in parse_attachments() when using inline image attachment</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15919">PHPBB-15919</a>] - Lint test throws PHP warnings due to node modules folder</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15922">PHPBB-15922</a>] - Remove support for APC cache</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15935">PHPBB-15935</a>] - Check if APCu is installed before installing it</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15938">PHPBB-15938</a>] - Static attributes blacklist references no longer existing classes</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15959">PHPBB-15959</a>] - Travis Network Test is Failing for news.cnet.com</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16043">PHPBB-16043</a>] - SQL errors result in fatal error in specific cases</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16056">PHPBB-16056</a>] - JPEG dimensions undetectable for some kind of jpeg files</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16213">PHPBB-16213</a>] - vendor and phpbb folders should have .htaccess files</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16238">PHPBB-16238</a>] - Remove S_LOGIN_REDIRECT work around</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16309">PHPBB-16309</a>] - Smilies with a left square bracket do not work</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16346">PHPBB-16346</a>] - Random code errors</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16349">PHPBB-16349</a>] - Fix merge issues in acp_attachments and posting_attach_body.html</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16445">PHPBB-16445</a>] - unnecessary hr breaks content flow and semantics</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16477">PHPBB-16477</a>] - Padding-right is missing in icon.css</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16569">PHPBB-16569</a>] - Massive margin between posts when zoomed out in browser</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16587">PHPBB-16587</a>] - Replace sami with doctum</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16639">PHPBB-16639</a>] - Wrong use of make_path_relative</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16650">PHPBB-16650</a>] - Fatal error in Extensions catalog</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16666">PHPBB-16666</a>] - Windows tests in github actions can't write file in postgres</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16667">PHPBB-16667</a>] - Remove unused create_schema install task</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16688">PHPBB-16688</a>] - PHP fatal error on installing extension via catalog</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16717">PHPBB-16717</a>] - Fix installer bugs</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16732">PHPBB-16732</a>] - Vagrant is not working</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16749">PHPBB-16749</a>] - SQL error on installation</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16761">PHPBB-16761</a>] - Missing closing a tag in pagination</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16762">PHPBB-16762</a>] - Fix paging render issues in topicrow paging</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16763">PHPBB-16763</a>] - fix mine pip alignment on forum icons</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16778">PHPBB-16778</a>] - bidi.css loading was removed by a merge somewhere</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16786">PHPBB-16786</a>] - PHPUnit configuration validates against a deprecated schema</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16796">PHPBB-16796</a>] - misalignment on index and viewforum for topics and posts titles</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16817">PHPBB-16817</a>] - Oauth functional tests using incorrect selectors on master</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16835">PHPBB-16835</a>] - mentions_templates.html missing in ACP</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16836">PHPBB-16836</a>] - disk_free_space(): The system cannot find the path specified - PHP 8</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16857">PHPBB-16857</a>] - Remove leftover code for flash</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16891">PHPBB-16891</a>] - Controller Helper Routing in ACP can break Extension Installation</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16906">PHPBB-16906</a>] - Error running phpbb with vagrant</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16923">PHPBB-16923</a>] - Fix composer.json requirements</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16935">PHPBB-16935</a>] - Sphinx search references moved classes with old namespace</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16938">PHPBB-16938</a>] - Unexistent css property in inline style</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16943">PHPBB-16943</a>] - Composer error on installing extensions via catalog</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16960">PHPBB-16960</a>] - Migrations table not populated at the end of installation</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17022">PHPBB-17022</a>] - Link to SQL Report page is generated incorrectly</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17024">PHPBB-17024</a>] - Installing extension from catalog not possible with latest composer</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17049">PHPBB-17049</a>] - Minimum stability config entry missing from migrations</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17052">PHPBB-17052</a>] - Composer &gt;=2.3.10 unable to load installer plugin for extension catalog</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17062">PHPBB-17062</a>] - Cron task service fail because service is being instantiated incorrectly</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17067">PHPBB-17067</a>] - Untranslated string in CLI command</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17069">PHPBB-17069</a>] - Array with duplicate keys</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17074">PHPBB-17074</a>] - Condition to avoid creation of roles with same name is broken</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17085">PHPBB-17085</a>] - Invalid icons referenced in template files</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17086">PHPBB-17086</a>] - phpBB / Codespaces support</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17105">PHPBB-17105</a>] - Extensions Can't Be Installed</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17142">PHPBB-17142</a>] - Installation errors when using MSSQL+ IIS + PHP 8.2 </li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17148">PHPBB-17148</a>] - phpBB3.3.10 Setup does not support PostgreSQL 8.3 </li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17157">PHPBB-17157</a>] - Read Topic Permission With Search permission</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17181">PHPBB-17181</a>] - If statement to highlight Reported PMS on the view message page doesn't work.</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17194">PHPBB-17194</a>] - Php version in vagrant configuration is not set correctly</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17209">PHPBB-17209</a>] - Mentions migration fails if standard roles can't be found</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17297">PHPBB-17297</a>] - Lazy Avatar Loading Broken</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17301">PHPBB-17301</a>] - Wrong length parameter for fread in phpbb/cache/driver/file.php can lead to unusable forum</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17306">PHPBB-17306</a>] - Wrong declaration of function input values</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17313">PHPBB-17313</a>] - Web Push Settings Module Update Error</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17318">PHPBB-17318</a>] - Avatars do not show in Notifications Dropdown</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17321">PHPBB-17321</a>] - Webpush worker not updated when its script is changed</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17323">PHPBB-17323</a>] - If there is no posts, search index fails</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17328">PHPBB-17328</a>] - Exporting events in master not possible</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17330">PHPBB-17330</a>] - Web Push Notifications Firefox/Android Bug</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17335">PHPBB-17335</a>] - Extension Management Language Bugs</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17336">PHPBB-17336</a>] - Extension Catalog Bugging on &quot;Dev&quot; Minimum Stability</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17341">PHPBB-17341</a>] - acp_forums_copy_perm adm template file is not used anymore</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17343">PHPBB-17343</a>] - Push Notification in Wrong Language</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17351">PHPBB-17351</a>] - phpBB2 password hashes incorrectly handled during rehash cron</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17353">PHPBB-17353</a>] - Gravatar avatar src is not image src</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17364">PHPBB-17364</a>] - Array to String error in ACP Forums</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17373">PHPBB-17373</a>] - Additional horizontal line at the bottom of the quick links</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17379">PHPBB-17379</a>] - Custom BBCode ID is offset due to removed flash bbcode</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17384">PHPBB-17384</a>] - Passing E_USER_ERROR to trigger_error() is deprecated in PHP 8.4</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17399">PHPBB-17399</a>] - Add select attribute for British English the default language</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17451">PHPBB-17451</a>] - Web Push Notification Updates Last Active Time</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17454">PHPBB-17454</a>] - Push Notification Site Names with Emoji</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17457">PHPBB-17457</a>] - app.php causing multiple sessions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17460">PHPBB-17460</a>] - View quoted post FontAwesome icon is not rendered</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17468">PHPBB-17468</a>] - Reset password feature is not restricted to email</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17487">PHPBB-17487</a>] - PHP critical Uncaught Error when sending email via board</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17488">PHPBB-17488</a>] - PHP critical Uncaught Error when MySQL PDO driver is not enabled</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17489">PHPBB-17489</a>] - Email notifications won't be sent due to messenger queue issues</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17496">PHPBB-17496</a>] - PHP 8.4 deprecation error can break code execution</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17504">PHPBB-17504</a>] - Tests fail because of changed label of ondrej/php repo</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17507">PHPBB-17507</a>] - General SQL error on installing remove_jabber.php migration with PostgreSQL</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17508">PHPBB-17508</a>] - PHP warning on editing custom profile fields</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17510">PHPBB-17510</a>] - CodeSniffer ruleset is reported as DEPRECATED</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17519">PHPBB-17519</a>] - Cron URLs are encoded incorrectly</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17527">PHPBB-17527</a>] - PHP fatal error when decorating Twig phpBB extension service in phpBB extension</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17528">PHPBB-17528</a>] - Uncaught exception when adding autoincrement column in PostgreSQL</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17529">PHPBB-17529</a>] - Installer timeout if config.php doesn't exist</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17533">PHPBB-17533</a>] - Reverting migrations may cause restoring incorrect data and throw &quot;module exists&quot; exceptions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17537">PHPBB-17537</a>] - Caching of extensions autoloader ConfigCache not working</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17546">PHPBB-17546</a>] - Schema generator CLI does not work</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17547">PHPBB-17547</a>] - Login fails after multiple failed attempts due to incorrect Captcha enum value passed to init()</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17548">PHPBB-17548</a>] - Updating to phpBB4 with files missing is giving a error</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17549">PHPBB-17549</a>] - British English language pack has wrong license definition in composer.json</li>
+			</ul>
+			<h4>Epic</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17009">PHPBB-17009</a>] - Add support for web push notifications</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-10824">PHPBB-10824</a>] - Styles should use the same composer.json format for metadata as extensions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-11063">PHPBB-11063</a>] - Change version check to SSL</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-11515">PHPBB-11515</a>] - Add interface for lock classes and add new methods</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-11838">PHPBB-11838</a>] - OAuth registration from ucp_register</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12439">PHPBB-12439</a>] - Unify behavior of sql_multi_insert for different dbms types</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12591">PHPBB-12591</a>] - Improve breadcrumb functionality with new &quot;Home page&quot;/&quot;Forum index&quot; link</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12623">PHPBB-12623</a>] - Remove the DEBUG constant</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12960">PHPBB-12960</a>] - Remove broken CAPTCHAs</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-13162">PHPBB-13162</a>] - Add truncate table functionality to DBAL</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14095">PHPBB-14095</a>] - Replace loading.gif with CSS animations</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14131">PHPBB-14131</a>] - Completely overhaul all colors in Colours.css</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14336">PHPBB-14336</a>] - add title text to online status icon</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14573">PHPBB-14573</a>] - Extend breadcrumb to support more pages</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14771">PHPBB-14771</a>] - Support playing audio files directly in the browser</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14865">PHPBB-14865</a>] - Use stylelint.io to manage css standards</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14948">PHPBB-14948</a>] - Changes 3.3 PHP requirement to 7.1</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14970">PHPBB-14970</a>] - Use stylelint.io in travis CI builds</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14972">PHPBB-14972</a>] - PHP 7.2 compatibility: wrong sizeof/count parameter type</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14981">PHPBB-14981</a>] - Upgrade normalize to version 5</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15115">PHPBB-15115</a>] - Improve &amp; Update the css linting &amp; error checking </li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15116">PHPBB-15116</a>] - Fix admin.css lint errors</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15148">PHPBB-15148</a>] - convert contact menu to svg</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15160">PHPBB-15160</a>] - Set correct gitignore path for node modules</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15274">PHPBB-15274</a>] - Migration &quot;custom&quot; tool does not allow parameters</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15291">PHPBB-15291</a>] - Allow short array notation in event declarations</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15295">PHPBB-15295</a>] - Restore MyIsam and mysql environments to test suite</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15330">PHPBB-15330</a>] - Twig function to know if a language string is defined</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15343">PHPBB-15343</a>] - Improve control of forum row</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15344">PHPBB-15344</a>] - upgrade stylelint</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15366">PHPBB-15366</a>] - Reference function directly instead of creating a method</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15371">PHPBB-15371</a>] - Split uploaded files into subdirectories</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15388">PHPBB-15388</a>] - Prosilver: Give interior of Category boxes round corners</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15392">PHPBB-15392</a>] - Change dirname(__FILE__) to __DIR__ everywhere</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15402">PHPBB-15402</a>] - Cleanup tweak.css file</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15403">PHPBB-15403</a>] - add useful front-end tools to package.json</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15404">PHPBB-15404</a>] - Simplify and standardize browser support</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15406">PHPBB-15406</a>] - cleanup and standardize rtl</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15413">PHPBB-15413</a>] - Login from any page and redirecting back there</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15414">PHPBB-15414</a>] - Cleanup unnecessary css</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15499">PHPBB-15499</a>] - Drop HHVM support</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15508">PHPBB-15508</a>] - Upgrade Twig to version 2.x</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15510">PHPBB-15510</a>] - Link Orphan attachments in ACP&gt;General to Orphaned attachments page </li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15514">PHPBB-15514</a>] - Improve accessibility by adding vital info from explanation to a title</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15518">PHPBB-15518</a>] - Do not attempt to accurately determine whether posters can read private messages in viewtopic</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15528">PHPBB-15528</a>] - Display the version of the installed styles in acp</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15529">PHPBB-15529</a>] - Color groups in ACP</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15531">PHPBB-15531</a>] - Log malformed BBCodes</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15534">PHPBB-15534</a>] - Outdated ACP extensions database link for phpBB 3.2</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15535">PHPBB-15535</a>] - Add S_FIRST_POST to postrow on viewtopic</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15545">PHPBB-15545</a>] - There is no vertical space between format buttons</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15553">PHPBB-15553</a>] - Add a method to get direct link to storage files</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15561">PHPBB-15561</a>] - Add core events for adding columns to MySQL and Postgres search backends</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15563">PHPBB-15563</a>] - Error instaling phpbb with sqlite database</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15569">PHPBB-15569</a>] - Adjust update instructions to suggest file replacement method</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15580">PHPBB-15580</a>] - Remove extra settings in ACP</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15605">PHPBB-15605</a>] - Correct Right-Margin for ribbon image</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15646">PHPBB-15646</a>] - Add support for Argon2i passwords</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15663">PHPBB-15663</a>] - Remove flash support in attachments</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15687">PHPBB-15687</a>] - Fix filenames in attachments downloads</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15689">PHPBB-15689</a>] - Show statistics of storages in acp_storage</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15692">PHPBB-15692</a>] - Move checks if file exist from adapter to storage</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15699">PHPBB-15699</a>] - Move files between remote filesystems when storage configuration is changed</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15714">PHPBB-15714</a>] - Login after register</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15718">PHPBB-15718</a>] - Update CONTRIBUTING.md</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15747">PHPBB-15747</a>] - Change parameter depth for a boolean subfolders</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15768">PHPBB-15768</a>] - Add a license to a repository</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15769">PHPBB-15769</a>] - Rework avatar handling</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15772">PHPBB-15772</a>] - Hide warning message in acp when install dir is present and allow_install_dir is true</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15924">PHPBB-15924</a>] - Move from precise to trusty builds</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15926">PHPBB-15926</a>] - Deny installs on PHP &gt;= 7.3@dev - Increase min. req. to 5.4.7</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16105">PHPBB-16105</a>] - Use &quot;global&quot; reCAPTCHA domain to circumvent blocking in some countries</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16115">PHPBB-16115</a>] - Add PHP 7.4 builds to travis CI</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16198">PHPBB-16198</a>] - Change symfony debug component with symfony ErrorHandler component</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16204">PHPBB-16204</a>] - Remove hooks system</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16207">PHPBB-16207</a>] - Require cookies for sessions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16237">PHPBB-16237</a>] - Icon overhaul and rework using twig mixin and iconify</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16240">PHPBB-16240</a>] - Remove deprecated template/theme log language strings</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16288">PHPBB-16288</a>] - PHP 8 compatibility</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16313">PHPBB-16313</a>] - Remote http{} block from nginx sample config</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16430">PHPBB-16430</a>] - Permission ordering</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16441">PHPBB-16441</a>] - Remove deprecated core.ucp_register_agreement</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16472">PHPBB-16472</a>] - Remove PhantomJS UI tests</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16473">PHPBB-16473</a>] - managed_with_clean_error_exception has incorrect filename</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16533">PHPBB-16533</a>] - Add core and template events to customize UCP login keys management module</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16549">PHPBB-16549</a>] - Use PHPUnit 9.3+ for PHP 8.0+ tests</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16574">PHPBB-16574</a>] - Remove support for flash BBCode</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16577">PHPBB-16577</a>] - Add documentation about return type hinting to coding guidelines</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16632">PHPBB-16632</a>] - Update composer to version 2</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16636">PHPBB-16636</a>] - Add PHP 8.0 builds to TravisCI</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16659">PHPBB-16659</a>] - Use Github Actions instead of TravisCI and AppVeyor</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16661">PHPBB-16661</a>] - Clean up github actions tasks after merge</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16668">PHPBB-16668</a>] - Clean up and optimize the schema generator</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16675">PHPBB-16675</a>] - Restore checking commit messages</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16687">PHPBB-16687</a>] - Add stylelint checks to GitHub Actions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16737">PHPBB-16737</a>] - Rewrite acp_search by splitting configuration and indexing</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16748">PHPBB-16748</a>] - Update coding guidelines to place static after visibility qualifiers</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16751">PHPBB-16751</a>] - Add rank-img class for easier targeting</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16754">PHPBB-16754</a>] - Update doctum</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16764">PHPBB-16764</a>] - Remove remote avatar functionality</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16775">PHPBB-16775</a>] - Run xo linting in GitHub Actions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16777">PHPBB-16777</a>] - Remove the max image width/height settings</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16782">PHPBB-16782</a>] - Adjust mentions bbcode to better distinct between user and group</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16820">PHPBB-16820</a>] - Move ATTACHMENT_CATEGORY_ constants to attachment manager class</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16821">PHPBB-16821</a>] - Keep Symfony up to the latest 5.x version</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16822">PHPBB-16822</a>] - Replace patchwork/utf8 with symfony/polyfill</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16825">PHPBB-16825</a>] - Adjust handling of session ID when requiring cookies</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16833">PHPBB-16833</a>] - Subscribe to forum or topic  icons could be more intuitive</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16853">PHPBB-16853</a>] - Remove depreciated 3.2 css classes</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16858">PHPBB-16858</a>] - Update to the latest version of jQuery 3.6.0</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16860">PHPBB-16860</a>] - Breadcrumbs titles are messed up</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16885">PHPBB-16885</a>] - Add filters to Twig - INT and FLOAT</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16898">PHPBB-16898</a>] - Do not restrict the debug error handler to the development environment</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16899">PHPBB-16899</a>] - Add SVG and WEBP image type to ranks, smilies and topic icons</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16909">PHPBB-16909</a>] - Add PHP 8.2 builds to test matrix</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16913">PHPBB-16913</a>] - Add Search Index Progress Bar with Stats</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16920">PHPBB-16920</a>] - Upgrade Symfony to the version 5.4</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16937">PHPBB-16937</a>] - Run psalm in GitHub Actions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16939">PHPBB-16939</a>] - Wait for postgres service to start in GitHub Actions windows builds</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16940">PHPBB-16940</a>] - Optimize phpBB Native Search</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16941">PHPBB-16941</a>] - Add Sphinx search backend tests</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16944">PHPBB-16944</a>] - Use icon bundle to load Iconify locally instead of loading from Iconify API</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16950">PHPBB-16950</a>] - Make functional download test work without rewrite config</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16955">PHPBB-16955</a>] - Improve psalm baseline results and add baseline</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16965">PHPBB-16965</a>] - Allow empty value as default database server name on installing</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16967">PHPBB-16967</a>] - Deprecate use of PHP and INCLUDEPHP in templates</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17010">PHPBB-17010</a>] - Add notification method webpush</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17025">PHPBB-17025</a>] - Move post destination topic field should not be populated with a zero</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17093">PHPBB-17093</a>] - Add ACP option to decide who can browse board &quot;Disable board&quot;</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17100">PHPBB-17100</a>] - Introduce twig macros for commonly used form elements</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17135">PHPBB-17135</a>] - Use Symfony Mailer to send emails</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17151">PHPBB-17151</a>] - Adjust twig form macros to follow HTML guidelines</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17153">PHPBB-17153</a>] - Remove deprecated avatar functions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17155">PHPBB-17155</a>] - Open first unread post by default on topic with unread posts</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17176">PHPBB-17176</a>] - Upgrade Symfony to 6.3</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17184">PHPBB-17184</a>] - Storage: Remove split files into subfolders feature</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17193">PHPBB-17193</a>] - Combine unit and functional tests on github actions runs</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17195">PHPBB-17195</a>] - Remove travis CI files</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17230">PHPBB-17230</a>] - Update doctum for PHP 8.1 support</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17236">PHPBB-17236</a>] - Update symfony dependencies to improve PHP 8.3 compatibility</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17277">PHPBB-17277</a>] - Add template events to UCP</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17279">PHPBB-17279</a>] - Use only needed iconify icon packages</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17283">PHPBB-17283</a>] - Remove iconify support</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17291">PHPBB-17291</a>] - Use icon function in ACP templates</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17293">PHPBB-17293</a>] - Update composer and dependencies to latest versions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17300">PHPBB-17300</a>] - Better Topic Icons</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17304">PHPBB-17304</a>] - HiDPI smilies for phpBB</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17308">PHPBB-17308</a>] - Rename tracker project key to PHPBB-</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17309">PHPBB-17309</a>] - Update gulp and remove no longer needed gulp packages</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17310">PHPBB-17310</a>] - Update GitHub actions workflows to Node.js 20</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17333">PHPBB-17333</a>] - Push Notification UX Enhancements</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17339">PHPBB-17339</a>] - Add support for push notifications when not logged in</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17340">PHPBB-17340</a>] - Update composer to 2.7.7</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17342">PHPBB-17342</a>] - Add PHP 8.4-dev tests to GitHub Actions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17344">PHPBB-17344</a>] - UX improvements to web push subscription interface</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17355">PHPBB-17355</a>] - Update gravatar hash to sha256</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17359">PHPBB-17359</a>] - Distinct disabled and not installed extensions in the list</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17363">PHPBB-17363</a>] - Web Push Support for Apple Mobile Devices</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17371">PHPBB-17371</a>] - Web Push UX Updates</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17400">PHPBB-17400</a>] - MSSQL 2017 builds not working on GitHub Actions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17402">PHPBB-17402</a>] - Add possibility to force reparsing BBCode via CLI</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17414">PHPBB-17414</a>] - Add interface class for CAPTCHA classes</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17415">PHPBB-17415</a>] - Add wrapper for backwards compatibility with legacy CAPTCHAs</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17416">PHPBB-17416</a>] - Add Web Push Notifications FAQ entires</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17418">PHPBB-17418</a>] - HiDPI topic icons</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17434">PHPBB-17434</a>] - Update Vagrantfile to make it work in recent ruby versions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17445">PHPBB-17445</a>] - Webpush notifications availability shouldn't require email templates</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17449">PHPBB-17449</a>] - Proper emoji handling for progressive web app manifests</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17450">PHPBB-17450</a>] - Remove obsolete requirement for JSON extension</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17459">PHPBB-17459</a>] - Improve prosilver font sizes and backgrounds</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17465">PHPBB-17465</a>] - Add unit tests for handling of web push notifications</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17478">PHPBB-17478</a>] - Add security policy to repository</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17481">PHPBB-17481</a>] - Adjust package generation to be version independent</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17490">PHPBB-17490</a>] - Add unit tests for new Symfony Mailer classes</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17493">PHPBB-17493</a>] - Drop support for Jabber</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17494">PHPBB-17494</a>] - Functional tests don't handle boolean attributes correctly</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17498">PHPBB-17498</a>] - Move GitHub Actions Ubuntu 20.04 runners to Ubuntu 22.04</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17501">PHPBB-17501</a>] - Improve prosilver backgrounds and usability</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17513">PHPBB-17513</a>] - Web push notifications on Safari stop after 3 pushes</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17530">PHPBB-17530</a>] - Use Doctrine driver middleware instead of 'platform' parameter</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17535">PHPBB-17535</a>] - Upgrade PHPUnit to version 10</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17538">PHPBB-17538</a>] - Terms and Policy wording improvements</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17540">PHPBB-17540</a>] - Update windows runners and limit amount of runners on GitHub Actions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17542">PHPBB-17542</a>] - Test Framework can be exited unexpectedly</li>
+			</ul>
+			<h4>New Feature</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-9687">PHPBB-9687</a>] - Refactor ban system</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-11150">PHPBB-11150</a>] - Extension Management with Composer</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12683">PHPBB-12683</a>] - Add a CLI command to generate the search index</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-13713">PHPBB-13713</a>] - Add ability to @mention specific users in posts</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14169">PHPBB-14169</a>] - Split uploaded files storage into separate class(es)</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15214">PHPBB-15214</a>] - Ability to specify load order of template events</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15538">PHPBB-15538</a>] - Improve and simplify the inclusion of icons</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15565">PHPBB-15565</a>] - fix quote font-size after px conversion</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15851">PHPBB-15851</a>] - Automatic update downloader backend implementation</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16243">PHPBB-16243</a>] - Update template paths</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16856">PHPBB-16856</a>] - Add lang_js() function to twig as replacement for LA_</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16863">PHPBB-16863</a>] - Support playing video attachments</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17173">PHPBB-17173</a>] - Generate signatures for release packages</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17326">PHPBB-17326</a>] - Add icon setting to BBCode edit screen in ACP</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17413">PHPBB-17413</a>] - Add support for Cloudflare Turnstile CAPTCHA</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17515">PHPBB-17515</a>] - Add new event to: ucp_pm_viewmessage.html</li>
+			</ul>
+			<h4>Security Issue</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15570">PHPBB-15570</a>] - Extension version check is restricted to TLS 1.0</li>
+			</ul>
+			<h4>Sub-task</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12624">PHPBB-12624</a>] - Add debug.load_time</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12627">PHPBB-12627</a>] - Add debug.sql_explain</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12628">PHPBB-12628</a>] - Add debug.memory</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12629">PHPBB-12629</a>] - Add debug.errors_show</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12630">PHPBB-12630</a>] - Add debug.url_matcher</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12631">PHPBB-12631</a>] - Add finder.cache to control whether to cache finder results</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12635">PHPBB-12635</a>] - Add allow_install_dir</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-12636">PHPBB-12636</a>] - Add log.session_errors</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14285">PHPBB-14285</a>] - Move avatars / file downloads to controller</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15253">PHPBB-15253</a>] - Create an abstraction for storage</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15276">PHPBB-15276</a>] - Use storage in avatars</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15286">PHPBB-15286</a>] - Use storage in attachments</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15287">PHPBB-15287</a>] - Factory to build storage from DI</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15289">PHPBB-15289</a>] - Allow to configure storage from ACP</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15305">PHPBB-15305</a>] - Add streamings for storage</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15342">PHPBB-15342</a>] - Track storage files</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16643">PHPBB-16643</a>] - Migrate the installer to Doctrine DBAL</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16741">PHPBB-16741</a>] - Migrate DB Tools to Doctrine</li>
+			</ul>
+			<h4>Task</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14495">PHPBB-14495</a>] - Build the 3.3 version on the master branch</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14584">PHPBB-14584</a>] - Move deprecated globals and functions to compatibility_*.php</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15213">PHPBB-15213</a>] - Fix stylelint failures in master branch</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15244">PHPBB-15244</a>] - Remove the UNGLOBALISE-related code</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15410">PHPBB-15410</a>] - Remove obsolete code from BBCodes ACP</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15466">PHPBB-15466</a>] - Move Nils in CREDITS.txt</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15516">PHPBB-15516</a>] - Add instructions on running UI tests</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15540">PHPBB-15540</a>] - Refactor search backend classes to Symfony services</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15738">PHPBB-15738</a>] - Remove code related with safe mode</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15874">PHPBB-15874</a>] - Don't access directly to the user lang property</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15927">PHPBB-15927</a>] - Fix ACP table display error</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16112">PHPBB-16112</a>] - Update composer dependencies to latest</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16133">PHPBB-16133</a>] - Upgrade packages in packages.json</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16224">PHPBB-16224</a>] - Update composer dependencies</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16246">PHPBB-16246</a>] - Prettify and update README Automated Testing section</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16284">PHPBB-16284</a>] - Move 4.0 migrations to v400 folder.</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16405">PHPBB-16405</a>] - Update npm dependencies to latest versions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16572">PHPBB-16572</a>] - Update node modules to latest versions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16615">PHPBB-16615</a>] - Update node dependencies to resolve dependabot alert</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16616">PHPBB-16616</a>] - Update composer dependencies to latest versions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16633">PHPBB-16633</a>] - Update pull request template after end of life of 3.2</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16669">PHPBB-16669</a>] - Update node ini dependency to latest version</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16746">PHPBB-16746</a>] - Update node dependencies in master</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16769">PHPBB-16769</a>] - Update composer to latest version</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16790">PHPBB-16790</a>] - Remove unused code in acp,mcp,ucp</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16928">PHPBB-16928</a>] - Update composer and composer dependencies to latest versions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16987">PHPBB-16987</a>] - Update composer and composer dependencies</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17048">PHPBB-17048</a>] - Update composer and dependencies for 3.3.9</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17066">PHPBB-17066</a>] - Update GitHub Actions configuration to resolve deprecations</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17108">PHPBB-17108</a>] - Update composer dependencies to latest versions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17110">PHPBB-17110</a>] - Reword &quot;slander&quot; to &quot;libel&quot; in registration legalese</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17149">PHPBB-17149</a>] - Update authors and pull request template</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17154">PHPBB-17154</a>] - Update composer and dependencies to latest versions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17204">PHPBB-17204</a>] - Update composer and node dependencies</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17280">PHPBB-17280</a>] - Fallback to branch name on branches without ticket ID</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17281">PHPBB-17281</a>] - Update psalm to 5.x version</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17403">PHPBB-17403</a>] - Update composer and node requirements</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17432">PHPBB-17432</a>] - Update dependencies to latest version</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17464">PHPBB-17464</a>] - Remove deprecated meta tags</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17503">PHPBB-17503</a>] - Update composer dependencies</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17509">PHPBB-17509</a>] - Bump DBMS supported versions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17512">PHPBB-17512</a>] - Add PHP Sniffer coding standard to check union type</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17514">PHPBB-17514</a>] - Remove version 3 specifier from paths and content</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17516">PHPBB-17516</a>] - Remove dependency on CHItA/TopologicalSort</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17517">PHPBB-17517</a>] - Make proper use of eslint</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17543">PHPBB-17543</a>] - Update composer and dependencies</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17544">PHPBB-17544</a>] - Support Codespaces on master</li>
+			</ul>
+
+			<a name="v3316rc1"></a><h3>Changes since 3.3.16</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17639">PHPBB-17639</a>] - Installation under PHP 8.4 failed with timeout detection reason check_filesystem.php</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17650">PHPBB-17650</a>] - Migrator bug prevents complete uninstallation for certain extensions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17651">PHPBB-17651</a>] - Notification manager tests fail on mssql</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17658">PHPBB-17658</a>] - Testing for 3.3.x is broken on PHP 8</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17659">PHPBB-17659</a>] - Move oauth login to controllers</li>
+			</ul>
+			<h4>Hardening</h4>
+			<ul>
+				<li>[SECURITY-292] - Improve secure downloads referer checking</li>
+				<li>[SECURITY-295] - Hardening of hostname lookups</li>
+			</ul>
+			<h4>Security Issue</h4>
+			<ul>
+				<li>[SECURITY-293] - Improper state verification in OAuth implementation</li>
+				<li>[SECURITY-294] - Improper access verification when setting permissions in ACP</li>
+				<li>[SECURITY-296] - Ensure proper casting in profile field migration</li>
+			</ul>
+
+			<a name="v3316rc1"></a><h3>Changes since 3.3.16-RC1</h3>
+			<h4>Hardening</h4>
+			<ul>
+				<li>[SECURITY-289] - Hardening against non-rasterized image uploads</li>
+			</ul>
+			<h4>Security Issue</h4>
+			<ul>
+				<li>[SECURITY-285] - Password Reset Link Poisoning</li>
+				<li>[SECURITY-286] - IDOR when composing PMs</li>
+				<li>[SECURITY-287] - CSRF on report submission</li>
+				<li>[SECURITY-290] - Cross-User Notification Read State Manipulation</li>
+			</ul>
+
+			<a name="v3315"></a><h3>Changes since 3.3.15</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14401">PHPBB-14401</a>] - Sphinx: Remove ending slash from binlog_path</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15085">PHPBB-15085</a>] - HTTP authentication from feeds served via controller</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17034">PHPBB-17034</a>] - Rank post limit</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17157">PHPBB-17157</a>] - Read Topic Permission With Search permission</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17399">PHPBB-17399</a>] - Add select attribute for British English the default language</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17475">PHPBB-17475</a>] - Overflow on resynchronize statistics when running on MSSQL with large number of attachments</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17477">PHPBB-17477</a>] - Problem with Whois lookups returning incorrect information due to ARIN/RIPE changes</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17486">PHPBB-17486</a>] - Upgrade from 3.0 to 3.3 fails with SQL &quot;Incorrect integer value&quot; error</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17491">PHPBB-17491</a>] - Ascending posts pagination in version 3.3.15</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17504">PHPBB-17504</a>] - Tests fail because of changed label of ondrej/php repo</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17506">PHPBB-17506</a>] - PHP fatal error on install</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17510">PHPBB-17510</a>] - CodeSniffer ruleset is reported as DEPRECATED</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17519">PHPBB-17519</a>] - Cron URLs are encoded incorrectly</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17527">PHPBB-17527</a>] - PHP fatal error when decorating Twig phpBB extension service in phpBB extension</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17533">PHPBB-17533</a>] - Reverting migrations may cause restoring incorrect data and throw &quot;module exists&quot; exceptions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17563">PHPBB-17563</a>] - CodeSniffer ruleset (PPSSE) not fully compatible with CS 4</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17565">PHPBB-17565</a>] - Incorrect exporting PM as CSV for Excel</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17580">PHPBB-17580</a>] - Downloading files with a byte range of 8192 bytes causes fatal error</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17589">PHPBB-17589</a>] - QA captcha appears on every other login attempt</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17622">PHPBB-17622</a>] - Version helper may return update from newer branch</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-13481">PHPBB-13481</a>] - Explain in ACP Attachment settings images get resized (at client-side)</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15007">PHPBB-15007</a>] - Add Restart link to installer</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16941">PHPBB-16941</a>] - Add Sphinx search backend tests</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17498">PHPBB-17498</a>] - Move GitHub Actions Ubuntu 20.04 runners to Ubuntu 22.04</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17536">PHPBB-17536</a>] - Add event to Edit forum in ACP to modify template</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17538">PHPBB-17538</a>] - Terms and Policy wording improvements</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17555">PHPBB-17555</a>] - Improve running of tests on windows runners in GitHub Actions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17570">PHPBB-17570</a>] - Replace an old CSS accessibility hack with a modern, recommended and W3C compliant method</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17598">PHPBB-17598</a>] - Deny access to composer files in apache</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17605">PHPBB-17605</a>] - Fix homestead and use a fork since is no longer maintained</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17620">PHPBB-17620</a>] - Skip whois test when daily rate-limit is reached</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17621">PHPBB-17621</a>] - Change U_WARN to use new warn_allowed variable</li>
+			</ul>
+			<h4>New Feature</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17515">PHPBB-17515</a>] - Add new event to: ucp_pm_viewmessage.html</li>
+			</ul>
+			<h4>Task</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17110">PHPBB-17110</a>] - Reword &quot;slander&quot; to &quot;libel&quot; in registration legalese</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17545">PHPBB-17545</a>] - Improve handling of DDoS/brute force attacks on login form</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17584">PHPBB-17584</a>] - Exclude tests from PSR1 code sniffs</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17591">PHPBB-17591</a>] - Update to Code Sniffer 4</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17593">PHPBB-17593</a>] - Allow functional tests on a secure local server</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17612">PHPBB-17612</a>] - Remove imageset to css converter</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17613">PHPBB-17613</a>] - Remove support for retired WebPI packages</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17628">PHPBB-17628</a>] - Update composer and node dependencies</li>
+			</ul>
+
+			<a name="v3315rc1"></a><h3>Changes since 3.3.15-RC1</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17480">PHPBB-17480</a>] - PHP fatal error in version check failure</li>
+			</ul>
+			<h4>Security Issue</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/SECURITY-283">SECURITY-283</a>] - Use jQuery to generate HTML from page data</li>
+			</ul>
+
+			<a name="v3314"></a><h3>Changes since 3.3.14</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17227">PHPBB-17227</a>] - Member list sorting bug - repeating users on several pages</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17381">PHPBB-17381</a>] - 'topic_views' column overflow blocks access to the topic</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17417">PHPBB-17417</a>] - Day selection not visible when no results</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17422">PHPBB-17422</a>] - Ascending posts pagination</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17436">PHPBB-17436</a>] - PHP fatal error while converting from phpBB 2.0 with Attachment MOD</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17455">PHPBB-17455</a>] - PHP warning on MySQLi connection failure</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17463">PHPBB-17463</a>] - Extra &amp; in unread posts search pagination </li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17468">PHPBB-17468</a>] - Reset password feature is not restricted to email</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17470">PHPBB-17470</a>] - Enable feeds setting not enforced</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17429">PHPBB-17429</a>] - Adding event before users have been added to a group</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17431">PHPBB-17431</a>] - Add more vars to memberlist event</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17433">PHPBB-17433</a>] - Unclear instructions in ACP, Server settings</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17443">PHPBB-17443</a>] - Various Guzzle client issues for version checks</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17446">PHPBB-17446</a>] - Add acp_account_activation_edit_add event</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17461">PHPBB-17461</a>] - Add php events for ACP main actions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17467">PHPBB-17467</a>] - Add TLS v.1.3 support to email messenger connection</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17471">PHPBB-17471</a>] - Forum feed link in forumlist_body does not return the correct URL</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17478">PHPBB-17478</a>] - Add security policy to repository</li>
+			</ul>
+
+			<a name="v3314rc1"></a><h3>Changes since 3.3.14-RC1</h3>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17421">PHPBB-17421</a>] - Rename section for not installed extensions to not installed</li>
+			</ul>
+
+			<a name="v3313"></a><h3>Changes since 3.3.13</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17181">PHPBB-17181</a>] - If statement to highlight Reported PMS on the view message page doesn't work.</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17383">PHPBB-17383</a>] - HELO/EHLO error while using gethostbyaddr()</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17384">PHPBB-17384</a>] - Passing E_USER_ERROR to trigger_error() is deprecated in PHP 8.4</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17385">PHPBB-17385</a>] - Version check without SSL flag for CDB extensions fails</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17386">PHPBB-17386</a>] - Incorrect trace result while tracing user-based permissions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17387">PHPBB-17387</a>] - PHP warnings in search results</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17390">PHPBB-17390</a>] - Missing buttons for approval of new messages</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17391">PHPBB-17391</a>] - PHP warnings on attempt to create user group having name already in use</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17398">PHPBB-17398</a>] - Ajax error on deleting cookies</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17405">PHPBB-17405</a>] - Function phpbb_gmgetdate() returns incorrect result for edge cases</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17410">PHPBB-17410</a>] - UCP tabs do not work when testing out another user's permissions</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16852">PHPBB-16852</a>] - Addition of a new PHP event concerning bump topics</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17359">PHPBB-17359</a>] - Distinct disabled and not installed extensions in the list</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17376">PHPBB-17376</a>] - Link reference to quote post is a poor accessibility experience</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17382">PHPBB-17382</a>] - Incorrect grammar on FAQ page regarding searching for members</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17388">PHPBB-17388</a>] - Add php event to bump_topic_allowed function</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17394">PHPBB-17394</a>] - Check mergeability of PR on GitHub Actions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17396">PHPBB-17396</a>] - Automatically handle merges of 3.3.x into master</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17397">PHPBB-17397</a>] - Add event for forum_data query in viewforum</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17402">PHPBB-17402</a>] - Add possibility to force reparsing BBCode via CLI</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17407">PHPBB-17407</a>] - Limit mergeability check to single comment</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17411">PHPBB-17411</a>] - Add core event to search.php</li>
+			</ul>
+
+			<a name="v3313rc1"></a><h3>Changes since 3.3.13-RC1</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17377">PHPBB-17377</a>] - MSSQL builds on GitHub actions broken</li>
+			</ul>
+
+			<a name="v3312"></a><h3>Changes since 3.3.12</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-13916">PHPBB-13916</a>] - Cancelling save draft removes previous notify setting on posting page</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14454">PHPBB-14454</a>] - Accessing ACP modules while testing user permissions returns a General Error</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15043">PHPBB-15043</a>] - Searching no longer working in 3.2.0</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15576">PHPBB-15576</a>] - PM subject truncated to shorter length than maxlength</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16213">PHPBB-16213</a>] - vendor and phpbb folders should have .htaccess files</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16907">PHPBB-16907</a>] - &quot;phpbb&quot; value in &quot;hiddenSegments&quot; blocks client requests for extensions in IIS</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17109">PHPBB-17109</a>] - Users without the &quot;Can use signature&quot; permission should not see checkboxes for signature</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17175">PHPBB-17175</a>] - Breadcrumbs show wrong forum and topic when using 'email topic'</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17301">PHPBB-17301</a>] - Wrong length parameter for fread in phpbb/cache/driver/file.php can lead to unusable forum</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17327">PHPBB-17327</a>] - Fix linting issue in console user add command</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17332">PHPBB-17332</a>] - New permission copied from existing permission ignores permission set options</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17337">PHPBB-17337</a>] - Transaction begin is missing from mysqli driver </li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17338">PHPBB-17338</a>] - Incorrect members list sorting by user_last_visit</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17351">PHPBB-17351</a>] - phpBB2 password hashes incorrectly handled during rehash cron</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17352">PHPBB-17352</a>] - Long rank titles push other profile details below</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17353">PHPBB-17353</a>] - Gravatar avatar src is not image src</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17356">PHPBB-17356</a>] - Errors hidden by at are being displayed in PHP 8 or newer</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17358">PHPBB-17358</a>] - Redis cache never expires with the TTL of 0</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17362">PHPBB-17362</a>] - Missing declaration of property in extension manager</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17365">PHPBB-17365</a>] - Enforce the search word limit on queries containing operators without white space</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17366">PHPBB-17366</a>] - Captcha disappears on error message from registration &amp; posting</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17369">PHPBB-17369</a>] - Permanently deleting soft-deleted topics returns incorrect forum in redirect link</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17370">PHPBB-17370</a>] - Deleting Cookies on FAQ/other pages</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17374">PHPBB-17374</a>] - ACP - Maintenance - Logs: Deleting Error / Bug</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17375">PHPBB-17375</a>] - User lastvisit gets updated too often in session garbage collection</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16553">PHPBB-16553</a>] - Disapproving a reported post causes a &quot;Module not accessible&quot; error</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17308">PHPBB-17308</a>] - Rename tracker project key to PHPBB-</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17315">PHPBB-17315</a>] - Add new template events to group</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17316">PHPBB-17316</a>] - Add template events to ucp_groups_manage</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17317">PHPBB-17317</a>] - Update button text and make it more readable</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17325">PHPBB-17325</a>] - Show explicit message for &quot;Re-Check version&quot; if installed version is still up to date</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17340">PHPBB-17340</a>] - Update composer to 2.7.7</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17342">PHPBB-17342</a>] - Add PHP 8.4-dev tests to GitHub Actions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17347">PHPBB-17347</a>] - Support deleting users by ID via console</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17350">PHPBB-17350</a>] - Add user IP address to log when installing extensions on fresh installs</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17355">PHPBB-17355</a>] - Update gravatar hash to sha256</li>
+			</ul>
+			<h4>Task</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-13933">PHPBB-13933</a>] - Update tokens' definitions in acp_bbcodes</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16890">PHPBB-16890</a>] - Edit the config sample files and web.config to deny access to the &quot;config&quot; directory</li>
+			</ul>
+
+			<a name="v3312rc1"></a><h3>Changes since 3.3.12-RC1</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17312">PHPBB3-17312</a>] - User last visit gets updated too often</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17324">PHPBB3-17324</a>] - Add template event to notification_dropdown.html</li>
+			</ul>
+			<h4>Hardening</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/SECURITY-276">SECURITY-276</a>] - Prevent resending activation email too often</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/SECURITY-278">SECURITY-278</a>] - Always release cron lock, even invalid task is passed</li>
+			</ul>
+
+			<a name="v3311"></a><h3>Changes since 3.3.11</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-14047">PHPBB3-14047</a>] - Jabber discards messages when stream gets closed without waiting for acknowledgement</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-15325">PHPBB3-15325</a>] - Global moderator permissions shown in forum moderator permissions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-16470">PHPBB3-16470</a>] - Memberlist bug - sorting by Last active date is incorrect</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17077">PHPBB3-17077</a>] - Multiple posts at once, even if the user shouldn't ignore the flood interval</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17117">PHPBB3-17117</a>] - Deactivated notification method leads to crash</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17130">PHPBB3-17130</a>] - Text reparser changes magic URL state in posts</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17187">PHPBB3-17187</a>] - Unread Topic URL Link Not Working On MCP View Forum Topic List</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17200">PHPBB3-17200</a>] - Color Parse Error In viewonline.php Legend</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17201">PHPBB3-17201</a>] - Redirect to installer might be invalid when accessing subfolder</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17202">PHPBB3-17202</a>] - The bidi.css File Is Loaded When Viewing LTR Topic Print View Page</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17203">PHPBB3-17203</a>] - Group Description With BBCode Ordered List Breaks Layout</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17207">PHPBB3-17207</a>] - Extensions are unable to use PHPBB_USE_BOARD_URL_PATH</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17208">PHPBB3-17208</a>] - Update Error YouTube Profilfeld</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17212">PHPBB3-17212</a>] - Who is online incorrectly reports page when posting with only post URL parameter</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17237">PHPBB3-17237</a>] - QUICKMOD_ACTION_NOT_ALLOWED uses &quot; instead of ' </li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17286">PHPBB3-17286</a>] - Non-existent urls to be written down to session_page</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17292">PHPBB3-17292</a>] - Link to spamhaus.org no longer valid</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17296">PHPBB3-17296</a>] - mod_security false positive denies access to ACP</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17302">PHPBB3-17302</a>] - Password reset function does not update all necessary data</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17306">PHPBB3-17306</a>] - Wrong declaration of function input values</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17230">PHPBB3-17230</a>] - Update doctum for PHP 8.1 support</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17232">PHPBB3-17232</a>] - Improve MySQL error messages in PHP 8.1+</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17233">PHPBB3-17233</a>] - Add PHP 8.3 tests to the 3.3.x branch</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17235">PHPBB3-17235</a>] - Missing autocomplete for username &amp; password</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17236">PHPBB3-17236</a>] - Update symfony dependencies to improve PHP 8.3 compatibility</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17277">PHPBB3-17277</a>] - Add template events to UCP</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17284">PHPBB3-17284</a>] - Add event to add content after the online users list in viewtopic</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17293">PHPBB3-17293</a>] - Update composer and dependencies to latest versions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17299">PHPBB3-17299</a>] - Allow core event to modify variables while sending email</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17303">PHPBB3-17303</a>] - Update jQuery to 3.7+</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17305">PHPBB3-17305</a>] - Improve queries for unanswered topics and posts</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17310">PHPBB3-17310</a>] - Update GitHub actions workflows to Node.js 20</li>
+			</ul>
+			<h4>Task</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17204">PHPBB3-17204</a>] - Update composer and node dependencies</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17280">PHPBB3-17280</a>] - Fallback to branch name on branches without ticket ID</li>
+			</ul>
+
 			<a name="v3310"></a><h3>Changes since 3.3.10</h3>
 			<h4>Bug</h4>
 			<ul>
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt
index 47621b23187..0c471e5454e 100644
--- a/phpBB/docs/CREDITS.txt
+++ b/phpBB/docs/CREDITS.txt
@@ -90,7 +90,6 @@ Smarty (c) 2001, 2002 by ispi of Lincoln, Inc, http://smarty.php.net/
 
 GPL licensed:
 phpMyAdmin (c) 2001, 2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/
-Jabber Class (c) 2006 Flyspray.org, http://www.flyspray.org/
 Chora (c) 2000-2006, The Horde Project. http://horde.org/chora/
 Horde Project (c) 2000-2006, The Horde Project. http://horde.org/
 jQuery (c) 2011, John Resig. http://jquery.com/
@@ -106,5 +105,4 @@ MIT licensed:
 Symfony2 (c) 2004-2011 Fabien Potencier, https://symfony.com/
 Cookie Consent (c) 2015 Silktide Ltd, https://cookieconsent.insites.com
 
-Emoji by:
-Twemoji (c) 2018 Twitter, Inc, https://twemoji.twitter.com/
+HiDPI smilies by rednoah: https://github.com/rednoah/phpBB-smilies
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html
deleted file mode 100644
index f8b93d55d4a..00000000000
--- a/phpBB/docs/FAQ.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<!DOCTYPE html>
-<html dir="ltr" lang="en">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.3.x frequently asked questions" />
-<title>phpBB &bull; FAQ</title>
-
-<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
-
-</head>
-
-<body id="phpbb" class="section-docs">
-
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-header">
-		<div class="headerbar">
-			<div class="inner">
-
-			<div id="doc-description">
-				<a href="../index.php" id="logo"><span class="site_logo"></span></a>
-				<h1>phpBB 3.3.x FAQ</h1>
-				<p>phpBB 3.3.x frequently asked questions</p>
-				<p style="display: none;"><a href="#start_here">Skip</a></p>
-			</div>
-
-			</div>
-		</div>
-	</div>
-
-	<a name="start_here"></a>
-
-	<div id="page-body">
-
-<!-- BEGIN DOCUMENT -->
-
-	<p class="paragraph main-description">
-		This is a very basic Frequently Asked Questions (FAQ) page which attempts to answer some of the
-		more commonly asked questions. It is by no means exhaustive and should be used in combination with
-		the 'built-in' User FAQ within phpBB3, the community forums and our IRC channel
-		(see <a href="README.html">README</a> for details).
-	</p>
-
-	<h1>FAQ</h1>
-
-	<div class="paragraph menu">
-		<div class="inner">
-
-		<div class="content">
-
-<!-- add entry about common UTF8 problems (for example wrong uploading, editing) -->
-<ul>
-	<li><a href="#install">I am finding phpBB too difficult to install. Will you do it for me?</a></li>
-	<li><a href="#legal">I am having problems with the admin at a certain board, help!</a></li>
-	<li><a href="#legal">A board has ripped off my graphics/software/etc., stop them!</a></li>
-	<li><a href="#legal">A board is dealing in warez/porn/etc., you need to prevent them doing this!</a></li>
-	<li><a href="#legal">I want to sue you because i think you host an illegal board!</a></li>
-	<li><a href="#viewonline">According to viewonline a user is doing/reading something they should not be able to!</a></li>
-	<li><a href="#mail">I keep getting Mail sending errors when I (or my users) post/send PM's/etc.!</a></li>
-	<li><a href="#mail_language">My users are complaining that emails are not in their selected language!</a></li>
-	<li><a href="#avatars">I am unable to upload avatars from my computer, regardless of the settings.</a></li>
-	<li><a href="#gallery_avatars">I just cannot get gallery avatars to appear!</a></li>
-	<li><a href="#permissions">How do I use/set permissions?</a></li>
-	<li><a href="#login_issues">I (or my users) cannot stay logged in to the forum!</a></li>
-	<li><a href="#logout_issues">My users are complaining about being logged out too quickly!</a></li>
-	<li><a href="#not_answered">My question isn't answered here!</a></li>
-	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
-</ul>
-
-		</div>
-
-		</div>
-	</div>
-
-	<hr />
-
-	<a name="install"></a><h2>I am finding phpBB too difficult to install. Will you do it for me?</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<p>Simple answer, no we will not. We are not being difficult when we say this we are actually trying to help you. phpBB has a reputation for being easy to install, that reputation is we believe well deserved. It is a simple process of unarchiving a single file, uploading the resulting directory/files to their intended location and entering some data in a web based form. The sequence of events, what to type where, etc. is covered in detail in the accompanying <a href="INSTALL.html">INSTALL.html</a> documentation. If you cannot install phpBB the chances are you will be unable to administer or update it.</p>
-
-<p>There are people, companies (unrelated to your hosting provider), etc. that will install your forum, either for free or for a payment. We do not recommend you make use of these offers. Unless the service is provided by your hosting company you will have to divulge passwords and other sensitive details. If you did not know how to use an ATM would you give a passer-by your bank card and PIN and ask them to show you what to do? No, probably not! The same applies to your hosting account details!</p>
-
-<p>We think a better solution is for you to carefully read the enclosed documentation, read through our knowledge base at <a href="https://www.phpbb.com/">www.phpbb.com</a> and if necessary ask for help on any thing you get stuck on. However, the decision is yours but please note we may not offer support if we believe you have had the board installed by a third party. In such cases you should direct your questions to that company or person/s.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="legal"></a><h2>I am having problems with the admin at a certain board, help!<br />
-A board has ripped off my graphics/software/etc., stop them!<br />
-A board is dealing in warez/porn/etc., you need to prevent them doing this!<br />
-I want to sue you because i think you host an illegal board!</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<p>We provide the software, we have absolutely nothing to do with any board that runs it (beyond phpbb.com of course!) and we also do not host any site. The GPL grants the user an unlimited right of use subject to their adherence of that license. Therefore we cannot prevent, dictate, control or otherwise limit the use of phpBB software. So please do not contact us for such matters.</p>
-
-<p>If you have a problem with a given board please take it up with them, not us. We are not and cannot be held legally responsible for any third party use of this software (much like Microsoft et al cannot be held responsible for the use of Windows in illegal activities, etc.). Additionally we do <strong>not</strong> track the use of phpBB software in any way. So please do not ask us for details on a &quot;given&quot; board we will not be able to help you. If any law firms or lawyers out there send us writs, cease and desist orders, etc. for third party website use of this software we reserve the right to charge for time wasted dealing with such issues...</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="viewonline"></a><h2>According to viewonline a user is doing/reading something they should not be able to!</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<p>No, they probably are not. phpBB uses sessions to keep track of users as they move between pages. The session information tells us who this user is. Therefore in order to determine what a user can do on a page we first need the session details. Once this data is available we can check whether the user is permitted to do whatever it is they are trying to do. This can result in it appearing as if a user is reading a topic in a forum they should not be able to access. Or perhaps viewing private messages when they are only guests, etc. In practice the user is not doing these things, they are viewing a &quot;You are not permitted to do this&quot; type message. The session data has simply been updated before we were able to determine what the user could or could not do.</p>
-
-<p>Of course this only applies where permissions have been set correctly!</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="mail"></a><h2>I keep getting Mail sending errors when I (or my users) post/send PM's/etc.!</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<p>This error will occur if phpBB cannot send mail. phpBB can send email two ways; using the PHP <code>mail()</code> function or directly via SMTP. Some hosting providers limit the <code>mail()</code> function to prevent its use in spamming, others may rename it or limit its functionality. If the <code>mail()</code> function got renamed, you are able to enter the correct name within the administration control panel. In either case you may need to make use of SMTP. This requires that you have access to such a facility, e.g. your hosting provider may provide one (perhaps requiring specific written authorisation), etc. Please see <a href="https://www.phpbb.com/">www.phpbb.com</a> for additional help on this matter.</p>
-
-<p>If you do require SMTP services please do not ask (on our forums or elsewhere) for someone to provide you with one. Open relays are now things of the past thanks to the unthinking spammers out there. Therefore you are unlikely to find someone willing to offer you (free) services.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="mail_language"></a><h2>My users are complaining that emails are not in their selected language!</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<p>You must have deleted a language pack or the language pack is incomplete. phpBB will try to send emails in the users selected language. If it cannot find a suitable email template it will switch to the boards default language.</p>
-
-<!-- additional entry about encoded emails -->
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="avatars"></a><h2>I am unable to upload avatars from my computer, regardless of the settings.</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<p>There are two possibilities here, the first is you have not created the directory you specified as the storage location for avatars, ie. as specified in the <code>Admin -&gt; General -&gt; Board Configuration -&gt; Avatar settings</code> section. If the directory does not exist uploadeable avatars are automatically disabled. You should create the required directory (ensuring it has global write access or other appropriate permissions to allow the webserver to write files to it).</p>
-
-<p>The second possibility is that your provider has disabled file_upload support. You should contact your provider and ask them if this is the case. There is not a lot you can do, there are still three other avatar settings left to choose from including uploading via an URL which will work fine.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="gallery_avatars"></a><h2>I just cannot get gallery avatars to appear!</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<p>phpBB categorises gallery avatars and it does this by reading through folders contained in the location you specified as being the gallery path. For example, if you set the gallery path to <samp>images/avatars/gallery</samp> phpBB will expect to find a series of folders within that path, e.g. <samp>images/avatars/gallery/moviestars</samp>, <samp>images/avatars/gallery/cartoons</samp>, <samp>images/avatars/gallery/misc</samp>, etc. Placing images directly in <samp>images/avatars/gallery/</samp> will result in nothing being listed in your gallery.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="permissions"></a><h2>How do I use/set permissions?</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<p>Please read the paragraph about permissions in our extensive <a href="https://www.phpbb.com/support/docs/en/3.3/ug/">online documentation</a>.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="login_issues"></a><h2>I (or my users) cannot stay logged in to the forum!</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<p>If you (or your users) are, after attempting a login, being returned to the index (or other page) without appearing to be logged in the most likely problem is incorrect cookie settings. phpBB uses cookies to store a session id and a small amount of user data. For this data to be stored correctly the cookie domain, name, path and secure settings must be correct. You can check this in <code>Admin-&gt;General-&gt;Server Configuration-&gt;Cookie Settings</code>. Typically the cookie domain can be left blank and the cookie path set to <samp>/</samp> (a single forward slash). Do <strong>not</strong> set the cookie as being secure unless your board is running over a secure sockets layer connection, ie. https://</p>
-
-<p>If you still have problems try setting the cookie domain to your full domain name, e.g. <samp>www.mysystem.tld</samp>, <samp>www.something.mydomain.tld</samp>. You <strong>must</strong> ensure the domain name contains at least two dots or browsers will be unlikely to recognise the cookie, e.g. <samp>.mydomain.com</samp>, <samp>mydomain.com</samp>. Do <strong>not</strong> add http:// or anything else to the domain name!</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="logout_issues"></a><h2>My users are complaining about being logged out too quickly!</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<p>You can increase the default length of sessions (ie. how long before a users session is considered 'dead') in <code>Admin-&gt;General-&gt;Server Configuration-&gt;Load Settings</code>. Set it to whatever value your users feel comfortable with, remember that security issues may affect your decision (ie. having too long a session may allow non-users to abuse your board should a user forget to logout or otherwise leave a current session on a public workstation).</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="not_answered"></a><h2>My question isn't answered here!</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<p>Please read our <a href="https://www.phpbb.com/support/docs/en/3.3/ug/">extensive user documentation</a> first, it may just explain what you want to know.</p>
-
-<p>Feel free to search our community forum for the information you require. <strong>PLEASE DO NOT</strong> post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:</p>
-
-<p><a href="https://www.phpbb.com">www.phpbb.com</a></p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="disclaimer"></a><h2>Copyright and disclaimer</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-	<p>phpBB is free software, released under the terms of the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License, version 2 (GPL-2.0)</a>. Copyright © <a href="https://www.phpbb.com">phpBB Limited</a>. For full copyright and license information, please see the docs/CREDITS.txt file.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-<!-- END DOCUMENT -->
-
-	<div id="page-footer">
-		<div class="version">&nbsp;</div>
-	</div>
-</div></div>
-
-<div>
-	<a id="bottom" accesskey="z"></a>
-</div>
-
-</body>
-</html>
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index b175b0799cd..58ebb0ee492 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.3.x Installation, updating and conversion information" />
+<meta name="description" content="phpBB Installation, updating and conversion information" />
 <title>phpBB &bull; Install</title>
 
 <link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@@ -21,8 +21,8 @@
 
 			<div id="doc-description">
 				<a href="../index.php" id="logo"><span class="site_logo"></span></a>
-				<h1>phpBB 3.3.x Install</h1>
-				<p>phpBB 3.3.x Installation, updating and conversion information</p>
+				<h1>phpBB Install</h1>
+				<p>phpBB Installation, updating and conversion information</p>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>
 
@@ -109,7 +109,7 @@ <h1>Install</h1>
 		<li>Change the permissions on config.php to be writable by all (666 or -rw-rw-rw- within your FTP Client)</li>
 		<li>Change the permissions on the following directories to be writable by all (777 or -rwxrwxrwx within your FTP Client):<br />
 			<code>store/</code>, <code>cache/</code>, <code>files/</code> and <code>images/avatars/upload/</code>.</li>
-		<li>Point your web browser to the location where you uploaded the phpBB files with the addition of <code>install/app.php</code> or simply <code>install/</code>, e.g. <code>http://www.example.com/phpBB3/install/app.php</code>, <code>http://www.example.com/forum/install/</code>.</li>
+		<li>Point your web browser to the location where you uploaded the phpBB files with the addition of <code>install/index.php</code> or simply <code>install/</code>, e.g. <code>http://www.example.com/phpBB/install/index.php</code>, <code>http://www.example.com/forum/install/</code>.</li>
 		<li>Click the <strong><em>INSTALL</em></strong> tab, follow the steps and fill out all the requested information.</li>
 		<li>Change the permissions on config.php to be writable only by yourself (644 or -rw-r--r-- within your FTP Client)</li>
 		<li>phpBB should now be available, please <strong>MAKE SURE</strong> you read at least <a href="#postinstall">Section 6</a> below for important, security related post-installation instructions, and also take note of <a href="#anti_spam">Section 7</a> regarding anti-spam measures.</li>
@@ -133,25 +133,24 @@ <h1>Install</h1>
 
 		<div class="content">
 
-	<p>phpBB 3.3.x has a few requirements which must be met before you are able to install and use it.</p>
+	<p>phpBB 4.0.x has a few requirements which must be met before you are able to install and use it.</p>
 
 	<ul>
 		<li>A webserver or web hosting account running on any major Operating System with support for PHP</li>
 		<li>A SQL database system, <strong>one of</strong>:
 		<ul>
-			<li>MySQL 4.1.3 or above (MySQLi required)</li>
-			<li>MariaDB 5.1 or above</li>
-			<li>PostgreSQL 9.4+</li>
-			<li>SQLite 3.6.15+</li>
-			<li>MS SQL Server 2000 or above (via ODBC or the native adapter)</li>
-			<li>Oracle</li>
+			<li>MySQL 8.0 or above (MySQLi required)</li>
+			<li>MariaDB 10.2.7 or above</li>
+			<li>PostgreSQL 9.5 or above</li>
+			<li>SQLite 3.8.3 or above</li>
+			<li>MS SQL Server 2012 or above</li>
+			<li>Oracle 12.1.0.2 or above</li>
 		</ul>
 		</li>
-		<li><strong>PHP 8.1.0+</strong> up to and including <strong>PHP 8.2</strong> with support for the database you intend to use.</li>
+		<li><strong>PHP 8.2.0+</strong> up to and including <strong>PHP 8.5</strong> with support for the database you intend to use.</li>
 		<li>The following PHP modules are required:
 		<ul>
 			<li>json</li>
-			<li>mbstring</li>
 			<li>XML support</li>
 		</ul>
 		</li>
@@ -191,7 +190,7 @@ <h1>Install</h1>
 
 	<p>phpBB comes supplied with British English as its standard language. However, a number of separate packs for different languages are available. If you are not a native English speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can, of course, change this default at a later stage). For more details on language packs, where to obtain them and how to install them please see the <a href="README.html#i18n">README</a>.</p>
 
-	<p>Once all the files have been uploaded to your site, you should point your browser at this location with the addition of <code>/install/</code>. For example, if your domain name is <code>www.example.com</code> and you placed the phpBB files in the directory <code>/phpBB3</code> off your web root you would enter <code>http://www.example.com/phpBB3/install/</code> or (alternatively) <code>http://www.example.com/phpBB3/install/app.php</code> into your browser. When you have done this, you should see the <strong><em>phpBB Introduction</em></strong> screen appear.</p>
+	<p>Once all the files have been uploaded to your site, you should point your browser at this location with the addition of <code>/install/</code>. For example, if your domain name is <code>www.example.com</code> and you placed the phpBB files in the directory <code>/phpBB</code> off your web root you would enter <code>http://www.example.com/phpBB/install/</code> or (alternatively) <code>http://www.example.com/phpBB/install/index.php</code> into your browser. When you have done this, you should see the <strong><em>phpBB Introduction</em></strong> screen appear.</p>
 
 	<h4>Introduction:</h4>
 
@@ -273,9 +272,9 @@ <h4>Advanced settings</h4>
 
 	<p>First, you should make a copy of your existing <code>config.php</code> file; keep it in a safe place! Next, delete all the existing phpBB files, you should leave your <code>files/</code>, <code>images/</code> and <code>ext/</code> directories in place, otherwise you will lose your file attachments, uploaded images and get errors due to missing extension files. You can leave alternative styles in place too. With this complete, you can upload the new phpBB files (see <a href="#install">New installation</a> for details if necessary). Once complete, copy back your saved <code>config.php</code>, replacing the new one. Another method is to just <strong>replace</strong> the existing files with the files from the full package - though make sure you do <strong>not</strong> overwrite your config.php file.</p>
 
-	<p>You should now got to <code>/install/app.php/update</code> which will display a warning: <strong>No valid update directory was found, please make sure you uploaded the relevant files</strong>. Beneath that warning you will see a radio button <em>Update database only</em>, just click <strong>Submit</strong>. Depending on your previous version this will make a number of database changes. You may receive <em>FAILURES</em> during this procedure. They should not be a cause for concern unless you see an actual <em>ERROR</em>, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
+	<p>You should now got to <code>/install/index.php/update</code> which will display a warning: <strong>No valid update directory was found, please make sure you uploaded the relevant files</strong>. Beneath that warning you will see a radio button <em>Update database only</em>, just click <strong>Submit</strong>. Depending on your previous version this will make a number of database changes. You may receive <em>FAILURES</em> during this procedure. They should not be a cause for concern unless you see an actual <em>ERROR</em>, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
 
-	<p>Once <code>/install/app.php/update</code> has completed, it displays the success message: <strong>The database update was successful</strong>. You may proceed to the Administration Control Panel and then remove the install directory as advised.</p>
+	<p>Once <code>/install/index.php/update</code> has completed, it displays the success message: <strong>The database update was successful</strong>. You may proceed to the Administration Control Panel and then remove the install directory as advised.</p>
 
 <a name="update_files"></a><h3>4.ii. Changed files</h3>
 
@@ -285,7 +284,7 @@ <h4>Advanced settings</h4>
 
 	<p>The directory structure has been preserved, enabling you (if you wish) to simply upload the uncompressed contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any modifications (MODs) these files will overwrite the originals, possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.</p>
 
-	<p>As for the other update procedures, you should go to <code>/install/app.php/update</code>, select "Update database only" and submit the page after you have finished updating the files. This will update your database schema and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
+	<p>As for the other update procedures, you should go to <code>/install/index.php/update</code>, select "Update database only" and submit the page after you have finished updating the files. This will update your database schema and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
 
 <a name="update_patch"></a><h3>4.iii. Patch file</h3>
 
@@ -297,7 +296,7 @@ <h4>Advanced settings</h4>
 
 	<p>If you do get failures, you should look at using the <a href="#update_files">Changed Files</a> package to replace the files which failed to patch. Please note that you will need to manually re-add any MODs to these particular files. Alternatively, if you know how, you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.</p>
 
-	<p>You should, of course, delete the patch file (or files) after use. As for the other update procedures, you should navigate to <code>/install/app.php/update</code>, select "Update database only" and submit the page after you have finished updating the files. This will update your database schema and data (if appropriate) and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
+	<p>You should, of course, delete the patch file (or files) after use. As for the other update procedures, you should navigate to <code>/install/index.php/update</code>, select "Update database only" and submit the page after you have finished updating the files. This will update your database schema and data (if appropriate) and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
 
 <a name="update_advanced"></a><h3>4.iv. Advanced update package (Expert users)</h3>
 
@@ -313,7 +312,7 @@ <h4>Advanced settings</h4>
 		<li>Go to the <a href="https://www.phpbb.com/downloads/">downloads page</a> and download the latest update package listed there, matching your current version.</li>
 		<li>Upload the uncompressed archive contents to your phpBB installation - only the <code>install/</code> and <code>vendor/</code> folders are required. Upload these folders in their entirety, retaining the file structure.</li>
 		<li>After the install folder is present, phpBB will go offline automatically.</li>
-		<li>Point your browser to the install directory, for example <code>http://www.example.com/phpBB3/install/</code></li>
+		<li>Point your browser to the install directory, for example <code>http://www.example.com/phpBB/install/</code></li>
 		<li>Choose the "Update" Tab and follow the instructions</li>
 	</ul>
 
@@ -357,7 +356,7 @@ <h4>Advanced settings</h4>
 				</ul></li>
 
 				<li>Upload the contents of the 3.3.x Full Package (<strong>except</strong> for config.php) into your forum's directory. Make sure the root level .htaccess file is included in the upload.</li>
-				<li>Browse to <code>/install/app.php/update</code></li>
+				<li>Browse to <code>/install/index.php/update</code></li>
 				<li>Read the notice <em>Update database only</em> and press <strong>Submit</strong></li>
 				<li>Delete the <code>install/</code> directory</li>
 			</ol>
@@ -407,7 +406,7 @@ <h4>Advanced settings</h4>
 
 	<p>After verifying the settings in the ACP, you can delete the install directory to enable the board. The board will stay disabled until you do so.</p>
 
-	<p>Once you are pleased with your new installation, you may want to give it the name of your old installation, changing the directory name. With phpBB3 this is possible without any problems, but you may still want to check your cookie settings within the administration panel; in case your cookie path needs to be adjusted prior to renaming.</p>
+	<p>Once you are pleased with your new installation, you may want to give it the name of your old installation, changing the directory name. With phpBB this is possible without any problems, but you may still want to check your cookie settings within the administration panel; in case your cookie path needs to be adjusted prior to renaming.</p>
 
 <a name="convprob"></a><h3>5.iv. Common conversion problems</h3>
 
@@ -417,7 +416,7 @@ <h4>Advanced settings</h4>
 
 	<p><strong>Password conversion</strong> Due to the utf-8 based handling of passwords in phpBB 3.x, it is not always possible to transfer all passwords. For passwords "lost in translation" the easiest workaround is to use the <em>I forgot my password</em> link on the login page.</p>
 
-	<p><strong>Path to your former board</strong> The convertor expects the relative path to your old board's files. So, for instance, if the old board is located at <code>http://www.yourdomain.com/forum</code> and the phpBB 3.x installation is located at <code>http://www.yourdomain.com/phpBB3</code>, then the correct value would be <code>../forum</code>. Note that the webserver user must be able to access the source installation's files.</p>
+	<p><strong>Path to your former board</strong> The convertor expects the relative path to your old board's files. So, for instance, if the old board is located at <code>http://www.yourdomain.com/forum</code> and the phpBB installation is located at <code>http://www.yourdomain.com/phpBB</code>, then the correct value would be <code>../forum</code>. Note that the webserver user must be able to access the source installation's files.</p>
 
 	<p><strong>Missing images</strong> If your default board language's language pack does not include all images, then some images might be missing in your installation. Always use a complete language pack as default language.</p>
 
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index 04dcad8e283..7a5644f764e 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.3.x Readme" />
+<meta name="description" content="phpBB Readme" />
 <title>phpBB &bull; Readme</title>
 
 <link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@@ -21,7 +21,7 @@
 
 			<div id="doc-description">
 				<a href="../index.php" id="logo"><span class="site_logo"></span></a>
-				<h1>phpBB 3.3.x Readme</h1>
+				<h1>phpBB Readme</h1>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>
 
@@ -106,7 +106,6 @@ <h1>Readme</h1>
 		<li>Updates from phpBB 3.0 RC1, 3.1 RC1 and 3.2 RC1 to the latest version</li>
 		<li>Note: if using the <em>Advanced Update Package</em>, updates are supported from phpBB 3.0.2 onward. To update a pre-3.0.2 installation, first update to 3.0.2 and then update to the current version.</li>
 		<li>Conversions from phpBB 2.0.x to the latest version</li>
-		<li>New installations of phpBB 3.2.x - only the latest released version</li>
 		<li>New installations of phpBB 3.3.x - only the latest released version</li>
 	</ul>
 
@@ -146,7 +145,7 @@ <h1>Readme</h1>
 
 	<p>For more information about styles, please see: <a href="https://www.phpbb.com/styles/">https://www.phpbb.com/styles/</a></p>
 
-	<p><strong>Please note</strong> that 3rd party styles downloaded for versions of phpBB2 will <strong>not</strong> work in phpBB3. It is also important to ensure that the style is updated to match the current version of the phpBB software you are using.</p>
+	<p><strong>Please note</strong> that 3rd party styles downloaded for older versions of phpBB might <strong>not</strong> work in the latest phpBB. It is also important to ensure that the style is updated to match the current version of the phpBB software you are using.</p>
 
 	<p>Once you have downloaded a style, the usual next step is to unarchive (or upload the unarchived contents of) the package into your <code>styles/</code> directory. You then need to visit <code>Administration Control Panel -&gt; Customise tab -&gt; Style management -&gt; Install Styles</code> where you should see the new style available. Click &quot;Install style&quot; to install the style.</p>
 
@@ -250,7 +249,7 @@ <h1>Readme</h1>
 
 	<p>The phpBB developers use a bug tracking system to store, list and manage all reported bugs, it can be found at the location listed below. Please <strong>DO NOT</strong> post bug reports to our forums. In addition please <strong>DO NOT</strong> use the bug tracker for support requests. Posting such a request will only see you directed to the support forums (while taking time away from working on real bugs).</p>
 
-	<p><a href="http://tracker.phpbb.com/browse/PHPBB3">http://tracker.phpbb.com/browse/PHPBB3</a></p>
+	<p><a href="http://tracker.phpbb.com/browse/PHPBB">http://tracker.phpbb.com/browse/PHPBB</a></p>
 
 	<p>While we very much appreciate receiving bug reports (the more reports the more stable phpBB will be) we ask you carry out a few steps before adding new entries:</p>
 
@@ -264,9 +263,9 @@ <h1>Readme</h1>
 	<p>If you do post a new bug (i.e. one that isn't already listed in the bug tracker) first make sure that you have logged in (your username and password are the same as for the community forums) then please include the following details:</p>
 
 	<ul>
-		<li>Your server type/version, e.g. Apache 2.2.3, IIS 7, Sambar, etc.</li>
-		<li>PHP version and mode of operation, e.g. PHP 8.1.0 as a module, PHP 8.2.3 running as CGI, etc.</li>
-		<li>DB type/version, e.g. MySQL 5.0.77, PostgreSQL 9.0.6, MSSQL Server 2000 (via ODBC), etc.</li>
+		<li>Your server type/version, e.g. Apache 2.4.65, IIS 10, Sambar, etc.</li>
+		<li>PHP version and mode of operation, e.g. PHP 8.2.0 as a module, PHP 8.2.3 running as CGI, etc.</li>
+		<li>DB type/version, e.g. MySQL 8.0.44, PostgreSQL 9.5.6, MSSQL Server 2012 (via ODBC), etc.</li>
 	</ul>
 
 	<p>The relevant database type/version is listed within the administration control panel.</p>
@@ -323,11 +322,11 @@ <h1>Readme</h1>
 
 		<div class="content">
 
-	<p>phpBB 4.0.x takes advantage of new features added in PHP 8.1. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 8.1.0 and the maximum supported version is the latest stable version of PHP.</p>
+	<p>phpBB 4.0.x takes advantage of new features added in PHP 8.2. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 8.2.0 and the maximum supported version is the latest stable version of PHP.</p>
 
 	<p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p>
 
-	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 4.1.3, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 8.1.x to 8.2.x and 8.3.x.</p>
+	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 8.0 to 9.4, MariaDB 10.2 to 10.11, PostgreSQL 9.5 to 15, Oracle 12 and SQLite 3. Versions of PHP used range from 8.2.x to 8.3.x, 8.4.x and 8.5.x.</p>
 
 <a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3>
 
diff --git a/phpBB/docs/assets/css/stylesheet.css b/phpBB/docs/assets/css/stylesheet.css
index b240a90d586..e4c743a9587 100644
--- a/phpBB/docs/assets/css/stylesheet.css
+++ b/phpBB/docs/assets/css/stylesheet.css
@@ -1,5 +1,5 @@
 /*
-	The original "prosilver" theme for phpBB3
+	The original "prosilver" theme for phpBB
 	Created by subBlue design :: http://www.subBlue.com
 */
 
diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html
deleted file mode 100644
index c011fdc27f6..00000000000
--- a/phpBB/docs/auth_api.html
+++ /dev/null
@@ -1,293 +0,0 @@
-<!DOCTYPE html>
-<html dir="ltr" lang="en">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="keywords" content="" />
-<meta name="description" content="This is an explanation of how to use the phpBB auth/acl API" />
-<title>phpBB3 &bull; Auth API</title>
-
-<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
-
-</head>
-
-<body id="phpbb" class="section-docs">
-
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-header">
-		<div class="headerbar">
-			<div class="inner">
-
-			<div id="doc-description">
-				<a href="../index.php" id="logo"><span class="site_logo"></span></a>
-				<h1>Auth API</h1>
-				<p>This is an explanation of how to use the phpBB auth/acl API</p>
-				<p style="display: none;"><a href="#start_here">Skip</a></p>
-			</div>
-
-			</div>
-		</div>
-	</div>
-
-	<a name="start_here"></a>
-
-	<div id="page-body">
-
-<!-- BEGIN DOCUMENT -->
-
-	<p class="paragraph main-description">This is an explanation of how to use the phpBB auth/acl API.</p>
-
-	<h1>Auth API</h1>
-
-	<div class="paragraph menu">
-		<div class="inner">
-
-		<div class="content">
-
-<ol>
-	<li><a href="#intro">Introduction</a></li>
-	<li><a href="#methods">Methods</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#acl">acl</a></li>
-		<li><a href="#acl_get">acl_get</a></li>
-		<li><a href="#acl_gets">acl_gets</a></li>
-		<li><a href="#acl_getf">acl_getf</a></li>
-		<li><a href="#acl_getf_global">acl_getf_global</a></li>
-		<li><a href="#acl_cache">acl_cache</a></li>
-		<li><a href="#acl_clear_prefetch">acl_clear_prefetch</a></li>
-		<li><a href="#acl_get_list">acl_get_list</a></li>
-		<li><a href="#misc">Miscellaneous</a></li>
-	</ol>
-	</li>
-	<li><a href="#admin_related">Admin related functions</a></li>
-	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
-</ol>
-
-		</div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="intro"></a><h2>1. Introduction</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-	<h4>What is it?</h4>
-
-	<p>The <code>auth</code> class contains methods related to authorisation users to access various board functions, e.g. posting, viewing, replying, logging in (and out), etc. If you need to check whether a user can carry out a task or handle user login/logouts this class is required.</p>
-
-	<h4>Initialisation</h4>
-
-	<p>To use any methods contained with the <code>auth</code> class it first needs to be instantiated. This is best achieved early in the execution of the script in the following manner:</p>
-
-	<div class="codebox"><pre>
-$auth = new phpbb\auth\auth();</pre>
-	</div>
-
-	<p>Once an instance of the class has been created you are free to call the various methods it contains. Please note that should you wish to use the <code>auth_admin</code> methods you will need to instantiate this separately but in the same way.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="methods"></a><h2>2. Methods</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-	<p>Following are the methods you are able to use.</p>
-
-	<a name="acl"></a><h3>2.i. acl</h3>
-
-	<p>The <code>acl</code> method is the initialisation routine for all the acl functions. If you intend calling any acl method you must first call this. The method takes as its one and only required parameter an associative array containing user information as stored in the database. This array must contain at least the following information; user_id, user_permissions and user_type. It is called in the following way:</p>
-
-	<div class="codebox"><pre>
-$auth-&gt;acl(<code>userdata</code>);</pre>
-	</div>
-
-	<p>Where userdata is the array containing the aforementioned data.</p>
-
-	<a name="acl_get"></a><h3>2.ii. acl_get</h3>
-
-	<p>This method is the primary way of determining what a user can and cannot do for a given option globally or in a given forum. The method should be called in the following way:</p>
-
-	<div class="codebox"><pre>
-$result = $auth-&gt;acl_get(<code>option</code>[, <code>forum</code>]);</pre>
-	</div>
-
-	<p>Where option is a string representing the required option, e.g. 'f_list', 'm_edit', 'a_adduser', etc. By adding a ! in front of the option, e.g. '!f_list' the result of this method will be negated. The optional forum term is the integer forum_id.</p>
-
-	<p>The method returns a positive integer when the user is allowed to carry out the option and a zero if denied or the other way around if the option is prefixed with an exclamation mark.</p>
-
-	<p>If you specify a forum and there is also a global setting for the specified option then this method will return a positive integer if one of them evaluates to a positive integer. An example would be the m_approve option which can be set per forum but also globally. If a user has the global option he will automatically have m_approve in every forum.</p>
-
-	<p>There are some special options or <em>flags</em> which are used as prefixes for other options, e.g. 'f_' or 'm_'. These flags will automatically be set to a positive integer if the user has one or more permissions with the given prefix. A local setting will result in the flag being set only locally (so it will require a forum id to retrieve). If a user has one or more global permissions with the prefix acl_get will return a positive integer regardless of the forum id.</p>
-
-	<a name="acl_gets"></a><h3>2.iii. acl_gets</h3>
-
-	<p>This method is funtionally similar to <code>acl_get</code> in that it returns information on whether a user can or cannot carry out a given task. The difference here is the ability to test several different options in one go. This may be useful for testing whether a user is a moderator or an admin in one call. Rather than having to call and check <code>acl_get</code> twice.</p>
-
-	<p>The method should be called thus:</p>
-
-	<div class="codebox"><pre>
-$result = $auth-&gt;acl_gets(<code>option1</code>[, <code>option2</code>, ..., <code>optionN</code>, <code>forum</code>]);</pre>
-	</div>
-
-	<p>As with the <code>acl_get</code> method the options are strings representing the required permissions to check. The forum again is an integer representing a given forum_id.</p>
-
-	<p>The method will return a positive integer if <code>acl_get</code> for one of the options evaluates to a positive integer (combines permissions with OR).</p>
-
-	<a name="acl_getf"></a><h3>2.iv. acl_getf</h3>
-
-	<p>This method is used to find out in which forums a user is allowed to carry out an operation or to find out in which forums he is not allowed to carry out an operation. The method should be called in the following way:</p>
-
-	<div class="codebox"><pre>
-$result = $auth-&gt;acl_getf(<code>option</code>[, <code>clean</code>]);</pre>
-	</div>
-
-	<p>Just like in the <code>acl_get</code> method the option is a string specifying the permission which has to be checked (negation using ! is allowed). The second parameter is a boolean. If it is set to false this method returns all forums with either zero or a positive integer. If it is set to true only those forums with a positive integer as the result will be returned.</p>
-
-	<p>The method returns an associative array of the form:</p>
-
-	<div class="codebox"><pre>
-array(<em>forum_id1</em> =&gt; array(<em>option</em> =&gt; <em>integer</em>), <em>forum_id2</em> =&gt; ...)</pre>
-	</div>
-
-	<p>Where option is the option passed to the method and integer is either zero or a positive integer and the same <code>acl_get(option, forum_id)</code> would return.</p>
-
-	<a name="acl_getf_global"></a><h3>2.v. acl_getf_global</h3>
-
-	<p>This method is used to find out whether a user has a permission in at least one forum or globally. This method is similar to checking whether <code>acl_getf(option, true)</code> returned one or more forums but it's faster. It should be called in the following way:</p>
-
-	<div class="codebox"><pre>
-$result = $auth-&gt;acl_getf_global(<code>option</code>)</pre>
-	</div>
-
-	<p>As with the previous methods option is a string specifying the permission which has to be checked.</p>
-
-	<p>This method returns either zero or a positive integer.</p>
-
-	<a name="acl_cache"></a><h3>2.vi. acl_cache</h3>
-
-	<p>This should be considered a private method and not be called externally. It handles the generation of the user_permissions data from the basic user and group authorisation data. When necessary this method is called automatically by <code>acl</code>.</p>
-
-	<a name="acl_clear_prefetch"></a><h3>2.vii. acl_clear_prefetch</h3>
-
-	<p>This method clears the user_permissions column in the users table for the given user.  If the user ID passed is zero, the permissions cache is cleared for all users.  This method should be called whenever permissions are set.</p>
-
-	<div class="codebox"><pre>
-// clear stored permissions for user 2
-$user_id = 2;
-$auth->acl_clear_prefetch($user_id);
-</pre></div>
-
-	<p>This method returns null.</p>
-
-	<a name="acl_get_list"></a><h3>2.viii. acl_get_list</h3>
-
-	<p>This method returns an an array describing which users have permissions in given fora.  The resultant array contains an entry for permission that every user has in every forum when no arguments are passed.</p>
-
-	<div class="codebox"><pre>
-$user_id = array(2, 53);
-$permissions = array('f_list', 'f_read');
-$forum_id = array(1, 2, 3);
-$result = $auth-&gt;acl_get_list($user_id, $permissions, $forum_id);
-</pre></div>
-
-	<p>The parameters may be of the following legal types:</p>
-		<ul>
-			<li><strong>$user_id</strong>: <code>false</code>, int, array(int, int, int, ...)</li>
-			<li><strong>$permissions</strong>: <code>false</code>, string, array(string, string, ...)</li>
-			<li><strong>$forum_id</strong>: <code>false</code>, int, array(int, int, int, ...)</li>
-		</ul>
-
-	<a name="misc"></a><h3>2.ix. Miscellaneous</h3>
-
-	<p>There are other methods defined in the auth class which serve mostly as private methods, but are available for use if needed.  Each of them is used to pull data directly from the database tables.  They are:</p>
-		<ul>
-			<li><pre>function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false)</pre></li>
-			<li><pre>function acl_user_raw_data($user_id = false, $opts = false, $forum_id = false)</pre></li>
-			<li><pre>function acl_raw_data_single_user($user_id)</pre></li>
-			<li><pre>function acl_raw_data($user_id = false, $opts = false, $forum_id = false)</pre></li>
-			<li><pre>function acl_role_data($user_type, $role_type, $ug_id = false, $forum_id = false)</pre></li>
-		</ul>
-
-	<p>Of these, <code>acl_raw_data</code> is the most general, but the others will be faster if you need a smaller amount of data.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="admin_related"></a><h2>3. Admin related functions</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-	<p>A number of additional methods are available related to <code>auth</code>. These handle more basic functions such as adding user and group permissions, new options and clearing the user cache. These methods are contained within a separate class, <code>auth_admin</code>. This can be found in <code>includes/acp/auth.php</code>.</p>
-
-	<p>To use any methods this class contains it first needs to be instantiated separately from <code>auth</code>. This is achieved in the same way as <code>auth</code>:</p>
-
-	<div class="codebox"><pre>
-$auth_admin = new auth_admin();</pre>
-	</div>
-
-	<p>This instance gives you access to both the methods of this specific class and that of <code>auth</code>.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="disclaimer"></a><h2>4. Copyright and disclaimer</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-	<p>phpBB is free software, released under the terms of the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License, version 2 (GPL-2.0)</a>. Copyright © <a href="https://www.phpbb.com">phpBB Limited</a>. For full copyright and license information, please see the docs/CREDITS.txt file.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-<!-- END DOCUMENT -->
-
-	<div id="page-footer">
-		<div class="version">&nbsp;</div>
-	</div>
-</div></div>
-
-<div>
-	<a id="bottom" accesskey="z"></a>
-</div>
-
-</body>
-</html>
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
deleted file mode 100644
index a5b35281898..00000000000
--- a/phpBB/docs/coding-guidelines.html
+++ /dev/null
@@ -1,2555 +0,0 @@
-<!DOCTYPE html>
-<html dir="ltr" lang="en">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="keywords" content="" />
-<meta name="description" content="Proteus coding guidelines document" />
-<title>phpBB3 &bull; Coding Guidelines</title>
-
-<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
-
-</head>
-
-<body id="phpbb" class="section-docs">
-
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-header">
-		<div class="headerbar">
-			<div class="inner">
-
-			<div id="doc-description">
-				<a href="../index.php" id="logo"><span class="site_logo"></span></a>
-				<h1>Coding Guidelines</h1>
-				<p>Proteus coding guidelines document</p>
-				<p style="display: none;"><a href="#start_here">Skip</a></p>
-			</div>
-
-			</div>
-		</div>
-	</div>
-
-	<a name="start_here"></a>
-
-	<div id="page-body">
-
-<!-- BEGIN DOCUMENT -->
-
-<p class="paragraph main-description">
-	These are the phpBB Coding Guidelines for Proteus, all attempts should be made to follow them as closely as possible.
-</p>
-
-<h1>Coding Guidelines</h1>
-
-	<div class="paragraph menu">
-		<div class="inner">
-
-		<div class="content">
-
-<ol>
-	<li><a href="#defaults">Defaults</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#editorsettings">Editor Settings</a></li>
-		<li><a href="#fileheader">File Header</a></li>
-		<li><a href="#locations">File Locations</a></li>
-		<li><a href="#constants">Special Constants</a></li>
-	</ol>
-	</li>
-	<li><a href="#code">Code Layout/Guidelines</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#namingvars">Variable/Function/Class Naming</a></li>
-		<li><a href="#codelayout">Code Layout</a></li>
-		<li><a href="#sql">SQL/SQL Layout</a></li>
-		<li><a href="#optimizing">Optimizations</a></li>
-		<li><a href="#general">General Guidelines</a></li>
-		<li><a href="#phprestrictions">Restrictions on the Use of PHP</a></li>
-	</ol>
-	</li>
-	<li><a href="#styling">Styling</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#cfgfiles">Style Config Files</a></li>
-		<li><a href="#genstyling">General Styling Rules</a></li>
-	</ol></li>
-	<li><a href="#templating">Templating</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#templates">General Templating</a></li>
-		<li><a href="#stylestree">Styles Tree</a></li>
-		<li><a href="#template-events">Template Events</a></li>
-	</ol></li>
-	<li><a href="#charsets">Character Sets and Encodings</a></li>
-	<li><a href="#translation">Translation (<abbr title="Internationalisation">i18n</abbr>/<abbr title="Localisation">L10n</abbr>) Guidelines</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#standardisation">Standardisation</a></li>
-		<li><a href="#otherconsiderations">Other considerations</a></li>
-		<li><a href="#placeholders">Working with placeholders</a></li>
-		<li><a href="#usingplurals">Using plurals</a></li>
-		<li><a href="#writingstyle">Writing Style</a></li>
-	</ol>
-	</li>
-	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
-</ol>
-
-		</div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="defaults"></a><h2>1. Defaults</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-<a name="editorsettings"></a><h3>1.i. Editor Settings</h3>
-
-	<h4>Tabs vs Spaces:</h4>
-	<p>In order to make this as simple as possible, we will be using tabs, not spaces. We enforce 4 (four) spaces for one tab - therefore you need to set your tab width within your editor to 4 spaces. Make sure that when you <strong>save</strong> the file, it's saving tabs and not spaces. This way, we can each have the code be displayed the way we like it, without breaking the layout of the actual files.</p>
-	<p>Tabs in front of lines are no problem, but having them within the text can be a problem if you do not set it to the amount of spaces every one of us uses. Here is a short example of how it should look like:</p>
-
-	<div class="codebox"><pre>
-{TAB}$mode{TAB}{TAB}= $request->variable('mode', '');
-{TAB}$search_id{TAB}= $request->variable('search_id', '');</pre>
-	</div>
-
-	<p>If entered with tabs (replace the {TAB}) both equal signs need to be on the same column.</p>
-
-	<h3>Linefeeds:</h3>
-	<p>Ensure that your editor is saving files in the UNIX (LF) line ending format. This means that lines are terminated with a newline, not with Windows Line endings (CR/LF combo) as they are on Win32 or Classic Mac (CR) Line endings. Any decent editor should be able to do this, but it might not always be the default setting. Know your editor. If you want advice for an editor for your Operating System, just ask one of the developers. Some of them do their editing on Win32.</p>
-
-	<a name="fileheader"></a><h3>1.ii. File Layout</h3>
-
-	<h4>Standard header for new files:</h4>
-	<p>This template of the header must be included at the start of all phpBB files: </p>
-
-	<div class="codebox"><pre>
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited &lt;https://www.phpbb.com&gt;
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/</pre>
-	</div>
-
-	<p>Please see the <a href="#locations">File Locations section</a> for the correct package name.</p>
-
-	<h4>PHP closing tags</h4>
-
-	<p>A file containg only PHP code should not end with the optional PHP closing tag <strong>?&gt;</strong> to avoid issues with whitespace following it.</p>
-
-	<h4>Newline at end of file</h4>
-
-	<p>All files should end in a newline so the last line does not appear as modified in diffs, when a line is appended to the file.</p>
-
-	<h4>Files containing inline code:</h4>
-
-	<p>For those files you have to put an empty comment directly after the header to prevent the documentor assigning the header to the first code element found.</p>
-
-	<div class="codebox"><pre>
-/**
-* {HEADER}
-*/
-
-/**
-*/
-{CODE}</pre>
-	</div>
-
-	<h4>Files containing only functions:</h4>
-
-	<p>Do not forget to comment the functions (especially the first function following the header). Each function should have at least a comment of what this function does. For more complex functions it is recommended to document the parameters too.</p>
-
-	<h4>Files containing only classes:</h4>
-
-	<p>Do not forget to comment the class. Classes need a separate @package definition, it is the same as the header package name. Apart from this special case the above statement for files containing only functions needs to be applied to classes and it's methods too.</p>
-
-	<h4>Code following the header but only functions/classes file:</h4>
-
-	<p>If this case is true, the best method to avoid documentation confusions is adding an ignore command, for example:</p>
-
-	<div class="codebox"><pre>
-/**
-* {HEADER}
-*/
-
-/**
-* @ignore
-*/
-Small code snipped, mostly one or two defines or an if statement
-
-/**
-* {DOCUMENTATION}
-*/
-class ...</pre>
-	</div>
-
-	<a name="locations"></a><h3>1.iii. File Locations</h3>
-
-	<p>Functions used by more than one page should be placed in functions.php, functions specific to one page should be placed on that page (at the bottom) or within the relevant sections functions file. Some files in <code>/includes</code> are holding functions responsible for special sections, for example uploading files, displaying &quot;things&quot;, user related functions and so forth.</p>
-
-	<p>The following packages are defined, and related new features/functions should be placed within the mentioned files/locations, as well as specifying the correct package name. The package names are bold within this list:</p>
-
-	<ul>
-		<li><strong>phpBB3</strong><br />Core files and all files not assigned to a separate package</li>
-		<li><strong>acm</strong><br /><code>/phpbb/cache</code><br />Cache System</li>
-		<li><strong>acp</strong><br /><code>/adm</code>, <code>/includes/acp</code>, <code>/includes/functions_admin.php</code><br />Administration Control Panel</li>
-		<li><strong>dbal</strong><br /><code>/phpbb/db</code>, <code>/includes/db</code><br />Database Abstraction Layer.
-			<ul>
-				<li><code>/phpbb/db/driver/</code><br />Database Abstraction Layer classes</li>
-				<li><code>/phpbb/db/migration/</code><br />Migrations are used for updating the database from one release to another</li>
-			</ul>
-		</li>
-		<li><strong>diff</strong><br /><code>/includes/diff</code><br />Diff Engine</li>
-		<li><strong>docs</strong><br /><code>/docs</code><br />phpBB Documentation</li>
-		<li><strong>images</strong><br /><code>/images</code><br />All global images not connected to styles</li>
-		<li><strong>install</strong><br /><code>/install</code><br />Installation System</li>
-		<li><strong>language</strong><br /><code>/language</code><br />All language files</li>
-		<li><strong>login</strong><br /><code>/phpbb/auth</code><br />Login Authentication Plugins</li>
-		<li><strong>VC</strong><br /><code>/includes/captcha</code><br />CAPTCHA</li>
-		<li><strong>mcp</strong><br /><code>mcp.php</code>, <code>/includes/mcp</code>, <code>report.php</code><br />Moderator Control Panel</li>
-		<li><strong>ucp</strong><br /><code>ucp.php</code>, <code>/includes/ucp</code><br />User Control Panel</li>
-		<li><strong>utf</strong><br /><code>/includes/utf</code><br />UTF8-related functions/classes</li>
-		<li><strong>search</strong><br /><code>/phpbb/search</code>, <code>search.php</code><br />Search System</li>
-		<li><strong>styles</strong><br /><code>/styles</code><br />phpBB Styles/Templates/Themes</li>
-	</ul>
-
-	<a name="constants"></a><h3>1.iv. Special Constants</h3>
-
-	<p>There are some special constants application developers are able to utilize to bend some of phpBB's internal functionality to suit their needs.</p>
-
-	<div class="codebox"><pre>
-PHPBB_MSG_HANDLER          (overwrite message handler)
-PHPBB_DB_NEW_LINK          (overwrite new_link parameter for sql_connect)
-PHPBB_ROOT_PATH            (overwrite $phpbb_root_path)
-PHPBB_ADMIN_PATH           (overwrite $phpbb_admin_path)
-PHPBB_USE_BOARD_URL_PATH   (use generate_board_url() for image paths instead of $phpbb_root_path)
-PHPBB_DISABLE_ACP_EDITOR   (disable ACP style editor for templates)
-PHPBB_DISABLE_CONFIG_CHECK (disable ACP config.php writeable check)
-
-PHPBB_ACM_MEMCACHED_PORT     (overwrite memcached port, default is 11211)
-PHPBB_ACM_MEMCACHED_COMPRESS (overwrite memcached compress setting, default is disabled)
-PHPBB_ACM_MEMCACHED_HOST     (overwrite memcached host name, default is localhost)
-
-PHPBB_ACM_REDIS_HOST        (overwrite redis host name, default is localhost)
-PHPBB_ACM_REDIS_PORT        (overwrite redis port, default is 6379)
-PHPBB_ACM_REDIS_PASSWORD    (overwrite redis password, default is empty)
-PHPBB_ACM_REDIS_DB          (overwrite redis default database)
-
-PHPBB_QA                   (Set board to QA-Mode, which means the updater also checks for RC-releases)
-</pre></div>
-
-<h4>PHPBB_USE_BOARD_URL_PATH</h4>
-
-<p>If the <code>PHPBB_USE_BOARD_URL_PATH</code> constant is set to true, phpBB uses generate_board_url() (this will return the boards url with the script path included) on all instances where web-accessible images are loaded. The exact locations are:</p>
-
-<ul>
-	<li>/phpbb/user.php - \phpbb\user::img()</li>
-	<li>/includes/functions_content.php - smiley_text()</li>
-</ul>
-
-<p>Path locations for the following template variables are affected by this too:</p>
-
-<ul>
-	<li>{T_ASSETS_PATH} - assets (non-style specific, static resources)</li>
-	<li>{T_THEME_PATH} - styles/xxx/theme</li>
-	<li>{T_TEMPLATE_PATH} - styles/xxx/template</li>
-	<li>{T_SUPER_TEMPLATE_PATH} - styles/xxx/template</li>
-	<li>{T_IMAGES_PATH} - images/</li>
-	<li>{T_SMILIES_PATH} - $config['smilies_path']/</li>
-	<li>{T_AVATAR_GALLERY_PATH} - $config['avatar_gallery_path']/</li>
-	<li>{T_ICONS_PATH} - $config['icons_path']/</li>
-	<li>{T_RANKS_PATH} - $config['ranks_path']/</li>
-	<li>{T_UPLOAD_PATH} - $config['upload_path']/</li>
-	<li>{T_STYLESHEET_LINK} - styles/xxx/theme/stylesheet.css</li>
-	<li>New template variable {BOARD_URL} for the board url + script path.</li>
-</ul>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="code"></a><h2>2. Code Layout/Guidelines</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-	<p>Please note that these guidelines apply to all php, html, javascript and css files.</p>
-
-	<a name="namingvars"></a><h3>2.i. Variable/Function/Class Naming</h3>
-
-	<p>We will not be using any form of hungarian notation in our naming conventions. Many of us believe that hungarian naming is one of the primary code obfuscation techniques currently in use.</p>
-
-	<h4>Variable Names:</h4>
-	<p>In PHP, variable names should be in all lowercase, with words separated by an underscore, example:</p>
-
-	<div class="indent">
-		<p><code>$current_user</code> is right, but <code>$currentuser</code> and <code> $currentUser</code> are not.</p>
-	</div>
-
-	<p>In JavaScript, variable names should use camel case:</p>
-
-	<div class="indent">
-		<p><code>currentUser</code> is right, but <code>currentuser</code> and <code>current_user</code> are not.</p>
-	</div>
-
-	<p>Names should be descriptive, but concise. We don't want huge sentences as our variable names, but typing an extra couple of characters is always better than wondering what exactly a certain variable is for. </p>
-
-	<h4>Loop Indices:</h4>
-	<p>The <em>only</em> situation where a one-character variable name is allowed is when it's the index for some looping construct. In this case, the index of the outer loop should always be $i. If there's a loop inside that loop, its index should be $j, followed by $k, and so on. If the loop is being indexed by some already-existing variable with a meaningful name, this guideline does not apply, example:</p>
-
-	<div class="codebox"><pre>
-for ($i = 0; $i &lt; $outer_size; $i++)
-{
-   for ($j = 0; $j &lt; $inner_size; $j++)
-   {
-      foo($i, $j);
-   }
-}</pre>
-	</div>
-
-	<h4>Function Names:</h4>
-	<p>Functions should also be named descriptively. We're not programming in C here, we don't want to write functions called things like "stristr()". Again, all lower-case names with words separated by a single underscore character in PHP, and camel caps in JavaScript. Function names should be prefixed with "phpbb_" and preferably have a verb in them somewhere. Good function names are <code>phpbb_print_login_status()</code>, <code>phpbb_get_user_data()</code>, etc. Constructor functions in JavaScript should begin with a capital letter.</p>
-
-	<h4>Function Arguments:</h4>
-	<p>Arguments are subject to the same guidelines as variable names. We don't want a bunch of functions like: <code>do_stuff($a, $b, $c)</code>. In most cases, we'd like to be able to tell how to use a function by just looking at its declaration. </p>
-
-	<h4>Class Names:</h4>
-
-	<p>Apart from following the rules for function names, all classes should meet the following conditions:</p>
-	<ul>
-		<li>Every class must be defined in a separate file.</li>
-		<li>The classes have to be located in a subdirectory of <code>phpbb/</code>.</li>
-		<li>Classnames must be namespaced with <code>\phpbb\</code> to avoid name clashes.</li>
-		<li>Class names/namespaces have to reflect the location of the file they are defined in. The namespace must be the directory in which the file is located. So the directory names must not contain any underscores, but the filename may.</li>
-		<li>Directories should typically be a singular noun (e.g. <code>dir</code> in the example below, not <code>dirs</code>.</li>
-	</ul>
-
-	<p>So given the following example directory structure you would result in the below listed lookups</p>
-	<div class="codebox"><pre>
-phpbb/
-  class_name.php
-  dir/
-    class_name.php
-      subdir/
-        class_name.php</pre>
-	</div>
-
-	<div class="codebox"><pre>
-\phpbb\class_name            - phpbb/class_name.php
-\phpbb\dir\class_name        - phpbb/dir/class_name.php
-\phpbb\dir\subdir\class_name - phpbb/dir/subdir/class_name.php</pre>
-	</div>
-
-
-	<h4>Summary:</h4>
-	<p>The basic philosophy here is to not hurt code clarity for the sake of laziness. This has to be balanced by a little bit of common sense, though; <code>phpbb_print_login_status_for_a_given_user()</code> goes too far, for example -- that function would be better named <code>phpbb_print_user_login_status()</code>, or just <code>phpbb_print_login_status()</code>.</p>
-
-	<h4>Special Namings: </h4>
-	<p>For all emoticons use the term <code>smiley</code> in singular and <code>smilies</code> in plural. For emails we use the term <code>email</code> (without dash between “e” and “m”).</p>
-
-	<a name="codelayout"></a><h3>2.ii. Code Layout</h3>
-
-	<h4>Always include the braces:</h4>
-	<p>This is another case of being too lazy to type 2 extra characters causing problems with code clarity. Even if the body of some construct is only one line long, do <em>not</em> drop the braces. Just don't, examples:</p>
-
-	<p class="bad">// These are all wrong. </p>
-
-	<div class="codebox"><pre>
-if (condition) do_stuff();
-
-if (condition)
-	do_stuff();
-
-while (condition)
-	do_stuff();
-
-for ($i = 0; $i &lt; size; $i++)
-	do_stuff($i);</pre>
-	</div>
-
-	<p class="good">// These are all right. </p>
-	<div class="codebox"><pre>
-if (condition)
-{
-	do_stuff();
-}
-
-while (condition)
-{
-	do_stuff();
-}
-
-for ($i = 0; $i &lt; size; $i++)
-{
-	do_stuff();
-}</pre>
-	</div>
-
-	<h4>Where to put the braces:</h4>
-	<p>In PHP code, braces always go on their own line. The closing brace should also always be at the same column as the corresponding opening brace, examples:</p>
-
-	<div class="codebox"><pre>
-if (condition)
-{
-	while (condition2)
-	{
-		...
-	}
-}
-else
-{
-	...
-}
-
-for ($i = 0; $i &lt; $size; $i++)
-{
-	...
-}
-
-while (condition)
-{
-	...
-}
-
-function do_stuff()
-{
-	...
-}</pre>
-	</div>
-
-	<p>In JavaScript code, braces always go on the same line:</p>
-
-	<div class="codebox"><pre>
-if (condition) {
-	while (condition2) {
-		...
-	}
-} else {
-	...
-}
-
-for (var i = 0; i &lt; size; i++) {
-	...
-}
-
-while (condition) {
-	...
-}
-
-function do_stuff() {
-	...
-}</pre>
-	</div>
-
-	<h4>Use spaces between tokens:</h4>
-	<p>This is another simple, easy step that helps keep code readable without much effort. Whenever you write an assignment, expression, etc.. Always leave <em>one</em> space between the tokens. Basically, write code as if it was English. Put spaces between variable names and operators. Don't put spaces just after an opening bracket or before a closing bracket. Don't put spaces just before a comma or a semicolon. This is best shown with a few examples, examples:</p>
-
-	<p>// Each pair shows the wrong way followed by the right way. </p>
-
-	<div class="codebox"><pre>
-$i=0;
-$i = 0;
-
-if($i&lt;7) ...
-if ($i &lt; 7) ...
-
-if ( ($i &lt; 7)&amp;&amp;($j &gt; 8) ) ...
-if ($i &lt; 7 &amp;&amp; $j &gt; 8) ...
-
-do_stuff( $i, 'foo', $b );
-do_stuff($i, 'foo', $b);
-
-for($i=0; $i&lt;$size; $i++) ...
-for ($i = 0; $i &lt; $size; $i++) ...
-
-$i=($j &lt; $size)?0:1;
-$i = ($j &lt; $size) ? 0 : 1;</pre>
-	</div>
-
-	<h4>Operator precedence:</h4>
-	<p>Do you know the exact precedence of all the operators in PHP? Neither do I. Don't guess. Always make it obvious by using brackets to force the precedence of an equation so you know what it does. Remember to not over-use this, as it may harden the readability. Basically, do not enclose single expressions. Examples:</p>
-
-	<p class="bad">// what's the result? who knows. </p>
-	<div class="codebox">
-		<pre>$bool = ($i &lt; 7 &amp;&amp; $j &gt; 8 || $k == 4);</pre>
-	</div>
-
-	<p class="bad">// now you can be certain what I'm doing here.</p>
-	<div class="codebox">
-		<pre>$bool = (($i &lt; 7) &amp;&amp; (($j &lt; 8) || ($k == 4)));</pre>
-	</div>
-
-	<p class="good">// But this one is even better, because it is easier on the eye but the intention is preserved</p>
-	<div class="codebox">
-		<pre>$bool = ($i &lt; 7 &amp;&amp; ($j &lt; 8 || $k == 4));</pre>
-	</div>
-
-	<h4>Quoting strings:</h4>
-	<p>There are two different ways to quote strings in PHP - either with single quotes or with double quotes. The main difference is that the parser does variable interpolation in double-quoted strings, but not in single quoted strings. Because of this, you should <em>always</em> use single quotes <em>unless</em> you specifically need variable interpolation to be done on that string. This way, we can save the parser the trouble of parsing a bunch of strings where no interpolation needs to be done.</p>
-	<p>Also, if you are using a string variable as part of a function call, you do not need to enclose that variable in quotes. Again, this will just make unnecessary work for the parser. Note, however, that nearly all of the escape sequences that exist for double-quoted strings will not work with single-quoted strings. Be careful, and feel free to break this guideline if it's making your code easier to read, examples:</p>
-
-	<p class="bad">// wrong </p>
-	<div class="codebox"><pre>
-$str = "This is a really long string with no variables for the parser to find.";
-
-do_stuff("$str");</pre>
-	</div>
-
-	<p class="good">// right</p>
-	<div class="codebox"><pre>
-$str = 'This is a really long string with no variables for the parser to find.';
-
-do_stuff($str);</pre>
-	</div>
-
-	<p class="bad">// Sometimes single quotes are just not right</p>
-	<div class="codebox"><pre>
-$post_url = $phpbb_root_path . 'posting.' . $phpEx . '?mode=' . $mode . '&amp;amp;start=' . $start;</pre>
-	</div>
-
-	<p class="good">// Double quotes are sometimes needed to not overcrowd the line with concatenations.</p>
-	<div class="codebox"><pre>
-$post_url = "{$phpbb_root_path}posting.$phpEx?mode=$mode&amp;amp;start=$start";</pre>
-	</div>
-
-	<p>In SQL statements mixing single and double quotes is partly allowed (following the guidelines listed here about SQL formatting), else one should try to only use one method - mostly single quotes.</p>
-
-	<h4>Commas after every array element:</h4>
-	<p>If an array is defined with each element on its own line, you still have to modify the previous line to add a comma when appending a new element. PHP allows for trailing (useless) commas in array definitions. These should always be used so each element including the comma can be appended with a single line. In JavaScript, do not use the trailing comma, as it causes browsers to throw errors.</p>
-
-	<p class="bad">// wrong</p>
-	<div class="codebox"><pre>
-$foo = array(
-	'bar' => 42,
-	'boo' => 23
-);</pre>
-	</div>
-
-	<p class="good">// right </p>
-	<div class="codebox"><pre>
-$foo = array(
-	'bar' => 42,
-	'boo' => 23,
-);</pre>
-	</div>
-
-
-	<h4>Associative array keys:</h4>
-	<p>In PHP, it's legal to use a literal string as a key to an associative array without quoting that string. We don't want to do this -- the string should always be quoted to avoid confusion. Note that this is only when we're using a literal, not when we're using a variable, examples:</p>
-
-	<p class="bad">// wrong</p>
-	<div class="codebox">
-		<pre>$foo = $assoc_array[blah];</pre>
-	</div>
-
-	<p class="good">// right </p>
-	<div class="codebox">
-		<pre>$foo = $assoc_array['blah'];</pre>
-	</div>
-
-	<p class="bad">// wrong</p>
-	<div class="codebox">
-		<pre>$foo = $assoc_array["$var"];</pre>
-	</div>
-
-	<p class="good">// right </p>
-	<div class="codebox">
-		<pre>$foo = $assoc_array[$var];</pre>
-	</div>
-
-	<h4>Comments:</h4>
-	<p>Each complex function should be preceded by a comment that tells a programmer everything they need to know to use that function. The meaning of every parameter, the expected input, and the output are required as a minimal comment. The function's behaviour in error conditions (and what those error conditions are) should also be present - but mostly included within the comment about the output.<br /><br />Especially important to document are any assumptions the code makes, or preconditions for its proper operation. Any one of the developers should be able to look at any part of the application and figure out what's going on in a reasonable amount of time.<br /><br />Avoid using <code>/* */</code> comment blocks for one-line comments, <code>//</code> should be used for one/two-liners.</p>
-
-	<h4>Magic numbers:</h4>
-	<p>Don't use them. Use named constants for any literal value other than obvious special cases. Basically, it's ok to check if an array has 0 elements by using the literal 0. It's not ok to assign some special meaning to a number and then use it everywhere as a literal. This hurts readability AND maintainability. The constants <code>true</code> and <code>false</code> should be used in place of the literals 1 and 0 -- even though they have the same values (but not type!), it's more obvious what the actual logic is when you use the named constants. Typecast variables where it is needed, do not rely on the correct variable type (PHP is currently very loose on typecasting which can lead to security problems if a developer does not keep a very close eye on it).</p>
-
-	<h4>Shortcut operators:</h4>
-	<p>The only shortcut operators that cause readability problems are the shortcut increment <code>$i++</code> and decrement <code>$j--</code> operators. These operators should not be used as part of an expression. They can, however, be used on their own line. Using them in expressions is just not worth the headaches when debugging, examples:</p>
-
-	<p class="bad">// wrong </p>
-	<div class="codebox"><pre>
-$array[++$i] = $j;
-$array[$i++] = $k;</pre>
-	</div>
-
-	<p class="good">// right </p>
-	<div class="codebox"><pre>
-$i++;
-$array[$i] = $j;
-
-$array[$i] = $k;
-$i++;</pre>
-	</div>
-
-	<h4>Inline conditionals:</h4>
-	<p>Inline conditionals should only be used to do very simple things. Preferably, they will only be used to do assignments, and not for function calls or anything complex at all. They can be harmful to readability if used incorrectly, so don't fall in love with saving typing by using them, examples:</p>
-
-	<p class="bad">// Bad place to use them</p>
-	<div class="codebox"><pre>
-($i &lt; $size &amp;&amp; $j &gt; $size) ? do_stuff($foo) : do_stuff($bar);</pre>
-	</div>
-
-	<p class="good">// OK place to use them </p>
-	<div class="codebox"><pre>
-$min = ($i &lt; $j) ? $i : $j;</pre>
-	</div>
-
-	<h4>Don't use uninitialized variables.</h4>
-	<p>For phpBB3, we intend to use a higher level of run-time error reporting. This will mean that the use of an uninitialized variable will be reported as a warning. These warnings can be avoided by using the built-in isset() function to check whether a variable has been set - but preferably the variable is always existing. For checking if an array has a key set this can come in handy though, examples:</p>
-
-	<p class="bad">// Wrong </p>
-	<div class="codebox">
-		<pre>if ($forum) ...</pre>
-	</div>
-
-	<p class="good">// Right </p>
-	<div class="codebox">
-		<pre>if (isset($forum)) ...</pre></div>
-
-	<p class="good">// Also possible</p>
-	<div class="codebox">
-		<pre>if (isset($forum) &amp;&amp; $forum == 5)</pre>
-	</div>
-
-	<p>The <code>empty()</code> function is useful if you want to check if a variable is not set or being empty (an empty string, 0 as an integer or string, NULL, false, an empty array or a variable declared, but without a value in a class). Therefore empty should be used in favor of <code>isset($array) &amp;&amp; count($array) &gt; 0</code> - this can be written in a shorter way as <code>!empty($array)</code>.</p>
-
-	<h4>Switch statements:</h4>
-	<p>Switch/case code blocks can get a bit long sometimes. To have some level of notice and being in-line with the opening/closing brace requirement (where they are on the same line for better readability), this also applies to switch/case code blocks and the breaks. An example:</p>
-
-	<p class="bad">// Wrong </p>
-	<div class="codebox"><pre>
-switch ($mode)
-{
-	case 'mode1':
-		// I am doing something here
-		break;
-	case 'mode2':
-		// I am doing something completely different here
-		break;
-}</pre>
-	</div>
-
-	<p class="good">// Good </p>
-	<div class="codebox"><pre>
-switch ($mode)
-{
-	case 'mode1':
-		// I am doing something here
-	break;
-
-	case 'mode2':
-		// I am doing something completely different here
-	break;
-
-	default:
-		// Always assume that a case was not caught
-	break;
-}</pre>
-	</div>
-
-	<p class="good">// Also good, if you have more code between the case and the break </p>
-	<div class="codebox"><pre>
-switch ($mode)
-{
-	case 'mode1':
-
-		// I am doing something here
-
-	break;
-
-	case 'mode2':
-
-		// I am doing something completely different here
-
-	break;
-
-	default:
-
-		// Always assume that a case was not caught
-
-	break;
-}</pre>
-	</div>
-
-	<p>Even if the break for the default case is not needed, it is sometimes better to include it just for readability and completeness.</p>
-
-	<p>If no break is intended, please add a comment instead. An example:</p>
-
-	<p class="good">// Example with no break </p>
-	<div class="codebox"><pre>
-switch ($mode)
-{
-	case 'mode1':
-
-		// I am doing something here
-
-	// no break here
-
-	case 'mode2':
-
-		// I am doing something completely different here
-
-	break;
-
-	default:
-
-		// Always assume that a case was not caught
-
-	break;
-}</pre>
-	</div>
-
-	<h4>Class Members</h4>
-	<p>Use the explicit visibility qualifiers <code>public</code>, <code>private</code> and <code>protected</code> for all properties instead of <code>var</code>.
-
-	<p>Place the <code>static</code> qualifier after the visibility qualifiers.</p>
-
-	<p class="bad">//Wrong </p>
-	<div class="codebox"><pre>
-var $x;
-static private function f()</pre>
-	</div>
-
-	<p class="good">// Right </p>
-	<div class="codebox"><pre>
-public $x;
-private static function f()</pre>
-	</div>
-
-	<h4>Constants</h4>
-	<p>Prefer class constants over global constants created with <code>define()</code>.</p>
-
-	<a name="sql"></a><h3>2.iii. SQL/SQL Layout</h3>
-
-	<h4>Common SQL Guidelines: </h4>
-	<p>All SQL should be cross-DB compatible, if DB specific SQL is used alternatives must be provided which work on all supported DB's (MySQL4/5, MSSQL (7.0 and 2000), PostgreSQL (8.3+), SQLite, Oracle8, ODBC (generalised if possible)).</p>
-	<p>All SQL commands should utilise the DataBase Abstraction Layer (DBAL)</p>
-
-	<h4>SQL code layout:</h4>
-	<p>SQL Statements are often unreadable without some formatting, since they tend to be big at times. Though the formatting of sql statements adds a lot to the readability of code. SQL statements should be formatted in the following way, basically writing keywords: </p>
-
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-&lt;-one tab-&gt;FROM ' . SOME_TABLE . '
-&lt;-one tab-&gt;WHERE a = 1
-&lt;-two tabs-&gt;AND (b = 2
-&lt;-three tabs-&gt;OR b = 3)
-&lt;-one tab-&gt;ORDER BY b';</pre>
-	</div>
-
-	<p>Here the example with the tabs applied:</p>
-
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . SOME_TABLE . '
-	WHERE a = 1
-		AND (b = 2
-			OR b = 3)
-	ORDER BY b';</pre>
-	</div>
-
-	<h4>SQL Quotes: </h4>
-	<p>Use double quotes where applicable. (The variables in these examples are typecasted to integers beforehand.) Examples: </p>
-
-	<p class="bad">// These are wrong.</p>
-	<div class="codebox"><pre>
-"UPDATE " . SOME_TABLE . " SET something = something_else WHERE a = $b";
-
-'UPDATE ' . SOME_TABLE . ' SET something = ' . $user_id . ' WHERE a = ' . $something;</pre>
-	</div>
-
-	<p class="good">// These are right. </p>
-
-	<div class="codebox"><pre>
-'UPDATE ' . SOME_TABLE . " SET something = something_else WHERE a = $b";
-
-'UPDATE ' . SOME_TABLE . " SET something = $user_id WHERE a = $something";</pre>
-	</div>
-
-	<p>In other words use single quotes where no variable substitution is required or where the variable involved shouldn't appear within double quotes. Otherwise use double quotes.</p>
-
-	<h4>Avoid DB specific SQL: </h4>
-	<p>The &quot;not equals operator&quot;, as defined by the SQL:2003 standard, is &quot;&lt;&gt;&quot;</p>
-
-	<p class="bad">// This is wrong.</p>
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . SOME_TABLE . '
-	WHERE a != 2';</pre>
-	</div>
-
-	<p class="good">// This is right. </p>
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . SOME_TABLE . '
-	WHERE a &lt;&gt; 2';</pre>
-	</div>
-
-	<h4>Common DBAL methods: </h4>
-
-	<h4>sql_escape():</h4>
-
-	<p>Always use <code>$db-&gt;sql_escape()</code> if you need to check for a string within an SQL statement (even if you are sure the variable cannot contain single quotes - never trust your input), for example:</p>
-
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . SOME_TABLE . "
-	WHERE username = '" . $db-&gt;sql_escape($username) . "'";</pre>
-	</div>
-
-	<h4>sql_query_limit():</h4>
-
-	<p>We do not add limit statements to the sql query, but instead use <code>$db-&gt;sql_query_limit()</code>. You basically pass the query, the total number of lines to retrieve and the offset.</p>
-
-	<p><strong>Note: </strong> Since Oracle handles limits differently and because of how we implemented this handling you need to take special care if you use <code>sql_query_limit</code> with an sql query retrieving data from more than one table.</p>
-
-	<p>Make sure when using something like "SELECT x.*, y.jars" that there is not a column named jars in x; make sure that there is no overlap between an implicit column and the explicit columns.</p>
-
-	<h4>sql_build_array():</h4>
-
-	<p>If you need to UPDATE or INSERT data, make use of the <code>$db-&gt;sql_build_array()</code> function. This function already escapes strings and checks other types, so there is no need to do this here. The data to be inserted should go into an array - <code>$sql_ary</code> - or directly within the statement if one or two variables needs to be inserted/updated. An example of an insert statement would be:</p>
-
-	<div class="codebox"><pre>
-$sql_ary = array(
-	'somedata'		=&gt; $my_string,
-	'otherdata'		=&gt; $an_int,
-	'moredata'		=&gt; $another_int,
-);
-
-$db-&gt;sql_query('INSERT INTO ' . SOME_TABLE . ' ' . $db-&gt;sql_build_array('INSERT', $sql_ary));</pre>
-	</div>
-
-	<p>To complete the example, this is how an update statement would look like:</p>
-
-	<div class="codebox"><pre>
-$sql_ary = array(
-	'somedata'		=&gt; $my_string,
-	'otherdata'		=&gt; $an_int,
-	'moredata'		=&gt; $another_int,
-);
-
-$sql = 'UPDATE ' . SOME_TABLE . '
-	SET ' . $db-&gt;sql_build_array('UPDATE', $sql_ary) . '
-	WHERE user_id = ' . (int) $user_id;
-$db-&gt;sql_query($sql);</pre>
-	</div>
-
-	<p>The <code>$db-&gt;sql_build_array()</code> function supports the following modes: <code>INSERT</code> (example above), <code>INSERT_SELECT</code> (building query for <code>INSERT INTO table (...) SELECT value, column ...</code> statements), <code>UPDATE</code> (example above) and <code>SELECT</code> (for building WHERE statement [AND logic]).</p>
-
-	<h4>sql_multi_insert():</h4>
-
-	<p>If you want to insert multiple statements at once, please use the separate <code>sql_multi_insert()</code> method. An example:</p>
-
-	<div class="codebox"><pre>
-$sql_ary = array();
-
-$sql_ary[] = array(
-	'somedata'		=&gt; $my_string_1,
-	'otherdata'		=&gt; $an_int_1,
-	'moredata'		=&gt; $another_int_1,
-);
-
-$sql_ary[] = array(
-	'somedata'		=&gt; $my_string_2,
-	'otherdata'		=&gt; $an_int_2,
-	'moredata'		=&gt; $another_int_2,
-);
-
-$db->sql_multi_insert(SOME_TABLE, $sql_ary);</pre>
-	</div>
-
-	<h4>sql_in_set():</h4>
-
-	<p>The <code>$db-&gt;sql_in_set()</code> function should be used for building <code>IN ()</code> and <code>NOT IN ()</code> constructs. Since (specifically) MySQL tend to be faster if for one value to be compared the <code>=</code> and <code>&lt;&gt;</code> operator is used, we let the DBAL decide what to do. A typical example of doing a positive match against a number of values would be:</p>
-
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . FORUMS_TABLE . '
-	WHERE ' . $db-&gt;sql_in_set('forum_id', $forum_ids);
-$db-&gt;sql_query($sql);</pre>
-	</div>
-
-	<p>Based on the number of values in $forum_ids, the query can look differently.</p>
-
-	<p class="good">// SQL Statement if $forum_ids = array(1, 2, 3);</p>
-
-	<div class="codebox"><pre>
-SELECT FROM phpbb_forums WHERE forum_id IN (1, 2, 3)</pre>
-	</div>
-
-	<p class="good">// SQL Statement if $forum_ids = array(1) or $forum_ids = 1</p>
-
-	<div class="codebox"><pre>
-SELECT FROM phpbb_forums WHERE forum_id = 1</pre>
-	</div>
-
-	<p>Of course the same is possible for doing a negative match against a number of values:</p>
-
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . FORUMS_TABLE . '
-	WHERE ' . $db-&gt;sql_in_set('forum_id', $forum_ids, <strong>true</strong>);
-$db-&gt;sql_query($sql);</pre>
-	</div>
-
-	<p>Based on the number of values in $forum_ids, the query can look differently here too.</p>
-
-	<p class="good">// SQL Statement if $forum_ids = array(1, 2, 3);</p>
-
-	<div class="codebox"><pre>
-SELECT FROM phpbb_forums WHERE forum_id <strong>NOT</strong> IN (1, 2, 3)</pre>
-	</div>
-
-	<p class="good">// SQL Statement if $forum_ids = array(1) or $forum_ids = 1</p>
-
-	<div class="codebox"><pre>
-SELECT FROM phpbb_forums WHERE forum_id <strong>&lt;&gt;</strong> 1</pre>
-	</div>
-
-	<p>If the given array is empty, an error will be produced.</p>
-
-	<h4>sql_build_query():</h4>
-
-	<p>The <code>$db-&gt;sql_build_query()</code> function is responsible for building sql statements for SELECT and SELECT DISTINCT queries if you need to JOIN on more than one table or retrieve data from more than one table while doing a JOIN. This needs to be used to make sure the resulting statement is working on all supported db's. Instead of explaining every possible combination, I will give a short example:</p>
-
-	<div class="codebox"><pre>
-$sql_array = array(
-	'SELECT'	=&gt; 'f.*, ft.mark_time',
-
-	'FROM'		=&gt; array(
-		FORUMS_WATCH_TABLE	=&gt; 'fw',
-		FORUMS_TABLE		=&gt; 'f',
-	),
-
-	'LEFT_JOIN'	=&gt; array(
-		array(
-			'FROM'	=&gt; array(FORUMS_TRACK_TABLE =&gt; 'ft'),
-			'ON'	=&gt; 'ft.user_id = ' . $user-&gt;data['user_id'] . ' AND ft.forum_id = f.forum_id',
-		),
-	),
-
-	'WHERE'		=&gt; 'fw.user_id = ' . $user-&gt;data['user_id'] . '
-		AND f.forum_id = fw.forum_id',
-
-	'ORDER_BY'	=&gt; 'left_id',
-);
-
-$sql = $db-&gt;sql_build_query('SELECT', $sql_array);</pre>
-	</div>
-
-	<p>The possible first parameter for sql_build_query() is SELECT or SELECT_DISTINCT. As you can see, the logic is pretty self-explaining. For the LEFT_JOIN key, just add another array if you want to join on to tables for example. The added benefit of using this construct is that you are able to easily build the query statement based on conditions - for example the above LEFT_JOIN is only necessary if server side topic tracking is enabled; a slight adjustement would be:</p>
-
-	<div class="codebox"><pre>
-$sql_array = array(
-	'SELECT'	=&gt; 'f.*',
-
-	'FROM'		=&gt; array(
-		FORUMS_WATCH_TABLE	=&gt; 'fw',
-		FORUMS_TABLE		=&gt; 'f',
-	),
-
-	'WHERE'		=&gt; 'fw.user_id = ' . $user-&gt;data['user_id'] . '
-		AND f.forum_id = fw.forum_id',
-
-	'ORDER_BY'	=&gt; 'left_id',
-);
-
-if ($config['load_db_lastread'])
-{
-	$sql_array['LEFT_JOIN'] = array(
-		array(
-			'FROM'	=&gt; array(FORUMS_TRACK_TABLE =&gt; 'ft'),
-			'ON'	=&gt; 'ft.user_id = ' . $user-&gt;data['user_id'] . ' AND ft.forum_id = f.forum_id',
-		),
-	);
-
-	$sql_array['SELECT'] .= ', ft.mark_time ';
-}
-else
-{
-	// Here we read the cookie data
-}
-
-$sql = $db-&gt;sql_build_query('SELECT', $sql_array);</pre>
-	</div>
-
-	<a name="optimizing"></a><h3>2.iv. Optimizations</h3>
-
-	<h4>Operations in loop definition: </h4>
-	<p>Always try to optimize your loops if operations are going on at the comparing part, since this part is executed every time the loop is parsed through. For assignments a descriptive name should be chosen. Example:</p>
-
-	<p class="bad">// On every iteration the count function is called</p>
-	<div class="codebox"><pre>
-for ($i = 0; $i &lt; count($post_data); $i++)
-{
-	do_something();
-}</pre>
-	</div>
-
-	<p class="good">// You are able to assign the (not changing) result within the loop itself</p>
-	<div class="codebox"><pre>
-for ($i = 0, $size = count($post_data); $i &lt; $size; $i++)
-{
-	do_something();
-}</pre>
-	</div>
-
-	<h4>Use of in_array(): </h4>
-	<p>Try to avoid using in_array() on huge arrays, and try to not place them into loops if the array to check consist of more than 20 entries. in_array() can be very time consuming and uses a lot of cpu processing time. For little checks it is not noticeable, but if checked against a huge array within a loop those checks alone can take several seconds. If you need this functionality, try using isset() on the arrays keys instead, actually shifting the values into keys and vice versa. A call to <code>isset($array[$var])</code> is a lot faster than <code>in_array($var, array_keys($array))</code> for example.</p>
-
-
-	<a name="general"></a><h3>2.v. General Guidelines</h3>
-
-	<h4>General things:</h4>
-	<p>Never trust user input (this also applies to server variables as well as cookies).</p>
-	<p>Try to sanitize values returned from a function.</p>
-	<p>Try to sanitize given function variables within your function.</p>
-	<p>The auth class should be used for all authorisation checking.</p>
-	<p>No attempt should be made to remove any copyright information (either contained within the source or displayed interactively when the source is run/compiled), neither should the copyright information be altered in any way (it may be added to).</p>
-
-	<h4>Variables: </h4>
-	<p>Make use of the <code>\phpbb\request\request</code> class for everything.</p>
-	<p>The $request->variable() method determines the type to set from the second parameter (which determines the default value too). If you need to get a scalar variable type, you need to tell this the variable() method explicitly. Examples:</p>
-
-	<p class="bad">// Old method, do not use it</p>
-	<div class="codebox"><pre>
-$start = (isset($HTTP_GET_VARS['start'])) ? intval($HTTP_GET_VARS['start']) : intval($HTTP_POST_VARS['start']);
-$submit = (isset($HTTP_POST_VARS['submit'])) ? true : false;</pre>
-	</div>
-
-	<p class="good">// Use request var and define a default variable (use the correct type)</p>
-	<div class="codebox"><pre>
-$start = $request->variable('start', 0);
-$submit = $request->is_set_post('submit');</pre>
-	</div>
-
-	<p class="bad">// $start is an int, the following use of $request->variable() therefore is not allowed</p>
-	<div class="codebox"><pre>
-$start = $request->variable('start', '0');</pre>
-	</div>
-
-	<p class="good">// Getting an array, keys are integers, value defaults to 0</p>
-	<div class="codebox"><pre>
-$mark_array = $request->variable('mark', array(0));</pre>
-	</div>
-
-	<p class="good">// Getting an array, keys are strings, value defaults to 0</p>
-	<div class="codebox"><pre>
-$action_ary = $request->variable('action', array('' =&gt; 0));</pre>
-	</div>
-
-	<h4>Login checks/redirection: </h4>
-	<p>To show a forum login box use <code>login_forum_box($forum_data)</code>, else use the <code>login_box()</code> function.</p>
-
-	<p><code>$forum_data</code> should contain at least the <code>forum_id</code> and <code>forum_password</code> fields. If the field <code>forum_name</code> is available, then it is displayed on the forum login page.</p>
-
-	<p>The <code>login_box()</code> function can have a redirect as the first parameter. As a thumb of rule, specify an empty string if you want to redirect to the users current location, else do not add the <code>$SID</code> to the redirect string (for example within the ucp/login we redirect to the board index because else the user would be redirected to the login screen).</p>
-
-	<h4>Sensitive Operations: </h4>
-	<p>For sensitive operations always let the user confirm the action. For the confirmation screens, make use of the <code>confirm_box()</code> function.</p>
-
-	<h4>Altering Operations: </h4>
-	<p>For operations altering the state of the database, for instance posting, always verify the form token, unless you are already using <code>confirm_box()</code>. To do so, make use of the <code>add_form_key()</code> and <code>check_form_key()</code> functions. </p>
-	<div class="codebox"><pre>
-	add_form_key('my_form');
-
-	if ($submit)
-	{
-		if (!check_form_key('my_form'))
-		{
-			trigger_error('FORM_INVALID');
-		}
-	}</pre>
-	</div>
-
-	<p>The string passed to <code>add_form_key()</code> needs to match the string passed to <code>check_form_key()</code>. Another requirement for this to work correctly is that all forms include the <code>{S_FORM_TOKEN}</code> template variable.</p>
-
-
-	<h4>Sessions: </h4>
-	<p>Sessions should be initiated on each page, as near the top as possible using the following code:</p>
-
-	<div class="codebox"><pre>
-$user-&gt;session_begin();
-$auth-&gt;acl($user-&gt;data);
-$user-&gt;setup();</pre>
-	</div>
-
-	<p>The <code>$user-&gt;setup()</code> call can be used to pass on additional language definition and a custom style (used in viewforum).</p>
-
-	<h4>Errors and messages: </h4>
-	<p>All messages/errors should be outputted by calling <code>trigger_error()</code> using the appropriate message type and language string. Example:</p>
-
-	<div class="codebox"><pre>
-trigger_error('NO_FORUM');</pre>
-	</div>
-
-	<div class="codebox"><pre>
-trigger_error($user-&gt;lang['NO_FORUM']);</pre>
-	</div>
-
-	<div class="codebox"><pre>
-trigger_error('NO_MODE', E_USER_ERROR);</pre>
-	</div>
-
-	<h4>Url formatting</h4>
-
-	<p>All urls pointing to internal files need to be prepended by the <code>$phpbb_root_path</code> variable. Within the administration control panel all urls pointing to internal files need to be prepended by the <code>$phpbb_admin_path</code> variable. This makes sure the path is always correct and users being able to just rename the admin folder and the acp still working as intended (though some links will fail and the code need to be slightly adjusted).</p>
-
-	<p>The <code>append_sid()</code> function from 2.0.x is available too, though it does not handle url alterations automatically. Please have a look at the code documentation if you want to get more details on how to use append_sid(). A sample call to append_sid() can look like this:</p>
-
-	<div class="codebox"><pre>
-append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;g=' . $row['group_id'])</pre>
-	</div>
-
-	<h4>General function usage: </h4>
-
-	<p>Some of these functions are only chosen over others because of personal preference and have no benefit other than maintaining consistency throughout the code.</p>
-
-	<ul>
-		<li>
-			<p>Use <code>strpos</code> instead of <code>strstr</code></p>
-		</li>
-		<li>
-			<p>Use <code>else if</code> instead of <code>elseif</code></p>
-		</li>
-		<li>
-			<p>Use <code>false</code> (lowercase) instead of <code>FALSE</code></p>
-		</li>
-		<li>
-			<p>Use <code>true</code> (lowercase) instead of <code>TRUE</code></p>
-		</li>
-	</ul>
-
-	<h4>Exiting</h4>
-
-	<p>Your page should either call <code>page_footer()</code> in the end to trigger output through the template engine and terminate the script, or alternatively at least call the <code>exit_handler()</code>. That call is necessary because it provides a method for external applications embedding phpBB to be called at the end of the script.</p>
-
-	<a name="phprestrictions"></a><h3>2.vi. Restrictions on the Use of PHP</h3>
-
-	<h4>Dynamic code execution:</h4>
-
-	<p>Never execute dynamic PHP code (generated or in a constant string) using any of the following PHP functions:</p>
-
-	<ul>
-		<li><strong>eval</strong></li>
-		<li><strong>create_function</strong></li>
-		<li><strong>preg_replace</strong> with the <strong>e</strong> modifier in the pattern</li>
-	</ul>
-
-	<p>If absolutely necessary a file should be created, and a mechanism for creating this file prior to running phpBB should be provided as a setup process.</p>
-
-	<p>The <strong>e</strong> modifier in <strong>preg_replace</strong> can be replaced by <strong>preg_replace_callback</strong> and objects to encapsulate state that is needed in the callback code.</p>
-
-	<h4>Other functions, operators, statements and keywords:</h4>
-
-	<p>The following PHP statements should also not be used in phpBB:</p>
-
-	<ul>
-		<li><strong>goto</strong></li>
-	</ul>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="styling"></a><h2>3. Styling</h2>
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-	<a name="cfgfiles"></a><h3>3.i. Style Config Files</h3>
-	<p>Style cfg files are simple name-value lists with the information necessary for installing a style. The important part of the style configuration file is assigning an unique name.</p>
-	<div class="codebox"><pre>
-# General Information about this style
-name = prosilver_duplicate
-copyright = © phpBB Limited, 2007
-style_version = 3.3.0
-phpbb_version = 3.3.0
-
-# Defining a different template bitfield
-# template_bitfield = lNg=
-
-# Parent style
-# Set value to empty or to this style's name if this style does not have a parent style
-parent = prosilver</pre>
-	</div>
-	<a name="genstyling"></a><h3>3.2. General Styling Rules</h3>
-<p>Templates should be produced in a consistent manner. Where appropriate they should be based off an existing copy, e.g. index, viewforum or viewtopic (the combination of which implement a range of conditional and variable forms). Please also note that the indentation and coding guidelines also apply to templates where possible.</p>
-
-<p>The outer table class <code>forumline</code> has gone and is replaced with <code>tablebg</code>.</p>
-<p>When writing <code>&lt;table&gt;</code> the order <code>&lt;table class="" cellspacing="" cellpadding="" border="" align=""&gt;</code> creates consistency and allows everyone to easily see which table produces which "look". The same applies to most other tags for which additional parameters can be set, consistency is the major aim here.</p>
-<p>Each block level element should be indented by one tab, same for tabular elements, e.g. <code>&lt;tr&gt;</code> <code>&lt;td&gt;</code> etc., whereby the intendiation of <code>&lt;table&gt;</code> and the following/ending <code>&lt;tr&gt;</code> should be on the same line. This applies not to div elements of course.</p>
-<p>Don't use <code>&lt;span&gt;</code> more than is essential ... the CSS is such that text sizes are dependent on the parent class. So writing <code>&lt;span class="gensmall"&gt;&lt;span class="gensmall"&gt;TEST&lt;/span&gt;&lt;/span&gt;</code> will result in very very small text. Similarly don't use span at all if another element can contain the class definition, e.g.</p>
-
-<div class="codebox"><pre>
-&lt;td&gt;&lt;span class=&quot;gensmall&quot;&gt;TEST&lt;/span&gt;&lt;/td&gt;
-</pre></div>
-
-<p>can just as well become:</p>
-<div class="codebox"><pre>
-&lt;td class=&quot;gensmall&quot;&gt;TEST&lt;/td&gt;
-</pre></div>
-
-<p>Try to match text class types with existing usage, e.g. don't use the nav class where viewtopic uses gensmall for example.</p>
-
-<p>Row colours/classes are now defined by the template, use an <code>IF S_ROW_COUNT</code> switch, see viewtopic or viewforum for an example.</p>
-
-<p>Remember block level ordering is important.</p>
-
-<p>Use a standard cellpadding of 2 and cellspacing of 0 on outer tables. Inner tables can vary from 0 to 3 or even 4 depending on the need.</p>
-
-<p><strong>Use div container/css for styling and table for data representation.</strong></p>
-
-<p>The separate catXXXX and thXXX classes are gone. When defining a header cell just use <code>&lt;th&gt;</code> rather than <code>&lt;th class="thHead"&gt;</code> etc. Similarly for cat, don't use <code>&lt;td class="catLeft"&gt;</code> use <code>&lt;td class="cat"&gt;</code> etc.</p>
-
-<p>Try to retain consistency of basic layout and class usage, i.e. _EXPLAIN text should generally be placed below the title it explains, e.g. <code>{L_POST_USERNAME}&lt;br /&gt;&lt;span class="gensmall"&gt;{L_POST_USERNAME_EXPLAIN}&lt;/span&gt;</code> is the typical way of handling this ... there may be exceptions and this isn't a hard and fast rule.</p>
-
-<p>Try to keep template conditional and other statements tabbed in line with the block to which they refer.</p>
-
-<p class="good">this is correct</p>
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN test --&gt;</span>
-	&lt;tr&gt;
-		&lt;td&gt;&#123;test.TEXT&#125;&lt;/td&gt;
-	&lt;/tr&gt;
-<span class="comment">&lt;!-- END test --&gt;</span>
-</pre></div>
-
-<p class="good">this is also correct:</p>
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN test --&gt;</span>
-&lt;tr&gt;
-	&lt;td&gt;&#123;test.TEXT&#125;&lt;/td&gt;
-&lt;/tr&gt;
-<span class="comment">&lt;!-- END test --&gt;</span>
-</pre></div>
-
-<p>it gives immediate feedback on exactly what is looping - decide which way to use based on the readability.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="templating"></a><h2>4. Templating</h2>
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-	<a name="templates"></a><h3>4.i. General Templating</h3>
-
-<h4>File naming</h4>
-<p>Firstly templates now take the suffix &quot;.html&quot; rather than &quot;.tpl&quot;. This was done simply to make the lives of some people easier wrt syntax highlighting, etc.</p>
-
-<h4>Variables</h4>
-<p>All template variables should be named appropriately (using underscores for spaces), language entries should be prefixed with L_, system data with S_, urls with U_, javascript urls with UA_, language to be put in javascript statements with LA_, all other variables should be presented 'as is'.</p>
-
-<p>L_* template variables are automatically mapped to the corresponding language entry if the code does not set (and therefore overwrite) this variable specifically and if the language entry exists. For example <code>{L_USERNAME}</code> maps to <code>$user-&gt;lang['USERNAME']</code>. The LA_* template variables are handled within the same way, but properly escaped so they can be put in javascript code. This should reduce the need to assign loads of new language variables in MODifications.
-</p>
-
-<h4>Blocks/Loops</h4>
-<p>The basic block level loop remains and takes the form:</p>
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN loopname --&gt;</span>
-	markup, {loopname&#46;X_YYYYY}, etc&#46;
-<span class="comment">&lt;!-- END loopname --&gt;</span>
-</pre></div>
-
-<p>A bit later loops will be explained further. To not irritate you we will explain conditionals as well as other statements first.</p>
-
-<h4>Including files</h4>
-<p>Something that existed in 2.0.x which no longer exists in 3.x is the ability to assign a template to a variable. This was used (for example) to output the jumpbox. Instead (perhaps better, perhaps not but certainly more flexible) we now have INCLUDE. This takes the simple form:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- INCLUDE filename --&gt;</span>
-</pre></div>
-
-<p>You will note in the 3.x templates the major sources start with <code>&lt;!-- INCLUDE overall_header.html --&gt;</code> or <code>&lt;!-- INCLUDE simple_header.html --&gt;</code>, etc. In 2.0.x control of &quot;which&quot; header to use was defined entirely within the code. In 3.x the template designer can output what they like. Note that you can introduce new templates (i.e. other than those in the default set) using this system and include them as you wish ... perhaps useful for a common &quot;menu&quot; bar or some such. No need to modify loads of files as with 2.0.x.</p>
-
-<p>Added in <strong>3.0.6</strong> is the ability to include a file using a template variable to specify the file, this functionality only works for root variables (i.e. not block variables).</p>
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- INCLUDE {FILE_VAR} --&gt;</span>
-</pre></div>
-
-<p>Template defined variables can also be utilised.</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- DEFINE $SOME_VAR = 'my_file.html' --&gt;</span>
-<span class="comment">&lt;!-- INCLUDE {$SOME_VAR} --&gt;</span>
-</pre></div>
-
-<h4>Conditionals/Control structures</h4>
-<p>The most significant addition to 3.x are conditions or control structures, &quot;if something then do this else do that&quot;. The system deployed is very similar to Smarty. This may confuse some people at first but it offers great potential and great flexibility with a little imagination. In their most simple form these constructs take the form:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF expr --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>expr can take many forms, for example:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF loop&#46;S_ROW_COUNT is even --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>This will output the markup if the S_ROW_COUNT variable in the current iteration of loop is an even value (i.e. the expr is TRUE). You can use various comparison methods (standard as well as equivalent textual versions noted in square brackets) including (<code>not, or, and, eq, neq, is</code> should be used if possible for better readability):</p>
-
-<div class="codebox"><pre>
-== [eq]
-!= [neq, ne]
-&lt;&gt; (same as !=)
-!== (not equivalent in value and type)
-=== (equivalent in value and type)
-&gt; [gt]
-&lt; [lt]
-&gt;= [gte]
-&lt;= [lte]
-&amp;&amp; [and]
-|| [or]
-% [mod]
-! [not]
-+
--
-*
-/
-,
-&lt;&lt; (bitwise shift left)
-&gt;&gt; (bitwise shift right)
-| (bitwise or)
-^ (bitwise xor)
-&amp; (bitwise and)
-~ (bitwise not)
-is (can be used to join comparison operations)
-</pre></div>
-
-<p>Basic parenthesis can also be used to enforce good old BODMAS rules. Additionally some basic comparison types are defined:</p>
-
-<div class="codebox"><pre>
-even
-odd
-div
-</pre></div>
-
-<p>Beyond the simple use of IF you can also do a sequence of comparisons using the following:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF expr1 --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ELSEIF expr2 --&gt;</span>
-	markup
-	&#46;
-	&#46;
-	&#46;
-<span class="comment">&lt;!-- ELSEIF exprN --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ELSE --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>Each statement will be tested in turn and the relevant output generated when a match (if a match) is found. It is not necessary to always use ELSEIF, ELSE can be used alone to match &quot;everything else&quot;.<br /><br />So what can you do with all this? Well take for example the colouration of rows in viewforum. In 2.0.x row colours were predefined within the source as either row color1, row color2 or row class1, row class2. In 3.x this is moved to the template, it may look a little daunting at first but remember control flows from top to bottom and it's not too difficult:</p>
-
-<div class="codebox"><pre>
-&lt;table&gt;
-	<span class="comment">&lt;!-- IF loop&#46;S_ROW_COUNT is even --&gt;</span>
-		&lt;tr class=&quot;row1&quot;&gt;
-	<span class="comment">&lt;!-- ELSE --&gt;</span>
-		&lt;tr class=&quot;row2&quot;&gt;
-	<span class="comment">&lt;!-- ENDIF --&gt;</span>
-	&lt;td&gt;HELLO!&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-</pre></div>
-
-<p>This will cause the row cell to be output using class row1 when the row count is even, and class row2 otherwise. The S_ROW_COUNT parameter gets assigned to loops by default. Another example would be the following: </p>
-
-<div class="codebox"><pre>
-&lt;table&gt;
-	<span class="comment">&lt;!-- IF loop&#46;S_ROW_COUNT &gt; 10 --&gt;</span>
-		&lt;tr bgcolor=&quot;#FF0000&quot;&gt;
-	<span class="comment">&lt;!-- ELSEIF loop&#46;S_ROW_COUNT &gt; 5 --&gt;</span>
-		&lt;tr bgcolor=&quot;#00FF00&quot;&gt;
-	<span class="comment">&lt;!-- ELSEIF loop&#46;S_ROW_COUNT &gt; 2 --&gt;</span>
-		&lt;tr bgcolor=&quot;#0000FF&quot;&gt;
-	<span class="comment">&lt;!-- ELSE --&gt;</span>
-		&lt;tr bgcolor=&quot;#FF00FF&quot;&gt;
-	<span class="comment">&lt;!-- ENDIF --&gt;</span>
-	&lt;td&gt;hello!&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-</pre></div>
-
-<p>This will output the row cell in purple for the first two rows, blue for rows 2 to 5, green for rows 5 to 10 and red for remainder. So, you could produce a &quot;nice&quot; gradient effect, for example.<br /><br />What else can you do? Well, you could use IF to do common checks on for example the login state of a user:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF S_USER_LOGGED_IN --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>This replaces the existing (fudged) method in 2.0.x using a zero length array and BEGIN/END.</p>
-
-<h4>Extended syntax for Blocks/Loops</h4>
-
-<p>Back to our loops - they had been extended with the following additions. Firstly you can set the start and end points of the loop. For example:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN loopname(2) --&gt;</span>
-	markup
-<span class="comment">&lt;!-- END loopname --&gt;</span>
-</pre></div>
-
-<p>Will start the loop on the third entry (note that indexes start at zero). Extensions of this are:
-<br /><br />
-<code>loopname(2)</code>: Will start the loop on the 3rd entry<br />
-<code>loopname(-2)</code>: Will start the loop two entries from the end<br />
-<code>loopname(3,4)</code>: Will start the loop on the fourth entry and end it on the fifth<br />
-<code>loopname(3,-4)</code>: Will start the loop on the fourth entry and end it four from last<br />
-</p>
-
-<p>A further extension to begin is BEGINELSE:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN loop --&gt;</span>
-	markup
-<span class="comment">&lt;!-- BEGINELSE --&gt;</span>
-	markup
-<span class="comment">&lt;!-- END loop --&gt;</span>
-</pre></div>
-
-<p>This will cause the markup between <code>BEGINELSE</code> and <code>END</code> to be output if the loop contains no values. This is useful for forums with no topics (for example) ... in some ways it replaces &quot;bits of&quot; the existing &quot;switch_&quot; type control (the rest being replaced by conditionals).</p>
-
-<p>Another way of checking if a loop contains values is by prefixing the loops name with a dot:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF .loop --&gt;</span>
-	<span class="comment">&lt;!-- BEGIN loop --&gt;</span>
-		markup
-	<span class="comment">&lt;!-- END loop --&gt;</span>
-<span class="comment">&lt;!-- ELSE --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>You are even able to check the number of items within a loop by comparing it with values within the IF condition:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF .loop &gt; 2 --&gt;</span>
-	<span class="comment">&lt;!-- BEGIN loop --&gt;</span>
-		markup
-	<span class="comment">&lt;!-- END loop --&gt;</span>
-<span class="comment">&lt;!-- ELSE --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>Nesting loops cause the conditionals needing prefixed with all loops from the outer one to the inner most. An illustration of this:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN firstloop --&gt;</span>
-	{firstloop.MY_VARIABLE_FROM_FIRSTLOOP}
-
-	<span class="comment">&lt;!-- BEGIN secondloop --&gt;</span>
-		{firstloop.secondloop.MY_VARIABLE_FROM_SECONDLOOP}
-	<span class="comment">&lt;!-- END secondloop --&gt;</span>
-<span class="comment">&lt;!-- END firstloop --&gt;</span>
-</pre></div>
-
-<p>Sometimes it is necessary to break out of nested loops to be able to call another loop within the current iteration. This sounds a little bit confusing and it is not used very often. The following (rather complex) example shows this quite good - it also shows how you test for the first and last row in a loop (i will explain the example in detail further down):</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN l_block1 --&gt;</span>
-	<span class="comment">&lt;!-- IF l_block1.S_SELECTED --&gt;</span>
-		&lt;strong&gt;{l_block1.L_TITLE}&lt;/strong&gt;
-		<span class="comment">&lt;!-- IF S_PRIVMSGS --&gt;</span>
-
-			<span class="comment">&lt;!-- the ! at the beginning of the loop name forces the loop to be not a nested one of l_block1 --&gt;</span>
-			<span class="comment">&lt;!-- BEGIN !folder --&gt;</span>
-				<span class="comment">&lt;!-- IF folder.S_FIRST_ROW --&gt;</span>
-					&lt;ul class=&quot;nav&quot;&gt;
-				<span class="comment">&lt;!-- ENDIF --&gt;</span>
-
-				&lt;li&gt;&lt;a href=&quot;{folder.U_FOLDER}&quot;&gt;{folder.FOLDER_NAME}&lt;/a&gt;&lt;/li&gt;
-
-				<span class="comment">&lt;!-- IF folder.S_LAST_ROW --&gt;</span>
-					&lt;/ul&gt;
-				<span class="comment">&lt;!-- ENDIF --&gt;</span>
-			<span class="comment">&lt;!-- END !folder --&gt;</span>
-
-		<span class="comment">&lt;!-- ENDIF --&gt;</span>
-
-		&lt;ul class=&quot;nav&quot;&gt;
-		<span class="comment">&lt;!-- BEGIN l_block2 --&gt;</span>
-			&lt;li&gt;
-				<span class="comment">&lt;!-- IF l_block1.l_block2.S_SELECTED --&gt;</span>
-					&lt;strong&gt;{l_block1.l_block2.L_TITLE}&lt;/strong&gt;
-				<span class="comment">&lt;!-- ELSE --&gt;</span>
-					&lt;a href=&quot;{l_block1.l_block2.U_TITLE}&quot;&gt;{l_block1.l_block2.L_TITLE}&lt;/a&gt;
-				<span class="comment">&lt;!-- ENDIF --&gt;</span>
-			&lt;/li&gt;
-		<span class="comment">&lt;!-- END l_block2 --&gt;</span>
-		&lt;/ul&gt;
-	<span class="comment">&lt;!-- ELSE --&gt;</span>
-		&lt;a class=&quot;nav&quot; href=&quot;{l_block1.U_TITLE}&quot;&gt;{l_block1.L_TITLE}&lt;/a&gt;
-	<span class="comment">&lt;!-- ENDIF --&gt;</span>
-<span class="comment">&lt;!-- END l_block1 --&gt;</span>
-</pre></div>
-
-<p>Let us first concentrate on this part of the example:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN l_block1 --&gt;</span>
-	<span class="comment">&lt;!-- IF l_block1.S_SELECTED --&gt;</span>
-		markup
-	<span class="comment">&lt;!-- ELSE --&gt;</span>
-		&lt;a class=&quot;nav&quot; href=&quot;{l_block1.U_TITLE}&quot;&gt;{l_block1.L_TITLE}&lt;/a&gt;
-	<span class="comment">&lt;!-- ENDIF --&gt;</span>
-<span class="comment">&lt;!-- END l_block1 --&gt;</span>
-</pre></div>
-
-<p>Here we open the loop l_block1 and do some things if the value S_SELECTED within the current loop iteration is true, else we write the blocks link and title. Here, you see <code>{l_block1.L_TITLE}</code> referenced - you remember that L_* variables get automatically assigned the corresponding language entry? This is true, but not within loops. The L_TITLE variable within the loop l_block1 is assigned within the code itself.</p>
-
-<p>Let's have a closer look at the markup:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN l_block1 --&gt;</span>
-.
-.
-	<span class="comment">&lt;!-- IF S_PRIVMSGS --&gt;</span>
-
-		<span class="comment">&lt;!-- BEGIN !folder --&gt;</span>
-			<span class="comment">&lt;!-- IF folder.S_FIRST_ROW --&gt;</span>
-				&lt;ul class=&quot;nav&quot;&gt;
-			<span class="comment">&lt;!-- ENDIF --&gt;</span>
-
-			&lt;li&gt;&lt;a href=&quot;{folder.U_FOLDER}&quot;&gt;{folder.FOLDER_NAME}&lt;/a&gt;&lt;/li&gt;
-
-			<span class="comment">&lt;!-- IF folder.S_LAST_ROW --&gt;</span>
-				&lt;/ul&gt;
-			<span class="comment">&lt;!-- ENDIF --&gt;</span>
-		<span class="comment">&lt;!-- END !folder --&gt;</span>
-
-	<span class="comment">&lt;!-- ENDIF --&gt;</span>
-.
-.
-<span class="comment">&lt;!-- END l_block1 --&gt;</span>
-</pre></div>
-
-<p>The <code>&lt;!-- IF S_PRIVMSGS --&gt;</code> statement clearly checks a global variable and not one within the loop, since the loop is not given here. So, if S_PRIVMSGS is true we execute the shown markup. Now, you see the <code>&lt;!-- BEGIN !folder --&gt;</code> statement. The exclamation mark is responsible for instructing the template engine to iterate through the main loop folder. So, we are now within the loop folder - with <code>&lt;!-- BEGIN folder --&gt;</code> we would have been within the loop <code>l_block1.folder</code> automatically as is the case with l_block2:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN l_block1 --&gt;</span>
-.
-.
-	&lt;ul class=&quot;nav&quot;&gt;
-	<span class="comment">&lt;!-- BEGIN l_block2 --&gt;</span>
-		&lt;li&gt;
-			<span class="comment">&lt;!-- IF l_block1.l_block2.S_SELECTED --&gt;</span>
-				&lt;strong&gt;{l_block1.l_block2.L_TITLE}&lt;/strong&gt;
-			<span class="comment">&lt;!-- ELSE --&gt;</span>
-				&lt;a href=&quot;{l_block1.l_block2.U_TITLE}&quot;&gt;{l_block1.l_block2.L_TITLE}&lt;/a&gt;
-			<span class="comment">&lt;!-- ENDIF --&gt;</span>
-		&lt;/li&gt;
-	<span class="comment">&lt;!-- END l_block2 --&gt;</span>
-	&lt;/ul&gt;
-.
-.
-<span class="comment">&lt;!-- END l_block1 --&gt;</span>
-</pre></div>
-
-<p>You see the difference? The loop l_block2 is a member of the loop l_block1 but the loop folder is a main loop.</p>
-
-<p>Now back to our folder loop:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF folder.S_FIRST_ROW --&gt;</span>
-	&lt;ul class=&quot;nav&quot;&gt;
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-
-&lt;li&gt;&lt;a href=&quot;{folder.U_FOLDER}&quot;&gt;{folder.FOLDER_NAME}&lt;/a&gt;&lt;/li&gt;
-
-<span class="comment">&lt;!-- IF folder.S_LAST_ROW --&gt;</span>
-	&lt;/ul&gt;
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>You may have wondered what the comparison to S_FIRST_ROW and S_LAST_ROW is about. If you haven't guessed already - it is checking for the first iteration of the loop with <code>S_FIRST_ROW</code> and the last iteration with <code>S_LAST_ROW</code>. This can come in handy quite often if you want to open or close design elements, like the above list. Let us imagine a folder loop build with three iterations, it would go this way:</p>
-
-<div class="codebox"><pre>
-&lt;ul class=&quot;nav&quot;&gt; <span class="comment">&lt;!-- written on first iteration --&gt;</span>
-	&lt;li&gt;first element&lt;/li&gt; <span class="comment">&lt;!-- written on first iteration --&gt;</span>
-	&lt;li&gt;second element&lt;/li&gt; <span class="comment">&lt;!-- written on second iteration --&gt;</span>
-	&lt;li&gt;third element&lt;/li&gt; <span class="comment">&lt;!-- written on third iteration --&gt;</span>
-&lt;/ul&gt; <span class="comment">&lt;!-- written on third iteration --&gt;</span>
-</pre></div>
-
-<p>As you can see, all three elements are written down as well as the markup for the first iteration and the last one. Sometimes you want to omit writing the general markup - for example:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF folder.S_FIRST_ROW --&gt;</span>
-	&lt;ul class=&quot;nav&quot;&gt;
-<span class="comment">&lt;!-- ELSEIF folder.S_LAST_ROW --&gt;</span>
-	&lt;/ul&gt;
-<span class="comment">&lt;!-- ELSE --&gt;</span>
-	&lt;li&gt;&lt;a href=&quot;{folder.U_FOLDER}&quot;&gt;{folder.FOLDER_NAME}&lt;/a&gt;&lt;/li&gt;
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>would result in the following markup:</p>
-
-<div class="codebox"><pre>
-&lt;ul class=&quot;nav&quot;&gt; <span class="comment">&lt;!-- written on first iteration --&gt;</span>
-	&lt;li&gt;second element&lt;/li&gt; <span class="comment">&lt;!-- written on second iteration --&gt;</span>
-&lt;/ul&gt; <span class="comment">&lt;!-- written on third iteration --&gt;</span>
-</pre></div>
-
-<p>Just always remember that processing is taking place from top to bottom.</p>
-
-	<h4>Forms</h4>
-		<p>If a form is used for a non-trivial operation (i.e. more than a jumpbox), then it should include the <code>{S_FORM_TOKEN}</code> template variable.</p>
-		<div class="codebox"><pre>
-&lt;form method=&quot;post&quot; id=&quot;mcp&quot; action=&quot;{U_POST_ACTION}&quot;&gt;
-
-	&lt;fieldset class="submit-buttons"&gt;
-		&lt;input type=&quot;reset&quot; value=&quot;{L_RESET}&quot; name=&quot;reset&quot; class=&quot;button2&quot; /&gt;&nbsp;
-		&lt;input type=&quot;submit&quot; name=&quot;action[add_warning]&quot; value=&quot;{L_SUBMIT}&quot; class=&quot;button1&quot; /&gt;
-		{S_FORM_TOKEN}
-	&lt;/fieldset&gt;
-&lt;/form&gt;
-		</pre></div><br />
-
-	<a name="stylestree"></a><h3>4.ii. Styles Tree</h3>
-		<p>When basing a new style on an existing one, it is not necessary to provide all the template files. By declaring the base style name in the <strong>parent</strong> field in the style configuration file, the style can be set to reuse template files from the parent style.</p>
-
-		<p>The effect of doing so is that the template engine will use the template files in the new style where they exist, but fall back to files in the parent style otherwise.</p>
-
-		<p>We strongly encourage the use of parent styles for styles based on the bundled styles, as it will ease the update procedure.</p>
-
-		<div class="codebox"><pre>
-# General Information about this style
-name = Custom Style
-copyright = © phpBB Limited, 2007
-style_version = 3.2.0-b1
-phpbb_version = 3.2.0-b1
-
-# Defining a different template bitfield
-# template_bitfield = lNg=
-
-# Parent style
-# Set value to empty or to this style's name if this style does not have a parent style
-parent = prosilver
-		</pre></div>
-
-		<a name="template-events"></a><h3>4.iii. Template Events</h3>
-		<p>Template events must follow this format: <code>&lt;!-- EVENT event_name --&gt;</code></p>
-		<p>Using the above example, files named <code>event_name.html</code> located within extensions will be injected into the location of the event.</p>
-
-		<h4>Template event naming guidelines:</h4>
-		<ul>
-			<li>An event name must be all lowercase, with each word separated by an underscore.</li>
-			<li>An event name must briefly describe the location and purpose of the event.</li>
-			<li>
-				An event name must end with one of the following suffixes:
-				<ul>
-					<li><code>_prepend</code> - This event adds an item to the beginning of a block of related items, or adds to the beginning of individual items in a block.</li>
-					<li><code>_append</code> - This event adds an item to the end of a block of related items, or adds to the end of individual items in a block.</li>
-					<li><code>_before</code> - This event adds content directly before the specified block</li>
-					<li><code>_after</code> - This event adds content directly after the specified block</li>
-				</ul>
-			</li>
-		</ul>
-
-		<h4>Template event documentation</h4>
-		<p>Events must be documented in <code>phpBB/docs/events.md</code> in alphabetical order based on the event name. The format is as follows:</p>
-
-		<ul><li>An event found in only one template file:
-		<div class="codebox"><pre>event_name
-===
-* Location: styles/&lt;style_name&gt;/template/filename.html
-* Purpose: A brief description of what this event should be used for.
-This may span multiple lines.
-* Since: Version since when the event was added
-</pre></div></li>
-		<li>An event found in multiple template files:
-		<div class="codebox"><pre>event_name
-===
-* Locations:
-    + first/file/path.html
-    + second/file/path.html
-* Purpose: Same as above.
-* Since: 3.2.0-b1
-</pre></div>
-		<li>An event that is found multiple times in a file should have the number of instances in parenthesis next to the filename.
-		<div class="codebox"><pre>event_name
-===
-* Locations:
-    + first/file/path.html (2)
-    + second/file/path.html
-* Purpose: Same as above.
-* Since: 3.2.0-b1
-</pre></div></li>
-		<li>An actual example event documentation:
-		<div class="codebox"><pre>forumlist_body_last_post_title_prepend
-====
-* Locations:
-    + styles/prosilver/template/forumlist_body.html
-    + styles/subsilver2/template/forumlist_body.html
-* Purpose: Add content before the post title of the latest post in a forum on the forum list.
-* Since: 3.2.0-a1
-</pre></div></ul><br />
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-
-
-<a name="charsets"></a><h2>5. Character Sets and Encodings</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-
-
-<h4>What are Unicode, UCS and UTF-8?</h4>
-<p>The <a href="http://en.wikipedia.org/wiki/Universal_Character_Set">Universal Character Set (UCS)</a> described in ISO/IEC 10646 consists of a large amount of characters. Each of them has a unique name and a code point which is an integer number. <a href="http://en.wikipedia.org/wiki/Unicode">Unicode</a> - which is an industry standard - complements the Universal Character Set with further information about the characters' properties and alternative character encodings. More information on Unicode can be found on the <a href="http://www.unicode.org/">Unicode Consortium's website</a>. One of the Unicode encodings is the <a href="http://en.wikipedia.org/wiki/UTF-8">8-bit Unicode Transformation Format (UTF-8)</a>. It encodes characters with up to four bytes aiming for maximum compatibility with the <a href="http://en.wikipedia.org/wiki/ASCII">American Standard Code for Information Interchange</a> which is a 7-bit encoding of a relatively small subset of the UCS.</p>
-
-<h4>phpBB's use of Unicode</h4>
-<p>Unfortunately PHP does not facilitate the use of Unicode prior to version 6. Most functions simply treat strings as sequences of bytes assuming that each character takes up exactly one byte. This behaviour still allows for storing UTF-8 encoded text in PHP strings but many operations on strings have unexpected results. To circumvent this problem we have created some alternative functions to PHP's native string operations which use code points instead of bytes. These functions can be found in <code>/includes/utf/utf_tools.php</code>. They are also covered in the <a href="http://area51.phpbb.com/docs/code/">phpBB3 Sourcecode Documentation</a>. A lot of native PHP functions still work with UTF-8 as long as you stick to certain restrictions. For example <code>explode</code> still works as long as the first and the last character of the delimiter string are ASCII characters.</p>
-
-<p>phpBB only uses the ASCII and the UTF-8 character encodings. Still all Strings are UTF-8 encoded because ASCII is a subset of UTF-8. The only exceptions to this rule are code sections which deal with external systems which use other encodings and character sets. Such external data should be converted to UTF-8 using the <code>utf8_recode()</code> function supplied with phpBB. It supports a variety of other character sets and encodings, a full list can be found below.</p>
-
-<p>With <code>$request->variable()</code> you can either allow all UCS characters in user input or restrict user input to ASCII characters. This feature is controlled by the method's third parameter called <code>$multibyte</code>. You should allow multibyte characters in posts, PMs, topic titles, forum names, etc. but it's not necessary for internal uses like a <code>$mode</code> variable which should only hold a predefined list of ASCII strings anyway.</p>
-
-<div class="codebox"><pre>
-// an input string containing a multibyte character
-$_REQUEST['multibyte_string'] = 'K&#228;se';
-
-// print request variable as a UTF-8 string allowing multibyte characters
-echo $request->variable('multibyte_string', '', true);
-// print request variable as ASCII string
-echo $request->variable('multibyte_string', '');
-</pre></div>
-
-<p>This code snippet will generate the following output:</p>
-
-<div class="codebox"><pre>
-K&#228;se
-K??se
-</pre></div>
-
-<h4>Case Folding</h4>
-
-<p>Case insensitive comparison of strings is no longer possible with <code>strtolower</code> or <code>strtoupper</code> as some characters have multiple lower case or multiple upper case forms depending on their position in a word. The <code>utf8_strtolower</code> and the <code>utf8_strtoupper</code> functions suffer from the same problem so they can only be used to display upper/lower case versions of a string but they cannot be used for case insensitive comparisons either. So instead you should use case folding which gives you a case insensitive version of the string which can be used for case insensitive comparisons. An NFC normalized string can be case folded using <code>utf8_case_fold_nfc()</code>.</p>
-
-<p class="bad">// Bad - The strings might be the same even if strtolower differs</p>
-
-<div class="codebox"><pre>
-if (strtolower($string1) == strtolower($string2))
-{
-	echo '$string1 and $string2 are equal or differ in case';
-}
-</pre></div>
-
-<p class="good">// Good - Case folding is really case insensitive</p>
-
-<div class="codebox"><pre>
-if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
-{
-	echo '$string1 and $string2 are equal or differ in case';
-}
-</pre></div>
-
-<h4>Confusables Detection</h4>
-
-<p>phpBB offers a special method <code>utf8_clean_string</code> which can be used to make sure string identifiers are unique. This method uses Normalization Form Compatibility Composition (NFKC) instead of NFC and replaces similarly looking characters with a particular representative of the equivalence class. This method is currently used for usernames and group names to avoid confusion with similarly looking names.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="translation"></a><h2>6. Translation (<abbr title="Internationalisation">i18n</abbr>/<abbr title="Localisation">L10n</abbr>) Guidelines</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-	<a name="standardisation"></a><h3>6.i. Standardisation</h3>
-
-	<h4>Reason:</h4>
-
-	<p>phpBB is one of the most translated open-source projects, with the current stable version being available in over 60 localisations. Whilst the ad hoc approach to the naming of language packs has worked, for phpBB3 and beyond we hope to make this process saner which will allow for better interoperation with current and future web browsers.</p>
-
-	<h4>Encoding:</h4>
-
-	<p>With phpBB3, the output encoding for the forum in now UTF-8, a Universal Character Encoding by the Unicode Consortium that is by design a superset to US-ASCII and ISO-8859-1. By using one character set which simultaenously supports all scripts which previously would have required different encodings (eg: ISO-8859-1 to ISO-8859-15 (Latin, Greek, Cyrillic, Thai, Hebrew, Arabic); GB2312 (Simplified Chinese); Big5 (Traditional Chinese), EUC-JP (Japanese), EUC-KR (Korean), VISCII (Vietnamese); et cetera), we remove the need to convert between encodings and improves the accessibility of multilingual forums.</p>
-
-	<p>The impact is that the language files for phpBB must now also be encoded as UTF-8, with a caveat that the files must <strong>not contain</strong> a <abbr title="Byte-Order-Mark">BOM</abbr> for compatibility reasons with non-Unicode aware versions of PHP. For those with forums using the Latin character set (ie: most European languages), this change is transparent since UTF-8 is superset to US-ASCII and ISO-8859-1.</p>
-
-	<h4>Language Tag:</h4>
-
-	<p>The <abbr title="Internet Engineering Task Force">IETF</abbr> recently published <a href="http://tools.ietf.org/html/rfc4646">RFC 4646</a> for tags used to identify languages, which in combination with <a href="http://tools.ietf.org/html/rfc4647">RFC 4647</a> obseletes the older <a href="http://tools.ietf.org/html/rfc3066">RFC 3006</a> and older-still <a href="http://tools.ietf.org/html/rfc1766">RFC 1766</a>. <a href="http://tools.ietf.org/html/rfc4646">RFC 4646</a> uses <a href="http://www.loc.gov/standards/iso639-2/php/English_list.php">ISO 639-1/ISO 639-2</a>, <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a>, <a href="http://www.unicode.org/iso15924/iso15924-codes.html">ISO 15924</a> and <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a> to define a language tag. Each complete tag is composed of subtags which are not case sensitive and can also be empty.</p>
-
-	<p>Ordering of the subtags in the case that they are all non-empty is: <code>language</code>-<code>script</code>-<code>region</code>-<code>variant</code>-<code>extension</code>-<code>privateuse</code>. Should any subtag be empty, its corresponding hyphen would also be omitted. Thus, the language tag for English will be <code>en</code> <strong>and not</strong> <code>en-----</code>.</p>
-
-	<p>Most language tags consist of a two- or three-letter language subtag (from <a href="http://www.loc.gov/standards/iso639-2/php/English_list.php">ISO 639-1/ISO 639-2</a>). Sometimes, this is followed by a two-letter or three-digit region subtag (from <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> or <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a>). Some examples are:</p>
-
-	<table>
-	<caption>Examples of various possible language tags as described by RFC 4646 and RFC 4647</caption>
-	<thead>
-	<tr>
-		<th scope="col">Language tag</th>
-		<th scope="col">Description</th>
-		<th scope="col">Component subtags</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>en</code></td>
-		<td>English</td>
-		<td><code>language</code></td>
-	</tr>
-	<tr>
-		<td><code>mas</code></td>
-		<td>Masai</td>
-		<td><code>language</code></td>
-	</tr>
-	<tr>
-		<td><code>fr-CA</code></td>
-		<td>French as used in Canada</td>
-		<td><code>language</code>+<code>region</code></td>
-	</tr>
-	<tr>
-		<td><code>en-833</code></td>
-		<td>English as used in the Isle of Man</td>
-		<td><code>language</code>+<code>region</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-Hans</code></td>
-		<td>Chinese written with Simplified script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-Hant-HK</code></td>
-		<td>Chinese written with Traditional script as used in Hong Kong</td>
-		<td><code>language</code>+<code>script</code>+<code>region</code></td>
-	</tr>
-	<tr>
-		<td><code>de-AT-1996</code></td>
-		<td>German as used in Austria with 1996 orthography</td>
-		<td><code>language</code>+<code>region</code>+<code>variant</code></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>The ultimate aim of a language tag is to convey the needed <strong>useful distingushing information</strong>, whilst keeping it as <strong>short as possible</strong>. So for example, use <code>en</code>, <code>fr</code> and <code>ja</code> as opposed to <code>en-GB</code>, <code>fr-FR</code> and <code>ja-JP</code>, since we know English, French and Japanese are the native language of Great Britain, France and Japan respectively.</p>
-
-	<p>Next is the <a href="http://www.unicode.org/iso15924/iso15924-codes.html">ISO 15924</a> language script code and when one should or shouldn't use it. For example, whilst <code>en-Latn</code> is syntaxically correct for describing English written with Latin script, real world English writing is <strong>more-or-less exclusively in the Latin script</strong>. For such languages like English that are written in a single script, the <a href="http://www.iana.org/assignments/language-subtag-registry"><abbr title="Internet Assigned Numbers Authority">IANA</abbr> Language Subtag Registry</a> has a "Suppress-Script" field meaning the script code <strong>should be omitted</strong> unless a specific language tag requires a specific script code. Some languages are <strong>written in more than one script</strong> and in such cases, the script code <strong>is encouraged</strong> since an end-user may be able to read their language in one script, but not the other. Some examples are:</p>
-
-	<table>
-	<caption>Examples of using a language subtag in combination with a script subtag</caption>
-	<thead>
-	<tr>
-		<th scope="col">Language tag</th>
-		<th scope="col">Description</th>
-		<th scope="col">Component subtags</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>en-Brai</code></td>
-		<td>English written in Braille script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>en-Dsrt</code></td>
-		<td>English written in Deseret (Mormon) script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>sr-Latn</code></td>
-		<td>Serbian written in Latin script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>sr-Cyrl</code></td>
-		<td>Serbian written in Cyrillic script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>mn-Mong</code></td>
-		<td>Mongolian written in Mongolian script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>mn-Cyrl</code></td>
-		<td>Mongolian written in Cyrillic script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>mn-Phag</code></td>
-		<td>Mongolian written in Phags-pa script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>az-Cyrl-AZ</code></td>
-		<td>Azerbaijani written in Cyrillic script as used in Azerbaijan</td>
-		<td><code>language</code>+<code>script</code>+<code>region</code></td>
-	</tr>
-	<tr>
-		<td><code>az-Latn-AZ</code></td>
-		<td>Azerbaijani written in Latin script as used in Azerbaijan</td>
-		<td><code>language</code>+<code>script</code>+<code>region</code></td>
-	</tr>
-	<tr>
-		<td><code>az-Arab-IR</code></td>
-		<td>Azerbaijani written in Arabic script as used in Iran</td>
-		<td><code>language</code>+<code>script</code>+<code>region</code></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>Usage of the three-digit <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a> code over the two-letter <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> code should happen if a macro-geographical entity is required and/or the <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> is ambiguous.</p>
-
-	<p>Examples of English using marco-geographical regions:</p>
-
-	<table>
-	<caption>Coding for English using macro-geographical regions (examples for English of ISO 3166-1 alpha-2 vs. UN M.49 code)</caption>
-	<thead>
-	<tr>
-		<th scope="col">ISO 639-1/ISO 639-2 + ISO 3166-1 alpha-2</th>
-		<th scope="col" colspan="2">ISO 639-1/ISO 639-2 + UN M.49 (Example macro regions)</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><dl><dt><code>en-AU</code></dt><dd>English as used in <strong>Australia</strong></dd></dl></td>
-		<td rowspan="2"><dl><dt><code>en-053</code></dt><dd>English as used in <strong>Australia &amp; New Zealand</strong></dd></dl></td>
-		<td rowspan="3"><dl><dt><code>en-009</code></dt><dd>English as used in <strong>Oceania</strong></dd></dl></td>
-	</tr>
-	<tr>
-		<td><dl><dt><code>en-NZ</code></dt><dd>English as used in <strong>New Zealand</strong></dd></dl></td>
-	</tr>
-	<tr>
-		<td><dl><dt><code>en-FJ</code></dt><dd>English as used in <strong>Fiji</strong></dd></dl></td>
-		<td><dl><dt><code>en-054 </code></dt><dd>English as used in <strong>Melanesia</strong></dd></dl></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>Examples of Spanish using marco-geographical regions:</p>
-
-	<table>
-	<caption>Coding for Spanish macro-geographical regions (examples for Spanish of ISO 3166-1 alpha-2 vs. UN M.49 code)</caption>
-	<thead>
-	<tr>
-		<th scope="col">ISO 639-1/ISO 639-2 + ISO 3166-1 alpha-2</th>
-		<th scope="col" colspan="2">ISO 639-1/ISO 639-2 + UN M.49 (Example macro regions)</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><dl><dt><code>es-PR</code></dt><dd>Spanish as used in <strong>Puerto Rico</strong></dd></dl></td>
-		<td rowspan="3"><dl><dt><code>es-419</code></dt><dd>Spanish as used in <strong>Latin America &amp; the Caribbean</strong></dd></dl></td>
-		<td rowspan="4"><dl><dt><code>es-019</code></dt><dd>Spanish as used in <strong>the Americas</strong></dd></dl></td>
-	</tr>
-	<tr>
-		<td><dl><dt><code>es-HN</code></dt><dd>Spanish as used in <strong>Honduras</strong></dd></dl></td>
-	</tr>
-	<tr>
-		<td><dl><dt><code>es-AR</code></dt><dd>Spanish as used in <strong>Argentina</strong></dd></dl></td>
-	</tr>
-	<tr>
-		<td><dl><dt><code>es-US</code></dt><dd>Spanish as used in <strong>United States of America</strong></dd></dl></td>
-		<td><dl><dt><code>es-021</code></dt><dd>Spanish as used in <strong>North America</strong></dd></dl></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>Example of where the <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> is ambiguous and why <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a> might be preferred:</p>
-
-	<table>
-	<caption>Coding for ambiguous ISO 3166-1 alpha-2 regions</caption>
-	<thead>
-	<tr>
-		<th scope="col" colspan="2"><code>CS</code> assignment pre-1994</th>
-		<th scope="col" colspan="2"><code>CS</code> assignment post-1994</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td colspan="2">
-		<dl>
-		<dt><code>CS</code></dt><dd><strong>Czechoslovakia</strong> (ISO 3166-1)</dd>
-		<dt><code>200</code></dt><dd><strong>Czechoslovakia</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-		<td colspan="2">
-		<dl>
-		<dt><code>CS</code></dt><dd><strong>Serbian &amp; Montenegro</strong> (ISO 3166-1)</dd>
-		<dt><code>891</code></dt><dd><strong>Serbian &amp; Montenegro</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<dl>
-		<dt><code>CZ</code></dt><dd><strong>Czech Republic</strong> (ISO 3166-1)</dd>
-		<dt><code>203</code></dt><dd><strong>Czech Republic</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-		<td>
-		<dl>
-		<dt><code>SK</code></dt><dd><strong>Slovakia</strong> (ISO 3166-1)</dd>
-		<dt><code>703</code></dt><dd><strong>Slovakia</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-		<td>
-		<dl>
-		<dt><code>RS</code></dt><dd><strong>Serbia</strong> (ISO 3166-1)</dd>
-		<dt><code>688</code></dt><dd><strong>Serbia</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-		<td>
-		<dl>
-		<dt><code>ME</code></dt><dd><strong>Montenegro</strong> (ISO 3166-1)</dd>
-		<dt><code>499</code></dt><dd><strong>Montenegro</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-	</tr>
-	</tbody>
-	</table>
-
-	<h4>Macro-languages &amp; Topolects:</h4>
-
-	<p><a href="http://tools.ietf.org/html/rfc4646">RFC 4646</a> anticipates features which shall be available in (currently draft) <a href="http://www.sil.org/iso639-3/">ISO 639-3</a> which aims to provide as complete enumeration of languages as possible, including living, extinct, ancient and constructed languages, whether majour, minor or unwritten. A new feature of <a href="http://www.sil.org/iso639-3/">ISO 639-3</a> compared to the previous two revisions is the concept of <a href="http://www.sil.org/iso639-3/macrolanguages.asp">macrolanguages</a> where Arabic and Chinese are two such examples. In such cases, their respective codes of <code>ar</code> and <code>zh</code> is very vague as to which dialect/topolect is used or perhaps some terse classical variant which may be difficult for all but very educated users. For such macrolanguages, it is recommended that the sub-language tag is used as a suffix to the macrolanguage tag, eg:</p>
-
-	<table>
-	<caption>Macrolanguage subtag + sub-language subtag examples</caption>
-	<thead>
-	<tr>
-		<th scope="col">Language tag</th>
-		<th scope="col">Description</th>
-		<th scope="col">Component subtags</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>zh-cmn</code></td>
-		<td>Mandarin (Putonghau/Guoyu) Chinese</td>
-		<td><code>macrolanguage</code>+<code>sublanguage</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-yue</code></td>
-		<td>Yue (Cantonese) Chinese</td>
-		<td><code>macrolanguage</code>+<code>sublanguage</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-cmn-Hans</code></td>
-		<td>Mandarin (Putonghau/Guoyu) Chinese written in Simplified script</td>
-		<td><code>macrolanguage</code>+<code>sublanguage</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-cmn-Hant</code></td>
-		<td>Mandarin (Putonghau/Guoyu) Chinese written in Traditional script</td>
-		<td><code>macrolanguage</code>+<code>sublanguage</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-nan-Latn-TW</code></td>
-		<td>Minnan (Hoklo) Chinese written in Latin script (POJ Romanisation) as used in Taiwan</td>
-		<td><code>macrolanguage</code>+<code>sublanguage</code>+<code>script</code>+<code>region</code></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<a name="otherconsiderations"></a><h3>6.ii. Other considerations</h3>
-
-	<h4>Normalisation of language tags for phpBB:</h4>
-
-	<p>For phpBB, the language tags are <strong>not</strong> used in their raw form and instead converted to all lower-case and have the hyphen <code>-</code> replaced with an underscore <code>_</code> where appropriate, with some examples below:</p>
-
-	<table>
-	<caption>Language tag normalisation examples</caption>
-	<thead>
-	<tr>
-		<th scope="col">Raw language tag</th>
-		<th scope="col">Description</th>
-		<th scope="col">Value of <code>USER_LANG</code><br />in <code>./common.php</code></th>
-		<th scope="col">Language pack directory<br />name in <code>/language/</code></th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>en</code></td>
-		<td>British English</td>
-		<td><code>en</code></td>
-		<td><code>en</code></td>
-	</tr>
-	<tr>
-		<td><code>de-AT</code></td>
-		<td>German as used in Austria</td>
-		<td><code>de-at</code></td>
-		<td><code>de_at</code></td>
-	</tr>
-	<tr>
-		<td><code>es-419</code></td>
-		<td>Spanish as used in Latin America &amp; Caribbean</td>
-		<td><code>en-419</code></td>
-		<td><code>en_419</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-yue-Hant-HK</code></td>
-		<td>Cantonese written in Traditional script as used in Hong Kong</td>
-		<td><code>zh-yue-hant-hk</code></td>
-		<td><code>zh_yue_hant_hk</code></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<h4>How to use <code>iso.txt</code>:</h4>
-
-	<p>The <code>iso.txt</code> file is a small UTF-8 encoded plain-text file which consists of three lines:</p>
-
-	<ol>
-		<li><code>Language's English name</code></li>
-		<li><code>Language's local name</code></li>
-		<li><code>Authors information</code></li>
-	</ol>
-
-	<p><code>iso.txt</code> is automatically generated by the language pack submission system on phpBB.com. You don't have to create this file yourself if you plan on releasing your language pack on phpBB.com, but do keep in mind that phpBB itself does require this file to be present.</p>
-
-	<p>Because language tags themselves are meant to be machine read, they can be rather obtuse to humans and why descriptive strings as provided by <code>iso.txt</code> are needed. Whilst <code>en-US</code> could be fairly easily deduced to be "English as used in the United States", <code>de-CH</code> is more difficult less one happens to know that <code>de</code> is from "<span lang="de">Deutsch</span>", German for "German" and <code>CH</code> is the abbreviation of the official Latin name for Switzerland, "<span lang="la">Confoederatio Helvetica</span>".</p>
-
-	<p>For the English language description, the language name is always first and any additional attributes required to describe the subtags within the language code are then listed in order separated with commas and enclosed within parentheses, eg:</p>
-
-	<table>
-	<caption>English language description examples for iso.txt</caption>
-	<thead>
-	<tr>
-		<th scope="col">Raw language tag</th>
-		<th scope="col">English description within <code>iso.txt</code></th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>en</code></td>
-		<td>British English</td>
-	</tr>
-	<tr>
-		<td><code>en-US</code></td>
-		<td>English (United States)</td>
-	</tr>
-	<tr>
-		<td><code>en-053</code></td>
-		<td>English (Australia &amp; New Zealand)</td>
-	</tr>
-	<tr>
-		<td><code>de</code></td>
-		<td>German</td>
-	</tr>
-	<tr>
-		<td><code>de-CH-1996</code></td>
-		<td>German (Switzerland, 1996 orthography)</td>
-	</tr>
-	<tr>
-		<td><code>gws-1996</code></td>
-		<td>Swiss German (1996 orthography)</td>
-	</tr>
-	<tr>
-		<td><code>zh-cmn-Hans-CN</code></td>
-		<td>Mandarin Chinese (Simplified, Mainland China)</td>
-	</tr>
-	<tr>
-		<td><code>zh-yue-Hant-HK</code></td>
-		<td>Cantonese Chinese (Traditional, Hong Kong)</td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>For the localised language description, just translate the English version though use whatever appropriate punctuation typical for your own locale, assuming the language uses punctuation at all.</p>
-
-	<h4>Unicode bi-directional considerations:</h4>
-
-	<p>Because phpBB is now UTF-8, all translators must take into account that certain strings may be shown when the directionality of the document is either opposite to normal or is ambiguous.</p>
-
-	<p>The various Unicode control characters for bi-directional text and their HTML enquivalents where appropriate are as follows:</p>
-
-	<table>
-	<caption>Unicode bidirectional control characters &amp; HTML elements/entities</caption>
-	<thead>
-	<tr>
-		<th scope="col">Unicode character<br />abbreviation</th>
-		<th scope="col">Unicode<br />code-point</th>
-		<th scope="col">Unicode character<br />name</th>
-		<th scope="col">Equivalent HTML<br />markup/entity</th>
-		<th scope="col">Raw character<br />(enclosed between '')</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>LRM</code></td>
-		<td><code>U+200E</code></td>
-		<td>Left-to-Right Mark</td>
-		<td><code>&amp;lrm;</code></td>
-		<td>'&#x200E;'</td>
-	</tr>
-	<tr>
-		<td><code>RLM</code></td>
-		<td><code>U+200F</code></td>
-		<td>Right-to-Left Mark</td>
-		<td><code>&amp;rlm;</code></td>
-		<td>'&#x200F;'</td>
-	</tr>
-	<tr>
-		<td><code>LRE</code></td>
-		<td><code>U+202A</code></td>
-		<td>Left-to-Right Embedding</td>
-		<td><code>dir=&quot;ltr&quot;</code></td>
-		<td>'&#x202A;'</td>
-	</tr>
-	<tr>
-		<td><code>RLE</code></td>
-		<td><code>U+202B</code></td>
-		<td>Right-to-Left Embedding</td>
-		<td><code>dir=&quot;rtl&quot;</code></td>
-		<td>'&#x202B;'</td>
-	</tr>
-	<tr>
-		<td><code>PDF</code></td>
-		<td><code>U+202C</code></td>
-		<td>Pop Directional Formatting</td>
-		<td><code>&lt;/bdo&gt;</code></td>
-		<td>'&#x202C;'</td>
-	</tr>
-	<tr>
-		<td><code>LRO</code></td>
-		<td><code>U+202D</code></td>
-		<td>Left-to-Right Override</td>
-		<td><code>&lt;bdo dir=&quot;ltr&quot;&gt;</code></td>
-		<td>'&#x202D;'</td>
-	</tr>
-	<tr>
-		<td><code>RLO</code></td>
-		<td><code>U+202E</code></td>
-		<td>Right-to-Left Override</td>
-		<td><code>&lt;bdo dir=&quot;rtl&quot;&gt;</code></td>
-		<td>'&#x202E;'</td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>For <code>iso.txt</code>, the directionality of the text can be explicitly set using special Unicode characters via any of the three methods provided by left-to-right/right-to-left markers/embeds/overrides, as without them, the ordering of characters will be incorrect, eg:</p>
-
-	<table>
-	<caption>Unicode bidirectional control characters iso.txt</caption>
-	<thead>
-	<tr>
-		<th scope="col">Directionality</th>
-		<th scope="col">Raw character view</th>
-		<th scope="col">Display of localised<br />description in <code>iso.txt</code></th>
-		<th scope="col">Ordering</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>dir=&quot;ltr&quot;</code></td>
-		<td>English (Australia &amp; New Zealand)</td>
-		<td dir="ltr">English (Australia &amp; New Zealand)</td>
-		<td class="good">Correct</td>
-	</tr>
-	<tr>
-		<td><code>dir=&quot;rtl&quot;</code></td>
-		<td>English (Australia &amp; New Zealand)</td>
-		<td dir="rtl">English (Australia &amp; New Zealand)</td>
-		<td class="bad">Incorrect</td>
-	</tr>
-	<tr>
-		<td><code>dir=&quot;rtl&quot;</code> with <code>LRM</code></td>
-		<td>English (Australia &amp; New Zealand)<code>U+200E</code></td>
-		<td dir="rtl">English (Australia &amp; New Zealand)&#x200E;</td>
-		<td class="good">Correct</td>
-	</tr>
-	<tr>
-		<td><code>dir=&quot;rtl&quot;</code> with <code>LRE</code> &amp; <code>PDF</code></td>
-		<td><code>U+202A</code>English (Australia &amp; New Zealand)<code>U+202C</code></td>
-		<td dir="rtl">&#x202A;English (Australia &amp; New Zealand)&#x202C;</td>
-		<td class="good">Correct</td>
-	</tr>
-	<tr>
-		<td><code>dir=&quot;rtl&quot;</code> with <code>LRO</code> &amp; <code>PDF</code></td>
-		<td><code>U+202D</code>English (Australia &amp; New Zealand)<code>U+202C</code></td>
-		<td dir="rtl">&#x202D;English (Australia &amp; New Zealand)&#x202C;</td>
-		<td class="good">Correct</td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>In choosing which of the three methods to use, in the majority of cases, the <code>LRM</code> or <code>RLM</code> to put a &quot;strong&quot; character to fully enclose an ambiguous punctuation character and thus make it inherit the correct directionality is sufficient.</p>
-	<p>Within some cases, there may be mixed scripts of a left-to-right and right-to-left direction, so using <code>LRE</code> &amp; <code>RLE</code> with <code>PDF</code> may be more appropriate. Lastly, in very rare instances where directionality must be forced, then use <code>LRO</code> &amp; <code>RLO</code> with <code>PDF</code>.</p>
-	<p>For further information on authoring techniques of bi-directional text, please see the W3C tutorial on <a href="http://www.w3.org/International/tutorials/bidi-xhtml/">authoring techniques for XHTML pages with bi-directional text</a>.</p>
-
-	<a name="placeholders"></a><h3>6.iii. Working with placeholders</h3>
-
-	<p>As phpBB is translated into languages with different ordering rules to that of English, it is possible to show specific values in any order deemed appropriate. Take for example the extremely simple &quot;Page <em>X</em> of <em>Y</em>&quot;, whilst in English this could just be coded as:</p>
-
-	<div class="codebox"><pre>
-	...
-'PAGE_OF'	=&gt;	'Page %s of %s',
-		/* Just grabbing the replacements as they
-		come and hope they are in the right order */
-	...</pre>
-	</div>
-
-	<p>&hellip; a clearer way to show explicit replacement ordering is to do:</p>
-
-	<div class="codebox"><pre>
-	...
-'PAGE_OF'	=&gt;	'Page %1$s of %2$s',
-		/* Explicit ordering of the replacements,
-		even if they are the same order as English */
-	...</pre>
-	</div>
-
-	<p>Why bother at all? Because some languages, the string transliterated back to English might read something like:</p>
-
-	<div class="codebox"><pre>
-	...
-'PAGE_OF'	=&gt;	'Total of %2$s pages, currently on page %1$s',
-		/* Explicit ordering of the replacements,
-		reversed compared to English as the total comes first */
-	...</pre>
-	</div>
-
-	<a name="usingplurals"></a><h3>6.iv. Using plurals</h3>
-
-	<p>
-		The english language is very simple when it comes to plurals.<br />
-		You have <code>0 elephants</code>, <code>1 elephant</code>, or <code>2+ elephants</code>. So basically you have 2 different forms: one singular and one plural.<br />
-		But for some other languages this is quite more difficult. Let's take the Bosnian language as another example:<br />
-		You have <code>[1/21/31] slon</code>, <code>[2/3/4] slona</code>, <code>[0/5/6] slonova</code> and <code>[7/8/9/11] ...</code> and some more difficult rules.
-	</p>
-
-	<p>The <a href="https://area51.phpbb.com/docs/dev/3.3.x/language/plurals.html">plural system</a> takes care of this and can be used as follows:</p>
-
-	<p>The PHP code will basically look like this:</p>
-
-	<div class="codebox"><pre>
-	...
-	$user->lang('NUMBER_OF_ELEPHANTS', $number_of_elephants);
-	...</pre>
-	</div>
-
-	<p>And the English translation would be:</p>
-
-	<div class="codebox"><pre>
-	...
-	'NUMBER_OF_ELEPHANTS'	=> array(
-		0	=> 'You have no elephants', // Optional special case for 0
-		1	=> 'You have 1 elephant', // Singular
-		2	=> 'You have %d elephants', // Plural
-	),
-	...</pre>
-	</div>
-
-	<p>While the Bosnian translation can have more cases:</p>
-
-	<div class="codebox"><pre>
-	...
-	'NUMBER_OF_ELEPHANTS'	=> array(
-		0	=> 'You have no slonova', // Optional special case for 0
-		1	=> 'You have %d slon', // Used for 1, 21, 31, ..
-		2	=> 'You have %d slona', // Used for 5, 6,
-		3	=> ...
-	),
-	...</pre>
-	</div>
-
-	<p><strong>NOTE:</strong> It is okay to use plurals for an unknown number compared to a single item, when the number is not known and displayed:</p>
-	<div class="codebox"><pre>
-	...
-	'MODERATOR'	=> 'Moderator',  // Your board has 1 moderator
-	'MODERATORS'	=> 'Moderators', // Your board has multiple moderators
-	...</pre>
-	</div>
-
-	<a name="writingstyle"></a><h3>6.v. Writing Style</h3>
-
-	<h4>Miscellaneous tips &amp; hints:</h4>
-
-	<p>As the language files are PHP files, where the various strings for phpBB are stored within an array which in turn are used for display within an HTML page, rules of syntax for both must be considered. Potentially problematic characters are: <code>'</code> (straight quote/apostrophe), <code>&quot;</code> (straight double quote), <code>&lt;</code> (less-than sign), <code>&gt;</code> (greater-than sign) and <code>&amp;</code> (ampersand).</p>
-
-	<p class="bad">// Bad - The un-escapsed straight-quote/apostrophe will throw a PHP parse error</p>
-
-	<div class="codebox"><pre>
-	...
-'CONV_ERROR_NO_AVATAR_PATH'
-	=&gt;	'Note to developer: you must specify $convertor['avatar_path'] to use %s.',
-	...</pre>
-	</div>
-
-	<p class="good">// Good - Literal straight quotes should be escaped with a backslash, ie: \</p>
-
-	<div class="codebox"><pre>
-	...
-'CONV_ERROR_NO_AVATAR_PATH'
-	=&gt;	'Note to developer: you must specify $convertor[\'avatar_path\'] to use %s.',
-	...</pre>
-	</div>
-
-	<p>However, because phpBB3 now uses UTF-8 as its sole encoding, we can actually use this to our advantage and not have to remember to escape a straight quote when we don't have to:</p>
-
-	<p class="bad">// Bad - The un-escapsed straight-quote/apostrophe will throw a PHP parse error</p>
-
-	<div class="codebox"><pre>
-	...
-'USE_PERMISSIONS'	=&gt;	'Test out user's permissions',
-	...</pre>
-	</div>
-
-	<p class="good">// Okay - However, non-programmers wouldn't type "user\'s" automatically</p>
-
-	<div class="codebox"><pre>
-	...
-'USE_PERMISSIONS'	=&gt;	'Test out user\'s permissions',
-	...</pre>
-	</div>
-
-	<p class="good">// Best - Use the Unicode Right-Single-Quotation-Mark character</p>
-
-	<div class="codebox"><pre>
-	...
-'USE_PERMISSIONS'	=&gt;	'Test out user&rsquo;s permissions',
-	...</pre>
-	</div>
-
-	<p>The <code>&quot;</code> (straight double quote), <code>&lt;</code> (less-than sign) and <code>&gt;</code> (greater-than sign) characters can all be used as displayed glyphs or as part of HTML markup, for example:</p>
-
-	<p class="bad">// Bad - Invalid HTML, as segments not part of elements are not entitised</p>
-
-	<div class="codebox"><pre>
-	...
-'FOO_BAR'	=&gt;	'PHP version &lt; 5.3.3.&lt;br /&gt;
-	Visit &quot;Downloads&quot; at &lt;a href=&quot;http://www.php.net/&quot;&gt;www.php.net&lt;/a&gt;.',
-	...</pre>
-	</div>
-
-	<p class="good">// Okay - No more invalid HTML, but &quot;&amp;quot;&quot; is rather clumsy</p>
-
-	<div class="codebox"><pre>
-	...
-'FOO_BAR'	=&gt;	'PHP version &amp;lt; 5.3.3.&lt;br /&gt;
-	Visit &amp;quot;Downloads&amp;quot; at &lt;a href=&quot;http://www.php.net/&quot;&gt;www.php.net&lt;/a&gt;.',
-	...</pre>
-	</div>
-
-	<p class="good">// Best - No more invalid HTML, and usage of correct typographical quotation marks</p>
-
-	<div class="codebox"><pre>
-	...
-'FOO_BAR'	=&gt;	'PHP version &amp;lt; 5.3.3.&lt;br /&gt;
-	Visit &ldquo;Downloads&rdquo; at &lt;a href=&quot;http://www.php.net/&quot;&gt;www.php.net&lt;/a&gt;.',
-	...</pre>
-	</div>
-
-	<p>Lastly, the <code>&amp;</code> (ampersand) must always be entitised regardless of where it is used:</p>
-
-	<p class="bad">// Bad - Invalid HTML, none of the ampersands are entitised</p>
-
-	<div class="codebox"><pre>
-	...
-'FOO_BAR'	=&gt;	'&lt;a href=&quot;http://somedomain.tld/?foo=1&amp;bar=2&quot;&gt;Foo &amp; Bar&lt;/a&gt;.',
-	...</pre>
-	</div>
-
-	<p class="good">// Good - Valid HTML, amperands are correctly entitised in all cases</p>
-
-	<div class="codebox"><pre>
-	...
-'FOO_BAR'	=&gt;	'&lt;a href=&quot;http://somedomain.tld/?foo=1&amp;amp;bar=2&quot;&gt;Foo &amp;amp; Bar&lt;/a&gt;.',
-	...</pre>
-	</div>
-
-	<p>As for how these charcters are entered depends very much on choice of Operating System, current language locale/keyboard configuration and native abilities of the text editor used to edit phpBB language files. Please see <a href="http://en.wikipedia.org/wiki/Unicode#Input_methods">http://en.wikipedia.org/wiki/Unicode#Input_methods</a> for more information.</p>
-
-	<h4>Spelling, punctuation, grammar, et cetera:</h4>
-
-	<p>The default language pack bundled with phpBB is <strong>British English</strong> using <a href="http://www.cambridge.org/">Cambridge University Press</a> spelling and is assigned the language code <code>en</code>. The style and tone of writing tends towards formal and translations <strong>should</strong> emulate this style, at least for the variant using the most compact language code. Less formal translations or those with colloquialisms <strong>must</strong> be denoted as such via either an <code>extension</code> or <code>privateuse</code> tag within its language code.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-	<hr />
-
-<a name="disclaimer"></a><h2>7. Copyright and disclaimer</h2>
-
-	<div class="paragraph">
-		<div class="inner">
-
-		<div class="content">
-
-	<p>phpBB is free software, released under the terms of the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License, version 2 (GPL-2.0)</a>. Copyright © <a href="https://www.phpbb.com">phpBB Limited</a>. For full copyright and license information, please see the docs/CREDITS.txt file.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		</div>
-	</div>
-
-<!-- END DOCUMENT -->
-
-	<div id="page-footer">
-		<div class="version">&nbsp;</div>
-	</div>
-</div></div>
-
-<div>
-	<a id="bottom" accesskey="z"></a>
-</div>
-
-</body>
-</html>
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 95d4a9515c0..117aa4cb2d5 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -94,12 +94,50 @@ acp_ext_list_enabled_title_after
 * Since: 3.1.11-RC1
 * Purpose: Add text after enabled extensions section title.
 
+acp_ext_list_not_installed_name_after
+===
+* Location: adm/style/acp_ext_list.html
+* Since: 3.3.14-RC1
+* Changed: 3.3.14 Renamed from acp_ext_list_available_name_after
+* Purpose: Add content after the name of not installed extensions in the list
+
+acp_ext_list_not_installed_title_after
+===
+* Location: adm/style/acp_ext_list.html
+* Since: 3.3.14-RC1
+* Changed: 3.3.14 Renamed from acp_ext_list_available_title_after
+* Purpose: Add text after not installed extensions section title.
+
+acp_forums_cat_options_append
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.3.16-RC1
+* Purpose: Add additional settings to a forum type 'category' within 'General forum settings' fieldset
+
+acp_forums_cat_options_prepend
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.3.16-RC1
+* Purpose: Add additional settings to a forum type 'category' within 'General forum settings' fieldset
+
 acp_forums_custom_settings
 ===
 * Location: adm/style/acp_forums.html
 * Since: 3.1.6-RC1
 * Purpose: Add its own box (fieldset) for extension settings
 
+acp_forums_link_options_append
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.3.16-RC1
+* Purpose: Add additional settings to a forum type 'link' within 'General forum settings' fieldset
+
+acp_forums_link_options_prepend
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.3.16-RC1
+* Purpose: Add additional settings to a forum type 'link' within 'General forum settings' fieldset
+
 acp_forums_main_settings_append
 ===
 * Location: adm/style/acp_forums.html
@@ -184,6 +222,24 @@ acp_group_types_prepend
 * Since: 3.2.9-RC1
 * Purpose: Add additional group type options to group settings (prepend the list)
 
+acp_groups_add_user_options_after
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.3.13-RC1
+* Purpose: Add content after options for adding user to group in the ACP
+
+acp_groups_add_user_options_before
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.3.13-RC1
+* Purpose: Add content before options for adding user to group in the ACP
+
+acp_groups_add_user_usernames_before
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.3.13-RC1
+* Purpose: Add content before usernames option for adding user to group in the ACP
+
 acp_groups_find_username_append
 ===
 * Location: adm/style/acp_groups.html
@@ -921,11 +977,19 @@ index_body_forumlist_body_after
 * Since: 3.1.1
 * Purpose: Add content after the forum list body on the index page
 
+index_body_forumlist_body_before
+===
+* Locations:
+    + styles/prosilver/template/index_body.html
+* Since: 4.0.0-a1
+* Purpose: Add content before the forum list body on the index page
+
 index_body_markforums_after
 ===
 * Locations:
     + styles/prosilver/template/index_body.html
 * Since: 3.1.0-RC2
+* Deprecated: 4.0.0-a1 Use index_body_forumlist_body_before instead
 * Purpose: Add content after the mark-read link above the forum list on Board index
 
 index_body_markforums_before
@@ -933,6 +997,7 @@ index_body_markforums_before
 * Locations:
     + styles/prosilver/template/index_body.html
 * Since: 3.1.0-RC2
+* Deprecated: 4.0.0-a1 Use index_body_forumlist_body_before instead
 * Purpose: Add content before the mark-read link above the forum list on Board index
 
 index_body_stat_blocks_after
@@ -1478,20 +1543,6 @@ memberlist_view_rank_avatar_before
 * Since: 3.1.6-RC1
 * Purpose: Add information before rank in memberlist (with avatar)
 
-memberlist_view_rank_no_avatar_after
-===
-* Locations:
-    + styles/prosilver/template/memberlist_view.html
-* Since: 3.1.6-RC1
-* Purpose: Add information after rank in memberlist (without avatar)
-
-memberlist_view_rank_no_avatar_before
-===
-* Locations:
-    + styles/prosilver/template/memberlist_view.html
-* Since: 3.1.6-RC1
-* Purpose: Add information before rank in memberlist (without avatar)
-
 memberlist_view_user_statistics_after
 ===
 * Locations:
@@ -1597,6 +1648,20 @@ navbar_header_username_prepend
 * Since: 3.1.0-RC1
 * Purpose: Add text and HTMl before the username shown in the navbar.
 
+notification_dropdown_footer_after
+===
+* Locations:
+    + styles/prosilver/template/notification_dropdown.html
+* Since: 3.3.12
+* Purpose: Add content after notifications list footer.
+
+notification_dropdown_footer_before
+===
+* Locations:
+    + styles/prosilver/template/notification_dropdown.html
+* Since: 3.3.12
+* Purpose: Add content before notifications list footer.
+
 overall_footer_after
 ===
 * Locations:
@@ -1691,29 +1756,33 @@ overall_header_body_before
 overall_header_breadcrumb_append
 ===
 * Locations:
-    + styles/prosilver/template/navbar_header.html
+    + styles/prosilver/template/breadcrumbs.html
 * Since: 3.1.0-a1
+* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add links to the list of breadcrumbs in the header
 
 overall_header_breadcrumb_prepend
 ===
 * Locations:
-    + styles/prosilver/template/navbar_header.html
+    + styles/prosilver/template/breadcrumbs.html
 * Since: 3.1.0-RC3
+* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add links to the list of breadcrumbs in the header (after site-home, but before board-index)
 
 overall_header_breadcrumbs_after
 ===
 * Locations:
-    + styles/prosilver/template/navbar_header.html
+    + styles/prosilver/template/breadcrumbs.html
 * Since: 3.1.0-RC3
+* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add content after the breadcrumbs (outside of the breadcrumbs container)
 
 overall_header_breadcrumbs_before
 ===
 * Locations:
-    + styles/prosilver/template/navbar_header.html
+    + styles/prosilver/template/breadcrumbs.html
 * Since: 3.1.0-RC3
+* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add content before the breadcrumbs (outside of the breadcrumbs container)
 
 overall_header_content_before
@@ -1775,15 +1844,17 @@ overall_header_navigation_prepend
 overall_header_navlink_append
 ===
 * Locations:
-    + styles/prosilver/template/navbar_header.html
+    + styles/prosilver/template/breadcrumbs.html
 * Since: 3.1.0-b3
+* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add content after each individual navlink (breadcrumb)
 
 overall_header_navlink_prepend
 ===
 * Locations:
-    + styles/prosilver/template/navbar_header.html
+    + styles/prosilver/template/breadcrumbs.html
 * Since: 3.1.0-b3
+* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add content before each individual navlink (breadcrumb)
 
 overall_header_page_body_before
@@ -2521,6 +2592,20 @@ ucp_friend_list_before
 * Since: 3.1.0-a4
 * Purpose: Add optional elements before list of friends in UCP
 
+ucp_group_settings_after
+===
+* Locations:
+    + styles/prosilver/template/ucp_groups_manage.html
+* Since: 3.3.13-RC1
+* Purpose: Add content after options for managing a group in the UCP
+
+ucp_group_settings_before
+===
+* Locations:
+    + styles/prosilver/template/ucp_groups_manage.html
+* Since: 3.3.13-RC1
+* Purpose: Add content before options for managing a group in the UCP
+
 ucp_header_content_before
 ===
 * Locations:
@@ -2746,6 +2831,13 @@ ucp_pm_viewmessage_custom_fields_before
 * Purpose: Add data before the custom fields on the user profile when viewing
 a private message
 
+ucp_pm_viewmessage_message_content_before
+===
+* Locations:
+    + styles/prosilver/template/ucp_pm_viewmessage.html
+* Since: 3.3.16-RC1
+* Purpose: Add content before the private message text
+
 ucp_pm_viewmessage_options_before
 ===
 * Locations:
@@ -3200,6 +3292,13 @@ viewtopic_body_footer_before
 * Purpose: Add content to the bottom of the View topic screen below the posts
 and quick reply, directly before the jumpbox in Prosilver.
 
+viewtopic_body_online_list_after
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+* Since: 3.3.12-RC1
+* Purpose: Add content after the online users list
+
 viewtopic_body_online_list_before
 ===
 * Locations:
diff --git a/phpBB/docs/install-config.sample.yml b/phpBB/docs/install-config.sample.yml
index a354e52e2f5..5ef6c643bea 100644
--- a/phpBB/docs/install-config.sample.yml
+++ b/phpBB/docs/install-config.sample.yml
@@ -23,7 +23,6 @@ installer:
         smtp_delivery : ~
         smtp_host: ~
         smtp_port: ~
-        smtp_auth: ~
         smtp_user: ~
         smtp_pass: ~
 
diff --git a/phpBB/docs/lighttpd.sample.conf b/phpBB/docs/lighttpd.sample.conf
index e783c809fcc..f8e2b9ec9cc 100644
--- a/phpBB/docs/lighttpd.sample.conf
+++ b/phpBB/docs/lighttpd.sample.conf
@@ -1,7 +1,7 @@
 # Sample lighttpd configuration file for phpBB.
 # Global settings have been removed, copy them
 # from your system's lighttpd.conf.
-# Tested with lighttpd 1.4.35
+# Tested with lighttpd 1.4.36
 
 # Load moules
 server.modules += (
@@ -28,7 +28,12 @@ $HTTP["host"] == "www.myforums.com" {
 	accesslog.filename		= "/var/log/lighttpd/access-www.myforums.com.log"
 
 	# Deny access to internal phpbb files.
-	$HTTP["url"] =~ "^/(config\.php|common\.php|cache|files|images/avatars/upload|includes|phpbb|store|vendor)" {
+	$HTTP["url"] =~ "^/(config|common\.php|cache|files|images/avatars/upload|includes|phpbb|store|vendor|vendor-ext)" {
+		url.access-deny = ( "" )
+	}
+
+	# Deny access to composer files.
+	$HTTP["url"] =~ "^/composer\.(json|lock)$" {
 		url.access-deny = ( "" )
 	}
 
@@ -43,11 +48,12 @@ $HTTP["host"] == "www.myforums.com" {
 	}
 
 	# The following 3 lines will rewrite URLs passed through the front controller
-	# to not require app.php in the actual URL. In other words, a controller is
-	# by default accessed at /app.php/my/controller, but can also be accessed at
+	# to not require index.php in the actual URL. In other words, a controller is
+	# by default accessed at /index.php/my/controller, but can also be accessed at
 	# /my/controller
 	url.rewrite-if-not-file = (
-	   "^/(.*)$" => "/app.php/$1"
+		"^/install/(.*)$" => "/install/index.php/$1",
+		"^/(.*)$" => "/index.php/$1"
 	)
 
 	fastcgi.server = ( ".php" =>
diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf
index 9d2623c88b7..83255b01a00 100644
--- a/phpBB/docs/nginx.sample.conf
+++ b/phpBB/docs/nginx.sample.conf
@@ -50,12 +50,12 @@ server {
 			fastcgi_param PATH_INFO $fastcgi_path_info;
 			fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
 			fastcgi_param DOCUMENT_ROOT $realpath_root;
-			try_files $uri $uri/ /app.php$is_args$args;
+			try_files $uri $uri/ /index.php$is_args$args;
 			fastcgi_pass php;
 		}
 
 		# Deny access to internal phpbb files.
-		location ~ /(config\.php|common\.php|cache|files|images/avatars/upload|includes|(?<!ext/)phpbb(?!\w+)|store|vendor) {
+		location ~ /(config|common\.php|composer\.(json|lock)|cache|files|images/avatars/upload|includes|(?<!ext/)phpbb(?!\w+)|store|vendor|vendor-ext) {
 			deny all;
 			# deny was ignored before 0.8.40 for connections over IPv6.
 			# Use internal directive to prohibit access on older versions.
@@ -64,7 +64,7 @@ server {
 	}
 
 	location @rewriteapp {
-		rewrite ^(.*)$ /app.php/$1 last;
+		rewrite ^(.*)$ /index.php/$1 last;
 	}
 
 	# Correctly pass scripts for installer
@@ -78,13 +78,13 @@ server {
 			fastcgi_param PATH_INFO $fastcgi_path_info;
 			fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
 			fastcgi_param DOCUMENT_ROOT $realpath_root;
-			try_files $uri $uri/ /install/app.php$is_args$args =404;
+			try_files $uri $uri/ /install/index.php$is_args$args =404;
 			fastcgi_pass php;
 		}
 	}
 
 	location @rewrite_installapp {
-		rewrite ^(.*)$ /install/app.php/$1 last;
+		rewrite ^(.*)$ /install/index.php/$1 last;
 	}
 
 	# Deny access to version control system directories.
@@ -92,4 +92,10 @@ server {
 		deny all;
 		internal;
 	}
+
+	# Deny access to apache configuration files.
+	location ~ /\.htaccess|/\.htpasswd|/\.htgroups {
+		deny all;
+		internal;
+	}
 }
diff --git a/phpBB/docs/vagrant.md b/phpBB/docs/vagrant.md
index 893b38db2d4..6c888ff7fd9 100644
--- a/phpBB/docs/vagrant.md
+++ b/phpBB/docs/vagrant.md
@@ -2,15 +2,17 @@
 
 phpBB includes support for Vagrant. This allows developers and contributors to run phpBB without the need to set up their own local web server with traditional WAMP/MAMP stacks. It also provides a consistent environment between developers for writing and debugging code changes more productively.
 
-phpBB uses the [Laravel/Homestead](https://laravel.com/docs/5.1/homestead) Vagrant box. It runs a Linux server with Ubuntu 14.04, PHP 5.6, Nginx, SQLite3, MySQL, and a whole lot more (complete specs below).
+phpBB uses the [Laravel/Homestead](https://laravel.com/docs/5.1/homestead) Vagrant box. It runs a Linux server with Ubuntu, PHP 7.2, Apache, SQLite3, MySQL, and a whole lot more (complete specs below).
 
 ## Get Started
 
 * Download and Install [Vagrant](https://www.vagrantup.com/downloads.html)
 * Download and Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-* Run `vagrant up` from the root of your cloned fork of the phpBB Git repository
+* Run `vagrant up` from the `vagrant` directory of your cloned fork of the phpBB Git repository
 
 ```sh
+$ cd vagrant
+$ ../composer.phar install
 $ vagrant up
 ```
 
@@ -91,11 +93,11 @@ $ mysql -uhomestead -psecret phpbb < /home/vagrant/phpbb/phpBB/store/phpbb.sql
 
 ### Included Software
 
-* Ubuntu 14.04
+* Ubuntu
 * Git
-* PHP 5.6
+* PHP 7.2
 * HHVM
-* Nginx
+* Apache
 * MySQL
 * Sqlite3
 * Postgres
diff --git a/phpBB/images/icons/misc/fire.svg b/phpBB/images/icons/misc/fire.svg
new file mode 100644
index 00000000000..5645475690b
--- /dev/null
+++ b/phpBB/images/icons/misc/fire.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 73.75 92.51">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #d3575d;
+      }
+
+      .cls-1, .cls-2 {
+        stroke-width: 0px;
+      }
+
+      .cls-2 {
+        fill: url(#Neues_Verlaufsfeld_1);
+      }
+    </style>
+    <linearGradient id="Neues_Verlaufsfeld_1" data-name="Neues Verlaufsfeld 1" x1="36.87" y1="2" x2="36.87" y2="90.51" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fdf4dc"/>
+      <stop offset=".03" stop-color="#fdf1d3"/>
+      <stop offset=".11" stop-color="#fdebc1"/>
+      <stop offset=".19" stop-color="#fde8b5"/>
+      <stop offset=".28" stop-color="#fee7b2"/>
+      <stop offset=".67" stop-color="#fed36d"/>
+      <stop offset=".89" stop-color="#ffc232"/>
+      <stop offset="1" stop-color="#e5832c"/>
+    </linearGradient>
+  </defs>
+  <g id="Layer_1" data-name="Layer 1">
+    <g id="Fire">
+      <g>
+        <path class="cls-2" d="m31.52,2.02c-.34.31,4.05,4.97,4.5,11.33.46,6.46-5.95,9.98-15.32,19-9.54,9.18-9.98,10.45-14.01,17.17-2.05,3.42-4.96,8.42-4.67,15.17.31,7.07,3.96,11.98,5.83,14.5,5.99,8.07,14.53,11.79,15,11.17.42-.56-4.79-3.78-7.65-11.17-4.2-10.82,3.07-21.76,4.04-23.17,4.04-5.88,8.57-10.24,9.45-9.5.68.58-2.19,3.41-2.83,8.5-.68,5.32,1.22,12.05,5,13.33,2.64.9,3.79-1.68,8.5-2.17,4.55-.47,10.46,1.22,12.83,5,3.59,5.73-6.73,17.99-4.83,19.23,1.93,1.27,14.39-10,19.33-19.4,2.62-4.98,6.94-13.2,4.17-21.17-2.13-6.14-6.61-6.8-7.67-13.33-1.04-6.42,2.45-10.91,1.17-11.67-1.41-.83-7.37,3.52-9.17,9.83-1.74,6.12,1.75,9.51-.83,13-2.04,2.76-6.43,3.67-10,2.67-2.94-.83-6.33-3.24-6.83-6.5-.47-3.05,1.96-4.5,5.5-11.17,2-3.76,3.26-6.15,3.67-8.5,1.86-10.9-14.59-22.7-15.17-22.17Z"/>
+        <path class="cls-1" d="m47.74,92.51c-.67,0-1.16-.21-1.48-.42-2.23-1.46-.85-4.16,1.05-7.9,1.91-3.73,4.79-9.38,3.18-11.95-1.92-3.05-7.06-4.47-10.94-4.07-1.89.19-3.06.77-4.18,1.33-1.41.69-3,1.48-5.17.75-4.92-1.67-7.12-9.34-6.34-15.48.09-.72.22-1.4.38-2.04-1.05,1.25-2.2,2.73-3.36,4.42-1.29,1.88-7.54,11.74-3.82,21.31,1.8,4.64,4.63,7.53,6.15,9.09,1.07,1.09,2.4,2.45,1.23,4-.24.32-.8.87-1.82.87h0c-2.23,0-10.48-4.11-16.38-12.04-1.91-2.57-5.89-7.93-6.23-15.61-.33-7.48,2.98-12.99,4.95-16.28l.81-1.35c3.35-5.62,4.48-7.52,13.53-16.23,2.28-2.2,4.39-4.07,6.25-5.72,6.06-5.39,8.73-7.93,8.46-11.69-.29-4.09-2.5-7.54-3.56-9.19-.69-1.07-1.63-2.54-.29-3.76h0c1.15-1.05,2.54-.29,2.99-.05,3.95,2.16,17.34,13.19,15.49,24.02-.46,2.67-1.82,5.23-3.87,9.1-1.36,2.56-2.54,4.34-3.49,5.78-1.5,2.27-1.97,3.04-1.8,4.14.35,2.28,3.04,4.22,5.4,4.88,2.99.84,6.43,0,7.85-1.93.8-1.08.67-2.13.33-4.22-.34-2.12-.77-4.75.19-8.13,1.64-5.79,6.23-9.93,8.97-11.03,1.23-.49,2.28-.49,3.14.02,1.89,1.12,1.25,3.21.69,5.06-.6,1.99-1.43,4.72-.9,8.01.48,3,1.76,4.45,3.37,6.29,1.46,1.66,3.11,3.54,4.21,6.7,3.05,8.79-1.54,17.53-4.28,22.75-4.5,8.56-15.46,19.32-19.79,20.44-.34.09-.65.12-.93.12Zm-6.85-28.41c4.83,0,10.43,1.93,12.99,6.01,2.82,4.49-.55,11.08-3.01,15.89-.13.25-.26.52-.4.79,4.1-3.19,11.05-10.26,14.44-16.72,2.44-4.65,6.53-12.43,4.05-19.58-.84-2.42-2.1-3.86-3.44-5.38-1.71-1.95-3.65-4.16-4.32-8.29-.59-3.66.11-6.69.75-8.88-1.71,1.42-3.92,4-4.85,7.28-.72,2.52-.4,4.5-.09,6.4.38,2.34.77,4.76-1.06,7.24-2.74,3.71-8.19,4.52-12.15,3.4-3.53-.99-7.63-3.96-8.27-8.12-.41-2.68.78-4.47,2.42-6.96.9-1.36,2.02-3.06,3.29-5.45,1.94-3.65,3.11-5.86,3.46-7.9.91-5.36-3.52-11.18-7.6-15.15.45,1.37.79,2.89.9,4.51.42,5.89-3.65,9.5-9.8,14.97-1.83,1.63-3.91,3.47-6.13,5.62-8.67,8.34-9.64,9.98-12.87,15.4l-.81,1.36c-1.85,3.09-4.66,7.77-4.38,14.05.28,6.45,3.64,10.97,5.44,13.39,1.88,2.52,3.97,4.56,5.94,6.14-.74-1.23-1.45-2.64-2.07-4.22-4.44-11.45,2.77-22.85,4.26-25.02.28-.41,6.86-9.94,10.48-10.43.71-.09,1.39.09,1.91.53,1.5,1.27.59,3.03-.08,4.31-.69,1.33-1.73,3.33-2.06,5.97-.61,4.81,1.2,10.35,3.66,11.19.54.19.86.07,2.11-.54,1.24-.61,2.93-1.45,5.54-1.72.56-.06,1.15-.09,1.74-.09Z"/>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/phpBB/images/icons/misc/heart.svg b/phpBB/images/icons/misc/heart.svg
new file mode 100644
index 00000000000..f25d0a3c649
--- /dev/null
+++ b/phpBB/images/icons/misc/heart.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 83.59 73.05">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: #c40007;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+        stroke-width: 4px;
+      }
+
+      .cls-2 {
+        fill: url(#Unbenannter_Verlauf_41);
+        stroke-width: 0px;
+      }
+    </style>
+    <linearGradient id="Unbenannter_Verlauf_41" data-name="Unbenannter Verlauf 41" x1="41.8" y1="2" x2="41.8" y2="71.05" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff"/>
+      <stop offset="1" stop-color="#ecedf0"/>
+    </linearGradient>
+  </defs>
+  <g id="Layer_1" data-name="Layer 1">
+    <g id="heart">
+      <g>
+        <path class="cls-2" d="m41.8,71.05c14.96-14.08,38.34-25.92,39.79-49.33-4.09-27.63-30.48-22.93-39.79-6h0C32.48-1.22,6.09-5.92,2,21.72c1.45,23.4,24.84,35.25,39.8,49.33"/>
+        <path class="cls-1" d="m41.8,71.05c14.96-14.08,38.34-25.92,39.79-49.33-4.09-27.63-30.48-22.93-39.79-6h0C32.48-1.22,6.09-5.92,2,21.72c1.45,23.4,24.84,35.25,39.8,49.33"/>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/phpBB/images/icons/misc/radioactive.svg b/phpBB/images/icons/misc/radioactive.svg
new file mode 100644
index 00000000000..372c84e4237
--- /dev/null
+++ b/phpBB/images/icons/misc/radioactive.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 83.37 83.37">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #196db5;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+      }
+
+      .cls-1, .cls-2 {
+        stroke: #196db5;
+        stroke-width: 4px;
+      }
+
+      .cls-2 {
+        fill: #ecedf0;
+        stroke-miterlimit: 10;
+      }
+    </style>
+  </defs>
+  <g id="Layer_1" data-name="Layer 1">
+    <g id="radioactive">
+      <circle class="cls-2" cx="41.69" cy="41.69" r="39.69"/>
+      <path class="cls-1" d="m37.09,32.64l-6.37-14.01h0c-1.8.93-3.47,2.08-4.98,3.4-5.36,4.68-8.75,11.56-8.75,19.23,0,0,14.54,0,14.54,0,0-2.4.89-4.59,2.37-6.26.88-.99,1.96-1.8,3.18-2.36"/>
+      <path class="cls-1" d="m46.95,50.36l8.55,12.8h0c-1.74,1.04-3.6,1.85-5.52,2.44-6.8,2.09-14.43,1.34-20.95-2.71,0,0,7.67-12.35,7.67-12.35,2.04,1.27,4.37,1.66,6.57,1.29,1.31-.22,2.57-.72,3.68-1.46"/>
+      <path class="cls-1" d="m46.28,32.64l6.37-14.01h0c1.8.93,3.47,2.08,4.98,3.4,5.36,4.68,8.75,11.56,8.75,19.23,0,0-14.54,0-14.54,0,0-2.4-.89-4.59-2.37-6.26-.88-.99-1.96-1.8-3.18-2.36"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/phpBB/images/icons/misc/star.svg b/phpBB/images/icons/misc/star.svg
new file mode 100644
index 00000000000..e5e88794b96
--- /dev/null
+++ b/phpBB/images/icons/misc/star.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 86.66 83.37">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #ecedf0;
+        stroke: #196db5;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+        stroke-width: 4px;
+      }
+    </style>
+  </defs>
+  <g id="Layer_1" data-name="Layer 1">
+    <g id="star">
+      <polygon class="cls-1" points="43.33 61.61 17.13 81.37 26.28 48.78 2 28.28 30.83 28.28 43.33 2 55.82 28.28 84.66 28.28 60.38 48.78 69.52 81.37 43.33 61.61"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/phpBB/images/icons/misc/thinking.svg b/phpBB/images/icons/misc/thinking.svg
new file mode 100644
index 00000000000..b3fdc9fca36
--- /dev/null
+++ b/phpBB/images/icons/misc/thinking.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 92.62 89.11">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: url(#Unbenannter_Verlauf_13-7);
+      }
+
+      .cls-1, .cls-2, .cls-3, .cls-4, .cls-5, .cls-6, .cls-7, .cls-8 {
+        stroke: #605a4f;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+      }
+
+      .cls-1, .cls-4 {
+        stroke-width: 3px;
+      }
+
+      .cls-2 {
+        fill: url(#Unbenannter_Verlauf_13-4);
+      }
+
+      .cls-2, .cls-3, .cls-5, .cls-6, .cls-8 {
+        stroke-width: 2px;
+      }
+
+      .cls-3 {
+        fill: url(#Unbenannter_Verlauf_13-6);
+      }
+
+      .cls-4 {
+        fill: url(#Unbenannter_Verlauf_13-8);
+      }
+
+      .cls-5 {
+        fill: url(#Unbenannter_Verlauf_13-3);
+      }
+
+      .cls-6 {
+        fill: url(#Unbenannter_Verlauf_13-2);
+      }
+
+      .cls-7 {
+        fill: url(#Unbenannter_Verlauf_13);
+        stroke-width: 4px;
+      }
+
+      .cls-8 {
+        fill: url(#Unbenannter_Verlauf_13-5);
+      }
+    </style>
+    <linearGradient id="Unbenannter_Verlauf_13" data-name="Unbenannter Verlauf 13" x1="46.31" y1="22.65" x2="46.31" y2="76.67" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ffb607"/>
+      <stop offset="1" stop-color="#fdda99"/>
+    </linearGradient>
+    <linearGradient id="Unbenannter_Verlauf_13-2" data-name="Unbenannter Verlauf 13" x1="46.48" y1="1" x2="46.48" y2="15.17" gradientTransform="translate(38.05 54.23) scale(1 -1)" xlink:href="#Unbenannter_Verlauf_13"/>
+    <linearGradient id="Unbenannter_Verlauf_13-3" data-name="Unbenannter Verlauf 13" x1="46.48" y1="1" x2="46.48" y2="15.17" xlink:href="#Unbenannter_Verlauf_13"/>
+    <linearGradient id="Unbenannter_Verlauf_13-4" data-name="Unbenannter Verlauf 13" x1="46.48" y1="1" x2="46.48" y2="15.17" gradientTransform="translate(-38.4 54.57) scale(1 -1)" xlink:href="#Unbenannter_Verlauf_13"/>
+    <linearGradient id="Unbenannter_Verlauf_13-5" data-name="Unbenannter Verlauf 13" x1="46.48" y1="1" x2="46.48" y2="15.17" gradientTransform="translate(-27.58 11.58)" xlink:href="#Unbenannter_Verlauf_13"/>
+    <linearGradient id="Unbenannter_Verlauf_13-6" data-name="Unbenannter Verlauf 13" x1="46.48" y1="1" x2="46.48" y2="15.17" gradientTransform="translate(27.24 27.76) scale(1 -1)" xlink:href="#Unbenannter_Verlauf_13"/>
+    <linearGradient id="Unbenannter_Verlauf_13-7" data-name="Unbenannter Verlauf 13" x1="52.5" y1="76.15" x2="40.76" y2="87.45" xlink:href="#Unbenannter_Verlauf_13"/>
+    <linearGradient id="Unbenannter_Verlauf_13-8" data-name="Unbenannter Verlauf 13" x1="51.08" y1="82.31" x2="41.55" y2="91.49" xlink:href="#Unbenannter_Verlauf_13"/>
+  </defs>
+  <g id="Layer_1" data-name="Layer 1">
+    <g id="thinking">
+      <path class="cls-7" d="m30.32,64.76c6.94,5.25,5.92,11.91,5.92,11.91h10.07s10.07,0,10.07,0c0,0-1.02-6.66,5.92-11.91l-.73.63c1.86-1.53,3.49-3.33,4.83-5.34,2.53-3.81,4-8.39,4-13.3,0-13.31-10.79-24.09-24.09-24.09-13.31,0-24.09,10.79-24.09,24.09,0,4.92,1.47,9.49,4,13.3,1.34,2.01,2.97,3.82,4.83,5.34"/>
+      <rect class="cls-6" x="81.7" y="39.05" width="5.67" height="14.17" transform="translate(38.4 130.68) rotate(-90)"/>
+      <rect class="cls-5" x="43.65" y="1" width="5.67" height="14.17"/>
+      <rect class="cls-2" x="5.25" y="39.4" width="5.67" height="14.17" transform="translate(54.57 38.4) rotate(90)"/>
+      <rect class="cls-8" x="16.07" y="12.58" width="5.67" height="14.17" transform="translate(-8.38 19.64) rotate(-46.07)"/>
+      <rect class="cls-3" x="70.89" y="12.58" width="5.67" height="14.17" transform="translate(110.7 86.41) rotate(-133.93)"/>
+      <rect class="cls-1" x="36" y="81.09" width="21.26" height="1.42"/>
+      <rect class="cls-4" x="37.81" y="86.19" width="17.01" height="1.42"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/phpBB/images/icons/smile/alert.svg b/phpBB/images/icons/smile/alert.svg
new file mode 100644
index 00000000000..173ba4d7800
--- /dev/null
+++ b/phpBB/images/icons/smile/alert.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 79.24 80.84">
+  <defs>
+    <style>
+      .cls-1, .cls-2 {
+        stroke: #196db5;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+        stroke-width: 4px;
+      }
+
+      .cls-1, .cls-3 {
+        fill: #196db5;
+      }
+
+      .cls-2 {
+        fill: #ecedf0;
+      }
+
+      .cls-3 {
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <g id="Layer_1" data-name="Layer 1">
+    <g id="alert">
+      <polygon class="cls-2" points="39.62 78.84 77.24 78.84 39.62 2 2 78.84 39.62 78.84"/>
+      <rect class="cls-1" x="37.32" y="31.89" width="4.25" height="24.09"/>
+      <circle class="cls-3" cx="39.45" cy="66.48" r="4.96"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/phpBB/images/icons/smile/info.svg b/phpBB/images/icons/smile/info.svg
new file mode 100644
index 00000000000..f6e9ef7512d
--- /dev/null
+++ b/phpBB/images/icons/smile/info.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 83.37 83.37">
+  <defs>
+    <style>
+      .cls-1 {
+        stroke-linecap: round;
+        stroke-linejoin: round;
+      }
+
+      .cls-1, .cls-2 {
+        stroke: #196db5;
+        stroke-width: 4px;
+      }
+
+      .cls-1, .cls-3 {
+        fill: #196db5;
+      }
+
+      .cls-2 {
+        fill: #ecedf0;
+        stroke-miterlimit: 10;
+      }
+
+      .cls-3 {
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <g id="Layer_1" data-name="Layer 1">
+    <g id="info">
+      <circle class="cls-2" cx="41.69" cy="41.69" r="39.69"/>
+      <rect class="cls-1" x="39.56" y="39.81" width="4.25" height="24.09"/>
+      <circle class="cls-3" cx="41.69" cy="23.69" r="4.96"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/phpBB/images/icons/smile/mrgreen.svg b/phpBB/images/icons/smile/mrgreen.svg
new file mode 100644
index 00000000000..ef639a5ccdc
--- /dev/null
+++ b/phpBB/images/icons/smile/mrgreen.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 89.46 92.29">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+      }
+
+      .cls-1, .cls-2, .cls-3 {
+        stroke: #000;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+        stroke-width: 3px;
+      }
+
+      .cls-2 {
+        fill: none;
+      }
+
+      .cls-3 {
+        fill: url(#Unbenannter_Verlauf_24);
+      }
+    </style>
+    <linearGradient id="Unbenannter_Verlauf_24" data-name="Unbenannter Verlauf 24" x1="13.66" y1="15.07" x2="75.8" y2="77.22" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#9af17d"/>
+      <stop offset="1" stop-color="#559435"/>
+    </linearGradient>
+  </defs>
+  <g id="Layer_1" data-name="Layer 1">
+    <g id="mrgreen">
+      <ellipse class="cls-3" cx="44.73" cy="46.15" rx="43.23" ry="44.65"/>
+      <path class="cls-2" d="m19.52,30.72s5.5-9.42,10.5-9.42,11.69,9.42,11.69,9.42"/>
+      <path class="cls-2" d="m69.64,30.72s-5.5-9.42-10.5-9.42-11.69,9.42-11.69,9.42"/>
+      <path class="cls-1" d="m11.52,41.47h68.33s-5.36,19.13-8.33,24.83-11,18.17-25.83,18.17-22.62-11.76-25.33-16.5c-3.67-6.42-8.83-26.5-8.83-26.5"/>
+      <line class="cls-2" x1="56.97" y1="81.63" x2="56.97" y2="41.47"/>
+      <line class="cls-2" x1="32.18" y1="80.24" x2="32.18" y2="41.97"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/phpBB/images/icons/smile/question.svg b/phpBB/images/icons/smile/question.svg
new file mode 100644
index 00000000000..7a7bf1602a0
--- /dev/null
+++ b/phpBB/images/icons/smile/question.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 83.37 83.37">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #ecedf0;
+        stroke-miterlimit: 10;
+        stroke-width: 4px;
+      }
+
+      .cls-1, .cls-2 {
+        stroke: #196db5;
+      }
+
+      .cls-3 {
+        fill: #196db5;
+        stroke-width: 0px;
+      }
+
+      .cls-2 {
+        fill: none;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+        stroke-width: 8px;
+      }
+    </style>
+  </defs>
+  <g id="Layer_1" data-name="Layer 1">
+    <g id="question">
+      <circle class="cls-1" cx="41.69" cy="41.69" r="39.69"/>
+      <path class="cls-2" d="m26.85,28.87c1.72-6.67,7.87-11.2,14.5-10.83,6.9.38,12.73,5.97,13.17,12.5.31,4.65-2.16,9.14-5.83,11.67-2.85,1.96-5.77,2.28-7.17,2.33v6.17"/>
+      <circle class="cls-3" cx="41.69" cy="63.17" r="4.96"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/phpBB/images/icons/smile/redface.svg b/phpBB/images/icons/smile/redface.svg
new file mode 100644
index 00000000000..84fe0db5ef5
--- /dev/null
+++ b/phpBB/images/icons/smile/redface.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 88.04 87.12">
+  <defs>
+    <style>
+      .cls-1, .cls-2 {
+        stroke-width: 0px;
+      }
+
+      .cls-3, .cls-4 {
+        fill: none;
+      }
+
+      .cls-3, .cls-4, .cls-5 {
+        stroke: #000;
+        stroke-width: 3px;
+      }
+
+      .cls-3, .cls-5 {
+        stroke-miterlimit: 10;
+      }
+
+      .cls-2 {
+        fill: #fff;
+      }
+
+      .cls-4 {
+        stroke-linecap: round;
+        stroke-linejoin: round;
+      }
+    </style>
+    <!-- Define the linear (start) gradient -->
+    <linearGradient id="linearGradient" x1="1.5" y1="43.56" x2="86.54" y2="43.56" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ffa49f" id="linearStart" />
+      <stop offset="1" stop-color="#fd5756" id="linearEnd" />
+    </linearGradient>
+
+    <!-- Define the radial gradient -->
+    <radialGradient id="radialGradient" cx="44.02" cy="43.56" fx="44.02" fy="43.56" r="42.29" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fdf504" id="radialStart" />
+      <stop offset="0.71" stop-color="#f8c00c" />
+      <stop offset="1" stop-color="#f8bd0c" id="radialEnd" />
+    </radialGradient>
+  </defs>
+  <g id="Layer_1" data-name="Layer 1">
+    <g id="redface">
+      <!-- <ellipse class="cls-5" cx="44.02" cy="43.56" rx="42.52" ry="42.06"/> -->
+      <!-- Ellipse with linear gradient -->
+      <ellipse class="cls-5" cx="44.02" cy="43.56" rx="42.52" ry="42.06" fill="url(#linearGradient)" opacity="1"/>
+
+      <!-- Ellipse with radial gradient, positioned exactly over the first -->
+      <ellipse class="cls-5" cx="44.02" cy="43.56" rx="42.52" ry="42.06" fill="url(#radialGradient)" opacity="0">
+        <animate attributeName="opacity" values="0;1;1;0" keyTimes="0;0.3;0.7;1" dur="2s" repeatCount="indefinite" />
+      </ellipse>
+      <path class="cls-2" d="m44.02,43.13h18.85c1.56,0,2.82-1.26,2.82-2.82v-8.65s-.37-3.6-2.08-6.08q-3.25-4.71-6.41-5.94c-2.5-.97-13.17-.98-13.17-.98,0,0-10.68.01-13.17.98q-3.17,1.23-6.41,5.94c-1.47,2.13-1.95,5.1-2.06,5.89-.02.13-.02.24-.02.37v8.48c0,1.56,1.26,2.82,2.82,2.82h18.85Z"/>
+      <ellipse class="cls-1" cx="38.06" cy="34.43" rx="4.96" ry="6.57"/>
+      <ellipse class="cls-1" cx="49.98" cy="34.43" rx="4.96" ry="6.57"/>
+      <path class="cls-4" d="m20.35,27.15s3.16-7.94,9.17-9.33"/>
+      <path class="cls-4" d="m67.69,27.15s-3.16-7.94-9.17-9.33"/>
+      <path class="cls-3" d="m56.52,68.49c7.91,0,13.33.12,13.33-12.09"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_arrow.svg b/phpBB/images/smilies/icon_arrow.svg
new file mode 100644
index 00000000000..4d190756ce0
--- /dev/null
+++ b/phpBB/images/smilies/icon_arrow.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><polyline points="18.24 34.01 24.21 28.32 11.25 28.32 11.25 19.79 24.21 19.79 18.24 14.13 25.42 14.13 35.53 24.09 25.46 34.01 18.24 34.01"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_cool.svg b/phpBB/images/smilies/icon_cool.svg
new file mode 100644
index 00000000000..500729316d2
--- /dev/null
+++ b/phpBB/images/smilies/icon_cool.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M11.31,32.91c6.18,5.18,13.72,5.21,19.9,0-4.08,7.87-15.8,7.84-19.9,0Z"/><path d="M5,18.65c0,11,16,12.71,14.28,0Z"/><path class="cls-2" d="M19.05,22.9a1.64,1.64,0,1,1-1.64-1.64A1.64,1.64,0,0,1,19.05,22.9Z"/><path d="M23.1,18.65c0,11,16,12.71,14.28,0Z"/><path class="cls-2" d="M37.14,22.9a1.64,1.64,0,1,1-1.64-1.64A1.63,1.63,0,0,1,37.14,22.9Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_cry.svg b/phpBB/images/smilies/icon_cry.svg
new file mode 100644
index 00000000000..e9312f9d7a2
--- /dev/null
+++ b/phpBB/images/smilies/icon_cry.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}.cls-3{fill:#5c92bd;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M10.67,39.31c4.1-7.85,15.82-7.87,19.89,0-6.18-5.22-13.72-5.19-19.89,0Z"/><path class="cls-2" d="M19.23,27.71V24.06c0-4-2.95-7.28-6.58-7.28h0C9,16.78,6.07,20,6.07,24.06v3.65"/><path d="M20,27.71h-1.5V24.06c0-3.6-2.62-6.53-5.83-6.53s-5.83,2.93-5.83,6.53v3.65H5.32V24.06c0-4.43,3.29-8,7.33-8s7.33,3.6,7.33,8Z"/><rect x="11.15" y="22.24" width="3" height="4.22"/><rect class="cls-3" x="5.54" y="26.22" width="13.38" height="1.5"/><path d="M20,27.71h-1.5V24.06c0-3.6-2.62-6.53-5.83-6.53s-5.83,2.93-5.83,6.53v3.65H5.32V24.06c0-4.43,3.29-8,7.33-8s7.33,3.6,7.33,8Z"/><path class="cls-2" d="M37,27.71V24.06c0-4-2.94-7.28-6.58-7.28h0c-3.63,0-6.58,3.26-6.58,7.28v3.65"/><path d="M37.73,27.71h-1.5V24.06c0-3.6-2.61-6.53-5.83-6.53s-5.83,2.93-5.83,6.53v3.65h-1.5V24.06c0-4.43,3.29-8,7.33-8s7.33,3.6,7.33,8Z"/><rect x="28.9" y="22.24" width="3" height="4.22"/><rect class="cls-3" x="23.29" y="26.22" width="13.38" height="1.5"/><path d="M37.73,27.71h-1.5V24.06c0-3.6-2.61-6.53-5.83-6.53s-5.83,2.93-5.83,6.53v3.65h-1.5V24.06c0-4.43,3.29-8,7.33-8s7.33,3.6,7.33,8Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_e_biggrin.svg b/phpBB/images/smilies/icon_e_biggrin.svg
new file mode 100644
index 00000000000..6e3803be049
--- /dev/null
+++ b/phpBB/images/smilies/icon_e_biggrin.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M5.41,19.89c.39-7.56,12.59-6.59,13.91,0l-.19.06c-1.79-4-7-4.72-10.4-2.54A9.54,9.54,0,0,0,5.6,20l-.19-.06Z"/><path d="M36.92,20c-3.43-4.29-10.75-5.62-13.53,0l-.19-.06c1.08-4.77,7.71-6.86,11.65-4.17a5.14,5.14,0,0,1,2.26,4.17l-.19.06Z"/><path class="cls-2" d="M5.5,27.21c4.2,20.91,27.76,20.68,31.52,0Z"/><path d="M21.38,43.56c-6.19,0-14.21-4.23-16.61-16.2l-.19-.9H37.92l-.16.89C36,37.12,29.6,43.48,21.5,43.56ZM6.43,28c2.43,10.39,9.48,14.1,15,14.1h.11C26.91,42,33.89,38.27,36.11,28Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_e_confused.svg b/phpBB/images/smilies/icon_e_confused.svg
new file mode 100644
index 00000000000..b9561e32041
--- /dev/null
+++ b/phpBB/images/smilies/icon_e_confused.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><circle class="cls-2" cx="10.64" cy="19.69" r="7.35"/><path d="M10.64,27.79a8.1,8.1,0,1,1,8.1-8.1A8.1,8.1,0,0,1,10.64,27.79Zm0-14.7a6.6,6.6,0,1,0,6.6,6.6A6.61,6.61,0,0,0,10.64,13.09Z"/><path d="M18.26,21.52a2.6,2.6,0,1,1-2.6-2.6A2.6,2.6,0,0,1,18.26,21.52Z"/><circle class="cls-2" cx="31.61" cy="19.69" r="7.35"/><path d="M31.61,27.79a8.1,8.1,0,1,1,8.1-8.1A8.1,8.1,0,0,1,31.61,27.79Zm0-14.7a6.6,6.6,0,1,0,6.6,6.6A6.61,6.61,0,0,0,31.61,13.09Z"/><path d="M39.23,21.52a2.6,2.6,0,1,1-2.6-2.6A2.6,2.6,0,0,1,39.23,21.52Z"/><path d="M27.41,40.2a11.18,11.18,0,0,1-5.28-2c-2.56-1.52-4.08-2-5.23-1.6S15,38.12,14.11,40.1l-1.38-.58c1-2.44,2.21-3.81,3.7-4.3,1.88-.62,3.95.25,6.46,1.74,1.84,1.09,3.91,2.13,5.4,1.59a4,4,0,0,0,2.1-2.71l1.42.49c-.68,2-1.66,3.14-3,3.63A4.16,4.16,0,0,1,27.41,40.2Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_e_geek.svg b/phpBB/images/smilies/icon_e_geek.svg
new file mode 100644
index 00000000000..77af7d61f9e
--- /dev/null
+++ b/phpBB/images/smilies/icon_e_geek.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48.19 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#cee657;}</style><linearGradient id="linear-gradient" x1="11.67" y1="4.55" x2="37.43" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M44.33,21.09c0,12.88-9.06,26.32-20.24,26.32S3.85,34,3.85,21.09,12.92.78,24.09.78,44.33,8.22,44.33,21.09Z"/><path d="M24.09,48.16c-12,0-21-14.29-21-27.07C3.1,8.69,11.74,0,24.09,0s21,8.66,21,21.06C45.08,33.87,36.11,48.16,24.09,48.16Zm0-46.63C12.44,1.53,4.6,9.39,4.6,21.09c0,12.07,8.34,25.57,19.49,25.57s19.49-13.5,19.49-25.57C43.58,9.39,35.75,1.53,24.09,1.53Z"/><rect class="cls-2" x="0.85" y="15.53" width="23.24" height="14.28" rx="2.64"/><path d="M21.1,30.66H3.84A3.85,3.85,0,0,1,0,26.81V18.52a3.84,3.84,0,0,1,3.84-3.84H21.1a3.84,3.84,0,0,1,3.84,3.84v8.29A3.85,3.85,0,0,1,21.1,30.66ZM3.84,16.38A2.14,2.14,0,0,0,1.7,18.52v8.29A2.15,2.15,0,0,0,3.84,29H21.1a2.16,2.16,0,0,0,2.15-2.15V18.52a2.15,2.15,0,0,0-2.15-2.14Z"/><rect class="cls-2" x="24.09" y="15.53" width="23.24" height="14.28" rx="2.64"/><path d="M44.34,30.66H27.09a3.85,3.85,0,0,1-3.84-3.85V18.52a3.84,3.84,0,0,1,3.84-3.84H44.34a3.85,3.85,0,0,1,3.85,3.84v8.29A3.86,3.86,0,0,1,44.34,30.66ZM27.09,16.38a2.15,2.15,0,0,0-2.15,2.14v8.29A2.16,2.16,0,0,0,27.09,29H44.34a2.15,2.15,0,0,0,2.15-2.15V18.52a2.14,2.14,0,0,0-2.15-2.14Z"/><path d="M18.17,22.67a3,3,0,1,1-3-3A3,3,0,0,1,18.17,22.67Z"/><path d="M36,22.67a3,3,0,1,1-3-3A3,3,0,0,1,36,22.67Z"/><path d="M19.07,36.71c1.54-.1,3.33,0,4.83,0s3.28-.1,4.84,0a6.85,6.85,0,0,1-9.67,0Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_e_sad.svg b/phpBB/images/smilies/icon_e_sad.svg
new file mode 100644
index 00000000000..69a323f1552
--- /dev/null
+++ b/phpBB/images/smilies/icon_e_sad.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M10.67,39.31c4.1-7.85,15.82-7.87,19.89,0-6.18-5.22-13.72-5.19-19.89,0Z"/><path class="cls-2" d="M19.23,27.71V24.06c0-4-2.95-7.28-6.58-7.28h0C9,16.78,6.07,20,6.07,24.06v3.65"/><path d="M20,27.71h-1.5V24.06c0-3.6-2.62-6.53-5.83-6.53s-5.83,2.93-5.83,6.53v3.65H5.32V24.06c0-4.43,3.29-8,7.33-8s7.33,3.6,7.33,8Z"/><rect x="11.15" y="22.24" width="3" height="5.47"/><path class="cls-2" d="M37,27.71V24.06c0-4-2.94-7.28-6.58-7.28h0c-3.63,0-6.58,3.26-6.58,7.28v3.65"/><path d="M37.73,27.71h-1.5V24.06c0-3.6-2.61-6.53-5.83-6.53s-5.83,2.93-5.83,6.53v3.65h-1.5V24.06c0-4.43,3.29-8,7.33-8s7.33,3.6,7.33,8Z"/><rect x="28.9" y="22.24" width="3" height="5.47"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_e_smile.svg b/phpBB/images/smilies/icon_e_smile.svg
new file mode 100644
index 00000000000..c273c77f1fb
--- /dev/null
+++ b/phpBB/images/smilies/icon_e_smile.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M16,20.87a3.45,3.45,0,1,1-3.45-3.44A3.45,3.45,0,0,1,16,20.87Z"/><path d="M33.46,20.87A3.45,3.45,0,1,1,30,17.43,3.45,3.45,0,0,1,33.46,20.87Z"/><path class="cls-2" d="M8.18,32.28c5.56,12.36,21,12.43,26.16,0A237.8,237.8,0,0,1,8.18,32.28Z"/><path d="M21.43,42.32c-5.9,0-11.22-3.71-13.94-9.73L7,31.46l1.23.07a236.35,236.35,0,0,0,26.08,0l1.19-.07L35,32.57c-2.5,6-7.51,9.67-13.4,9.75Zm-12-9.23C12,38,16.63,40.92,21.61,40.82s9.15-2.93,11.54-7.73A234.78,234.78,0,0,1,9.42,33.09Z"/><path d="M7.22,16.43C7.9,12.93,11.85,10,15.47,11a1,1,0,0,1,.74,1.22c-.43,1.32-2.24.56-3.23.75a7.2,7.2,0,0,0-5.76,3.51Z"/><path d="M35.3,16.43a7.2,7.2,0,0,0-5.76-3.51c-1-.18-3.13.61-3.26-1a1,1,0,0,1,.77-1c3.62-.95,7.57,2,8.25,5.48Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_e_surprised.svg b/phpBB/images/smilies/icon_e_surprised.svg
new file mode 100644
index 00000000000..ad5ce8bdc5b
--- /dev/null
+++ b/phpBB/images/smilies/icon_e_surprised.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path class="cls-2" d="M19.23,21.05V17.39c0-4-2.95-7.27-6.58-7.27h0c-3.64,0-6.58,3.25-6.58,7.27v3.66"/><path d="M20,21.05h-1.5V17.39c0-3.6-2.62-6.52-5.83-6.52s-5.83,2.92-5.83,6.52v3.66H5.32V17.39c0-4.42,3.29-8,7.33-8S20,13,20,17.39Z"/><rect x="11.15" y="15.58" width="3" height="5.47"/><path class="cls-2" d="M37,21.05V17.39c0-4-2.94-7.27-6.58-7.27h0c-3.63,0-6.58,3.25-6.58,7.27v3.66"/><path d="M37.73,21.05h-1.5V17.39c0-3.6-2.61-6.52-5.83-6.52s-5.83,2.92-5.83,6.52v3.66h-1.5V17.39c0-4.42,3.29-8,7.33-8s7.33,3.6,7.33,8Z"/><rect x="28.9" y="15.58" width="3" height="5.47"/><rect x="17.65" y="27.95" width="8.25" height="11.79"/><rect class="cls-2" x="17.65" y="27.95" width="8.25" height="1.44"/><rect x="17.65" y="27.46" width="8.25" height="0.49"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_e_ugeek.svg b/phpBB/images/smilies/icon_e_ugeek.svg
new file mode 100644
index 00000000000..0ae02fcc76f
--- /dev/null
+++ b/phpBB/images/smilies/icon_e_ugeek.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48.19 51.02"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:url(#linear-gradient-2);}.cls-3{fill:url(#linear-gradient-3);}.cls-4{fill:#3a3a3a;}</style><linearGradient id="linear-gradient" x1="11.67" y1="4.51" x2="37.43" y2="41.3" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient><linearGradient id="linear-gradient-2" x1="3.62" y1="28.36" x2="19.48" y2="12.5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a1d78d"/><stop offset="0.18" stop-color="#a3da90"/><stop offset="0.31" stop-color="#abe399"/><stop offset="0.43" stop-color="#b7f2a9"/><stop offset="0.49" stop-color="#c1ffb6"/><stop offset="0.5" stop-color="#befbb2"/><stop offset="0.56" stop-color="#b1eba1"/><stop offset="0.63" stop-color="#a8df96"/><stop offset="0.73" stop-color="#a2d98f"/><stop offset="1" stop-color="#a1d78d"/></linearGradient><linearGradient id="linear-gradient-3" x1="27.79" y1="29.28" x2="45.49" y2="11.57" xlink:href="#linear-gradient-2"/></defs><path class="cls-1" d="M44.33,21.06c0,12.88-9.06,26.31-20.24,26.31S3.85,33.94,3.85,21.06,12.92.75,24.09.75,44.33,8.19,44.33,21.06Z"/><path d="M24.09,48.12c-12,0-21-14.28-21-27.06C3.1,8.66,11.74,0,24.09,0s21,8.66,21,21.06C45.08,33.84,36.11,48.12,24.09,48.12Zm0-46.62C12.44,1.5,4.6,9.36,4.6,21.06c0,12.07,8.34,25.56,19.49,25.56S43.58,33.13,43.58,21.06C43.58,9.36,35.75,1.5,24.09,1.5Z"/><path class="cls-2" d="M.85,13.42H17.79a6.3,6.3,0,0,1,6.3,6.3V23a6.3,6.3,0,0,1-6.3,6.3H7.15A6.3,6.3,0,0,1,.85,23V13.42A0,0,0,0,1,.85,13.42Z"/><path d="M17,30.13H8a8,8,0,0,1-8-8V12.57H17a8,8,0,0,1,8,8v1.57A8,8,0,0,1,17,30.13ZM1.7,14.27v7.87A6.29,6.29,0,0,0,8,28.43h9a6.29,6.29,0,0,0,6.29-6.29V20.57A6.3,6.3,0,0,0,17,14.27Z"/><path class="cls-3" d="M30.4,13.42H47.34a0,0,0,0,1,0,0V23a6.3,6.3,0,0,1-6.3,6.3H30.4a6.3,6.3,0,0,1-6.3-6.3V19.72A6.3,6.3,0,0,1,30.4,13.42Z"/><path d="M40.19,30.13H31.24a8,8,0,0,1-8-8V20.57a8,8,0,0,1,8-8h17v9.57A8,8,0,0,1,40.19,30.13ZM31.24,14.27a6.31,6.31,0,0,0-6.3,6.3v1.57a6.3,6.3,0,0,0,6.3,6.29h9a6.3,6.3,0,0,0,6.3-6.29V14.27Z"/><rect x="10.65" y="20.19" width="7.05" height="2.68" rx="1.18"/><rect x="30.48" y="20.19" width="7.05" height="2.68" rx="1.18"/><path d="M27.28,35.8H20.91a1.54,1.54,0,0,1-1.55-1.55h0a1.54,1.54,0,0,1,1.55-1.55h6.37a1.54,1.54,0,0,1,1.55,1.55h0A1.54,1.54,0,0,1,27.28,35.8Z"/><path class="cls-4" d="M28.36,42a1.76,1.76,0,0,0-1.75-1.57h-5A1.75,1.75,0,0,0,19.83,42l-.16,1.46L22,49.9A1.67,1.67,0,0,0,23.57,51h1.05a1.67,1.67,0,0,0,1.59-1.12l2.31-6.44Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_e_wink.svg b/phpBB/images/smilies/icon_e_wink.svg
new file mode 100644
index 00000000000..f07eaf36ac5
--- /dev/null
+++ b/phpBB/images/smilies/icon_e_wink.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M16.86,22.47a3.79,3.79,0,1,1-3.78-3.79A3.78,3.78,0,0,1,16.86,22.47Z"/><path d="M27.49,18.68h3.4A2.34,2.34,0,0,1,33.23,21v.45a0,0,0,0,1,0,0H25.15a0,0,0,0,1,0,0V21A2.34,2.34,0,0,1,27.49,18.68Z"/><path d="M18.12,37.69c4.83.79,9.75-.6,12.53-4.83-.82,5.61-8.13,8-12.53,4.83Z"/><path d="M7.65,15.4c.69-3.5,4.64-6.43,8.26-5.47a1,1,0,0,1,.73,1.22c-.42,1.31-2.23.55-3.23.75C11,11.88,9,13.46,7.65,15.4Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_eek.svg b/phpBB/images/smilies/icon_eek.svg
new file mode 100644
index 00000000000..d3bbc31ae96
--- /dev/null
+++ b/phpBB/images/smilies/icon_eek.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><circle class="cls-2" cx="9.96" cy="20.75" r="8.4" transform="translate(-12.49 25.85) rotate(-77.17)"/><path d="M10,29.9a9.15,9.15,0,1,1,9.14-9.15A9.15,9.15,0,0,1,10,29.9Zm0-16.79a7.65,7.65,0,1,0,7.64,7.64A7.65,7.65,0,0,0,10,13.11Z"/><path d="M12,20.75A2.08,2.08,0,1,1,10,18.67,2.08,2.08,0,0,1,12,20.75Z"/><circle class="cls-2" cx="32.56" cy="20.75" r="8.4" transform="translate(-5.42 13.8) rotate(-22.14)"/><path d="M32.56,29.9a9.15,9.15,0,1,1,9.15-9.15A9.15,9.15,0,0,1,32.56,29.9Zm0-16.79a7.65,7.65,0,1,0,7.65,7.64A7.65,7.65,0,0,0,32.56,13.11Z"/><circle cx="32.56" cy="20.75" r="2.08"/><rect x="16.52" y="36.47" width="9.47" height="2.77" rx="1.08"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_evil.svg b/phpBB/images/smilies/icon_evil.svg
new file mode 100644
index 00000000000..2636a078ec9
--- /dev/null
+++ b/phpBB/images/smilies/icon_evil.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:red;}.cls-2{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" x1="9.23" y1="5.16" x2="34.18" y2="40.8" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M33,7.55A15.59,15.59,0,0,0,39.82,2c1.44,4.57.89,9.26-.73,14C37.52,12.39,35.59,9.4,33,7.55Z"/><path d="M39.17,18.06l-.77-1.77c-1.69-3.88-3.61-6.54-5.87-8.13l-1.09-.77,1.23-.53A15.05,15.05,0,0,0,39.2,1.55L40.07.28l.46,1.46c1.36,4.31,1.12,9-.73,14.49ZM34.38,7.71A19.8,19.8,0,0,1,39,13.92a21.12,21.12,0,0,0,.54-10.28A16.29,16.29,0,0,1,34.38,7.71Z"/><path class="cls-1" d="M9.56,7.55A15.59,15.59,0,0,1,2.7,2c-1.44,4.57-.89,9.26.73,14C5,12.39,6.93,9.4,9.56,7.55Z"/><path d="M3.34,18.06l-.62-1.83C.87,10.79.63,6.05,2,1.74L2.45.28l.87,1.27A15.05,15.05,0,0,0,9.85,6.86l1.23.53L10,8.16c-2.26,1.59-4.18,4.25-5.87,8.13ZM3,3.64a21,21,0,0,0,.54,10.28A19.8,19.8,0,0,1,8.14,7.71,16.29,16.29,0,0,1,3,3.64Z"/><path class="cls-2" d="M40.87,21.19c0,12.47-8.78,25.49-19.61,25.49S1.65,33.66,1.65,21.19,10.43,1.51,21.26,1.51,40.87,8.71,40.87,21.19Z"/><path d="M21.26,47.41C9.62,47.41.92,33.56.92,21.19.92,9.17,9.29.78,21.26.78S41.6,9.17,41.6,21.19C41.6,33.56,32.9,47.41,21.26,47.41Zm0-45.17C10,2.24,2.38,9.85,2.38,21.19,2.38,32.88,10.45,46,21.26,46S40.14,32.88,40.14,21.19C40.14,9.85,32.55,2.24,21.26,2.24Z"/><path d="M9.47,38.08c4.86-9.3,18.75-9.33,23.58,0-7.32-6.19-16.26-6.15-23.58,0Z"/><path class="cls-1" d="M32.85,26.88a4.77,4.77,0,1,1,1.07-6.67A4.77,4.77,0,0,1,32.85,26.88Z"/><path d="M32.85,26.87a4.78,4.78,0,0,1-6.67-1.06,4.93,4.93,0,0,1-.64-1.25,4.17,4.17,0,0,0,.46.82,3.93,3.93,0,1,0,.88-5.48,3.76,3.76,0,0,0-1.5,2.23,4.69,4.69,0,0,1,1.87-3,4.77,4.77,0,1,1,5.6,7.72Z"/><path d="M25.19,20.82l10.35-10-7.19,12.5a2,2,0,1,1-3.16-2.46Z"/><path class="cls-1" d="M9.67,26.88A4.77,4.77,0,1,0,8.6,20.21,4.77,4.77,0,0,0,9.67,26.88Z"/><path d="M9.67,26.87a4.77,4.77,0,0,0,6.66-1.06A5,5,0,0,0,17,24.56a4.17,4.17,0,0,1-.46.82,3.93,3.93,0,1,1-.88-5.48,3.76,3.76,0,0,1,1.5,2.23,4.69,4.69,0,0,0-1.87-3,4.77,4.77,0,1,0-5.6,7.72Z"/><path d="M17.33,20.82,7,10.78l7.19,12.5a2,2,0,1,0,3.16-2.46Z"/><path d="M31.91,26.54a4.11,4.11,0,0,1-5.86-1,4.89,4.89,0,0,1-.56-1.15A3.44,3.44,0,0,0,30.71,26a3.68,3.68,0,0,0,.77-5,3.36,3.36,0,0,0-4.82-.79,3.47,3.47,0,0,0-1.32,2A4.28,4.28,0,0,1,27,19.49a4.09,4.09,0,0,1,5.86,1A4.47,4.47,0,0,1,31.91,26.54Z"/><path d="M10.61,26.54a4.09,4.09,0,0,0,5.85-1A4.37,4.37,0,0,0,17,24.42a3.19,3.19,0,0,1-.4.75A3.37,3.37,0,0,1,11.8,26,3.69,3.69,0,0,1,11,21a3.35,3.35,0,0,1,4.81-.79,3.47,3.47,0,0,1,1.32,2,4.28,4.28,0,0,0-1.65-2.72,4.08,4.08,0,0,0-5.85,1A4.47,4.47,0,0,0,10.61,26.54Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_exclaim.svg b/phpBB/images/smilies/icon_exclaim.svg
new file mode 100644
index 00000000000..6d14ccd2e08
--- /dev/null
+++ b/phpBB/images/smilies/icon_exclaim.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M21.26,32a3.49,3.49,0,1,0,3.49,3.49A3.49,3.49,0,0,0,21.26,32Z"/><path d="M25.39,11.66a.57.57,0,0,0,0-.13,4.14,4.14,0,0,0-8.24,0s0,0,0,0,0,.22,0,.34v7.37a9,9,0,0,0,.95,4.1L19.84,27a1.6,1.6,0,0,0,2.85,0l1.79-3.58a9.13,9.13,0,0,0,.94-4.09V11.94A2.4,2.4,0,0,0,25.39,11.66Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_idea.svg b/phpBB/images/smilies/icon_idea.svg
new file mode 100644
index 00000000000..0f5ff849bbd
--- /dev/null
+++ b/phpBB/images/smilies/icon_idea.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><circle class="cls-2" cx="21.26" cy="21.39" r="10.09"/><path d="M21.26,32.49a11.1,11.1,0,1,1,11.09-11.1A11.1,11.1,0,0,1,21.26,32.49Zm0-20.19a9.1,9.1,0,1,0,9.09,9.09A9.1,9.1,0,0,0,21.26,12.3Z"/><rect x="19.44" y="18.17" width="3.63" height="24.87" rx="0.92"/><path d="M16.43,29.2V39.5a1,1,0,0,0,.48.88L19.58,42h3.36l2.66-1.66a1,1,0,0,0,.49-.88V29.2Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_lol.svg b/phpBB/images/smilies/icon_lol.svg
new file mode 100644
index 00000000000..93d0fe76433
--- /dev/null
+++ b/phpBB/images/smilies/icon_lol.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:red;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M19,20.56a.72.72,0,0,1-.75-.72v-.05a4.41,4.41,0,0,0-4.54-4.26,4.41,4.41,0,0,0-4.54,4.26.77.77,0,0,1-.75.77.73.73,0,0,1-.75-.72,5.92,5.92,0,0,1,6-5.81,5.91,5.91,0,0,1,6,5.76A.77.77,0,0,1,19,20.56Z"/><path d="M34.14,20.56a.72.72,0,0,1-.75-.72v-.05a4.55,4.55,0,0,0-9.08,0,.77.77,0,0,1-.75.77.73.73,0,0,1-.75-.72,6,6,0,0,1,12.08-.05A.77.77,0,0,1,34.14,20.56Z"/><path d="M21,42.07h0A12.64,12.64,0,0,1,8.38,29.43v-1.7H33.66v1.7A12.64,12.64,0,0,1,21,42.07Z"/><path class="cls-2" d="M21.63,35.56H20.42a4.78,4.78,0,0,0-4.78,4.78h0c3.61,2.4,7.2,2.21,10.77,0h0A4.78,4.78,0,0,0,21.63,35.56Z"/><path d="M21,42.82A13.41,13.41,0,0,1,7.63,29.43V27.72h1.5v1.71a11.89,11.89,0,1,0,23.78,0V27.72h1.5v1.71A13.4,13.4,0,0,1,21,42.82Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_mad.svg b/phpBB/images/smilies/icon_mad.svg
new file mode 100644
index 00000000000..1575f95c149
--- /dev/null
+++ b/phpBB/images/smilies/icon_mad.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path class="cls-2" d="M10.74,37.94a7.18,7.18,0,0,1,7.18-7.07H24.6a7.19,7.19,0,0,1,7.18,7.07Z"/><path d="M24.6,31.62A6.44,6.44,0,0,1,31,37.19H11.54a6.44,6.44,0,0,1,6.38-5.57H24.6m0-1.5H17.92A7.93,7.93,0,0,0,10,38.05v.64H32.53v-.64a7.93,7.93,0,0,0-7.93-7.93Z"/><path d="M26.4,27.22c-2.3-4.66,4.18-8.79,7.35-4.61l0,.19c-3.72-.95-6.26.79-7.11,4.47l-.19-.05Z"/><path d="M15.93,27.27c-.86-3.69-3.39-5.42-7.11-4.47l-.05-.19c2-3,7-1.79,7.68,1.64a4.11,4.11,0,0,1-.33,3l-.19.05Z"/><path d="M26,18.28a6,6,0,0,1,1.11-3,8.13,8.13,0,0,1,2.27-1.83c1.55-1.19,3.18-2.29,4.85-3.33a.16.16,0,0,1,.21.05,33.88,33.88,0,0,1-3.37,5,8.28,8.28,0,0,1-1.85,2.25,6,6,0,0,1-3,1.08.19.19,0,0,1-.21-.21Z"/><path d="M16.28,18.49a6,6,0,0,1-3-1.08,8.28,8.28,0,0,1-1.85-2.25q-1.8-2.33-3.37-4.83a.16.16,0,0,1,0-.21,34,34,0,0,1,5,3.33,8.13,8.13,0,0,1,2.27,1.83,6,6,0,0,1,1.11,3,.19.19,0,0,1-.21.21Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_mrgreen.svg b/phpBB/images/smilies/icon_mrgreen.svg
new file mode 100644
index 00000000000..a8157d4041a
--- /dev/null
+++ b/phpBB/images/smilies/icon_mrgreen.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#8bffb1"/><stop offset="1" stop-color="#3a794b"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M5.41,19.89c.39-7.56,12.59-6.59,13.91,0l-.19.06c-1.79-4-7-4.72-10.4-2.54A9.54,9.54,0,0,0,5.6,20l-.19-.06Z"/><path d="M36.92,20c-3.43-4.29-10.75-5.62-13.53,0l-.19-.06c1.08-4.77,7.71-6.86,11.65-4.17a5.14,5.14,0,0,1,2.26,4.17l-.19.06Z"/><path class="cls-2" d="M6.19,27.56c4,20,26.54,19.77,30.14,0Z"/><path d="M21.37,43.47c-6,0-13.83-4.11-16.16-15.72L5,26.56H37.53l-.22,1.17c-1.72,9.49-7.93,15.66-15.81,15.74ZM7.44,28.56c2.36,9.51,8.87,12.91,13.93,12.91h.11c5,0,11.46-3.49,13.62-12.91Z"/><rect x="14.58" y="27.88" width="2" height="13.1"/><rect x="25.94" y="27.88" width="2" height="13.1"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_neutral.svg b/phpBB/images/smilies/icon_neutral.svg
new file mode 100644
index 00000000000..2363cce8654
--- /dev/null
+++ b/phpBB/images/smilies/icon_neutral.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M28.88,36.44H13.44A1.43,1.43,0,0,1,12,35h0a1.43,1.43,0,0,1,1.43-1.43H28.88A1.43,1.43,0,0,1,30.31,35h0A1.43,1.43,0,0,1,28.88,36.44Z"/><path d="M30.64,22.41a2.84,2.84,0,1,1-2.83-2.84A2.83,2.83,0,0,1,30.64,22.41Z"/><path d="M17.55,22.41a2.84,2.84,0,1,1-2.83-2.84A2.83,2.83,0,0,1,17.55,22.41Z"/><path d="M29.49,15H25.87a2,2,0,0,0-1.95,2h7.51A1.94,1.94,0,0,0,29.49,15Z"/><path d="M9.3,19.7h0a.75.75,0,0,1,0-1.06l4.09-4.06a.75.75,0,0,1,1.06,0h0a.75.75,0,0,1,0,1.06l-4.1,4A.75.75,0,0,1,9.3,19.7Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_question.svg b/phpBB/images/smilies/icon_question.svg
new file mode 100644
index 00000000000..caa067b21c6
--- /dev/null
+++ b/phpBB/images/smilies/icon_question.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 41.98 48.12"><defs><style>.cls-1{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" x1="8.57" y1="4.51" x2="34.33" y2="41.3" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.23,21.06c0,12.88-9.06,26.31-20.24,26.31S.75,33.94.75,21.06,9.81.75,21,.75,41.23,8.19,41.23,21.06Z"/><path d="M21,48.12C9,48.12,0,33.84,0,21.06,0,8.66,8.63,0,21,0S42,8.66,42,21.06C42,33.84,33,48.12,21,48.12ZM21,1.5C9.33,1.5,1.5,9.36,1.5,21.06,1.5,33.13,9.83,46.62,21,46.62S40.48,33.13,40.48,21.06C40.48,9.36,32.65,1.5,21,1.5Z"/><path d="M21.21,29.42A1.25,1.25,0,0,1,20,28.17c0-1.89,0-4.25,2.5-6.13l1-.71c2.21-1.58,3.25-2.44,2.77-4.47-.55-2.36-3-3.35-5.15-3.29s-4.47,1.18-4.86,3.52a1.25,1.25,0,0,1-2.47-.42c.64-3.73,4.1-5.5,7.25-5.6s6.79,1.48,7.67,5.22-1.59,5.52-3.75,7.07c-.31.22-.62.44-.93.68-1.43,1.07-1.5,2.21-1.5,4.13A1.24,1.24,0,0,1,21.21,29.42Z"/><ellipse cx="21.21" cy="33.94" rx="2.04" ry="1.93"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_razz.svg b/phpBB/images/smilies/icon_razz.svg
new file mode 100644
index 00000000000..a959ffc79d0
--- /dev/null
+++ b/phpBB/images/smilies/icon_razz.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:red;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M16,20.5a3.27,3.27,0,0,1-3.45,3.07A3.27,3.27,0,0,1,9.06,20.5a3.27,3.27,0,0,1,3.44-3.07A3.28,3.28,0,0,1,16,20.5Z"/><path d="M33.46,20.5A3.27,3.27,0,0,1,30,23.57a3.27,3.27,0,0,1-3.45-3.07A3.28,3.28,0,0,1,30,17.43,3.27,3.27,0,0,1,33.46,20.5Z"/><path d="M27.05,8.78c3.51,1.05,7,3.28,8.58,6.63a12.18,12.18,0,0,0-9.08-3.88,1.41,1.41,0,1,1,.5-2.75Z"/><path d="M16,11.53a12.17,12.17,0,0,0-9.08,3.88c1.58-3.36,5.08-5.59,8.6-6.63A1.41,1.41,0,1,1,16,11.53Z"/><path class="cls-2" d="M8.88,33.58c5.27,11.16,19.87,11.22,24.76,0Z"/><path d="M21.42,42.72A14.71,14.71,0,0,1,8.2,33.9l-.5-1.07H34.78l-.45,1.05c-2.38,5.45-7.13,8.76-12.7,8.84Zm-11.3-8.39a13,13,0,0,0,11.49,6.89,12.35,12.35,0,0,0,10.84-6.89Z"/><path d="M21.44,42.72C15.16,42.72,9.5,38,6.64,30.43A.75.75,0,1,1,8,29.9C10.7,37,15.89,41.31,21.58,41.22S32,36.92,34.47,29.92a.75.75,0,0,1,1-.46.74.74,0,0,1,.46.95c-2.66,7.63-8,12.23-14.29,12.31Z"/><path d="M34.27,33H8.48a.75.75,0,0,1,0-1.5H34.27a.75.75,0,1,1,0,1.5Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_redface.svg b/phpBB/images/smilies/icon_redface.svg
new file mode 100644
index 00000000000..0b333e519ad
--- /dev/null
+++ b/phpBB/images/smilies/icon_redface.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffc984"/><stop offset="1" stop-color="#ff4900"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><path d="M24.64,36.47H17.88a1.57,1.57,0,0,1-1.57-1.57h0a1.57,1.57,0,0,1,1.57-1.57h6.76a1.57,1.57,0,0,1,1.57,1.57h0A1.57,1.57,0,0,1,24.64,36.47Z"/><path d="M8.75,19.68h0a.75.75,0,0,1,0-1.06l4.38-4.34a.75.75,0,0,1,1.06,0h0a.75.75,0,0,1,0,1.06L9.81,19.69A.75.75,0,0,1,8.75,19.68Z"/><path d="M16.83,21.85c0,1.66-1,3-2.26,3s-2.27-1.34-2.27-3,1-3,2.27-3S16.83,20.19,16.83,21.85Z"/><path d="M33.77,19.68h0a.75.75,0,0,0,0-1.06l-4.38-4.34a.75.75,0,0,0-1.06,0h0a.75.75,0,0,0,0,1.06l4.39,4.34A.75.75,0,0,0,33.77,19.68Z"/><path d="M25.69,21.85c0,1.66,1,3,2.26,3s2.27-1.34,2.27-3-1-3-2.27-3S25.69,20.19,25.69,21.85Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_rolleyes.svg b/phpBB/images/smilies/icon_rolleyes.svg
new file mode 100644
index 00000000000..4d737dd4bc7
--- /dev/null
+++ b/phpBB/images/smilies/icon_rolleyes.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="8.84" y1="4.55" x2="34.6" y2="41.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M41.5,21.09c0,12.88-9.06,26.32-20.24,26.32S1,34,1,21.09,10.08.78,21.26.78,41.5,8.22,41.5,21.09Z"/><path d="M21.26,48.16c-12,0-21-14.29-21-27.07C.27,8.69,8.9,0,21.26,0s21,8.66,21,21.06C42.25,33.87,33.27,48.16,21.26,48.16Zm0-46.63C9.6,1.53,1.77,9.39,1.77,21.09c0,12.07,8.33,25.57,19.49,25.57s19.49-13.5,19.49-25.57C40.75,9.39,32.92,1.53,21.26,1.53Z"/><circle class="cls-2" cx="13.49" cy="20.66" r="7.71" transform="translate(-10.66 15.59) rotate(-45)"/><path d="M13.49,29.05a8.4,8.4,0,1,1,8.39-8.39A8.4,8.4,0,0,1,13.49,29.05Zm0-15.41a7,7,0,1,0,7,7A7,7,0,0,0,13.49,13.64Z"/><path d="M17.59,16.56a4.1,4.1,0,1,1-4.1-4.1A4.11,4.11,0,0,1,17.59,16.56Z"/><circle class="cls-2" cx="29.03" cy="20.66" r="7.71" transform="translate(3.98 46) rotate(-80.76)"/><path d="M29,29.05a8.4,8.4,0,1,1,8.4-8.39A8.39,8.39,0,0,1,29,29.05Zm0-15.41a7,7,0,1,0,7,7A7,7,0,0,0,29,13.64Z"/><path d="M33.13,16.56a4.1,4.1,0,1,1-4.1-4.1A4.1,4.1,0,0,1,33.13,16.56Z"/><path d="M21.37,38.08H21L16.56,38a1.5,1.5,0,1,1,.07-3l4.47.11a10.07,10.07,0,0,0,6-1.73l.86-.57a1.5,1.5,0,1,1,1.67,2.49l-.87.57A13.15,13.15,0,0,1,21.37,38.08Z"/></svg>
\ No newline at end of file
diff --git a/phpBB/images/smilies/icon_twisted.svg b/phpBB/images/smilies/icon_twisted.svg
new file mode 100644
index 00000000000..264129041ac
--- /dev/null
+++ b/phpBB/images/smilies/icon_twisted.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 42.52 48.19"><defs><style>.cls-1{fill:red;}.cls-2{fill:url(#linear-gradient);}.cls-3{fill:#fff;}.cls-4{fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:1.5px;}</style><linearGradient id="linear-gradient" x1="9.23" y1="5.16" x2="34.18" y2="40.8" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffff2e"/><stop offset="1" stop-color="#ff913d"/></linearGradient></defs><path class="cls-1" d="M33,7.55A15.59,15.59,0,0,0,39.82,2c1.44,4.57.89,9.26-.73,14C37.52,12.39,35.59,9.4,33,7.55Z"/><path d="M39.17,18.06l-.77-1.77c-1.69-3.88-3.61-6.54-5.87-8.13l-1.09-.77,1.23-.53A15.05,15.05,0,0,0,39.2,1.55L40.07.28l.46,1.46c1.36,4.31,1.12,9-.73,14.49ZM34.38,7.71A19.8,19.8,0,0,1,39,13.92a21.12,21.12,0,0,0,.54-10.28A16.29,16.29,0,0,1,34.38,7.71Z"/><path class="cls-1" d="M9.56,7.55A15.59,15.59,0,0,1,2.7,2c-1.44,4.57-.89,9.26.73,14C5,12.39,6.93,9.4,9.56,7.55Z"/><path d="M3.34,18.06l-.62-1.83C.87,10.79.63,6.05,2,1.74L2.45.28l.87,1.27A15.05,15.05,0,0,0,9.85,6.86l1.23.53L10,8.16c-2.26,1.59-4.18,4.25-5.87,8.13ZM3,3.64a21,21,0,0,0,.54,10.28A19.8,19.8,0,0,1,8.14,7.71,16.29,16.29,0,0,1,3,3.64Z"/><path class="cls-2" d="M40.87,21.19c0,12.47-8.78,25.49-19.61,25.49S1.65,33.66,1.65,21.19,10.43,1.51,21.26,1.51,40.87,8.71,40.87,21.19Z"/><path d="M21.26,47.41C9.62,47.41.92,33.56.92,21.19.92,9.17,9.29.78,21.26.78S41.6,9.17,41.6,21.19C41.6,33.56,32.9,47.41,21.26,47.41Zm0-45.17C10,2.24,2.38,9.85,2.38,21.19,2.38,32.88,10.45,46,21.26,46S40.14,32.88,40.14,21.19C40.14,9.85,32.55,2.24,21.26,2.24Z"/><path class="cls-1" d="M32.85,26.88a4.77,4.77,0,1,1,1.07-6.67A4.77,4.77,0,0,1,32.85,26.88Z"/><path d="M32.85,26.87a4.78,4.78,0,0,1-6.67-1.06,4.93,4.93,0,0,1-.64-1.25,4.17,4.17,0,0,0,.46.82,3.93,3.93,0,1,0,.88-5.48,3.76,3.76,0,0,0-1.5,2.23,4.69,4.69,0,0,1,1.87-3,4.77,4.77,0,1,1,5.6,7.72Z"/><path d="M25.19,20.82l10.35-10-7.19,12.5a2,2,0,1,1-3.16-2.46Z"/><path class="cls-1" d="M9.67,26.88A4.77,4.77,0,1,0,8.6,20.21,4.77,4.77,0,0,0,9.67,26.88Z"/><path d="M9.67,26.87a4.77,4.77,0,0,0,6.66-1.06A5,5,0,0,0,17,24.56a4.17,4.17,0,0,1-.46.82,3.93,3.93,0,1,1-.88-5.48,3.76,3.76,0,0,1,1.5,2.23,4.69,4.69,0,0,0-1.87-3,4.77,4.77,0,1,0-5.6,7.72Z"/><path d="M17.33,20.82,7,10.78l7.19,12.5a2,2,0,1,0,3.16-2.46Z"/><path d="M31.91,26.54a4.11,4.11,0,0,1-5.86-1,4.89,4.89,0,0,1-.56-1.15A3.44,3.44,0,0,0,30.71,26a3.68,3.68,0,0,0,.77-5,3.36,3.36,0,0,0-4.82-.79,3.47,3.47,0,0,0-1.32,2A4.28,4.28,0,0,1,27,19.49a4.09,4.09,0,0,1,5.86,1A4.47,4.47,0,0,1,31.91,26.54Z"/><path d="M10.61,26.54a4.09,4.09,0,0,0,5.85-1A4.37,4.37,0,0,0,17,24.42a3.19,3.19,0,0,1-.4.75A3.37,3.37,0,0,1,11.8,26,3.69,3.69,0,0,1,11,21a3.35,3.35,0,0,1,4.81-.79,3.47,3.47,0,0,1,1.32,2,4.28,4.28,0,0,0-1.65-2.72,4.08,4.08,0,0,0-5.85,1A4.47,4.47,0,0,0,10.61,26.54Z"/><path class="cls-3" d="M26,39.85H16.48a6.1,6.1,0,0,1-6.1-6.11H32.14A6.11,6.11,0,0,1,26,39.85Z"/><path class="cls-4" d="M34.09,31.71v0c0,4.66-5.74,8.44-12.83,8.44h0c-7.09,0-12.83-3.78-12.83-8.44v0"/><polygon points="32.61 35.21 9.96 35.21 8.84 33.21 33.44 33.21 32.61 35.21"/></svg>
\ No newline at end of file
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 4eb06bd6f89..8cb5f5f9704 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -173,19 +173,17 @@ function main($id, $mode)
 
 						'img_max_width'			=> array('lang' => 'MAX_IMAGE_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false,),
 						'img_max_height'		=> array('lang' => 'MAX_IMAGE_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false,),
-						'img_link_width'		=> array('lang' => 'IMAGE_LINK_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false,),
-						'img_link_height'		=> array('lang' => 'IMAGE_LINK_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false,),
 
 						'allow_attachments'		=> array('lang' => 'ALLOW_ATTACHMENTS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
 						'allow_pm_attach'		=> array('lang' => 'ALLOW_PM_ATTACHMENTS',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
 						'max_attachments'		=> array('lang' => 'MAX_ATTACHMENTS',		'validate' => 'int:0:999',	'type' => 'number:0:999', 'explain' => false),
 						'max_attachments_pm'	=> array('lang' => 'MAX_ATTACHMENTS_PM',	'validate' => 'int:0:999',	'type' => 'number:0:999', 'explain' => false),
-						'display_order'			=> array('lang' => 'DISPLAY_ORDER',			'validate' => 'bool',	'type' => 'custom', 'method' => 'display_order', 'explain' => true),
+						'display_order'			=> array('lang' => 'DISPLAY_ORDER',			'validate' => 'bool',	'type' => 'radio', 'function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', ['DESCENDING', 'ASCENDING']], 'explain' => true),
 						'attachment_quota'		=> array('lang' => 'ATTACH_QUOTA',			'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
 						'max_filesize'			=> array('lang' => 'ATTACH_MAX_FILESIZE',	'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
 						'max_filesize_pm'		=> array('lang' => 'ATTACH_MAX_PM_FILESIZE','validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
 						'secure_downloads'		=> array('lang' => 'SECURE_DOWNLOADS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'secure_allow_deny'		=> array('lang' => 'SECURE_ALLOW_DENY',		'validate' => 'int',	'type' => 'custom', 'method' => 'select_allow_deny', 'explain' => true),
+						'secure_allow_deny'		=> array('lang' => 'SECURE_ALLOW_DENY',		'validate' => 'int',	'type' => 'radio', 'function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'ORDER_ALLOW_DENY', 0 => 'ORDER_DENY_ALLOW']], 'explain' => true),
 						'secure_allow_empty_referer'	=> array('lang' => 'SECURE_EMPTY_REFERRER', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'check_attachment_content' 		=> array('lang' => 'CHECK_CONTENT', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
@@ -197,7 +195,6 @@ function main($id, $mode)
 						'img_max'					=> array('lang' => 'MAX_IMAGE_SIZE',		'validate' => 'int:0:9999',	'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 						'img_strip_metadata'		=> array('lang' => 'IMAGE_STRIP_METADATA',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'img_quality'				=> array('lang' => 'IMAGE_QUALITY',			'validate' => 'int:50:90',	'type' => 'number:50:90', 'explain' => true, 'append' => ' &percnt;'),
-						'img_link'					=> array('lang' => 'IMAGE_LINK_SIZE',		'validate' => 'int:0:9999',	'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 					)
 				);
 
@@ -331,7 +328,7 @@ function main($id, $mode)
 						$l_explain = (isset($user->lang[$vars['lang'] . '_EXPLAIN'])) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : '';
 					}
 
-					$content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);
+					$content = phpbb_build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);
 					if (empty($content))
 					{
 						continue;
@@ -1082,7 +1079,7 @@ function main($id, $mode)
 				$attachments_per_page = (int) $config['topics_per_page'];
 
 				// Get total number or orphans older than 3 hours
-				$sql = 'SELECT COUNT(attach_id) as num_files, SUM(filesize) as total_size
+				$sql = 'SELECT COUNT(attach_id) as num_files, SUM(' . $this->db->cast_expr_to_bigint('filesize') . ') as total_size
 					FROM ' . ATTACHMENTS_TABLE . '
 					WHERE is_orphan = 1
 						AND filetime < ' . (time() - 3*60*60);
@@ -1718,16 +1715,6 @@ function perform_site_list()
 		}
 	}
 
-	/**
-	* Write display_order config field
-	*/
-	function display_order($value, $key = '')
-	{
-		$radio_ary = array(0 => 'DESCENDING', 1 => 'ASCENDING');
-
-		return h_radio('config[display_order]', $radio_ary, $value, $key);
-	}
-
 	/**
 	* Adjust all three max_filesize config vars for display
 	*/
@@ -1756,15 +1743,4 @@ function max_filesize($value, $key = '')
 			]
 		];
 	}
-
-	/**
-	* Write secure_allow_deny config field
-	*/
-	function select_allow_deny($value, $key = '')
-	{
-		$radio_ary = array(1 => 'ORDER_ALLOW_DENY', 0 => 'ORDER_DENY_ALLOW');
-
-		return h_radio('config[' . $key . ']', $radio_ary, $value, $key);
-	}
-
 }
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index d6acf93ccef..b49d74985f5 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -44,12 +44,12 @@ function main($id, $mode)
 		switch ($action)
 		{
 			case 'add':
-				$bbcode_match = $bbcode_tpl = $bbcode_helpline = '';
+				$bbcode_match = $bbcode_tpl = $bbcode_helpline = $bbcode_font_icon = '';
 				$display_on_posting = 0;
 			break;
 
 			case 'edit':
-				$sql = 'SELECT bbcode_match, bbcode_tpl, display_on_posting, bbcode_helpline
+				$sql = 'SELECT bbcode_match, bbcode_tpl, display_on_posting, bbcode_helpline, bbcode_font_icon
 					FROM ' . BBCODES_TABLE . '
 					WHERE bbcode_id = ' . $bbcode_id;
 				$result = $db->sql_query($sql);
@@ -65,6 +65,7 @@ function main($id, $mode)
 				$bbcode_tpl = htmlspecialchars($row['bbcode_tpl'], ENT_COMPAT);
 				$display_on_posting = $row['display_on_posting'];
 				$bbcode_helpline = $row['bbcode_helpline'];
+				$bbcode_font_icon = $row['bbcode_font_icon'];
 			break;
 
 			case 'modify':
@@ -88,6 +89,7 @@ function main($id, $mode)
 				$bbcode_match = $request->variable('bbcode_match', '');
 				$bbcode_tpl = html_entity_decode($request->variable('bbcode_tpl', '', true), ENT_COMPAT);
 				$bbcode_helpline = $request->variable('bbcode_helpline', '', true);
+				$bbcode_font_icon = $request->variable('bbcode_font_icon', '');
 			break;
 		}
 
@@ -101,15 +103,16 @@ function main($id, $mode)
 					'S_EDIT_BBCODE'		=> true,
 					'U_BACK'			=> $this->u_action,
 					'U_ACTION'			=> $this->u_action . '&amp;action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&amp;bbcode=$bbcode_id" : ''),
-
-					'L_BBCODE_USAGE_EXPLAIN'=> sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '<a href="#down">', '</a>'),
-					'BBCODE_MATCH'			=> $bbcode_match,
-					'BBCODE_TPL'			=> $bbcode_tpl,
-					'BBCODE_HELPLINE'		=> $bbcode_helpline,
-					'DISPLAY_ON_POSTING'	=> $display_on_posting,
+					'L_BBCODE_USAGE_EXPLAIN'		=> sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '<a href="#down">', '</a>'),
+					'BBCODE_MATCH'					=> $bbcode_match,
+					'BBCODE_TPL'					=> $bbcode_tpl,
+					'BBCODE_HELPLINE'				=> $bbcode_helpline,
+					'BBCODE_FONT_ICON'				=> $bbcode_font_icon,
+					'DISPLAY_ON_POSTING'			=> $display_on_posting,
 				);
 
 				$bbcode_tokens = array('TEXT', 'SIMPLETEXT', 'INTTEXT', 'IDENTIFIER', 'NUMBER', 'EMAIL', 'URL', 'LOCAL_URL', 'RELATIVE_URL', 'COLOR');
+				$bbcode_tokens = array_merge($bbcode_tokens, ['ALNUM', 'CHOICE', 'FLOAT', 'HASHMAP', 'INT', 'IP', 'IPPORT', 'IPV4', 'IPV6', 'MAP', 'RANGE', 'REGEXP', 'TIMESTAMP', 'UINT']);
 
 				/**
 				* Modify custom bbcode template data before we display the add/edit form
@@ -156,9 +159,11 @@ function main($id, $mode)
 				* @var	string	bbcode_match		The bbcode usage string to match
 				* @var	string	bbcode_tpl			The bbcode HTML replacement string
 				* @var	string	bbcode_helpline		The bbcode help line string
+				* @var	string	bbcode_font_icon	The name of the Font Awesome BBCode icon
 				* @var	array	hidden_fields		Array of hidden fields for use when
 				*									submitting form when $warn_unsafe is true
 				* @since 3.1.0-a3
+				* @changed 4.0.0-a1 Added bbcode_font_icon
 				*/
 				$vars = array(
 					'action',
@@ -168,6 +173,7 @@ function main($id, $mode)
 					'bbcode_match',
 					'bbcode_tpl',
 					'bbcode_helpline',
+					'bbcode_font_icon',
 					'hidden_fields',
 				);
 				extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_modify_create', compact($vars)));
@@ -231,6 +237,16 @@ function main($id, $mode)
 						trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
 					}
 
+					if (strlen($bbcode_font_icon) > 64)
+					{
+						trigger_error($user->lang['BBCODE_FONT_ICON_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					if (!empty($bbcode_font_icon) && !preg_match('/^(?!-)(?!.*--)[a-z0-9-]+(?<!-)$/', $bbcode_font_icon))
+					{
+						trigger_error($user->lang['BBCODE_FONT_ICON_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
 					/**
 					 * Replace Emojis and other 4bit UTF-8 chars not allowed by MySQL to UCR/NCR.
 					 * Using their Numeric Character Reference's Hexadecimal notation.
@@ -243,6 +259,7 @@ function main($id, $mode)
 						'bbcode_tpl'				=> $bbcode_tpl,
 						'display_on_posting'		=> $display_on_posting,
 						'bbcode_helpline'			=> $bbcode_helpline,
+						'bbcode_font_icon'			=> $bbcode_font_icon,
 						'first_pass_match'			=> $data['first_pass_match'],
 						'first_pass_replace'		=> $data['first_pass_replace'],
 						'second_pass_match'			=> $data['second_pass_match'],
@@ -327,6 +344,7 @@ function main($id, $mode)
 						'bbcode_match'			=> $bbcode_match,
 						'bbcode_tpl'			=> htmlspecialchars($bbcode_tpl, ENT_COMPAT),
 						'bbcode_helpline'		=> $bbcode_helpline,
+						'bbcode_font_icon'		=> $bbcode_font_icon,
 						'display_on_posting'	=> $display_on_posting,
 						)))
 					, 'confirm_bbcode.html');
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index df7c8bf6576..145daa33ca7 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -19,6 +19,7 @@
 * @ignore
 */
 
+use Minishlink\WebPush\VAPID;
 use phpbb\config\config;
 use phpbb\language\language;
 use phpbb\user;
@@ -77,6 +78,7 @@ function main($id, $mode)
 						'site_home_url'			=> array('lang' => 'SITE_HOME_URL',			'validate' => 'url',	'type' => 'url:40:255', 'explain' => true),
 						'site_home_text'		=> array('lang' => 'SITE_HOME_TEXT',		'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
 						'board_index_text'		=> array('lang' => 'BOARD_INDEX_TEXT',		'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
+						'sitename_short'		=> array('lang' => 'SITE_NAME_SHORT',		'validate' => 'string',	'type' => 'text:40:12', 'explain' => true),
 						'board_disable'			=> array('lang' => 'DISABLE_BOARD',			'validate' => 'bool',	'type' => 'custom', 'method' => 'board_disable', 'explain' => true),
 						'board_disable_msg'		=> false,
 						'board_disable_access'	=> array('lang' => 'DISABLE_BOARD_ACCESS', 	'validate' => 'int',	'type' => 'select', 'method' => 'board_disable_access', 'explain' => true),
@@ -85,8 +87,8 @@ function main($id, $mode)
 						'board_timezone'		=> array('lang' => 'SYSTEM_TIMEZONE',		'validate' => 'timezone',	'type' => 'custom', 'method' => 'timezone_select', 'explain' => true),
 
 						'legend2'				=> 'BOARD_STYLE',
-						'default_style'			=> array('lang' => 'DEFAULT_STYLE',			'validate' => 'int',	'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => true),
-						'guest_style'			=> array('lang' => 'GUEST_STYLE',			'validate' => 'int',	'type' => 'select', 'function' => 'style_select', 'params' => array($this->guest_style_get(), false), 'explain' => true),
+						'default_style'			=> array('lang' => 'DEFAULT_STYLE',			'validate' => 'int',	'type' => 'select', 'method' => 'phpbb_style_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => true),
+						'guest_style'			=> array('lang' => 'GUEST_STYLE',			'validate' => 'int',	'type' => 'select', 'method' => 'phpbb_style_select', 'params' => array($this->guest_style_get(), false), 'explain' => true),
 						'override_user_style'	=> array('lang' => 'OVERRIDE_STYLE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
 						'legend3'				=> 'WARNINGS',
@@ -258,8 +260,6 @@ function main($id, $mode)
 						'max_sig_urls'			=> array('lang' => 'MAX_SIG_URLS',			'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true),
 						'max_sig_font_size'		=> array('lang' => 'MAX_SIG_FONT_SIZE',		'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' %'),
 						'max_sig_smilies'		=> array('lang' => 'MAX_SIG_SMILIES',		'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true),
-						'max_sig_img_width'		=> array('lang' => 'MAX_SIG_IMG_WIDTH',		'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'max_sig_img_height'	=> array('lang' => 'MAX_SIG_IMG_HEIGHT',	'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 
 						'legend3'				=> 'ACP_SUBMIT_CHANGES',
 					)
@@ -391,7 +391,7 @@ function main($id, $mode)
 					'title'	=> 'ACP_AUTH_SETTINGS',
 					'vars'	=> array(
 						'legend1'		=> 'ACP_AUTH_SETTINGS',
-						'auth_method'	=> array('lang' => 'AUTH_METHOD',	'validate' => 'string',	'type' => 'select:1:toggable', 'method' => 'select_auth_method', 'explain' => false),
+						'auth_method'	=> array('lang' => 'AUTH_METHOD',	'validate' => 'string',	'type' => 'select:1:toggleable', 'method' => 'select_auth_method', 'explain' => false),
 					)
 				);
 			break;
@@ -402,7 +402,7 @@ function main($id, $mode)
 					'vars'	=> array(
 						'legend1'				=> 'ACP_SERVER_SETTINGS',
 						'gzip_compress'			=> array('lang' => 'ENABLE_GZIP',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'use_system_cron'		=> array('lang' => 'USE_SYSTEM_CRON',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'use_system_cron'		=> array('lang' => 'USE_SYSTEM_CRON',		'validate' => 'bool',	'type' => 'radio:enabled_disabled', 'explain' => true),
 
 						'legend2'				=> 'PATH_SETTINGS',
 						'enable_mod_rewrite'	=> array('lang' => 'MOD_REWRITE_ENABLE',	'validate' => 'bool',	'type' => 'custom', 'method' => 'enable_mod_rewrite', 'explain' => true),
@@ -431,10 +431,10 @@ function main($id, $mode)
 						'allow_autologin'		=> array('lang' => 'ALLOW_AUTOLOGIN',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'allow_password_reset'	=> array('lang' => 'ALLOW_PASSWORD_RESET',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'max_autologin_time'	=> array('lang' => 'AUTOLOGIN_LENGTH',		'validate' => 'int:0:99999',	'type' => 'number:0:99999',	'explain' => true,	'append' => ' ' . $user->lang['DAYS']),
-						'ip_check'				=> array('lang' => 'IP_VALID',				'validate' => 'int',	'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
+						'ip_check'				=> array('lang' => 'IP_VALID',				'validate' => 'int',	'type' => 'radio', 'function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [4 => 'ALL', 3 => 'CLASS_C', 2 => 'CLASS_B', 0 => 'NO_IP_VALIDATION']], 'explain' => true),
 						'browser_check'			=> array('lang' => 'BROWSER_VALID',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'forwarded_for_check'	=> array('lang' => 'FORWARDED_FOR_VALID',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'referer_validation'	=> array('lang' => 'REFERRER_VALID',		'validate' => 'int:0:3','type' => 'custom', 'method' => 'select_ref_check', 'explain' => true),
+						'referer_validation'	=> array('lang' => 'REFERRER_VALID',		'validate' => 'int:0:3','type' => 'radio', 'function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [REFERER_VALIDATE_PATH => 'REF_PATH', REFERER_VALIDATE_HOST => 'REF_HOST', REFERER_VALIDATE_NONE => 'NO_REF_VALIDATION']], 'explain' => true),
 						'check_dnsbl'			=> array('lang' => 'CHECK_DNSBL',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'email_check_mx'		=> array('lang' => 'EMAIL_CHECK_MX',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'min_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH',	'validate' => 'int:1',	'type' => 'custom', 'method' => 'password_length', 'explain' => true),
@@ -473,7 +473,6 @@ function main($id, $mode)
 						'smtp_delivery'			=> array('lang' => 'USE_SMTP',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'smtp_host'				=> array('lang' => 'SMTP_SERVER',			'validate' => 'string',	'type' => 'text:25:50', 'explain' => true),
 						'smtp_port'				=> array('lang' => 'SMTP_PORT',				'validate' => 'int:0:99999',	'type' => 'number:0:99999', 'explain' => true),
-						'smtp_auth_method'		=> array('lang' => 'SMTP_AUTH_METHOD',		'validate' => 'string',	'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true),
 						'smtp_username'			=> array('lang' => 'SMTP_USERNAME',			'validate' => 'string',	'type' => 'text:25:255', 'explain' => true),
 						'smtp_password'			=> array('lang' => 'SMTP_PASSWORD',			'validate' => 'string',	'type' => 'password:25:255', 'explain' => true),
 						'smtp_verify_peer'		=> array('lang' => 'SMTP_VERIFY_PEER',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
@@ -485,6 +484,22 @@ function main($id, $mode)
 				);
 			break;
 
+			case 'webpush':
+				$display_vars = [
+					'title'		=> 'ACP_WEBPUSH_SETTINGS',
+					'vars' 		=> [
+						'legend1'					=> 'GENERAL_SETTINGS',
+						'webpush_enable'			=> ['lang' => 'WEBPUSH_ENABLE', 'validate' => 'bool', 'type' => 'custom', 'method' => 'webpush_enable', 'explain' => true],
+						'webpush_vapid_public'		=> ['lang' => 'WEBPUSH_VAPID_PUBLIC', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true],
+						'webpush_vapid_private'		=> ['lang' => 'WEBPUSH_VAPID_PRIVATE', 'validate' => 'string', 'type' => 'password:25:255', 'explain' => true],
+						'webpush_method_default_enable'	=> ['lang' => 'WEBPUSH_METHOD_DEFAULT_ENABLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true],
+						'webpush_dropdown_subscribe'	=> ['lang' => 'WEBPUSH_DROPDOWN_SUBSCRIBE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true],
+
+						'legend3'				=> 'ACP_SUBMIT_CHANGES',
+					],
+				];
+			break;
+
 			default:
 				trigger_error('NO_MODE', E_USER_ERROR);
 			break;
@@ -576,6 +591,7 @@ function main($id, $mode)
 				// Array of emoji-enabled configurations
 				$config_name_ary = [
 					'sitename',
+					'sitename_short',
 					'site_desc',
 					'site_home_text',
 					'board_index_text',
@@ -704,17 +720,16 @@ function main($id, $mode)
 		{
 			if ($config['email_enable'])
 			{
-				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-
-				$messenger = new messenger(false);
-				$messenger->template('test');
-				$messenger->set_addresses($user->data);
-				$messenger->anti_abuse_headers($config, $user);
-				$messenger->assign_vars(array(
+				$email_method = $phpbb_container->get('messenger.method.email');
+				$email_method->set_use_queue(false);
+				$email_method->template('test');
+				$email_method->set_addresses($user->data);
+				$email_method->anti_abuse_headers($config, $user);
+				$email_method->assign_vars([
 					'USERNAME'	=> html_entity_decode($user->data['username'], ENT_COMPAT),
 					'MESSAGE'	=> html_entity_decode($request->variable('send_test_email_text', '', true), ENT_COMPAT),
-				));
-				$messenger->send(NOTIFY_EMAIL);
+				]);
+				$email_method->send();
 
 				trigger_error($user->lang('TEST_EMAIL_SENT') . adm_back_link($this->u_action));
 			}
@@ -783,7 +798,7 @@ function main($id, $mode)
 				$l_explain = (isset($user->lang[$vars['lang'] . '_EXPLAIN'])) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : '';
 			}
 
-			$content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);
+			$content = phpbb_build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);
 
 			if (empty($content))
 			{
@@ -836,7 +851,7 @@ function select_auth_method($selected_method, $key = '')
 
 		/* @var $auth_providers \phpbb\auth\provider_collection */
 		$auth_providers = $phpbb_container->get('auth.provider_collection');
-		$auth_plugins = array();
+		$auth_plugins = [];
 
 		foreach ($auth_providers as $key => $value)
 		{
@@ -849,32 +864,22 @@ function select_auth_method($selected_method, $key = '')
 
 		sort($auth_plugins);
 
-		$auth_select = '';
+		$auth_select_options = [];
 		foreach ($auth_plugins as $method)
 		{
-			$selected = ($selected_method == $method) ? ' selected="selected"' : '';
-			$auth_select .= "<option value=\"$method\"$selected data-toggle-setting=\"#auth_{$method}_settings\">" . ucfirst($method) . '</option>';
-		}
-
-		return $auth_select;
-	}
-
-	/**
-	* Select mail authentication method
-	*/
-	function mail_auth_select($selected_method, $key = '')
-	{
-		global $user;
-
-		$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP');
-		$s_smtp_auth_options = '';
-
-		foreach ($auth_methods as $method)
-		{
-			$s_smtp_auth_options .= '<option value="' . $method . '"' . (($selected_method == $method) ? ' selected="selected"' : '') . '>' . $user->lang['SMTP_' . str_replace('-', '_', $method)] . '</option>';
+			$auth_select_options[] = [
+				'value'		=> $method,
+				'selected'	=> $selected_method == $method,
+				'label'		=> ucfirst($method),
+				'data' 		=> [
+					'toggle-setting' => "#auth_{$method}_settings",
+				],
+			];
 		}
 
-		return $s_smtp_auth_options;
+		return [
+			'options' => $auth_select_options,
+		];
 	}
 
 	/**
@@ -884,27 +889,22 @@ function full_folder_select($value, $key = '')
 	{
 		global $user;
 
-		return '<option value="1"' . (($value == 1) ? ' selected="selected"' : '') . '>' . $user->lang['DELETE_OLDEST_MESSAGES'] . '</option><option value="2"' . (($value == 2) ? ' selected="selected"' : '') . '>' . $user->lang['HOLD_NEW_MESSAGES_SHORT'] . '</option>';
-	}
-
-	/**
-	* Select ip validation
-	*/
-	function select_ip_check($value, $key = '')
-	{
-		$radio_ary = array(4 => 'ALL', 3 => 'CLASS_C', 2 => 'CLASS_B', 0 => 'NO_IP_VALIDATION');
-
-		return h_radio('config[ip_check]', $radio_ary, $value, $key);
-	}
-
-	/**
-	* Select referer validation
-	*/
-	function select_ref_check($value, $key = '')
-	{
-		$radio_ary = array(REFERER_VALIDATE_PATH => 'REF_PATH', REFERER_VALIDATE_HOST => 'REF_HOST', REFERER_VALIDATE_NONE => 'NO_REF_VALIDATION');
+		$full_folder_select_options = [
+			0	=> [
+				'value'		=> 1,
+				'selected'	=> $value == 1,
+				'label'		=> $user->lang('DELETE_OLDEST_MESSAGES'),
+			],
+			1	=> [
+				'value'		=> 2,
+				'selected'	=> $value == 2,
+				'label'		=> $user->lang('HOLD_NEW_MESSAGES_SHORT'),
+			],
+		];
 
-		return h_radio('config[referer_validation]', $radio_ary, $value, $key);
+		return [
+			'options' => $full_folder_select_options,
+		];
 	}
 
 	/**
@@ -912,25 +912,42 @@ function select_ref_check($value, $key = '')
 	*/
 	function select_acc_activation($selected_value, $value)
 	{
-		global $user, $config;
+		global $user, $config, $phpbb_dispatcher;
 
-		$act_ary = array(
-			'ACC_DISABLE'	=> array(true, USER_ACTIVATION_DISABLE),
-			'ACC_NONE'		=> array(true, USER_ACTIVATION_NONE),
-			'ACC_USER'		=> array($config['email_enable'], USER_ACTIVATION_SELF),
-			'ACC_ADMIN'		=> array($config['email_enable'], USER_ACTIVATION_ADMIN),
-		);
+		$act_ary = [
+			'ACC_DISABLE'	=> [true, USER_ACTIVATION_DISABLE],
+			'ACC_NONE'		=> [true, USER_ACTIVATION_NONE],
+			'ACC_USER'		=> [$config['email_enable'], USER_ACTIVATION_SELF],
+			'ACC_ADMIN'		=> [$config['email_enable'], USER_ACTIVATION_ADMIN],
+		];
+
+		$act_options = [];
+
+		/**
+		 * Event to add and/or modify account activation configurations
+		 *
+		 * @event core.acp_account_activation_edit_add
+		 * @var	array	act_ary		Array of account activation methods
+		 * @var	array	act_options	Options available in the activation method
+		 * @since 3.3.15-RC1
+		 */
+		$vars = ['act_ary', 'act_options'];
+		extract($phpbb_dispatcher->trigger_event('core.acp_account_activation_edit_add', compact($vars)));
 
-		$act_options = '';
 		foreach ($act_ary as $key => $data)
 		{
 			list($available, $value) = $data;
-			$selected = ($selected_value == $value) ? ' selected="selected"' : '';
-			$class = (!$available) ? ' class="disabled-option"' : '';
-			$act_options .= '<option value="' . $value . '"' . $selected . $class . '>' . $user->lang($key) . '</option>';
+			$act_options[] = [
+				'value'		=> $value,
+				'selected'	=> $selected_value == $value,
+				'label'		=> $user->lang($key),
+				'class'		=> !$available ? 'disabled-option' : '',
+			];
 		}
 
-		return $act_options;
+		return [
+			'options' => $act_options,
+		];
 	}
 
 	/**
@@ -940,7 +957,27 @@ function username_length($value, $key = '')
 	{
 		global $user;
 
-		return '<input id="' . $key . '" type="number" min="1" max="999" name="config[min_name_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="number" min="8" max="180" name="config[max_name_chars]" value="' . $this->new_config['max_name_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
+		return [
+			[
+				'tag'		=> 'input',
+				'id'		=> $key,
+				'type'		=> 'number',
+				'name'		=> 'config[min_name_chars]',
+				'min'		=> 1,
+				'max'		=> 999,
+				'value'		=> $value,
+				'append'	=> $user->lang('MIN_CHARS') . '&nbsp;&nbsp;',
+			],
+			[
+				'tag'		=> 'input',
+				'type'		=> 'number',
+				'name'		=> 'config[max_name_chars]',
+				'min'		=> 8,
+				'max'		=> 180,
+				'value'		=> $this->new_config['max_name_chars'],
+				'append'	=> $user->lang('MAX_CHARS'),
+			],
+		];
 	}
 
 	/**
@@ -950,15 +987,20 @@ function select_username_chars($selected_value, $key)
 	{
 		global $user;
 
-		$user_char_ary = array('USERNAME_CHARS_ANY', 'USERNAME_ALPHA_ONLY', 'USERNAME_ALPHA_SPACERS', 'USERNAME_LETTER_NUM', 'USERNAME_LETTER_NUM_SPACERS', 'USERNAME_ASCII');
-		$user_char_options = '';
+		$user_char_ary = ['USERNAME_CHARS_ANY', 'USERNAME_ALPHA_ONLY', 'USERNAME_ALPHA_SPACERS', 'USERNAME_LETTER_NUM', 'USERNAME_LETTER_NUM_SPACERS', 'USERNAME_ASCII'];
+		$user_char_options = [];
 		foreach ($user_char_ary as $user_type)
 		{
-			$selected = ($selected_value == $user_type) ? ' selected="selected"' : '';
-			$user_char_options .= '<option value="' . $user_type . '"' . $selected . '>' . $user->lang[$user_type] . '</option>';
+			$user_char_options[] = [
+				'value'		=> $user_type,
+				'selected'	=> $selected_value == $user_type,
+				'label'		=> $user->lang($user_type),
+			];
 		}
 
-		return $user_char_options;
+		return [
+			'options' => $user_char_options,
+		];
 	}
 
 	/**
@@ -968,7 +1010,16 @@ function password_length($value, $key)
 	{
 		global $user;
 
-		return '<input id="' . $key . '" type="number" min="1" max="999" name="config[min_pass_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'];
+		return [
+			[
+				'tag'		=> 'input',
+				'id'		=> $key,
+				'type'		=> 'number',
+				'name'		=> 'config[min_pass_chars]',
+				'value'		=> $value,
+				'append'	=> $user->lang('MIN_CHARS'),
+			],
+		];
 	}
 
 	/**
@@ -979,14 +1030,20 @@ function select_password_chars($selected_value, $key)
 		global $user;
 
 		$pass_type_ary = array('PASS_TYPE_ANY', 'PASS_TYPE_CASE', 'PASS_TYPE_ALPHA', 'PASS_TYPE_SYMBOL');
-		$pass_char_options = '';
+		$pass_char_options = [];
 		foreach ($pass_type_ary as $pass_type)
 		{
-			$selected = ($selected_value == $pass_type) ? ' selected="selected"' : '';
-			$pass_char_options .= '<option value="' . $pass_type . '"' . $selected . '>' . $user->lang[$pass_type] . '</option>';
+			$pass_char_options[] = [
+				'tag'		=> 'select',
+				'value' 	=> $pass_type,
+				'selected'	=> $selected_value == $pass_type,
+				'label'		=> $user->lang[$pass_type],
+			];
 		}
 
-		return $pass_char_options;
+		return [
+			'options' => $pass_char_options,
+		];
 	}
 
 	/**
@@ -1035,7 +1092,22 @@ public function language_select(string $default = '', array $langdata = []): arr
 	{
 		global $db;
 
-		return phpbb_language_select($db, $default, $langdata);
+		return ['options' => phpbb_language_select($db, $default, $langdata)];
+	}
+
+	/**
+	 * Wrapper function for style_select()
+	 *
+	 * @param int|string $default	Style ID to be selected in the dropdown list
+	 * @param bool $all				Flag indicating if all styles data including inactive should be fetched
+	 *
+	 * @return array
+	 */
+	public function phpbb_style_select(int|string $default, bool $all): array
+	{
+		global $db;
+
+		return ['options' => style_select($default, $all)];
 	}
 
 	/**
@@ -1043,9 +1115,20 @@ public function language_select(string $default = '', array $langdata = []): arr
 	*/
 	function board_disable($value, $key)
 	{
-		$radio_ary = array(1 => 'YES', 0 => 'NO');
+		$options = phpbb_build_radio($value, $key, [1 => 'YES', 0 => 'NO']);
 
-		return h_radio('config[board_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $this->new_config['board_disable_msg'] . '" />';
+		return [
+			array_merge(['tag'	=> 'radio'], $options),
+			[
+				'tag'			=> 'input',
+				'type'			=> 'text',
+				'name'			=> 'config[board_disable_msg]',
+				'maxlength'		=> 255,
+				'size'			=> 40,
+				'id'			=> $key,
+				'value'			=> $this->new_config['board_disable_msg'] ?: '',
+			],
+		];
 	}
 
 	/**
@@ -1057,7 +1140,7 @@ function board_disable($value, $key)
 	 */
 	public function board_disable_access(int $value) : array
 	{
-		return [
+		return ['options' => [
 			[
 				'value'		=> 0,
 				'selected'	=> $value == 0,
@@ -1073,7 +1156,7 @@ public function board_disable_access(int $value) : array
 				'selected'	=> $value == 2,
 				'label'		=> $this->language->lang('DISABLE_BOARD_ACCESS_ADMIN_ALL_MODS'),
 			],
-		];
+		]];
 	}
 
 	/**
@@ -1081,12 +1164,21 @@ public function board_disable_access(int $value) : array
 	*/
 	function quick_reply($value, $key)
 	{
-		global $user;
+		global $language;
 
-		$radio_ary = array(1 => 'YES', 0 => 'NO');
+		$options = phpbb_build_radio($value, $key, [1 => 'YES', 0 => 'NO']);
 
-		return h_radio('config[allow_quick_reply]', $radio_ary, $value) .
-			'<br /><br /><input class="button2" type="submit" id="' . $key . '_enable" name="' . $key . '_enable" value="' . $user->lang['ALLOW_QUICK_REPLY_BUTTON'] . '" />';
+		return [
+			array_merge(['tag'	=> 'radio', 'append' => '<br><br>'], $options),
+			[
+				'tag'			=> 'input',
+				'type'			=> 'submit',
+				'class'			=> 'button2',
+				'name'			=> $key . '_enable',
+				'id'			=> $key . '_enable',
+				'value'			=> $language->lang('ALLOW_QUICK_REPLY_BUTTON'),
+			],
+		];
 	}
 
 	/**
@@ -1293,11 +1385,11 @@ function store_feed_forums($option, $key)
 	}
 
 	/**
-	* Option to enable/disable removal of 'app.php' from URLs
+	* Option to enable/disable removal of 'index.php' from URLs
 	*
-	* Note that if mod_rewrite is on, URLs without app.php will still work,
+	* Note that if mod_rewrite is on, URLs without index.php will still work,
 	* but any paths generated by the controller helper url() method will not
-	* contain app.php.
+	* contain index.php.
 	*
 	* @param int $value The current config value
 	* @param string $key The config key
@@ -1305,7 +1397,7 @@ function store_feed_forums($option, $key)
 	*/
 	function enable_mod_rewrite($value, $key)
 	{
-		global $user;
+		global $language;
 
 		// Determine whether mod_rewrite is enabled on the server
 		// NOTE: This only works on Apache servers on which PHP is NOT
@@ -1332,19 +1424,87 @@ function enable_mod_rewrite($value, $key)
 		$value = ($mod_rewrite === false) ? 0 : $value;
 		$message = $mod_rewrite === null ? 'MOD_REWRITE_INFORMATION_UNAVAILABLE' : ($mod_rewrite === false ? 'MOD_REWRITE_DISABLED' : false);
 
-		// Let's do some friendly HTML injection if we want to disable the
-		// form field because h_radio() has no pretty way of doing so
-		$field_name = 'config[enable_mod_rewrite]' . ($message === 'MOD_REWRITE_DISABLED' ? '" disabled="disabled' : '');
+		$options = phpbb_build_radio($value, $key, [1 => 'YES', 0 => 'NO']);
+		foreach ($options['buttons'] as $i => $button)
+		{
+			$options['buttons'][$i]['disabled'] = $message === 'MOD_REWRITE_DISABLED';
+		}
+
+		$tpl = array_merge(
+			[
+				'tag'	=> 'radio',
+				'append' => ($message !== false) ? '<br><span>' . $language->lang($message) . '</span>' : '',
+			],
+			$options
+		);
 
-		return h_radio($field_name, array(1 => 'YES', 0 => 'NO'), $value) .
-			($message !== false ? '<br /><span>' . $user->lang($message) . '</span>' : '');
+		return $tpl;
 	}
 
 	function send_test_email($value, $key)
 	{
 		global $user;
 
-		return '<input class="button2" type="submit" id="' . $key . '" name="' . $key . '" value="' . $user->lang('SEND_TEST_EMAIL') . '" />
-				<textarea id="' . $key . '_text" name="' . $key . '_text" placeholder="' . $user->lang('MESSAGE') . '"></textarea>';
+		return [
+			[
+				'tag'		=> 'input',
+				'type'		=> 'submit',
+				'name'		=> $key,
+				'id'		=> $key,
+				'class'		=> 'button2',
+				'value'		=> $user->lang('SEND_TEST_EMAIL'),
+			],
+			[
+				'tag'			=> 'textarea',
+				'name'			=> $key . '_text',
+				'id'			=> $key . '_text',
+				'placeholder'	=> $user->lang('MESSAGE'),
+			],
+		];
+	}
+
+	/**
+	 * Generate form data for web push enable
+	 *
+	 * @param string $value Webpush enable value
+	 * @param string $key Webpush enable config key
+	 *
+	 * @return array[] Form data
+	 */
+	public function webpush_enable($value, $key): array
+	{
+		return [
+			[
+				'tag'		=> 'radio',
+				'buttons'	=> [
+					[
+						'name'		=> "config[$key]",
+						'label'		=> $this->language->lang('YES'),
+						'type'		=> 'radio',
+						'class'		=> 'radio',
+						'value'		=> 1,
+						'checked'	=> $value,
+					],
+					[
+						'name'		=> "config[$key]",
+						'label'		=> $this->language->lang('NO'),
+						'type'		=> 'radio',
+						'class'		=> 'radio',
+						'value'		=> 0,
+						'checked'	=> !$value,
+					],
+				],
+			],
+			[
+				'tag'		=> 'input',
+				'class'		=> 'button2',
+				'name'		=> "config[$key]",
+				'type'		=> 'button',
+				'value'		=> $this->language->lang('WEBPUSH_GENERATE_VAPID_KEYS'),
+				'data'		=> [
+					'ajax'	=> 'generate_vapid_keys',
+				]
+			],
+		];
 	}
 }
diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php
index 323dd1baee6..982a8967b78 100644
--- a/phpBB/includes/acp/acp_bots.php
+++ b/phpBB/includes/acp/acp_bots.php
@@ -321,12 +321,15 @@ function main($id, $mode)
 					unset($bot_row['user_lang'], $bot_row['user_style']);
 				}
 
-				$s_active_options = '';
+				$s_active_options = [];
 				$_options = array('0' => 'NO', '1' => 'YES');
 				foreach ($_options as $value => $lang)
 				{
-					$selected = ($bot_row['bot_active'] == $value) ? ' selected="selected"' : '';
-					$s_active_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$lang] . '</option>';
+					$s_active_options[] = [
+						'value' 	=> $value,
+						'selected'	=> $bot_row['bot_active'] == $value,
+						'label'		=> $user->lang($lang),
+					];
 				}
 
 				$style_select = style_select($bot_row['bot_style'], true);
@@ -345,14 +348,22 @@ function main($id, $mode)
 					'BOT_AGENT'		=> $bot_row['bot_agent'],
 
 					'S_EDIT_BOT'		=> true,
-					'S_ACTIVE_OPTIONS'	=> $s_active_options,
-					'S_STYLE_OPTIONS'	=> $style_select,
+					'S_ACTIVE_OPTIONS'	=> [
+						'id'		=> 'bot_active',
+						'name'		=> 'bot_active',
+						'options'	=> $s_active_options,
+					],
+					'S_STYLE_OPTIONS'	=> [
+						'id'		=> 'bot_style',
+						'name'		=> 'bot_style',
+						'options'	=> $style_select,
+					],
 					'LANG_OPTIONS'		=> [
 						'id'		=> 'bot_lang',
 						'name'		=> 'bot_lang',
 						'options'	=> $lang_options,
 					],
-					'S_ERROR'			=> (count($error)) ? true : false,
+					'S_ERROR'		=> (bool) count($error),
 				));
 
 				return;
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php
index ff9f515d322..7addee6293a 100644
--- a/phpBB/includes/acp/acp_captcha.php
+++ b/phpBB/includes/acp/acp_captcha.php
@@ -95,7 +95,7 @@ function main($id, $mode)
 			add_form_key($form_key);
 
 			$submit = $request->variable('main_submit', false);
-			$error = $cfg_array = array();
+			$errors = $cfg_array = array();
 
 			if ($submit)
 			{
@@ -103,13 +103,13 @@ function main($id, $mode)
 				{
 					$cfg_array[$config_var] = $request->variable($config_var, $options['default']);
 				}
-				validate_config_vars($config_vars, $cfg_array, $error);
+				validate_config_vars($config_vars, $cfg_array, $errors);
 
 				if (!check_form_key($form_key))
 				{
-					$error[] = $user->lang['FORM_INVALID'];
+					$errors[] = $user->lang['FORM_INVALID'];
 				}
-				if ($error)
+				if ($errors)
 				{
 					$submit = false;
 				}
@@ -128,11 +128,9 @@ function main($id, $mode)
 					if (isset($captchas['available'][$selected]))
 					{
 						$old_captcha = $factory->get_instance($config['captcha_plugin']);
-						$old_captcha->uninstall();
+						$old_captcha->garbage_collect();
 
 						$config->set('captcha_plugin', $selected);
-						$new_captcha = $factory->get_instance($config['captcha_plugin']);
-						$new_captcha->install();
 
 						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_CONFIG_VISUAL');
 					}
@@ -145,17 +143,24 @@ function main($id, $mode)
 			}
 			else
 			{
-				$captcha_select = '';
+				$captcha_options = [];
 				foreach ($captchas['available'] as $value => $title)
 				{
-					$current = ($selected !== false && $value == $selected) ? ' selected="selected"' : '';
-					$captcha_select .= '<option value="' . $value . '"' . $current . '>' . $user->lang($title) . '</option>';
+					$captcha_options[] = [
+						'value'		=> $value,
+						'label'		=> $user->lang($title),
+						'selected'	=> $selected !== false && $value == $selected,
+					];
 				}
 
 				foreach ($captchas['unavailable'] as $value => $title)
 				{
-					$current = ($selected !== false && $value == $selected) ? ' selected="selected"' : '';
-					$captcha_select .= '<option value="' . $value . '"' . $current . ' class="disabled-option">' . $user->lang($title) . '</option>';
+					$captcha_options[] = [
+						'value'		=> $value,
+						'label'		=> $user->lang($title),
+						'selected'	=> $selected !== false && $value == $selected,
+						'class'		=> 'disabled-option',
+					];
 				}
 
 				$demo_captcha = $factory->get_instance($selected);
@@ -168,8 +173,12 @@ function main($id, $mode)
 				$template->assign_vars(array(
 					'CAPTCHA_PREVIEW_TPL'	=> $demo_captcha->get_demo_template($id),
 					'S_CAPTCHA_HAS_CONFIG'	=> $demo_captcha->has_config(),
-					'CAPTCHA_SELECT'		=> $captcha_select,
-					'ERROR_MSG'				=> implode('<br />', $error),
+					'CAPTCHA_SELECT'		=> [
+						'tag'		=> 'select',
+						'name'		=> 'select_captcha',
+						'options'	=> $captcha_options,
+					],
+					'ERRORS'				=> $errors,
 
 					'U_ACTION'				=> $this->u_action,
 				));
@@ -185,7 +194,7 @@ function deliver_demo($selected)
 		global $phpbb_container;
 
 		$captcha = $phpbb_container->get('captcha.factory')->get_instance($selected);
-		$captcha->init(CONFIRM_REG);
+		$captcha->init(\phpbb\captcha\plugins\confirm_type::REGISTRATION);
 		$captcha->execute_demo();
 
 		garbage_collection();
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 7b8dcc3ee52..7743ce5dbc8 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -162,12 +162,7 @@ function main($id, $mode)
 								throw new \phpbb\exception\runtime_exception('CANNOT_OPEN_FILE');
 							}
 
-							$storage->write_stream($file, $fp);
-
-							if (is_resource($fp))
-							{
-								fclose($fp);
-							}
+							$storage->write($file, $fp);
 
 							// Remove file from tmp
 							@unlink($temp_dir . '/' . $file);
@@ -279,7 +274,7 @@ function main($id, $mode)
 
 							try
 							{
-								$stream = $storage->read_stream($backup_info['file_name']);
+								$stream = $storage->read($backup_info['file_name']);
 								$fp = fopen($temp_file_name, 'w+b');
 
 								stream_copy_to_stream($stream, $fp);
@@ -287,7 +282,7 @@ function main($id, $mode)
 								fclose($fp);
 								fclose($stream);
 							}
-							catch (\phpbb\storage\exception\exception $e)
+							catch (\phpbb\storage\exception\storage_exception $e)
 							{
 								trigger_error($user->lang['RESTORE_DOWNLOAD_FAIL'] . adm_back_link($this->u_action));
 							}
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index cddf7b33247..2d1b4b72dd2 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -11,6 +11,8 @@
 *
 */
 
+use phpbb\messenger\method\messenger_interface;
+
 /**
 * @ignore
 */
@@ -74,13 +76,13 @@ function main($id, $mode)
 				{
 					// If giving usernames the admin is able to email inactive users too...
 					$sql_ary = array(
-						'SELECT'	=> 'user_id, username, user_email, user_jabber, user_notify_type, user_lang',
+						'SELECT'	=> 'user_id, username, user_email, user_lang',
 						'FROM'		=> array(
 							USERS_TABLE		=> '',
 						),
 						'WHERE'		=> $db->sql_in_set('username_clean', array_map('utf8_clean_string', $usernames)) . '
 							AND user_allow_massemail = 1',
-						'ORDER_BY'	=> 'user_lang, user_notify_type',
+						'ORDER_BY'	=> 'user_lang',
 					);
 				}
 				else
@@ -88,7 +90,7 @@ function main($id, $mode)
 					if ($group_id)
 					{
 						$sql_ary = array(
-							'SELECT'	=> 'u.user_id, u.user_email, u.username, u.username_clean, u.user_lang, u.user_jabber, u.user_notify_type',
+							'SELECT'	=> 'u.user_id, u.user_email, u.username, u.username_clean, u.user_lang',
 							'FROM'		=> array(
 								USERS_TABLE			=> 'u',
 								USER_GROUP_TABLE	=> 'ug',
@@ -98,19 +100,19 @@ function main($id, $mode)
 								AND u.user_id = ug.user_id
 								AND u.user_allow_massemail = 1
 								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')',
-							'ORDER_BY'	=> 'u.user_lang, u.user_notify_type',
+							'ORDER_BY'	=> 'u.user_lang',
 						);
 					}
 					else
 					{
 						$sql_ary = array(
-							'SELECT'	=> 'u.user_id, u.username, u.username_clean, u.user_email, u.user_jabber, u.user_lang, u.user_notify_type',
+							'SELECT'	=> 'u.user_id, u.username, u.username_clean, u.user_email, u.user_lang',
 							'FROM'		=> array(
 								USERS_TABLE	=> 'u',
 							),
 							'WHERE'		=> 'u.user_allow_massemail = 1
 								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')',
-							'ORDER_BY'	=> 'u.user_lang, u.user_notify_type',
+							'ORDER_BY'	=> 'u.user_lang',
 						);
 					}
 				}
@@ -152,15 +154,12 @@ function main($id, $mode)
 				$max_chunk_size = (int) $config['email_max_chunk_size'];
 				$email_list = array();
 				$old_lang = $rows[0]['user_lang'];
-				$old_notify_type = $rows[0]['user_notify_type'];
 
 				foreach ($rows as $row)
 				{
-					if (($row['user_notify_type'] == NOTIFY_EMAIL && $row['user_email']) ||
-						($row['user_notify_type'] == NOTIFY_IM && $row['user_jabber']) ||
-						($row['user_notify_type'] == NOTIFY_BOTH && ($row['user_email'] || $row['user_jabber'])))
+					if ($row['user_email'])
 					{
-						if ($i == $max_chunk_size || $row['user_lang'] != $old_lang || $row['user_notify_type'] != $old_notify_type)
+						if ($i == $max_chunk_size || $row['user_lang'] != $old_lang)
 						{
 							$i = 0;
 
@@ -170,37 +169,22 @@ function main($id, $mode)
 							}
 
 							$old_lang = $row['user_lang'];
-							$old_notify_type = $row['user_notify_type'];
 						}
 
 						$email_list[$j][$i]['lang']		= $row['user_lang'];
-						$email_list[$j][$i]['method']	= $row['user_notify_type'];
 						$email_list[$j][$i]['email']	= $row['user_email'];
 						$email_list[$j][$i]['name']		= $row['username'];
-						$email_list[$j][$i]['jabber']	= $row['user_jabber'];
 						$i++;
 					}
 				}
 
-				// Send the messages
-				if (!class_exists('messenger'))
-				{
-					include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-				}
-
-				if (!function_exists('get_group_name'))
-				{
-					include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-				}
-				$messenger = new messenger($use_queue);
-
 				$errored = false;
 
 				$email_template = 'admin_send_email';
-				$template_data = array(
+				$template_data = [
 					'CONTACT_EMAIL' => phpbb_get_board_contact($config, $phpEx),
 					'MESSAGE'		=> html_entity_decode($message, ENT_COMPAT),
-				);
+				];
 				$generate_log_entry = true;
 
 				/**
@@ -229,37 +213,41 @@ function main($id, $mode)
 				);
 				extract($phpbb_dispatcher->trigger_event('core.acp_email_send_before', compact($vars)));
 
+				/** @var \phpbb\di\service_collection $messenger_collection */
+				$messenger_collection = $phpbb_container->get('messenger.method_collection');
+				/** @var \phpbb\messenger\method\messenger_interface $messenger_method */
+				$messenger_method = $messenger_collection->offsetGet('messenger.method.email');
+
 				for ($i = 0, $size = count($email_list); $i < $size; $i++)
 				{
 					$used_lang = $email_list[$i][0]['lang'];
-					$used_method = $email_list[$i][0]['method'];
+
+					$messenger_method->set_use_queue($use_queue);
+					$messenger_method->template($email_template, $used_lang);
+					$messenger_method->subject(html_entity_decode($subject, ENT_COMPAT));
+					$messenger_method->assign_vars($template_data);
 
 					for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++)
 					{
 						$email_row = $email_list[$i][$j];
-
-						$messenger->{((count($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']);
-						$messenger->im($email_row['jabber'], $email_row['name']);
+						if (count($email_list[$i]) == 1)
+						{
+							$messenger_method->to($email_row['email'], $email_row['name']);
+						}
+						else
+						{
+							$messenger_method->bcc($email_row['email'], $email_row['name']);
+						}
 					}
 
-					$messenger->template($email_template, $used_lang);
-
-					$messenger->anti_abuse_headers($config, $user);
+					$messenger_method->anti_abuse_headers($config, $user);
+					$messenger_method->set_mail_priority($priority);
 
-					$messenger->subject(html_entity_decode($subject, ENT_COMPAT));
-					$messenger->set_mail_priority($priority);
-
-					$messenger->assign_vars($template_data);
-
-					if (!($messenger->send($used_method)))
-					{
-						$errored = true;
-					}
+					$errored = !$messenger_method->send() || $errored;
+					$messenger_method->save_queue();
 				}
 				unset($email_list);
 
-				$messenger->save_queue();
-
 				if ($generate_log_entry)
 				{
 					if (!empty($usernames))
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 1a30d38d610..d5adf629364 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -12,6 +12,7 @@
 */
 
 use phpbb\exception\exception_interface;
+use phpbb\exception\runtime_exception;
 use phpbb\exception\version_check_exception;
 
 /**
@@ -275,6 +276,11 @@ public function main_mode($id, $mode)
 				{
 					$this->template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($this->user));
 				}
+				catch (\Exception $e)
+				{
+					$this->template->assign_var('MIGRATOR_ERROR', $e->getMessage());
+					$this->template->assign_var('MIGRATOR_ERROR_STACK_TRACE', phpbb_filter_root_path($e->getTraceAsString()));
+				}
 
 				$this->tpl_name = 'acp_ext_enable';
 
@@ -362,6 +368,11 @@ public function main_mode($id, $mode)
 				{
 					$this->template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($this->user));
 				}
+				catch (\Exception $e)
+				{
+					$this->template->assign_var('MIGRATOR_ERROR', $e->getMessage());
+					$this->template->assign_var('MIGRATOR_ERROR_STACK_TRACE', phpbb_filter_root_path($e->getTraceAsString()));
+				}
 
 				$this->tpl_name = 'acp_ext_delete_data';
 
@@ -388,7 +399,7 @@ public function main_mode($id, $mode)
 
 						$this->template->assign_block_vars('updates_available', $updates_available);
 					}
-					catch (exception_interface $e)
+					catch (runtime_exception $e)
 					{
 						$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
 
@@ -797,7 +808,7 @@ public function list_enabled_exts(\phpbb\extension\manager $phpbb_extension_mana
 						$enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = true;
 						$enabled_extension_meta_data[$name]['U_VERSIONCHECK_FORCE'] = $this->u_action . '&amp;action=details&amp;versioncheck_force=1&amp;ext_name=' . urlencode($md_manager->get_metadata('name'));
 					}
-					catch (exception_interface $e)
+					catch (runtime_exception $e)
 					{
 						// Ignore exceptions due to the version check
 					}
@@ -807,7 +818,7 @@ public function list_enabled_exts(\phpbb\extension\manager $phpbb_extension_mana
 					$enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
 				}
 			}
-			catch (exception_interface $e)
+			catch (runtime_exception $e)
 			{
 				$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
 				$this->template->assign_block_vars('disabled', array(
@@ -887,7 +898,7 @@ public function list_disabled_exts(\phpbb\extension\manager $phpbb_extension_man
 			{
 				$disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
 			}
-			catch (exception_interface $e)
+			catch (runtime_exception $e)
 			{
 				$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
 				$this->template->assign_block_vars('disabled', array(
@@ -969,10 +980,10 @@ public function list_available_exts(array $managed_packages)
 			{
 				$available_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
 			}
-			catch (exception_interface $e)
+			catch (runtime_exception $e)
 			{
 				$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
-				$this->template->assign_block_vars('disabled', array(
+				$this->template->assign_block_vars('not_installed', array(
 					'META_DISPLAY_NAME'		=> $this->user->lang('EXTENSION_INVALID_LIST', $name, $message),
 					'S_VERSIONCHECK'		=> false,
 				));
@@ -986,9 +997,9 @@ public function list_available_exts(array $managed_packages)
 			$block_vars['NAME'] = $name;
 			$block_vars['U_DETAILS'] = $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name);
 
-			$this->template->assign_block_vars('disabled', $block_vars);
+			$this->template->assign_block_vars('not_installed', $block_vars);
 
-			$this->output_actions('disabled', array(
+			$this->output_actions('not_installed', array(
 				'ENABLE'		=> $this->u_action . '&amp;action=enable_pre&amp;ext_name=' . urlencode($name),
 				'REMOVE' => $this->u_catalog_action . '&amp;action=remove&amp;extension=' . urlencode($block_vars['META_NAME']),
 			));
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 6aafce12bcb..abd622fe9d3 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -213,13 +213,7 @@ function main($id, $mode)
 							phpbb_cache_moderators($db, $phpbb_container->get('dbal.tools'), $cache, $auth);
 							$copied_permissions = true;
 						}
-/* Commented out because of questionable UI workflow - re-visit for 3.0.7
-						else if (!$this->parent_id && $action != 'edit' && $auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))
-						{
-							$this->copy_permission_page($forum_data);
-							return;
-						}
-*/
+
 						$auth->acl_clear_prefetch();
 
 						$acl_url = '&amp;mode=setting_forum_local&amp;forum_id[]=' . $forum_data['forum_id'];
@@ -2054,7 +2048,7 @@ function delete_forum_content($forum_id)
 
 		$config->set('num_files', (int) $row['stat'], false);
 
-		$sql = 'SELECT SUM(filesize) as stat
+		$sql = 'SELECT SUM(' . $db->cast_expr_to_bigint('filesize') . ') as stat
 			FROM ' . ATTACHMENTS_TABLE;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index b24014cb398..82646115162 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -396,7 +396,7 @@ function main($id, $mode)
 					$allow_desc_urls	= $request->variable('desc_parse_urls', false);
 					$allow_desc_smilies	= $request->variable('desc_parse_smilies', false);
 
-					$submit_ary = array(
+					$submit_ary = [
 						'colour'			=> $request->variable('group_colour', ''),
 						'rank'				=> $request->variable('group_rank', 0),
 						'receive_pm'		=> isset($_REQUEST['group_receive_pm']) ? 1 : 0,
@@ -406,7 +406,13 @@ function main($id, $mode)
 						'max_recipients'	=> $request->variable('group_max_recipients', 0),
 						'founder_manage'	=> 0,
 						'skip_auth'			=> $request->variable('group_skip_auth', 0),
-					);
+
+						// Initialize avatar data
+						'avatar'			=> $avatar_data['avatar'] ?? '',
+						'avatar_type'		=> $avatar_data['avatar_type'] ?? '',
+						'avatar_height'		=> $avatar_data['avatar_height'] ?? 0,
+						'avatar_width'		=> $avatar_data['avatar_width'] ?? 0,
+					];
 
 					if ($user->data['user_type'] == USER_FOUNDER)
 					{
@@ -452,7 +458,7 @@ function main($id, $mode)
 					* Validate the length of "Maximum number of allowed recipients per
 					* private message" setting. We use 16777215 as a maximum because it matches
 					* MySQL unsigned mediumint maximum value which is the lowest amongst DBMSes
-					* supported by phpBB3. Also validate the submitted colour value.
+					* supported by phpBB. Also validate the submitted colour value.
 					*/
 					$validation_checks = array(
 						'max_recipients' => array('num', false, 0, 16777215),
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php
index 02412aa5267..35bbdf4e852 100644
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -114,29 +114,19 @@ function main($id, $mode)
 
 						if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !empty($inactive_users))
 						{
-							if (!class_exists('messenger'))
-							{
-								include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-							}
-
-							$messenger = new messenger(false);
+							$email_method = $phpbb_container->get('messenger.method.email');
+							$email_method->set_use_queue(false);
 
 							foreach ($inactive_users as $row)
 							{
-								$messenger->template('admin_welcome_activated', $row['user_lang']);
-
-								$messenger->set_addresses($row);
-
-								$messenger->anti_abuse_headers($config, $user);
-
-								$messenger->assign_vars(array(
-									'USERNAME'	=> html_entity_decode($row['username'], ENT_COMPAT))
-								);
-
-								$messenger->send(NOTIFY_EMAIL);
+								$email_method->template('admin_welcome_activated', $row['user_lang']);
+								$email_method->set_addresses($row);
+								$email_method->anti_abuse_headers($config, $user);
+								$email_method->assign_vars([
+									'USERNAME'	=> html_entity_decode($row['username'], ENT_COMPAT),
+								]);
+								$email_method->send();
 							}
-
-							$messenger->save_queue();
 						}
 
 						if (!empty($inactive_users))
@@ -195,7 +185,7 @@ function main($id, $mode)
 						trigger_error($user->lang['EMAIL_DISABLED'] . adm_back_link($this->u_action), E_USER_WARNING);
 					}
 
-					$sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey
+					$sql = 'SELECT user_id, username, user_email, user_lang, user_regdate, user_actkey
 						FROM ' . USERS_TABLE . '
 						WHERE ' . $db->sql_in_set('user_id', $mark) . '
 							AND user_inactive_reason';
@@ -204,44 +194,40 @@ function main($id, $mode)
 
 					$result = $db->sql_query($sql);
 
+					/** @var \phpbb\di\service_collection $messenger_collection */
+					$messenger_collection = $phpbb_container->get('messenger.method_collection');
+					/** @var \phpbb\messenger\method\messenger_interface $messenger_method */
+					$messenger_method = $messenger_collection->offsetGet('messenger.method.email');
+
 					if ($row = $db->sql_fetchrow($result))
 					{
 						// Send the messages
-						if (!class_exists('messenger'))
-						{
-							include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-						}
-
-						$messenger = new messenger();
 						$usernames = $user_ids = array();
 
 						do
 						{
-							$messenger->template('user_remind_inactive', $row['user_lang']);
-
-							$messenger->set_addresses($row);
-
-							$messenger->anti_abuse_headers($config, $user);
-
-							$messenger->assign_vars(array(
+							$messenger_method->template('user_remind_inactive', $row['user_lang']);
+							$messenger_method->set_addresses($row);
+							$messenger_method->anti_abuse_headers($config, $user);
+							$messenger_method->assign_vars([
 								'USERNAME'		=> html_entity_decode($row['username'], ENT_COMPAT),
 								'REGISTER_DATE'	=> $user->format_date($row['user_regdate'], false, true),
-								'U_ACTIVATE'	=> generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey'])
-							);
+								'U_ACTIVATE'	=> generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey'],
+							]);
 
-							$messenger->send($row['user_notify_type']);
+							$messenger_method->send();
+							$messenger_method->save_queue();
 
 							$usernames[] = $row['username'];
 							$user_ids[] = (int) $row['user_id'];
 						}
 						while ($row = $db->sql_fetchrow($result));
 
-						$messenger->save_queue();
-
-						// Add the remind state to the database
+						// Add the remind state to the database and increase activation expiration by one day
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET user_reminded = user_reminded + 1,
-								user_reminded_time = ' . time() . '
+								user_reminded_time = ' . time() . ',
+								user_actkey_expiration = ' . (int) $user::get_token_expiration() . '
 							WHERE ' . $db->sql_in_set('user_id', $user_ids);
 						$db->sql_query($sql);
 
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php
deleted file mode 100644
index 07f5dadbffa..00000000000
--- a/phpBB/includes/acp/acp_jabber.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-/**
-* @todo Check/enter/update transport info
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class acp_jabber
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		global $db, $user, $template, $phpbb_log, $request;
-		global $config, $phpbb_root_path, $phpEx;
-
-		$user->add_lang('acp/board');
-
-		if (!class_exists('jabber'))
-		{
-			include($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
-		}
-
-		$submit = (isset($_POST['submit'])) ? true : false;
-
-		if ($mode != 'settings')
-		{
-			return;
-		}
-
-		$this->tpl_name = 'acp_jabber';
-		$this->page_title = 'ACP_JABBER_SETTINGS';
-
-		$jab_enable				= $request->variable('jab_enable',			(bool) $config['jab_enable']);
-		$jab_host				= $request->variable('jab_host',			(string) $config['jab_host']);
-		$jab_port				= $request->variable('jab_port',			(int) $config['jab_port']);
-		$jab_username			= $request->variable('jab_username',		(string) $config['jab_username']);
-		$jab_password			= $request->variable('jab_password',		(string) $config['jab_password']);
-		$jab_package_size		= $request->variable('jab_package_size',	(int) $config['jab_package_size']);
-		$jab_use_ssl			= $request->variable('jab_use_ssl',		(bool) $config['jab_use_ssl']);
-		$jab_verify_peer		= $request->variable('jab_verify_peer',		(bool) $config['jab_verify_peer']);
-		$jab_verify_peer_name	= $request->variable('jab_verify_peer_name',	(bool) $config['jab_verify_peer_name']);
-		$jab_allow_self_signed	= $request->variable('jab_allow_self_signed',	(bool) $config['jab_allow_self_signed']);
-
-		$form_name = 'acp_jabber';
-		add_form_key($form_name);
-
-		if ($submit)
-		{
-			if (!check_form_key($form_name))
-			{
-				trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			$message = $user->lang['JAB_SETTINGS_CHANGED'];
-			$log = 'JAB_SETTINGS_CHANGED';
-
-			// Is this feature enabled? Then try to establish a connection
-			if ($jab_enable)
-			{
-				$jabber = new jabber($jab_host, $jab_port, $jab_username, $jab_password, $jab_use_ssl, $jab_verify_peer, $jab_verify_peer_name, $jab_allow_self_signed);
-
-				if (!$jabber->connect())
-				{
-					trigger_error($user->lang['ERR_JAB_CONNECT'] . '<br /><br />' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				// We'll try to authorise using this account
-				if (!$jabber->login())
-				{
-					trigger_error($user->lang['ERR_JAB_AUTH'] . '<br /><br />' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$jabber->disconnect();
-			}
-			else
-			{
-				// This feature is disabled.
-				// We update the user table to be sure all users that have IM as notify type are set to both as notify type
-				// We set this to both because users still have their jabber address entered and may want to receive jabber notifications again once it is re-enabled.
-				$sql_ary = array(
-					'user_notify_type'		=> NOTIFY_BOTH,
-				);
-
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE user_notify_type = ' . NOTIFY_IM;
-				$db->sql_query($sql);
-			}
-
-			$config->set('jab_enable', $jab_enable);
-			$config->set('jab_host', $jab_host);
-			$config->set('jab_port', $jab_port);
-			$config->set('jab_username', $jab_username);
-			if ($jab_password !== '********')
-			{
-				$config->set('jab_password', $jab_password);
-			}
-			$config->set('jab_package_size', $jab_package_size);
-			$config->set('jab_use_ssl', $jab_use_ssl);
-			$config->set('jab_verify_peer', $jab_verify_peer);
-			$config->set('jab_verify_peer_name', $jab_verify_peer_name);
-			$config->set('jab_allow_self_signed', $jab_allow_self_signed);
-
-			$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_' . $log);
-			trigger_error($message . adm_back_link($this->u_action));
-		}
-
-		$template->assign_vars(array(
-			'U_ACTION'				=> $this->u_action,
-			'JAB_ENABLE'			=> $jab_enable,
-			'L_JAB_SERVER_EXPLAIN'	=> sprintf($user->lang['JAB_SERVER_EXPLAIN'], '<a href="http://www.jabber.org/">', '</a>'),
-			'JAB_HOST'				=> $jab_host,
-			'JAB_PORT'				=> ($jab_port) ? $jab_port : '',
-			'JAB_USERNAME'			=> $jab_username,
-			'JAB_PASSWORD'			=> $jab_password !== '' ? '********' : '',
-			'JAB_PACKAGE_SIZE'		=> $jab_package_size,
-			'JAB_USE_SSL'			=> $jab_use_ssl,
-			'JAB_VERIFY_PEER'		=> $jab_verify_peer,
-			'JAB_VERIFY_PEER_NAME'	=> $jab_verify_peer_name,
-			'JAB_ALLOW_SELF_SIGNED'	=> $jab_allow_self_signed,
-			'S_CAN_USE_SSL'			=> jabber::can_use_ssl(),
-			'S_GTALK_NOTE'			=> (!@function_exists('dns_get_record')) ? true : false,
-		));
-	}
-}
diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php
index 1cf1246231a..9913264593b 100644
--- a/phpBB/includes/acp/acp_logs.php
+++ b/phpBB/includes/acp/acp_logs.php
@@ -50,7 +50,7 @@ function main($id, $mode)
 		$pagination = $phpbb_container->get('pagination');
 
 		// Delete entries if requested and able
-		if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs'))
+		if (($deleteall || ($deletemark && count($marked))) && $auth->acl_get('a_clearlogs'))
 		{
 			if (confirm_box(true))
 			{
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 8b34b5fea83..064980008d4 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -107,6 +107,20 @@ function main($id, $mode)
 					default:
 						$confirm = true;
 						$confirm_lang = 'CONFIRM_OPERATION';
+
+						/**
+						 * Event to add confirm box for custom ACP quick actions
+						 *
+						 * @event core.acp_main_add_actions_confirm
+						 * @var	string	id				The module ID
+						 * @var	string	mode			The module mode
+						 * @var	string	action			Custom action type name
+						 * @var	boolean	confirm			Do we display the confirm box to run the custom action
+						 * @var	string	confirm_lang	Lang var name to display in confirm box
+						 * @since 3.3.15-RC1
+						 */
+						$vars = ['id', 'mode', 'action', 'confirm', 'confirm_lang'];
+						extract($phpbb_dispatcher->trigger_event('core.acp_main_add_actions_confirm', compact($vars)));
 				}
 
 				if ($confirm)
@@ -175,7 +189,7 @@ function main($id, $mode)
 						$config->set('num_files', (int) $db->sql_fetchfield('stat'), false);
 						$db->sql_freeresult($result);
 
-						$sql = 'SELECT SUM(filesize) as stat
+						$sql = 'SELECT SUM(' . $db->cast_expr_to_bigint('filesize') . ') as stat
 							FROM ' . ATTACHMENTS_TABLE . '
 							WHERE is_orphan = 0';
 						$result = $db->sql_query($sql);
@@ -414,6 +428,19 @@ function main($id, $mode)
 							trigger_error('PURGE_SESSIONS_SUCCESS');
 						}
 					break;
+
+					default:
+						/**
+						 * Event to add custom ACP quick actions
+						 *
+						 * @event core.acp_main_add_actions
+						 * @var	string	id				The module ID
+						 * @var	string	mode			The module mode
+						 * @var	string	action			Custom action type name
+						 * @since 3.3.15-RC1
+						 */
+						$vars = ['id', 'mode', 'action'];
+						extract($phpbb_dispatcher->trigger_event('core.acp_main_add_actions', compact($vars)));
 				}
 			}
 		}
@@ -431,6 +458,7 @@ function main($id, $mode)
 
 		if ($auth->acl_get('a_board'))
 		{
+			/** @var \phpbb\version_helper $version_helper */
 			$version_helper = $phpbb_container->get('version_helper');
 			try
 			{
@@ -445,10 +473,11 @@ function main($id, $mode)
 				$template->assign_vars(array(
 					'S_VERSION_UP_TO_DATE'		=> empty($updates_available),
 					'S_VERSION_UPGRADEABLE'		=> !empty($upgrades_available),
+					'S_VERSIONCHECK_FORCE'		=> (bool) $recheck,
 					'UPGRADE_INSTRUCTIONS'		=> !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false,
 				));
 			}
-			catch (\RuntimeException $e)
+			catch (\phpbb\exception\runtime_exception $e)
 			{
 				$message = call_user_func_array(array($user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
 				$template->assign_vars(array(
@@ -495,7 +524,7 @@ function main($id, $mode)
 		$upload_dir_size = get_formatted_filesize($config['upload_dir_size']);
 
 		$storage_avatar = $phpbb_container->get('storage.avatar');
-		$avatar_dir_size = get_formatted_filesize($storage_avatar->get_size());
+		$avatar_dir_size = get_formatted_filesize($storage_avatar->total_size());
 
 		if ($posts_per_day > $total_posts)
 		{
@@ -641,6 +670,9 @@ function main($id, $mode)
 			}
 		}
 
+		// Warn if incomplete captcha is enabled
+		$this->check_captcha_type($config, $template);
+
 		if (!defined('PHPBB_DISABLE_CONFIG_CHECK'))
 		{
 			// World-Writable? (000x)
@@ -673,4 +705,27 @@ function main($id, $mode)
 		$this->tpl_name = 'acp_main';
 		$this->page_title = 'ACP_MAIN';
 	}
+
+	/**
+	 * Check CAPTCHA type and output warning if incomplete type or unsafe config is used
+	 *
+	 * @param \phpbb\config\config $config
+	 * @param \phpbb\template\template $template
+	 * @return void
+	 */
+	protected function check_captcha_type(\phpbb\config\config $config, \phpbb\template\template $template): void
+	{
+		$template_vars = [];
+
+		if (!$config['enable_confirm'])
+		{
+			$template_vars['S_CAPTCHA_UNSAFE'] = true;
+		}
+		else if ($config['captcha_plugin'] == 'core.captcha.plugins.incomplete')
+		{
+			$template_vars['S_CAPTCHA_INCOMPLETE'] = true;
+		}
+
+		$template->assign_vars($template_vars);
+	}
 }
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index 3bb66f2083a..3f5bc97e6ac 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -547,7 +547,7 @@ function main($id, $mode)
 			);
 
 			$hold_ary = $auth_admin->get_mask('set', (count($user_id)) ? $user_id : false, (count($group_id)) ? $group_id : false, (count($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, ACL_NO);
-			$auth_admin->display_mask('set', $permission_type, $hold_ary, ((count($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false));
+			$auth_admin->display_mask('set', $permission_type, $hold_ary, (count($group_id) ? 'group' : 'user'), (($permission_scope == 'local') ? true : false));
 		}
 		else
 		{
@@ -556,7 +556,7 @@ function main($id, $mode)
 			);
 
 			$hold_ary = $auth_admin->get_mask('view', (count($user_id)) ? $user_id : false, (count($group_id)) ? $group_id : false, (count($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, ACL_NEVER);
-			$auth_admin->display_mask('view', $permission_type, $hold_ary, ((count($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false));
+			$auth_admin->display_mask('view', $permission_type, $hold_ary, (count($group_id) ? 'group' : 'user'), (($permission_scope == 'local') ? true : false));
 		}
 	}
 
@@ -674,9 +674,13 @@ function check_existence($mode, &$ids)
 	}
 
 	/**
-	* Apply permissions
+	 * Apply permissions
+	 * @param string $mode Module mode (see info file)
+	 * @param string $permission_type Permission type to set (allowed types: a_, f_, m_, u_)
+	 * @param auth_admin $auth_admin Auth admin object to call permission-setting methods
+	 * @param array $user_id User ID array
 	*/
-	function set_permissions($mode, $permission_type, $auth_admin, &$user_id, &$group_id)
+	function set_permissions($mode, $permission_type, $auth_admin, $user_id)
 	{
 		global $db, $cache, $user, $auth;
 		global $request, $phpbb_container;
@@ -694,8 +698,8 @@ function set_permissions($mode, $permission_type, $auth_admin, &$user_id, &$grou
 		}
 
 		// We loop through the auth settings defined in our submit
-		$ug_id = key($psubmit);
-		$forum_id = key($psubmit[$ug_id]);
+		$ug_id = (int) key($psubmit);
+		$forum_id = (int) key($psubmit[$ug_id]);
 
 		$settings = $request->variable('setting', array(0 => array(0 => array('' => 0))), false, \phpbb\request\request_interface::POST);
 		if (empty($settings) || empty($settings[$ug_id]) || empty($settings[$ug_id][$forum_id]))
@@ -705,6 +709,16 @@ function set_permissions($mode, $permission_type, $auth_admin, &$user_id, &$grou
 
 		$auth_settings = $settings[$ug_id][$forum_id];
 
+		// Filter based on permissions type
+		$auth_settings = array_filter($auth_settings, function ($key) use ($permission_type) {
+			return strpos($key, $permission_type) === 0;
+		}, ARRAY_FILTER_USE_KEY);
+
+		if (empty($auth_settings))
+		{
+			trigger_error('WRONG_PERMISSION_SETTING_FORMAT', E_USER_WARNING);
+		}
+
 		// Do we have a role we want to set?
 		$roles = $request->variable('role', array(0 => array(0 => 0)), false, \phpbb\request\request_interface::POST);
 		$assigned_role = (isset($roles[$ug_id][$forum_id])) ? (int) $roles[$ug_id][$forum_id] : 0;
@@ -719,6 +733,8 @@ function set_permissions($mode, $permission_type, $auth_admin, &$user_id, &$grou
 		{
 			foreach ($inherit as $_ug_id => $forum_id_ary)
 			{
+				$_ug_id = (int) $_ug_id;
+
 				// Inherit users/groups?
 				if (!in_array($_ug_id, $ug_id))
 				{
@@ -732,6 +748,41 @@ function set_permissions($mode, $permission_type, $auth_admin, &$user_id, &$grou
 
 		$forum_id = array_unique($forum_id);
 
+		// Verify all collected ug_ids against the correct entity table and drop any
+		// that do not exist under the resolved ug_type.
+		if ($ug_type == 'user')
+		{
+			$sql = 'SELECT user_id
+				FROM ' . USERS_TABLE . '
+				WHERE ' . $db->sql_in_set('user_id', $ug_id);
+			$result = $db->sql_query($sql);
+
+			$ug_id = [];
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$ug_id[] = (int) $row['user_id'];
+			}
+		}
+		else
+		{
+			$sql = 'SELECT group_id
+				FROM ' . GROUPS_TABLE . '
+				WHERE ' . $db->sql_in_set('group_id', $ug_id);
+			$result = $db->sql_query($sql);
+
+			$ug_id = [];
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$ug_id[] = (int) $row['group_id'];
+			}
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($ug_id))
+		{
+			trigger_error($user->lang['NO_AUTH_SETTING_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
 		// If the auth settings differ from the assigned role, then do not set a role...
 		if ($assigned_role)
 		{
@@ -750,10 +801,12 @@ function set_permissions($mode, $permission_type, $auth_admin, &$user_id, &$grou
 			phpbb_cache_moderators($db, $phpbb_container->get('dbal.tools'), $cache, $auth);
 		}
 
-		// Remove users who are now moderators or admins from everyones foes list
-		if ($permission_type == 'm_' || $permission_type == 'a_')
+		// Remove groups or users who are now moderators or admins from everyone's foes list.
+		if (($permission_type == 'm_' || $permission_type == 'a_') && $ug_id)
 		{
-			phpbb_update_foes($db, $auth, $group_id, $user_id);
+			$foe_user_ids = ($ug_type == 'user') ? $ug_id : false;
+			$foe_group_ids = ($ug_type == 'group') ? $ug_id : false;
+			phpbb_update_foes($db, $auth, $foe_group_ids, $foe_user_ids);
 		}
 
 		$this->log_action($mode, 'add', $permission_type, $ug_type, $ug_id, $forum_id);
@@ -763,9 +816,13 @@ function set_permissions($mode, $permission_type, $auth_admin, &$user_id, &$grou
 	}
 
 	/**
-	* Apply all permissions
+	 * Apply all permissions
+	 * @param string $mode Module mode (see info file)
+	 * @param string $permission_type Permission type to set (allowed types: a_, f_, m_, u_)
+	 * @param auth_admin $auth_admin Auth admin object to call permission-setting methods
+	 * @param array $user_id User ID array
 	*/
-	function set_all_permissions($mode, $permission_type, $auth_admin, &$user_id, &$group_id)
+	function set_all_permissions($mode, $permission_type, $auth_admin, $user_id)
 	{
 		global $db, $cache, $user, $auth;
 		global $request, $phpbb_container;
@@ -784,10 +841,52 @@ function set_all_permissions($mode, $permission_type, $auth_admin, &$user_id, &$
 		$auth_roles = $request->variable('role', array(0 => array(0 => 0)), false, \phpbb\request\request_interface::POST);
 		$ug_ids = $forum_ids = array();
 
+		// Verify all ug_ids submitted via the form against the correct entity table.
+		// Any ID that does not exist as the correct type is silently dropped, so only
+		// real users/groups matching the resolved ug_type are written to the ACL tables.
+		$posted_ug_ids = array_unique(array_map('intval', array_keys($auth_settings)));
+		$valid_ug_ids = [];
+
+		if ($posted_ug_ids)
+		{
+			if ($ug_type == 'user')
+			{
+				$sql = 'SELECT user_id
+					FROM ' . USERS_TABLE . '
+					WHERE ' . $db->sql_in_set('user_id', $posted_ug_ids);
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$valid_ug_ids[] = (int) $row['user_id'];
+				}
+			}
+			else
+			{
+				$sql = 'SELECT group_id
+					FROM ' . GROUPS_TABLE . '
+					WHERE ' . $db->sql_in_set('group_id', $posted_ug_ids);
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$valid_ug_ids[] = (int) $row['group_id'];
+				}
+			}
+			$db->sql_freeresult($result);
+		}
+
 		// We need to go through the auth settings
 		foreach ($auth_settings as $ug_id => $forum_auth_row)
 		{
 			$ug_id = (int) $ug_id;
+
+			// Skip any ug_id not confirmed to exist in the database for the expected type
+			if (!in_array($ug_id, $valid_ug_ids))
+			{
+				continue;
+			}
+
 			$ug_ids[] = $ug_id;
 
 			foreach ($forum_auth_row as $forum_id => $auth_options)
@@ -795,6 +894,16 @@ function set_all_permissions($mode, $permission_type, $auth_admin, &$user_id, &$
 				$forum_id = (int) $forum_id;
 				$forum_ids[] = $forum_id;
 
+				// Filter based on permissions type
+				$auth_options = array_filter($auth_options, function ($key) use ($permission_type) {
+					return strpos($key, $permission_type) === 0;
+				}, ARRAY_FILTER_USE_KEY);
+
+				if (empty($auth_options))
+				{
+					continue;
+				}
+
 				// Check role...
 				$assigned_role = (isset($auth_roles[$ug_id][$forum_id])) ? (int) $auth_roles[$ug_id][$forum_id] : 0;
 
@@ -820,10 +929,12 @@ function set_all_permissions($mode, $permission_type, $auth_admin, &$user_id, &$
 			phpbb_cache_moderators($db, $phpbb_container->get('dbal.tools'), $cache, $auth);
 		}
 
-		// Remove users who are now moderators or admins from everyones foes list
-		if ($permission_type == 'm_' || $permission_type == 'a_')
+		// Remove groups or users who are now moderators or admins from everyone's foes list.
+		if (($permission_type == 'm_' || $permission_type == 'a_') && $ug_ids)
 		{
-			phpbb_update_foes($db, $auth, $group_id, $user_id);
+			$foe_user_ids = ($ug_type == 'user') ? $ug_ids : false;
+			$foe_group_ids = ($ug_type == 'group') ? $ug_ids : false;
+			phpbb_update_foes($db, $auth, $foe_group_ids, $foe_user_ids);
 		}
 
 		$this->log_action($mode, 'add', $permission_type, $ug_type, $ug_ids, $forum_ids);
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index a234a511b98..8cf60c2e7de 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -475,6 +475,41 @@ function main($id, $mode)
 					$cp->vars[$key] = $var;
 				}
 
+				// step 3 - all arrays
+				if ($action == 'edit')
+				{
+					// Get language entries
+					$sql = 'SELECT *
+						FROM ' . PROFILE_FIELDS_LANG_TABLE . '
+						WHERE lang_id <> ' . $this->edit_lang_id . "
+							AND field_id = $field_id
+						ORDER BY option_id ASC";
+					$result = $db->sql_query($sql);
+
+					$l_lang_options = [];
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$l_lang_options[$row['lang_id']][$row['option_id']] = $row['lang_value'];
+					}
+					$db->sql_freeresult($result);
+
+					$sql = 'SELECT lang_id, lang_name, lang_explain, lang_default_value
+						FROM ' . PROFILE_LANG_TABLE . '
+						WHERE lang_id <> ' . $this->edit_lang_id . "
+							AND field_id = $field_id
+						ORDER BY lang_id ASC";
+					$result = $db->sql_query($sql);
+
+					$l_lang_name = $l_lang_explain = $l_lang_default_value = [];
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$l_lang_name[$row['lang_id']] = $row['lang_name'];
+						$l_lang_explain[$row['lang_id']] = $row['lang_explain'];
+						$l_lang_default_value[$row['lang_id']] = $row['lang_default_value'];
+					}
+					$db->sql_freeresult($result);
+				}
+
 				foreach ($exclude[3] as $key)
 				{
 					$cp->vars[$key] = $request->variable($key, array(0 => ''), true);
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index 48a3b103f5c..2cd7529222c 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -516,7 +516,7 @@ protected function get_post_index_progress(int $post_counter): array
 		$this->db->sql_freeresult($result);
 
 		$total_count = $done_count + $remain_count;
-		$percent = ($done_count / $total_count) * 100;
+		$percent = $total_count > 0 ? ($done_count / $total_count) * 100 : 100;
 
 		return [
 			'VALUE'			=> $done_count,
diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php
index 3ea1036167a..a35f6d4f0c6 100644
--- a/phpBB/includes/acp/acp_storage.php
+++ b/phpBB/includes/acp/acp_storage.php
@@ -11,6 +11,18 @@
 *
 */
 
+use phpbb\db\driver\driver_interface;
+use phpbb\di\service_collection;
+use phpbb\language\language;
+use phpbb\log\log_interface;
+use phpbb\request\request;
+use phpbb\storage\exception\storage_exception;
+use phpbb\storage\helper;
+use phpbb\storage\state_helper;
+use phpbb\storage\update_type;
+use phpbb\template\template;
+use phpbb\user;
+
 /**
 * @ignore
 */
@@ -21,22 +33,28 @@
 
 class acp_storage
 {
-	/** @var \phpbb\config\config $config */
-	protected $config;
+	/** @var driver_interface */
+	protected $db;
 
-	/** @var \phpbb\language\language $lang */
+	/** @var language */
 	protected $lang;
 
-	/** @var \phpbb\request\request */
+	/** @var log_interface */
+	protected $log;
+
+	/** @var request */
 	protected $request;
 
-	/** @var \phpbb\template\template */
+	/** @var template */
 	protected $template;
 
-	/** @var \phpbb\di\service_collection */
+	/** @var user */
+	protected $user;
+
+	/** @var service_collection */
 	protected $provider_collection;
 
-	/** @var \phpbb\di\service_collection */
+	/** @var service_collection */
 	protected $storage_collection;
 
 	/** @var \phpbb\filesystem\filesystem */
@@ -54,210 +72,437 @@ class acp_storage
 	/** @var string */
 	public $u_action;
 
+	/** @var state_helper */
+	private $state_helper;
+
+	/** @var helper */
+	private $storage_helper;
+
+	/** @var string */
+	private $storage_table;
+
 	/**
 	 * @param string $id
 	 * @param string $mode
 	 */
-	public function main($id, $mode)
+	public function main(string $id, string $mode): void
 	{
 		global $phpbb_container, $phpbb_dispatcher, $phpbb_root_path;
 
-		$this->config = $phpbb_container->get('config');
-		$this->filesystem = $phpbb_container->get('filesystem');
+		$this->db = $phpbb_container->get('dbal.conn');
 		$this->lang = $phpbb_container->get('language');
+		$this->log = $phpbb_container->get('log');
 		$this->request = $phpbb_container->get('request');
 		$this->template = $phpbb_container->get('template');
+		$this->user = $phpbb_container->get('user');
 		$this->provider_collection = $phpbb_container->get('storage.provider_collection');
 		$this->storage_collection = $phpbb_container->get('storage.storage_collection');
+		$this->filesystem = $phpbb_container->get('filesystem');
 		$this->phpbb_root_path = $phpbb_root_path;
+		$this->state_helper = $phpbb_container->get('storage.state_helper');
+		$this->storage_helper = $phpbb_container->get('storage.helper');
+		$this->storage_table = $phpbb_container->getParameter('tables.storage');
 
-		// Add necesary language files
+		// Add necessary language files
 		$this->lang->add_lang(['acp/storage']);
 
 		/**
 		 * Add language strings
 		 *
 		 * @event core.acp_storage_load
-		 * @since 3.3.0-a1
+		 * @since 4.0.0-a1
 		 */
 		$phpbb_dispatcher->trigger_event('core.acp_storage_load');
 
-		$this->overview($id, $mode);
+		switch ($mode)
+		{
+			case 'settings':
+				$this->settings($id, $mode);
+			break;
+		}
 	}
 
 	/**
+	 * Method to route the request to the correct page
+	 *
 	 * @param string $id
 	 * @param string $mode
 	 */
-	public function overview($id, $mode)
+	private function settings(string $id, string $mode): void
 	{
-		$form_key = 'acp_storage';
-		add_form_key($form_key);
-
-		// Template from adm/style
-		$this->tpl_name = 'acp_storage';
-
-		// Set page title
-		$this->page_title = 'STORAGE_TITLE';
-
-		$messages = [];
-		if ($this->request->is_set_post('submit'))
+		$action = $this->request->variable('action', '');
+		if ($action && !$this->request->is_set_post('cancel'))
 		{
-			$modified_storages = [];
+			switch ($action)
+			{
+				case 'update':
+					$this->update_action();
+				break;
 
-			if (!check_form_key($form_key))
+				default:
+					trigger_error('NO_ACTION', E_USER_ERROR);
+			}
+		}
+		else
+		{
+			// If clicked to cancel (acp_storage_update_progress form)
+			if ($this->request->is_set_post('cancel'))
 			{
-				$messages[] = $this->lang->lang('FORM_INVALID');
+				$this->state_helper->clear_state();
 			}
 
-			foreach ($this->storage_collection as $storage)
+			// There is an updating in progress, show the form to continue or cancel
+			if ($this->state_helper->is_action_in_progress())
+			{
+				$this->update_inprogress();
+			}
+			else
 			{
-				$storage_name = $storage->get_name();
+				$this->settings_form();
+			}
+		}
+	}
 
-				$options = $this->get_provider_options($this->get_current_provider($storage_name));
+	/**
+	 * Page to update storage settings and move files
+	 *
+	 * @return void
+	 */
+	private function update_action(): void
+	{
+		if (!check_link_hash($this->request->variable('hash', ''), 'acp_storage'))
+		{
+			trigger_error($this->lang->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
+		}
 
-				$this->validate_path($storage_name, $options, $messages);
+		// If update_type is copy or move, copy files from the old to the new storage
+		if (in_array($this->state_helper->update_type(), [update_type::COPY, update_type::MOVE], true))
+		{
+			$i = 0;
+			foreach ($this->state_helper->storages() as $storage_name)
+			{
+				// Skip storages that have already copied files
+				if ($this->state_helper->storage_index() > $i++)
+				{
+					continue;
+				}
 
-				$modified = false;
+				$sql = 'SELECT file_id, file_path
+						FROM ' . $this->storage_table . "
+						WHERE  storage = '" . $this->db->sql_escape($storage_name) . "'
+							AND file_id > " . $this->state_helper->file_index();
+				$result = $this->db->sql_query($sql);
 
-				// Check if provider have been modified
-				if ($this->get_new_provider($storage_name) != $this->get_current_provider($storage_name))
+				while ($row = $this->db->sql_fetchrow($result))
 				{
-					$modified = true;
+					if (!still_on_time())
+					{
+						$this->db->sql_freeresult($result);
+						$this->display_progress_page();
+						return;
+					}
+
+					// Copy file from old adapter to the new one
+					$this->storage_helper->copy_file_to_new_adapter($storage_name, $row['file_path']);
+
+					$this->state_helper->set_file_index($row['file_id']); // update last file index copied
 				}
 
-				// Check if options have been modified
-				if (!$modified)
+				$this->db->sql_freeresult($result);
+
+				// Copied all files of a storage, increase storage index and reset file index
+				$this->state_helper->set_storage_index($this->state_helper->storage_index()+1);
+				$this->state_helper->set_file_index(0);
+			}
+
+			// If update_type is move files, remove the old files
+			if ($this->state_helper->update_type() === update_type::MOVE)
+			{
+				$i = 0;
+				foreach ($this->state_helper->storages() as $storage_name)
 				{
-					foreach (array_keys($options) as $definition)
+					// Skip storages that have already moved files
+					if ($this->state_helper->remove_storage_index() > $i++)
 					{
-						if ($this->get_new_definition($storage_name, $definition) != $this->get_current_definition($storage_name, $definition))
+						continue;
+					}
+
+					$sql = 'SELECT file_id, file_path
+							FROM ' . $this->storage_table . "
+							WHERE  storage = '" . $this->db->sql_escape($storage_name) . "'
+								AND file_id > " . $this->state_helper->file_index();
+					$result = $this->db->sql_query($sql);
+
+					while ($row = $this->db->sql_fetchrow($result))
+					{
+						if (!still_on_time())
 						{
-							$modified = true;
-							break;
+							$this->db->sql_freeresult($result);
+							$this->display_progress_page();
+							return;
 						}
+
+						// remove file from old (current) adapter
+						$current_adapter = $this->storage_helper->get_current_adapter($storage_name);
+						$current_adapter->delete($row['file_path']);
+
+						$this->state_helper->set_file_index($row['file_id']);
 					}
-				}
 
-				// If the storage have been modified, validate options
-				if ($modified)
-				{
-					$modified_storages[] = $storage_name;
-					$this->validate_data($storage_name, $messages);
+					$this->db->sql_freeresult($result);
+
+					// Remove all files of a storage, increase storage index and reset file index
+					$this->state_helper->set_remove_storage_index($this->state_helper->remove_storage_index() + 1);
+					$this->state_helper->set_file_index(0);
 				}
 			}
+		}
+
+		// Here all files have been copied/moved, so save new configuration
+		foreach ($this->state_helper->storages() as $storage_name)
+		{
+			$this->storage_helper->update_storage_config($storage_name);
+		}
+
+		$storages = $this->state_helper->storages();
+		$this->state_helper->clear_state();
+		$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_STORAGE_UPDATE', false, [implode(', ', $storages)]);
+		trigger_error($this->lang->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action));
+	}
+
+	/**
+	 * Page that show a form with the progress bar, and a button to continue or cancel
+	 *
+	 * @return void
+	 */
+	private function update_inprogress(): void
+	{
+		// Template from adm/style
+		$this->tpl_name = 'acp_storage_update_inprogress';
+
+		// Set page title
+		$this->page_title = 'STORAGE_TITLE';
+
+		$this->template->assign_vars([
+			'U_ACTION'	=> $this->u_action . '&amp;action=update&amp;hash=' . generate_link_hash('acp_storage'),
+			'CONTINUE_PROGRESS' => $this->get_storage_update_progress(),
+		]);
+	}
+
+	/**
+	 * Main settings page, shows a form with all the storages and their configuration options
+	 *
+	 * @return void
+	 */
+	private function settings_form(): void
+	{
+		$form_key = 'acp_storage';
+		add_form_key($form_key);
+
+		// Process form and create a "state" for the update,
+		// then show a confirm form
+		if ($this->request->is_set_post('submit'))
+		{
+			if (!check_form_key($form_key) || !check_link_hash($this->request->variable('hash', ''), 'acp_storage'))
+			{
+				trigger_error($this->lang->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
+			$modified_storages = $this->get_modified_storages();
+
+			// validate submited paths if they are local
+			$messages = [];
+			foreach ($modified_storages as $storage_name)
+			{
+				$this->validate_data($storage_name, $messages);
+			}
+			if (!empty($messages))
+			{
+				trigger_error(implode('<br>', $messages) . adm_back_link($this->u_action), E_USER_WARNING);
+			}
 
+			// Start process and show progress
 			if (!empty($modified_storages))
 			{
-				if (empty($messages))
-				{
-					foreach ($modified_storages as $storage_name)
-					{
-						$this->update_storage_config($storage_name);
-					}
+				// Create state
+				$this->state_helper->init(update_type::from((int) $this->request->variable('update_type', update_type::CONFIG->value)), $modified_storages, $this->request);
 
-					trigger_error($this->lang->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action), E_USER_NOTICE);
-				}
-				else
-				{
-					trigger_error(implode('<br />', $messages) . adm_back_link($this->u_action), E_USER_WARNING);
-				}
+				// Start displaying progress on first submit
+				$this->display_progress_page();
+				return;
 			}
 
 			// If there is no changes
 			trigger_error($this->lang->lang('STORAGE_NO_CHANGES') . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
-		$storage_stats = [];
+		// Template from adm/style
+		$this->tpl_name = 'acp_storage';
+
+		// Set page title
+		$this->page_title = 'STORAGE_TITLE';
+
+		$this->storage_stats(); // Show table with storage stats
+
+		// Validate local paths to check if everything is fine
+		$messages = [];
+		foreach ($this->storage_collection as $storage)
+		{
+			$this->validate_path($storage->get_name(), $messages);
+		}
+
+		$this->template->assign_vars([
+			'STORAGES'						=> $this->storage_collection,
+			'PROVIDERS' 					=> $this->provider_collection,
+
+			'ERROR_MESSAGES'				=> $messages,
+
+			'U_ACTION'						=> $this->u_action . '&amp;hash=' . generate_link_hash('acp_storage'),
+
+			'STORAGE_UPDATE_TYPE_CONFIG'	=> update_type::CONFIG->value,
+			'STORAGE_UPDATE_TYPE_COPY'		=> update_type::COPY->value,
+			'STORAGE_UPDATE_TYPE_MOVE'		=> update_type::MOVE->value,
+		]);
+	}
+
+	/**
+	 * When submit the settings form, check which storages have been modified
+	 * to update only those.
+	 *
+	 * @return array
+	 */
+	private function get_modified_storages(): array
+	{
+		$modified_storages = [];
+
 		foreach ($this->storage_collection as $storage)
 		{
 			$storage_name = $storage->get_name();
-			$options = $this->get_provider_options($this->get_current_provider($storage_name));
 
-			$this->validate_path($storage_name, $options, $messages);
+			$modified = false;
+
+			// Check if provider have been modified
+			if ($this->request->variable([$storage_name, 'provider'], '') != $this->storage_helper->get_current_provider($storage_name))
+			{
+				$modified = true;
+			}
+			else
+			{
+				$options = $this->storage_helper->get_provider_options($this->storage_helper->get_current_provider($storage_name));
 
+				// Check if options have been modified
+				foreach (array_keys($options) as $definition)
+				{
+					if ($this->request->variable([$storage_name, $definition], '') != $this->storage_helper->get_current_definition($storage_name, $definition))
+					{
+						$modified = true;
+						break;
+					}
+				}
+			}
+
+			if ($modified)
+			{
+				$modified_storages[] = $storage_name;
+			}
+		}
+
+		return $modified_storages;
+	}
+
+	/**
+	 * Fill template variables to show storage stats in settings page
+	 *
+	 * @return void
+	 */
+	protected function storage_stats(): void
+	{
+		// Top table with stats of each storage
+		$storage_stats = [];
+		foreach ($this->storage_collection as $storage)
+		{
 			try
 			{
 				$free_space = get_formatted_filesize($storage->free_space());
 			}
-			catch (\phpbb\storage\exception\exception $e)
+			catch (storage_exception $e)
 			{
 				$free_space = $this->lang->lang('STORAGE_UNKNOWN');
 			}
 
 			$storage_stats[] = [
 				'name' => $this->lang->lang('STORAGE_' . strtoupper($storage->get_name()) . '_TITLE'),
-				'files' => $storage->get_num_files(),
-				'size' => get_formatted_filesize($storage->get_size()),
+				'files' => $storage->total_files(),
+				'size' => get_formatted_filesize($storage->total_size()),
 				'free_space' => $free_space,
 			];
 		}
 
 		$this->template->assign_vars([
-			'STORAGES' => $this->storage_collection,
 			'STORAGE_STATS' => $storage_stats,
-			'PROVIDERS' => $this->provider_collection,
-
-			'ERROR_MSG'	=> implode('<br />', $messages),
-			'S_ERROR'	=> !empty($messages),
 		]);
 	}
 
 	/**
-	 * Get the current provider from config
-	 *
-	 * @param string $storage_name Storage name
-	 * @return string The current provider
-	 */
-	protected function get_current_provider($storage_name)
-	{
-		return $this->config['storage\\' . $storage_name . '\\provider'];
-	}
-
-	/**
-	 * Get the new provider from the request
-	 *
-	 * @param string $storage_name Storage name
-	 * @return string The new provider
+	 * Display progress page
 	 */
-	protected function get_new_provider($storage_name)
+	protected function display_progress_page() : void
 	{
-		return $this->request->variable([$storage_name, 'provider'], '');
-	}
+		$u_action = append_sid($this->u_action . '&amp;action=update&amp;hash=' . generate_link_hash('acp_storage'));
+		meta_refresh(1, $u_action);
 
-	/**
-	 * Get adapter definitions from a provider
-	 *
-	 * @param string $provider Provider class
-	 * @return array Adapter definitions
-	 */
-	protected function get_provider_options($provider)
-	{
-		return $this->provider_collection->get_by_class($provider)->get_options();
-	}
+		adm_page_header($this->lang->lang('STORAGE_UPDATE_IN_PROGRESS'));
+		$this->template->set_filenames([
+				'body'	=> 'acp_storage_update_progress.html'
+		]);
 
-	/**
-	 * Get the current value of the definition of a storage from config
-	 *
-	 * @param string $storage_name Storage name
-	 * @param string $definition Definition
-	 * @return string Definition value
-	 */
-	protected function get_current_definition($storage_name, $definition)
-	{
-		return $this->config['storage\\' . $storage_name . '\\config\\' . $definition];
+		$this->template->assign_vars([
+				'INDEXING_TITLE'		=> $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS'),
+				'INDEXING_EXPLAIN'		=> $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS_EXPLAIN'),
+				'INDEXING_PROGRESS_BAR'	=> $this->get_storage_update_progress(),
+		]);
+		adm_page_footer();
 	}
 
 	/**
-	 * Get the new value of the definition of a storage from the request
+	 * Get storage update progress to show progress bar
 	 *
-	 * @param string $storage_name Storage name
-	 * @param string $definition Definition
-	 * @return string Definition value
+	 * @return array
 	 */
-	protected function get_new_definition($storage_name, $definition)
+	protected function get_storage_update_progress(): array
 	{
-		return $this->request->variable([$storage_name, $definition], '');
+		$file_index = $this->state_helper->file_index();
+		$stage_is_copy = $this->state_helper->storage_index() < count($this->state_helper->storages());
+		$storage_name = $this->state_helper->storages()[$stage_is_copy ? $this->state_helper->storage_index() : $this->state_helper->remove_storage_index()];
+
+		$sql = 'SELECT COUNT(file_id) as done_count
+			FROM ' . $this->storage_table . '
+			WHERE file_id <= ' . $file_index . "
+				AND storage = '" . $this->db->sql_escape($storage_name) . "'";
+		$result = $this->db->sql_query($sql);
+		$done_count = (int) $this->db->sql_fetchfield('done_count');
+		$this->db->sql_freeresult($result);
+
+		$sql = 'SELECT COUNT(file_id) as remain_count
+			FROM ' . $this->storage_table . "
+			WHERE file_id > ' . $file_index . '
+				AND storage = '" . $this->db->sql_escape($storage_name) . "'";
+		$result = $this->db->sql_query($sql);
+		$remain_count = (int) $this->db->sql_fetchfield('remain_count');
+		$this->db->sql_freeresult($result);
+
+		$total_count = $done_count + $remain_count;
+		$percent = $total_count > 0 ? $done_count / $total_count : 0;
+
+		$steps = $this->state_helper->storage_index() + $this->state_helper->remove_storage_index() + $percent;
+		$multiplier = $this->state_helper->update_type() === update_type::MOVE ? 2 : 1;
+		$steps_total = count($this->state_helper->storages()) * $multiplier;
+
+		return [
+			'VALUE'			=> $steps,
+			'TOTAL'			=> $steps_total,
+			'PERCENTAGE'	=> $steps / $steps_total * 100,
+		];
 	}
 
 	/**
@@ -266,14 +511,14 @@ protected function get_new_definition($storage_name, $definition)
 	 * @param string $storage_name Storage name
 	 * @param array $messages Reference to messages array
 	 */
-	protected function validate_data($storage_name, &$messages)
+	protected function validate_data(string $storage_name, array &$messages): void
 	{
 		$storage_title = $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE');
 
 		// Check if provider exists
 		try
 		{
-			$new_provider = $this->provider_collection->get_by_class($this->get_new_provider($storage_name));
+			$new_provider = $this->provider_collection->get_by_class($this->request->variable([$storage_name, 'provider'], ''));
 		}
 		catch (\Exception $e)
 		{
@@ -288,91 +533,116 @@ protected function validate_data($storage_name, &$messages)
 			return;
 		}
 
+		$this->validate_path($storage_name, $messages);
+
 		// Check options
-		$new_options = $this->get_provider_options($this->get_new_provider($storage_name));
+		$new_provider = $this->provider_collection->get_by_class($this->request->variable([$storage_name, 'provider'], ''));
 
-		foreach ($new_options as $definition_key => $definition_value)
+		foreach ($new_provider->get_options() as $definition_key => $definition_value)
 		{
-			$provider = $this->provider_collection->get_by_class($this->get_new_provider($storage_name));
-			$definition_title = $this->lang->lang('STORAGE_ADAPTER_' . strtoupper($provider->get_name()) . '_OPTION_' . strtoupper($definition_key));
 
-			$value = $this->get_new_definition($storage_name, $definition_key);
+			$definition_title = $definition_value['title'];
+			$value = $this->request->variable([$storage_name, $definition_key], '');
 
-			switch ($definition_value['type'])
+			switch ($definition_value['form_macro']['tag'])
 			{
-				case 'email':
-					if (!filter_var($value, FILTER_VALIDATE_EMAIL))
+				case 'text':
+					if ($definition_value['form_macro']['type'] === 'email' && filter_var($value, FILTER_VALIDATE_EMAIL))
 					{
 						$messages[] = $this->lang->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $definition_title, $storage_title);
 					}
-				case 'text':
-				case 'password':
-					$maxlength = isset($definition_value['maxlength']) ? $definition_value['maxlength'] : 255;
+
+					$maxlength = $definition_value['form_macro']['max'] ?? 255;
 					if (strlen($value) > $maxlength)
 					{
 						$messages[] = $this->lang->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title);
 					}
-					break;
+
+					if ($new_provider->get_name() === 'local' && $definition_key === 'path')
+					{
+						$path = $value;
+
+						if (empty($path))
+						{
+							$messages[] = $this->lang->lang('STORAGE_PATH_NOT_SET', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'));
+						}
+						else if (!$this->filesystem->exists($this->phpbb_root_path . $path) || !$this->filesystem->is_writable($this->phpbb_root_path . $path))
+						{
+							$messages[] = $this->lang->lang('STORAGE_PATH_NOT_EXISTS', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'));
+						}
+					}
+				break;
+
 				case 'radio':
+					$found = false;
+					foreach ($definition_value['form_macro']['buttons'] as $button)
+					{
+						if ($button['value'] == $value)
+						{
+							$found = true;
+							break;
+						}
+					}
+
+					if (!$found)
+					{
+						$messages[] = $this->lang->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $definition_title, $storage_title);
+					}
+				break;
+
 				case 'select':
-					if (!in_array($value, array_values($definition_value['options'])))
+					$found = false;
+					foreach ($definition_value['form_macro']['options'] as $option)
+					{
+						if ($option['value'] == $value)
+						{
+							$found = true;
+							break;
+						}
+					}
+
+					if (!$found)
 					{
 						$messages[] = $this->lang->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $definition_title, $storage_title);
 					}
-					break;
+				break;
 			}
 		}
 	}
 
 	/**
-	 * Updates an storage with the info provided in the form
+	 * Validates path when the filesystem is local
 	 *
 	 * @param string $storage_name Storage name
+	 * @param array $messages Error messages array
+	 * @return void
 	 */
-	protected function update_storage_config($storage_name)
+	protected function validate_path(string $storage_name, array &$messages) : void
 	{
-		$current_options = $this->get_provider_options($this->get_current_provider($storage_name));
-
-		// Remove old storage config
-		foreach (array_keys($current_options) as $definition)
+		if ($this->request->is_set_post('submit'))
 		{
-			$this->config->delete('storage\\' . $storage_name . '\\config\\' . $definition);
+			$provider = $this->request->variable([$storage_name, 'provider'], '');
 		}
-
-		// Update provider
-		$this->config->set('storage\\' . $storage_name . '\\provider', $this->get_new_provider($storage_name));
-
-		// Set new storage config
-		$new_options = $this->get_provider_options($this->get_new_provider($storage_name));
-
-		foreach (array_keys($new_options) as $definition)
+		else
 		{
-			$this->config->set('storage\\' . $storage_name . '\\config\\' . $definition, $this->get_new_definition($storage_name, $definition));
+			$provider = $this->storage_helper->get_current_provider($storage_name);
 		}
-	}
 
-	/**
-	 * Validates path
-	 *
-	 * @param string $storage_name Storage name
-	 * @param array $options Storage provider configuration keys
-	 * @param array $messages Reference to error messages array
-	 * @return void
-	 */
-	protected function validate_path($storage_name, $options, &$messages)
-	{
-		if ($this->provider_collection->get_by_class($this->get_current_provider($storage_name))->get_name() == 'local' && isset($options['path']))
+		$options = $this->storage_helper->get_provider_options($provider);
+
+		if ($this->provider_collection->get_by_class($provider)->get_name() === 'local' && isset($options['path']))
 		{
-			$path = $this->request->is_set_post('submit') ? $this->get_new_definition($storage_name, 'path') : $this->get_current_definition($storage_name, 'path');
+			$path = $this->request->is_set_post('submit') ? $this->request->variable([$storage_name, 'path'], '') : $this->storage_helper->get_current_definition($storage_name, 'path');
 
 			if (empty($path))
 			{
 				$messages[] = $this->lang->lang('STORAGE_PATH_NOT_SET', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'));
 			}
-			else if (!$this->filesystem->is_writable($this->phpbb_root_path . $path) || !$this->filesystem->exists($this->phpbb_root_path . $path))
+			else if (!$this->filesystem->exists($this->phpbb_root_path . $path) || !$this->filesystem->is_writable($this->phpbb_root_path . $path))
 			{
 				$messages[] = $this->lang->lang('STORAGE_PATH_NOT_EXISTS', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'));
 			}
 		}
 	}
+
 }
diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php
index fa3afa6ce3e..4e8afebf1cd 100644
--- a/phpBB/includes/acp/acp_update.php
+++ b/phpBB/includes/acp/acp_update.php
@@ -38,12 +38,32 @@ function main($id, $mode)
 		try
 		{
 			$recheck = $request->variable('versioncheck_force', false);
+			$do_update = $request->variable('do_update', false);
+
 			$updates_available = $version_helper->get_update_on_branch($recheck);
 			$upgrades_available = $version_helper->get_suggested_updates();
+			$branch = '';
 			if (!empty($upgrades_available))
 			{
+				$branch = array_key_last($upgrades_available);
 				$upgrades_available = array_pop($upgrades_available);
 			}
+
+			if ($do_update && !empty($updates_available))
+			{
+				$updater = $phpbb_container->get('updater.controller');
+				$current_version = $config['version'];
+				$new_version = $upgrades_available['current'];
+				$download_url = 'https://download.phpbb.com/pub/release/';
+				$download_url .= $branch . '/' . $new_version . '/';
+				$download_url .= 'phpBB-' . $current_version . '_to_' . $new_version . '.zip';
+				$data = $updater->handle(
+					$download_url
+				);
+
+				$response = new \phpbb\json_response();
+				$response->send($data);
+			}
 		}
 		catch (\RuntimeException $e)
 		{
@@ -57,7 +77,7 @@ function main($id, $mode)
 			$template->assign_block_vars('updates_available', $updates_available);
 		}
 
-		$update_link = $phpbb_root_path . 'install/app.' . $phpEx;
+		$update_link = $phpbb_root_path . 'install/index.' . $phpEx;
 
 		$template_ary = [
 			'S_UP_TO_DATE'				=> empty($updates_available),
@@ -76,7 +96,7 @@ function main($id, $mode)
 		// Incomplete update?
 		if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<'))
 		{
-			$database_update_link = $phpbb_root_path . 'install/app.php/update';
+			$database_update_link = $phpbb_root_path . 'install/index.php/update';
 
 			$template->assign_vars(array(
 				'S_UPDATE_INCOMPLETE'		=> true,
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 85907e3ed94..df7d724fd66 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -16,6 +16,8 @@
 */
 
 use phpbb\controller\helper;
+use phpbb\language\language;
+use phpbb\messenger\method\messenger_interface;
 
 if (!defined('IN_PHPBB'))
 {
@@ -42,6 +44,9 @@ function main($id, $mode)
 		/** @var helper $controller_helper */
 		$controller_helper = $phpbb_container->get('controller.helper');
 
+		/** @var language $language Language object */
+		$language = $phpbb_container->get('language');
+
 		$user->add_lang(array('posting', 'ucp', 'acp/users'));
 		$this->tpl_name = 'acp_users';
 
@@ -72,11 +77,10 @@ function main($id, $mode)
 			$this->tpl_name = 'simple_body';
 
 			$user_ip = phpbb_ip_normalise($request->variable('user_ip', ''));
-			$domain = gethostbyaddr($user_ip);
 			$ipwhois = user_ipwhois($user_ip);
 
 			$template->assign_vars(array(
-				'MESSAGE_TITLE'		=> sprintf($user->lang['IP_WHOIS_FOR'], $domain),
+				'MESSAGE_TITLE'		=> sprintf($user->lang['IP_WHOIS_FOR'], phpbb_get_host_for_ip($user_ip)),
 				'MESSAGE_TEXT'		=> nl2br($ipwhois))
 			);
 
@@ -364,11 +368,6 @@ function main($id, $mode)
 
 							if ($config['email_enable'])
 							{
-								if (!class_exists('messenger'))
-								{
-									include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-								}
-
 								$server_url = generate_board_url();
 
 								$user_actkey = gen_rand_string(mt_rand(6, 10));
@@ -391,29 +390,29 @@ function main($id, $mode)
 									$user_actkey = empty($user_activation_key) ? $user_actkey : $user_activation_key;
 								}
 
-								if ($user_row['user_type'] == USER_NORMAL || empty($user_activation_key))
-								{
-									$sql = 'UPDATE ' . USERS_TABLE . "
-										SET user_actkey = '" . $db->sql_escape($user_actkey) . "'
-										WHERE user_id = $user_id";
-									$db->sql_query($sql);
-								}
-
-								$messenger = new messenger(false);
-
-								$messenger->template($email_template, $user_row['user_lang']);
-
-								$messenger->set_addresses($user_row);
-
-								$messenger->anti_abuse_headers($config, $user);
-
-								$messenger->assign_vars(array(
+								// Always update actkey even if same and also update actkey expiration to 24 hours from now
+								$sql_ary = [
+									'user_actkey'				=> $user_actkey,
+									'user_actkey_expiration'	=> $user::get_token_expiration(),
+								];
+
+								$sql = 'UPDATE ' . USERS_TABLE . '
+									SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+									WHERE user_id = ' . (int) $user_id;
+								$db->sql_query($sql);
+
+								// Start sending email
+								$email_method = $phpbb_container->get('messenger.method.email');
+								$email_method->set_use_queue(false);
+								$email_method->template($email_template, $user_row['user_lang']);
+								$email_method->set_addresses($user_row);
+								$email_method->anti_abuse_headers($config, $user);
+								$email_method->assign_vars([
 									'WELCOME_MSG'	=> html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), ENT_COMPAT),
 									'USERNAME'		=> html_entity_decode($user_row['username'], ENT_COMPAT),
-									'U_ACTIVATE'	=> "$server_url/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k=$user_actkey")
-								);
-
-								$messenger->send(NOTIFY_EMAIL);
+									'U_ACTIVATE'	=> "$server_url/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k=$user_actkey",
+								]);
+								$email_method->send();
 
 								$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_REACTIVATE', false, array($user_row['username']));
 								$phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_REACTIVATE_USER', false, array(
@@ -458,24 +457,15 @@ function main($id, $mode)
 									$phpbb_notifications = $phpbb_container->get('notification_manager');
 									$phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']);
 
-									if (!class_exists('messenger'))
-									{
-										include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-									}
-
-									$messenger = new messenger(false);
-
-									$messenger->template('admin_welcome_activated', $user_row['user_lang']);
-
-									$messenger->set_addresses($user_row);
-
-									$messenger->anti_abuse_headers($config, $user);
-
-									$messenger->assign_vars(array(
-										'USERNAME'	=> html_entity_decode($user_row['username'], ENT_COMPAT))
-									);
-
-									$messenger->send(NOTIFY_EMAIL);
+									$email_method = $phpbb_container->get('messenger.method.email');
+									$email_method->set_use_queue(false);
+									$email_method->template('admin_welcome_activated', $user_row['user_lang']);
+									$email_method->set_addresses($user_row);
+									$email_method->anti_abuse_headers($config, $user);
+									$email_method->assign_vars([
+										'USERNAME'	=> html_entity_decode($user_row['username'], ENT_COMPAT),
+									]);
+									$email_method->send();
 								}
 							}
 
@@ -1090,7 +1080,7 @@ function main($id, $mode)
 					$s_action_options .= '<option value="' . $value . '">' . $user->lang['USER_ADMIN_' . $lang] . '</option>';
 				}
 
-				$last_active = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit'];
+				$last_active = $user_row['user_last_active'] ?: ($user_row['session_time'] ?? 0);
 
 				$inactive_reason = '';
 				if ($user_row['user_type'] == USER_INACTIVE)
@@ -1156,7 +1146,7 @@ function main($id, $mode)
 					'POSTS_IN_QUEUE'	=> $user_row['posts_in_queue'],
 					'USER'				=> $user_row['username'],
 					'USER_REGISTERED'	=> $user->format_date($user_row['user_regdate']),
-					'REGISTERED_IP'		=> ($ip == 'hostname') ? gethostbyaddr($user_row['user_ip']) : $user_row['user_ip'],
+					'REGISTERED_IP'		=> ($ip == 'hostname') ? phpbb_get_host_for_ip($user_row['user_ip']) : $user_row['user_ip'],
 					'USER_LASTACTIVE'	=> ($last_active) ? $user->format_date($last_active) : ' - ',
 					'USER_EMAIL'		=> $user_row['user_email'],
 					'USER_WARNINGS'		=> $user_row['user_warnings'],
@@ -1439,7 +1429,6 @@ function main($id, $mode)
 				$user_row['iso_lang_id'] = $row['lang_id'];
 
 				$data = array(
-					'jabber'		=> $request->variable('jabber', $user_row['user_jabber'], true),
 					'bday_day'		=> 0,
 					'bday_month'	=> 0,
 					'bday_year'		=> 0,
@@ -1471,9 +1460,6 @@ function main($id, $mode)
 				if ($submit)
 				{
 					$error = validate_data($data, array(
-						'jabber'		=> array(
-							array('string', true, 5, 255),
-							array('jabber')),
 						'bday_day'		=> array('num', true, 1, 31),
 						'bday_month'	=> array('num', true, 1, 12),
 						'bday_year'		=> array('num', true, 1901, gmdate('Y', time())),
@@ -1509,7 +1495,6 @@ function main($id, $mode)
 					if (!count($error))
 					{
 						$sql_ary = array(
-							'user_jabber'	=> $data['jabber'],
 							'user_birthday'	=> $data['user_birthday'],
 						);
 
@@ -1566,7 +1551,6 @@ function main($id, $mode)
 				unset($now);
 
 				$template->assign_vars(array(
-					'JABBER'		=> $data['jabber'],
 					'S_BIRTHDAY_DAY_OPTIONS'	=> $s_birthday_day_options,
 					'S_BIRTHDAY_MONTH_OPTIONS'	=> $s_birthday_month_options,
 					'S_BIRTHDAY_YEAR_OPTIONS'	=> $s_birthday_year_options,
@@ -1596,7 +1580,6 @@ function main($id, $mode)
 					'viewemail'			=> $request->variable('viewemail', $user_row['user_allow_viewemail']),
 					'massemail'			=> $request->variable('massemail', $user_row['user_allow_massemail']),
 					'hideonline'		=> $request->variable('hideonline', !$user_row['user_allow_viewonline']),
-					'notifymethod'		=> $request->variable('notifymethod', $user_row['user_notify_type']),
 					'notifypm'			=> $request->variable('notifypm', $user_row['user_notify_pm']),
 					'allowpm'			=> $request->variable('allowpm', $user_row['user_allow_pm']),
 
@@ -1667,7 +1650,6 @@ function main($id, $mode)
 							'user_allow_viewemail'	=> $data['viewemail'],
 							'user_allow_massemail'	=> $data['massemail'],
 							'user_allow_viewonline'	=> !$data['hideonline'],
-							'user_notify_type'		=> $data['notifymethod'],
 							'user_notify_pm'		=> $data['notifypm'],
 
 							'user_dateformat'		=> $data['dateformat'],
@@ -1800,15 +1782,11 @@ function main($id, $mode)
 
 				$user_prefs_data = array(
 					'S_PREFS'			=> true,
-					'S_JABBER_DISABLED'	=> ($config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true,
 
 					'VIEW_EMAIL'		=> $data['viewemail'],
 					'MASS_EMAIL'		=> $data['massemail'],
 					'ALLOW_PM'			=> $data['allowpm'],
 					'HIDE_ONLINE'		=> $data['hideonline'],
-					'NOTIFY_EMAIL'		=> ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false,
-					'NOTIFY_IM'			=> ($data['notifymethod'] == NOTIFY_IM) ? true : false,
-					'NOTIFY_BOTH'		=> ($data['notifymethod'] == NOTIFY_BOTH) ? true : false,
 					'NOTIFY_PM'			=> $data['notifypm'],
 					'BBCODE'			=> $data['bbcode'],
 					'SMILIES'			=> $data['smilies'],
@@ -1838,7 +1816,11 @@ function main($id, $mode)
 						'name'		=> 'lang',
 						'options'	=> $lang_options,
 					],
-					'S_STYLE_OPTIONS'	=> style_select($data['style']),
+					'S_STYLE_OPTIONS'	=> [
+						'id'		=> 'style',
+						'name'		=> 'style',
+						'options' => style_select($data['style'])
+					],
 					'TIMEZONE_OPTIONS'	=> [
 						'tag'		=> 'select',
 						'name'		=> 'tz',
@@ -1910,9 +1892,27 @@ function main($id, $mode)
 									$sql = 'UPDATE ' . USERS_TABLE . '
 										SET ' . $db->sql_build_array('UPDATE', $result) . '
 										WHERE user_id = ' . (int) $user_id;
-
 									$db->sql_query($sql);
-									trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
+
+									if ($request->is_ajax())
+									{
+										$json_response = new \phpbb\json_response;
+										$json_response->send([
+											'success' => true,
+
+											'MESSAGE_TITLE'	=> $language->lang('INFORMATION'),
+											'MESSAGE_TEXT'	=> $language->lang('USER_AVATAR_UPDATED'),
+											'REFRESH_DATA'	=> [
+												'time'	=> 3,
+												'url'		=> $this->u_action . '&amp;u=' . $user_id,
+												'text'		=> $language->lang('BACK_TO_PREV'),
+											]
+										]);
+									}
+									else
+									{
+										trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
+									}
 								}
 							}
 						}
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index efe0f0e5d17..c8917c8d227 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -95,7 +95,7 @@ function get_mask($mode, $user_id = false, $group_id = false, $forum_id = false,
 			}
 			else
 			{
-				$hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%', ($scope == 'global') ? 0 : false) : $this->$acl_user_function($user_id, $auth_option . '%', ($scope == 'global') ? 0 : false);
+				$hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%') : $this->$acl_user_function($user_id, $auth_option . '%', ($scope == 'global') ? 0 : false);
 			}
 		}
 
@@ -463,10 +463,7 @@ function display_mask($mode, $permission_type, &$hold_ary, $user_mode = 'user',
 				foreach ($content_array as $ug_id => $ug_array)
 				{
 					// Build role dropdown options
-					$current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;
-
 					$role_options = array();
-
 					$s_role_options = '';
 					$current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;
 
@@ -560,10 +557,7 @@ function display_mask($mode, $permission_type, &$hold_ary, $user_mode = 'user',
 				foreach ($content_array as $forum_id => $forum_array)
 				{
 					// Build role dropdown options
-					$current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;
-
 					$role_options = array();
-
 					$current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;
 					$s_role_options = '';
 
diff --git a/phpBB/includes/acp/info/acp_board.php b/phpBB/includes/acp/info/acp_board.php
index 1a3ee7b6be5..a1d9f4fdd1b 100644
--- a/phpBB/includes/acp/info/acp_board.php
+++ b/phpBB/includes/acp/info/acp_board.php
@@ -30,6 +30,7 @@ function module()
 
 				'auth'		=> array('title' => 'ACP_AUTH_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')),
 				'email'		=> array('title' => 'ACP_EMAIL_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')),
+				'webpush'	=> array('title' => 'ACP_WEBPUSH_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')),
 
 				'cookie'	=> array('title' => 'ACP_COOKIE_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
 				'server'	=> array('title' => 'ACP_SERVER_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
diff --git a/phpBB/includes/acp/info/acp_jabber.php b/phpBB/includes/acp/info/acp_jabber.php
deleted file mode 100644
index 660299a12d8..00000000000
--- a/phpBB/includes/acp/info/acp_jabber.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-class acp_jabber_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_jabber',
-			'title'		=> 'ACP_JABBER_SETTINGS',
-			'modes'		=> array(
-				'settings'		=> array('title' => 'ACP_JABBER_SETTINGS', 'auth' => 'acl_a_jabber', 'cat' => array('ACP_CLIENT_COMMUNICATION')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index d0ced558232..b98fe1e6b3c 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -651,38 +651,4 @@ function bbcode_second_pass_code($type, $code)
 
 		return $code;
 	}
-
-	/**
-	* Function to perform custom bbcode second pass by extensions
-	* can be used to assign bbcode pattern replacement
-	* Example: '#\[list=([^\[]+):$uid\]#e'	=> "\$this->bbcode_second_pass_by_extension('\$1')"
-	*
-	* Accepts variable number of parameters
-	*
-	* @return bool Second pass result
-	*
-	* @deprecated 3.2.10 (To be removed 4.0.0)
-	*/
-	function bbcode_second_pass_by_extension()
-	{
-		global $phpbb_dispatcher;
-
-		$return = false;
-		$params_array = func_get_args();
-
-		/**
-		* Event to perform bbcode second pass with
-		* the custom validating methods provided by extensions
-		*
-		* @event core.bbcode_second_pass_by_extension
-		* @var array	params_array	Array with the function parameters
-		* @var mixed	return			Second pass result to return
-		*
-		* @since 3.1.5-RC1
-		*/
-		$vars = array('params_array', 'return');
-		extract($phpbb_dispatcher->trigger_event('core.bbcode_second_pass_by_extension', compact($vars)));
-
-		return $return;
-	}
 }
diff --git a/phpBB/includes/compatibility_globals.php b/phpBB/includes/compatibility_globals.php
index df152c81ab7..ca0394e88f6 100644
--- a/phpBB/includes/compatibility_globals.php
+++ b/phpBB/includes/compatibility_globals.php
@@ -49,8 +49,6 @@ function register_compatibility_globals()
 
 	/* @var $request \phpbb\request\request_interface */
 	$request = $phpbb_container->get('request');
-	// Inject request instance, so only this instance is used with request_var
-	request_var('', 0, false, false, $request);
 
 	/* @var $user \phpbb\user */
 	$user = $phpbb_container->get('user');
@@ -67,8 +65,6 @@ function register_compatibility_globals()
 	// Grab global variables, re-cache if necessary
 	/* @var $config phpbb\config\db */
 	$config = $phpbb_container->get('config');
-	set_config('', '', false, $config);
-	set_config_count('', 0, false, $config);
 
 	/* @var $phpbb_log \phpbb\log\log_interface */
 	$phpbb_log = $phpbb_container->get('log');
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index f560dbfbcb8..0f8e3006c49 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@
 */
 
 // phpBB Version
-@define('PHPBB_VERSION', '4.0.0-a1-dev');
+@define('PHPBB_VERSION', '4.0.0-a3-dev');
 
 // QA-related
 // define('PHPBB_QA', 1);
@@ -119,11 +119,6 @@
 define('POST_ANNOUNCE', 2);
 define('POST_GLOBAL', 3);
 
-// Notify methods
-define('NOTIFY_EMAIL', 0);
-define('NOTIFY_IM', 1);
-define('NOTIFY_BOTH', 2);
-
 // Notify status
 define('NOTIFY_YES', 0);
 define('NOTIFY_NO', 1);
@@ -152,9 +147,13 @@
 define('FULL_FOLDER_HOLD', -1);
 
 // Confirm types
+/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\confirm_type::REGISTRATION, to be removed in 5.0.0-a1 */
 define('CONFIRM_REG', 1);
+/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\confirm_type::LOGIN, to be removed in 5.0.0-a1 */
 define('CONFIRM_LOGIN', 2);
+/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\confirm_type::POST, to be removed in 5.0.0-a1 */
 define('CONFIRM_POST', 3);
+/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\confirm_type::REPORT, to be removed in 5.0.0-a1 */
 define('CONFIRM_REPORT', 4);
 
 // Categories - Attachments
@@ -174,7 +173,7 @@
 
 // Number of core BBCodes
 define('NUM_CORE_BBCODES', 12);
-define('NUM_PREDEFINED_BBCODES', 22);
+define('NUM_PREDEFINED_BBCODES', 20);
 
 // BBCode IDs
 define('BBCODE_ID_QUOTE', 0);
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php
index 7c92d375701..83ebd83da29 100644
--- a/phpBB/includes/diff/diff.php
+++ b/phpBB/includes/diff/diff.php
@@ -768,12 +768,12 @@ class diff3_op
 	/**
 	 * @var array|mixed
 	 */
-	protected $final1;
+	public $final1;
 
 	/**
 	 * @var array|mixed
 	 */
-	protected $final2;
+	public $final2;
 
 	/**
 	 * @var false
diff --git a/phpBB/includes/diff/engine.php b/phpBB/includes/diff/engine.php
index 0d73db02dad..8fcff6c4950 100644
--- a/phpBB/includes/diff/engine.php
+++ b/phpBB/includes/diff/engine.php
@@ -1,68 +1,98 @@
 <?php
 /**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
 
 /**
-* @ignore
-*/
+ * @ignore
+ */
 if (!defined('IN_PHPBB'))
 {
 	exit;
 }
 
 /**
-* Code from pear.php.net, Text_Diff-1.1.0 package
-* http://pear.php.net/package/Text_Diff/ (native engine)
-*
-* Modified by phpBB Limited to meet our coding standards
-* and being able to integrate into phpBB
-*
-* Class used internally by Text_Diff to actually compute the diffs. This
-* class is implemented using native PHP code.
-*
-* The algorithm used here is mostly lifted from the perl module
-* Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
-* http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
-*
-* More ideas are taken from: http://www.ics.uci.edu/~eppstein/161/960229.html
-*
-* Some ideas (and a bit of code) are taken from analyze.c, of GNU
-* diffutils-2.7, which can be found at:
-* ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
-*
-* Some ideas (subdivision by NCHUNKS > 2, and some optimizations) are from
-* Geoffrey T. Dairiki <dairiki@dairiki.org>. The original PHP version of this
-* code was written by him, and is used/adapted with his permission.
-*
-* Copyright 2004-2008 The Horde Project (http://www.horde.org/)
-*
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-* @package diff
-*
-* @access private
-*/
+ * Code from pear.php.net, Text_Diff-1.1.0 package
+ * http://pear.php.net/package/Text_Diff/ (native engine)
+ *
+ * Modified by phpBB Limited to meet our coding standards
+ * and being able to integrate into phpBB
+ *
+ * Class used internally by Text_Diff to actually compute the diffs. This
+ * class is implemented using native PHP code.
+ *
+ * The algorithm used here is mostly lifted from the perl module
+ * Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
+ * http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
+ *
+ * More ideas are taken from: http://www.ics.uci.edu/~eppstein/161/960229.html
+ *
+ * Some ideas (and a bit of code) are taken from analyze.c, of GNU
+ * diffutils-2.7, which can be found at:
+ * ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
+ *
+ * Some ideas (subdivision by NCHUNKS > 2, and some optimizations) are from
+ * Geoffrey T. Dairiki <dairiki@dairiki.org>. The original PHP version of this
+ * code was written by him, and is used/adapted with his permission.
+ *
+ * Copyright 2004-2008 The Horde Project (http://www.horde.org/)
+ *
+ * @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
+ * @package diff
+ *
+ * @access private
+ */
 class diff_engine
 {
+	/** var array */
+	protected $in_seq;
+
+	/** var int */
+	protected $lcs;
+
+	/** var array */
+	protected $seq;
+
 	/**
-	* If set to true we trim all lines before we compare them. This ensures that sole space/tab changes do not trigger diffs.
-	*/
-	var $skip_whitespace_changes = true;
+	 * bool
+	 *
+	 * If set to true we trim all lines before we compare them. This ensures that sole space/tab changes do not trigger diffs.
+	 */
+	protected $skip_whitespace_changes = true;
+
+	/** var array */
+	protected $xchanged;
+
+	/** var array */
+	protected $xind;
+
+	/** var array */
+	protected $xv;
+
+	/** var array */
+	protected $ychanged;
+
+	/** var array */
+	protected $yind;
+
+	/** var array */
+	protected $yv;
 
 	function diff(&$from_lines, &$to_lines, $preserve_cr = true)
 	{
-		// Remove empty lines...
-		// If preserve_cr is true, we basically only change \r\n and bare \r to \n to get the same carriage returns for both files
-		// If it is false, we try to only use \n once per line and ommit all empty lines to be able to get a proper data diff
-
+		/*
+		 * Remove empty lines...
+		 * If preserve_cr is true, we basically only change \r\n and bare \r to \n to get the same carriage returns for both files
+		 * If it is false, we try to only use \n once per line and ommit all empty lines to be able to get a proper data diff
+		 */
 		if (is_array($from_lines))
 		{
 			$from_lines = implode("\n", $from_lines);
@@ -87,7 +117,7 @@ function diff(&$from_lines, &$to_lines, $preserve_cr = true)
 		$n_from = count($from_lines);
 		$n_to = count($to_lines);
 
-		$this->xchanged = $this->ychanged = $this->xv = $this->yv = $this->xind = $this->yind = array();
+		$this->xchanged = $this->ychanged = $this->xv = $this->yv = $this->xind = $this->yind = [];
 		unset($this->seq, $this->in_seq, $this->lcs);
 
 		// Skip leading common lines.
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 453e1d31504..d063e58d2f1 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -107,9 +107,17 @@ function phpbb_gmgetdate($time = false)
 	}
 
 	// getdate() interprets timestamps in local time.
-	// What follows uses the fact that getdate() and
-	// date('Z') balance each other out.
-	return getdate($time - date('Z'));
+	// So use UTC timezone temporarily to get UTC date info array.
+	$current_timezone = date_default_timezone_get();
+
+	// Set UTC timezone and get respective date info
+	date_default_timezone_set('UTC');
+	$date_info = getdate($time);
+
+	// Restore timezone back
+	date_default_timezone_set($current_timezone);
+
+	return $date_info;
 }
 
 /**
@@ -122,7 +130,7 @@ function phpbb_gmgetdate($time = false)
 *
 * @return array|string                    data array if $string_only is false
 */
-function get_formatted_filesize($value, bool $string_only = true, array $allowed_units = null)
+function get_formatted_filesize($value, bool $string_only = true, array|null $allowed_units = null)
 {
 	global $user;
 
@@ -245,7 +253,7 @@ function still_on_time($extra_time = 15)
 * @return mixed				Boolean (true, false) if comparison operator is specified.
 *							Integer (-1, 0, 1) otherwise.
 */
-function phpbb_version_compare(string $version1, string $version2, string $operator = null)
+function phpbb_version_compare(string $version1, string $version2, string|null $operator = null)
 {
 	$version1 = strtolower($version1);
 	$version2 = strtolower($version2);
@@ -319,11 +327,14 @@ function style_select($default = '', $all = false, array $styledata = [])
 		$db->sql_freeresult($result);
 	}
 
-	$style_options = '';
+	$style_options = [];
 	foreach ($styledata as $row)
 	{
-		$selected = ($row['style_id'] == $default) ? ' selected="selected"' : '';
-		$style_options .= '<option value="' . $row['style_id'] . '"' . $selected . '>' . $row['style_name'] . '</option>';
+		$style_options[] = [
+			'value' 	=> $row['style_id'],
+			'selected'	=> $row['style_id'] == $default,
+			'label'		=> $row['style_name'],
+		];
 	}
 
 	return $style_options;
@@ -1795,6 +1806,33 @@ function redirect($url, $return = false, $disable_cd_check = false)
 	exit;
 }
 
+/**
+ * Redirect to controller
+ *
+ * @param string $controller_name Controller name
+ * @param array $params Parameters for route generation
+ * @return void
+ */
+function phpbb_redirect_to_controller(string $controller_name, array $params)
+{
+	global $phpbb_container;
+
+	/** @var \phpbb\controller\helper $controller_helper */
+	$controller_helper = $phpbb_container->get('controller.helper');
+	/** @var \Symfony\Component\HttpKernel\HttpKernel $http_kernel */
+	$http_kernel = $phpbb_container->get('http_kernel');
+	/** @var \phpbb\symfony_request $symfony_request */
+	$symfony_request = $phpbb_container->get('symfony_request');
+
+	$response = new \Symfony\Component\HttpFoundation\RedirectResponse(
+		$controller_helper->route($controller_name, $params, false),
+		\Symfony\Component\HttpFoundation\Response::HTTP_MOVED_PERMANENTLY
+	);
+	$response->send();
+	$http_kernel->terminate($symfony_request, $response);
+	exit();
+}
+
 /**
  * Returns the install redirect path for phpBB.
  *
@@ -1814,7 +1852,7 @@ function phpbb_get_install_redirect(string $phpbb_root_path, string $phpEx): str
 	$script_name = substr($script_name, -1) === '/' ? $script_name . '.' : $script_name;
 
 	// $phpbb_root_path accounts for redirects from e.g. /adm
-	$script_path = trim(dirname($script_name)) . '/' . $phpbb_root_path . 'install/app.' . $phpEx;
+	$script_path = trim(dirname($script_name)) . '/' . $phpbb_root_path . 'install/index.' . $phpEx;
 	// Replace any number of consecutive backslashes and/or slashes with a single slash
 	// (could happen on some proxy setups and/or Windows servers)
 	return preg_replace('#[\\\\/]{2,}#', '/', $script_path);
@@ -2009,16 +2047,14 @@ function check_link_hash($token, $link_name)
 */
 function add_form_key($form_name, $template_variable_suffix = '')
 {
-	global $config, $template, $user, $phpbb_dispatcher;
+	global $phpbb_container, $phpbb_dispatcher, $template;
 
-	$now = time();
-	$token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : '';
-	$token = sha1($now . $user->data['user_form_salt'] . $form_name . $token_sid);
+	/** @var \phpbb\form\form_helper $form_helper */
+	$form_helper = $phpbb_container->get('form_helper');
 
-	$s_fields = build_hidden_fields(array(
-		'creation_time' => $now,
-		'form_token'	=> $token,
-	));
+	$form_tokens = $form_helper->get_form_tokens($form_name, $now, $token_sid, $token);
+
+	$s_fields = build_hidden_fields($form_tokens);
 
 	/**
 	* Perform additional actions on creation of the form token
@@ -2058,35 +2094,12 @@ function add_form_key($form_name, $template_variable_suffix = '')
  */
 function check_form_key($form_name, $timespan = false)
 {
-	global $config, $request, $user;
-
-	if ($timespan === false)
-	{
-		// we enforce a minimum value of half a minute here.
-		$timespan = ($config['form_token_lifetime'] == -1) ? -1 : max(30, $config['form_token_lifetime']);
-	}
-
-	if ($request->is_set_post('creation_time') && $request->is_set_post('form_token'))
-	{
-		$creation_time	= abs($request->variable('creation_time', 0));
-		$token = $request->variable('form_token', '');
-
-		$diff = time() - $creation_time;
+	global $phpbb_container;
 
-		// If creation_time and the time() now is zero we can assume it was not a human doing this (the check for if ($diff)...
-		if (defined('DEBUG_TEST') || $diff && ($diff <= $timespan || $timespan === -1))
-		{
-			$token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : '';
-			$key = sha1($creation_time . $user->data['user_form_salt'] . $form_name . $token_sid);
+	/** @var \phpbb\form\form_helper $form_helper */
+	$form_helper = $phpbb_container->get('form_helper');
 
-			if ($key === $token)
-			{
-				return true;
-			}
-		}
-	}
-
-	return false;
+	return $form_helper->check_form_tokens($form_name, $timespan !== false ? $timespan : null);
 }
 
 // Message/Login boxes
@@ -2422,7 +2435,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
 			case LOGIN_ERROR_ATTEMPTS:
 
 				$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
-				$captcha->init(CONFIRM_LOGIN);
+				$captcha->init(\phpbb\captcha\plugins\confirm_type::LOGIN);
 				// $captcha->reset();
 
 				$template->assign_vars(array(
@@ -2730,7 +2743,7 @@ function get_backtrace()
 		// Only show function arguments for include etc.
 		// Other parameters may contain sensible information
 		$argument = '';
-		if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once')))
+		if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once', 'try_apply')))
 		{
 			$argument = htmlspecialchars(phpbb_filter_root_path($trace['args'][0]), ENT_COMPAT);
 		}
@@ -2953,8 +2966,16 @@ function msg_handler($errno, $msg_text, $errfile, $errline): bool
 	global $phpbb_root_path, $msg_title, $msg_long_text, $phpbb_log;
 	global $phpbb_container;
 
+	// https://www.php.net/manual/en/language.operators.errorcontrol.php
+	// error_reporting() return a different error code inside the error handler after php 8.0
+	$suppresed = E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE;
+	if (PHP_VERSION_ID < 80000)
+	{
+		$suppresed = 0;
+	}
+
 	// Do not display notices if we suppress them via @
-	if (error_reporting() == 0 && $errno != E_USER_ERROR && $errno != E_USER_WARNING && $errno != E_USER_NOTICE)
+	if (error_reporting() == $suppresed && $errno != E_USER_ERROR && $errno != E_USER_WARNING && $errno != E_USER_NOTICE)
 	{
 		return true;
 	}
@@ -3200,7 +3221,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline): bool
 * and converts backslashes to forward slashes.
 *
 * @param string $errfile	Absolute file path
-*							(e.g. /var/www/phpbb3/phpBB/includes/functions.php)
+*							(e.g. /var/www/phpbb/phpBB/includes/functions.php)
 *							Please note that if $errfile is outside of the phpBB root,
 *							the root path will not be found and can not be filtered.
 * @return string			Relative file path
@@ -3566,127 +3587,6 @@ function phpbb_quoteattr($data, $entities = null)
 	return $data;
 }
 
-/**
-* Get user avatar
-*
-* @deprecated 4.0.0 Use \phpbb\avatar\helper::get_user_avatar() instead
-*
-* @param array $user_row Row from the users table
-* @param string $alt Optional language string for alt tag within image, can be a language key or text
-* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
-* @param bool $lazy If true, will be lazy loaded (requires JS)
-*
-* @return string Avatar html
-*/
-function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false, $lazy = false)
-{
-	$row = \phpbb\avatar\manager::clean_row($user_row, 'user');
-	return phpbb_get_avatar($row, $alt, $ignore_config, $lazy);
-}
-
-/**
-* Get group avatar
-*
-* @deprecated 4.0.0 Use \phpbb\avatar\helper::get_group_avatar() instead
-*
-* @param array $group_row Row from the groups table
-* @param string $alt Optional language string for alt tag within image, can be a language key or text
-* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
-* @param bool $lazy If true, will be lazy loaded (requires JS)
-*
-* @return string Avatar html
-*/
-function phpbb_get_group_avatar($group_row, $alt = 'GROUP_AVATAR', $ignore_config = false, $lazy = false)
-{
-	$row = \phpbb\avatar\manager::clean_row($group_row, 'group');
-	return phpbb_get_avatar($row, $alt, $ignore_config, $lazy);
-}
-
-/**
-* Get avatar
-*
-* @deprecated 4.0.0 Use \phpbb\avatar\helper::get_avatar() instead
-*
-* @param array $row Row cleaned by \phpbb\avatar\manager::clean_row
-* @param string $alt Optional language string for alt tag within image, can be a language key or text
-* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
-* @param bool $lazy If true, will be lazy loaded (requires JS)
-*
-* @return string Avatar html
-*/
-function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false)
-{
-	global $user, $config;
-	global $phpbb_container, $phpbb_dispatcher;
-
-	if (!$config['allow_avatar'] && !$ignore_config)
-	{
-		return '';
-	}
-
-	$avatar_data = array(
-		'src' => $row['avatar'],
-		'width' => $row['avatar_width'],
-		'height' => $row['avatar_height'],
-	);
-
-	/* @var $phpbb_avatar_manager \phpbb\avatar\manager */
-	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-	$driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], !$ignore_config);
-	$html = '';
-
-	if ($driver)
-	{
-		$html = $driver->get_custom_html($user, $row, $alt);
-		$avatar_data = $driver->get_data($row);
-	}
-	else
-	{
-		$avatar_data['src'] = '';
-	}
-
-	if (empty($html) && !empty($avatar_data['src']))
-	{
-		if ($lazy)
-		{
-			// This path is sent with the base template paths in the assign_vars()
-			// call below. We need to correct it in case we are accessing from a
-			// controller because the web paths will be incorrect otherwise.
-			$phpbb_path_helper = $phpbb_container->get('path_helper');
-			$web_path = $phpbb_path_helper->get_web_root_path();
-
-			$theme = "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme';
-
-			$src = 'src="' . $theme . '/images/no_avatar.gif" data-src="' . $avatar_data['src'] . '"';
-		}
-		else
-		{
-			$src = 'src="' . $avatar_data['src'] . '"';
-		}
-
-		$html = '<img class="avatar" ' . $src . ' ' .
-			($avatar_data['width'] ? ('width="' . $avatar_data['width'] . '" ') : '') .
-			($avatar_data['height'] ? ('height="' . $avatar_data['height'] . '" ') : '') .
-			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
-	}
-
-	/**
-	* Event to modify HTML <img> tag of avatar
-	*
-	* @event core.get_avatar_after
-	* @var	array	row				Row cleaned by \phpbb\avatar\manager::clean_row
-	* @var	string	alt				Optional language string for alt tag within image, can be a language key or text
-	* @var	bool	ignore_config	Ignores the config-setting, to be still able to view the avatar in the UCP
-	* @var	array	avatar_data		The HTML attributes for avatar <img> tag
-	* @var	string	html			The HTML <img> tag of generated avatar
-	* @since 3.1.6-RC1
-	*/
-	$vars = array('row', 'alt', 'ignore_config', 'avatar_data', 'html');
-	extract($phpbb_dispatcher->trigger_event('core.get_avatar_after', compact($vars)));
-
-	return $html;
-}
-
 /**
 * Generate page header
 */
@@ -3878,6 +3778,9 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 		$timezone_name = $user->lang['timezones'][$timezone_name];
 	}
 
+	/** @var \phpbb\controller\helper $controller_helper */
+	$controller_helper = $phpbb_container->get('controller.helper');
+
 	// Output the notifications
 	$notifications = false;
 	if ($config['load_notifications'] && $config['allow_board_notifications'] && $user->data['user_id'] != ANONYMOUS && $user->data['user_type'] != USER_IGNORE)
@@ -3894,10 +3797,22 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 		{
 			$template->assign_block_vars('notifications', $notification->prepare_for_display());
 		}
+
+		// Assign web push template vars globally (if not done already by ucp_notifications) for the dropdown subscribe button
+		if ($config['webpush_enable'] && $config['webpush_dropdown_subscribe']
+			&& $template->retrieve_var('NOTIFICATIONS_WEBPUSH_ENABLE') === null)
+		{
+			$methods = $phpbb_notifications->get_subscription_methods();
+			$webpush = $methods['notification.method.webpush'] ?? null;
+
+			if ($webpush)
+			{
+				$form_helper = $phpbb_container->get('form_helper');
+				$template->assign_vars($webpush['method']->get_ucp_template_data($controller_helper, $form_helper));
+			}
+		}
 	}
 
-	/** @var \phpbb\controller\helper $controller_helper */
-	$controller_helper = $phpbb_container->get('controller.helper');
 	$notification_mark_hash = generate_link_hash('mark_all_notifications_read');
 
 	$phpbb_version_parts = explode('.', PHPBB_VERSION, 3);
@@ -3918,6 +3833,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 	$template->assign_vars(array(
 		'SITENAME'						=> $config['sitename'],
 		'SITE_DESCRIPTION'				=> $config['site_desc'],
+		'SITE_SHORTNAME'				=> (!empty($config['sitename_short'])) ? $config['sitename_short'] : utf8_substr($config['sitename'], 0, 12),
 		'PAGE_TITLE'					=> $page_title,
 		'SCRIPT_NAME'					=> str_replace('.' . $phpEx, '', $user->page['page_name']),
 		'LAST_VISIT_DATE'				=> sprintf($user->lang['YOU_LAST_VISIT'], $s_last_visit),
@@ -3960,9 +3876,9 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 		'U_PRIVATEMSGS'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox'),
 		'U_RETURN_INBOX'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox'),
 		'U_MEMBERLIST'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
-		'U_VIEWONLINE'			=> ($auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$phpbb_root_path}viewonline.$phpEx") : '',
+		'U_VIEWONLINE'			=> $auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel') ? $controller_helper->route('phpbb_members_online') : '',
 		'U_LOGIN_LOGOUT'		=> $u_login_logout,
-		'U_INDEX'				=> append_sid("{$phpbb_root_path}index.$phpEx"),
+		'U_INDEX'				=> $controller_helper->route('phpbb_index_controller'),
 		'U_SEARCH'				=> append_sid("{$phpbb_root_path}search.$phpEx"),
 		'U_SITE_HOME'			=> $config['site_home_url'],
 		'U_REGISTER'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),
@@ -3975,14 +3891,15 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 		'U_SEARCH_UNANSWERED'	=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unanswered'),
 		'U_SEARCH_UNREAD'		=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unreadposts'),
 		'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'),
-		'U_DELETE_COOKIES'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=delete_cookies'),
+		'U_DELETE_COOKIES'		=> $controller_helper->route('phpbb_ucp_delete_cookies_controller'),
 		'U_CONTACT_US'			=> ($config['contact_admin_form_enable'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') : '',
-		'U_TEAM'				=> (!$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'),
+		'U_TEAM'				=> (!$auth->acl_get('u_viewprofile')) ? '' : $controller_helper->route('phpbb_members_team'),
 		'U_TERMS_USE'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
 		'U_PRIVACY'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
 		'UA_PRIVACY'			=> addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy')),
 		'U_RESTORE_PERMISSIONS'	=> ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '',
 		'U_FEED'				=> $controller_helper->route('phpbb_feed_index'),
+		'U_MANIFEST'			=> $controller_helper->route('phpbb_manifest_controller'),
 
 		'S_ALLOW_MENTIONS'		=> ($config['allow_mentions'] && $auth->acl_get('u_mention') && (empty($forum_id) || $auth->acl_get('f_mention', $forum_id))) ? true : false,
 		'S_MENTION_NAMES_LIMIT'	=> $config['mention_names_limit'],
@@ -4040,7 +3957,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 
 		'T_FONT_AWESOME_LINK'	=> !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$web_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'],
 
-		'T_JQUERY_LINK'			=> !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery-3.6.0.min.js?assets_version=" . $config['assets_version'],
+		'T_JQUERY_LINK'			=> !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery-3.7.1.min.js?assets_version=" . $config['assets_version'],
 		'S_ALLOW_CDN'			=> !empty($config['allow_cdn']),
 		'S_COOKIE_NOTICE'		=> !empty($config['cookie_notice']),
 
@@ -4151,7 +4068,9 @@ function phpbb_generate_debug_output(\phpbb\db\driver\driver_interface $db, \php
 
 		if ($auth->acl_get('a_'))
 		{
-			$debug_info[] = '<a href="' . build_url() . '&amp;explain=1">SQL Explain</a>';
+			$page_url = build_url();
+			$page_url .= ((!str_contains($page_url, '?')) ? '?' : '&amp;') . 'explain=1';
+			$debug_info[] = '<a href="' . $page_url . '">SQL Explain</a>';
 		}
 	}
 
@@ -4338,3 +4257,14 @@ function phpbb_get_board_contact_link(\phpbb\config\config $config, $phpbb_root_
 		return 'mailto:' . htmlspecialchars($config['board_contact'], ENT_COMPAT);
 	}
 }
+
+/**
+ * Get host name for ip
+ *
+ * @param string $ip IP string
+ * @return string Hostname for IP in cleaned format
+ */
+function phpbb_get_host_for_ip(string $ip): string
+{
+	return utf8_htmlspecialchars(@gethostbyaddr($ip));
+}
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index e63ed0701be..54df35415d3 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -81,7 +81,7 @@ function adm_page_header($page_title)
 		'PHPBB_VERSION'			=> PHPBB_VERSION,
 		'PHPBB_MAJOR'			=> $phpbb_major,
 
-		'U_LOGOUT'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'),
+		'U_LOGOUT'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout&amp;hash=' . generate_link_hash('ucp_logout')),
 		'U_ADM_LOGOUT'			=> append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout&amp;hash=' . generate_link_hash('acp_logout')),
 		'U_ADM_INDEX'			=> append_sid("{$phpbb_admin_path}index.$phpEx"),
 		'U_INDEX'				=> append_sid("{$phpbb_root_path}index.$phpEx"),
@@ -187,7 +187,7 @@ function adm_page_footer($copyright_html = true)
 		'TRANSLATION_INFO'	=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
 		'S_COPYRIGHT_HTML'	=> $copyright_html,
 		'CREDIT_LINE'		=> $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited'),
-		'T_JQUERY_LINK'		=> !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$phpbb_root_path}assets/javascript/jquery-3.6.0.min.js",
+		'T_JQUERY_LINK'		=> !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$phpbb_root_path}assets/javascript/jquery-3.7.1.min.js",
 		'S_ALLOW_CDN'		=> !empty($config['allow_cdn']),
 		'VERSION'			=> $config['version'])
 	);
@@ -203,19 +203,24 @@ function adm_page_footer($copyright_html = true)
 */
 function adm_back_link($u_action)
 {
-	global $user;
-	return '<br /><br /><a href="' . $u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>';
+	global $language;
+	return '<br /><br /><a href="' . $u_action . '">&laquo; ' . $language->lang('BACK_TO_PREV') . '</a>';
 }
 
 /**
-* Build select field options in acp pages
-*/
-function build_select($option_ary, $option_default = false): array
+ * Build select field options in acp pages
+ *
+ * @param array				$options_ary Configuration options data
+ * @param int|string|bool	$option_default	Configuration option selected value
+ *
+ * @return array
+ */
+function build_select(array $options_ary, bool|int|string $option_default = false): array
 {
 	global $language;
 
 	$options = [];
-	foreach ($option_ary as $value => $title)
+	foreach ($options_ary as $value => $title)
 	{
 		$options[] = [
 			'value'	=> $value,
@@ -228,37 +233,50 @@ function build_select($option_ary, $option_default = false): array
 }
 
 /**
-* Build radio fields in acp pages
-*/
-function h_radio($name, $input_ary, $input_default = false, $id = false, $key = false, $separator = '')
+ * Build radio fields in acp pages
+ *
+ * @param int|string	$value	Configuration option value
+ * @param string		$key	Configuration option key name
+ * @param array			$options Configuration options data
+ * 							representing array of [values => language_keys]
+ *
+ * @return array
+ */
+function phpbb_build_radio(int|string $value, string $key, array $options): array
 {
-	global $user;
+	global $language;
 
-	$html = '';
-	$id_assigned = false;
-	foreach ($input_ary as $value => $title)
+	$buttons = [];
+	foreach ($options as $val => $title)
 	{
-		$selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : '';
-		$html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>' . $separator;
-		$id_assigned = true;
+		$buttons[] = [
+			'type'		=> 'radio',
+			'value'		=> $val,
+			'name'		=> 'config[' . $key . ']',
+			'checked'	=> $val == $value,
+			'label'		=> $language->lang($title),
+		];
 	}
 
-	return $html;
+	return [
+		'buttons' => $buttons,
+	];
 }
 
 /**
- * HTML-less version of build_cfg_template
+ * Build configuration data arrays or templates for configuration settings
  *
- * @param array $tpl_type Template type
- * @param string $key Config key
- * @param $new_ary
- * @param $config_key
- * @param $vars
- * @return array
+ * @param array			$tpl_type	Configuration setting type data
+ * @param string		$key		Configuration option name
+ * @param array|object	$new_ary	Updated configuration data
+ * @param string		$config_key	Configuration option name
+ * @param array			$vars		Configuration setting data
+ *
+ * @return array|string
  */
-function phpbb_build_cfg_template(array $tpl_type, string $key, &$new_ary, $config_key, $vars): array
+function phpbb_build_cfg_template(array $tpl_type, string $key, array|object &$new_ary, string $config_key, array $vars): array|string
 {
-	global $language;
+	global $language, $module, $phpbb_dispatcher;
 
 	$tpl = [];
 	$name = 'config[' . $config_key . ']';
@@ -368,154 +386,102 @@ function phpbb_build_cfg_template(array $tpl_type, string $key, &$new_ary, $conf
 		break;
 
 		case 'radio':
-			$tpl_type_cond = explode('_', $tpl_type[1]);
-			$type_no = $tpl_type_cond[0] != 'disabled' && $tpl_type_cond[0] != 'enabled';
-
-			$no_button = [
-				'type'		=> 'radio',
-				'name'		=> $name,
-				'value'		=> 0,
-				'checked'	=> !$new_ary[$config_key],
-				'label'		=> $type_no ? $language->lang('NO') : $language->lang('DISABLED'),
-			];
-
-			$yes_button = [
-				'id'		=> $key,
-				'type'		=> 'radio',
-				'name'		=> $name,
-				'value'		=> 1,
-				'checked'	=> (bool) $new_ary[$config_key],
-				'label'		=> $type_no ? $language->lang('YES') : $language->lang('ENABLED'),
-			];
-
-			$tpl = ['tag' => 'radio'];
-			if ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled')
+			if (!isset($vars['method']) && !isset($vars['function']))
 			{
-				$tpl['buttons'] = [$yes_button, $no_button];
-			}
-			else
-			{
-				$tpl['buttons'] = [$no_button, $yes_button];
+				if (in_array($tpl_type[1], ['yes_no', 'enabled_disabled']))
+				{
+					$options = array_reverse(explode('_', strtoupper($tpl_type[1])));
+					krsort($options);
+					$tpl_type = array_merge ($tpl_type, phpbb_build_radio($new_ary[$config_key], $config_key, $options));
+				}
 			}
-		break;
-	}
-
-	return $tpl;
-}
-
-/**
-* Build configuration template for acp configuration pages
-*/
-function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars)
-{
-	global $module, $phpbb_dispatcher;
-
-	$tpl = '';
-	$name = 'config[' . $config_key . ']';
-
-	// Make sure there is no notice printed out for non-existent config options (we simply set them)
-	if (!isset($new_ary[$config_key]))
-	{
-		$new_ary[$config_key] = '';
-	}
-
-	switch ($tpl_type[0])
-	{
-		case 'password':
-		case 'text':
-		case 'url':
-		case 'email':
-		case 'tel':
-		case 'search':
-		case 'color':
-		case 'datetime':
-		case 'datetime-local':
-		case 'month':
-		case 'week':
-		case 'date':
-		case 'time':
-		case 'number':
-		case 'range':
-		case 'dimension':
-		case 'textarea':
-		case 'radio':
-			$tpl = phpbb_build_cfg_template($tpl_type, $key, $new_ary, $config_key, $vars);
-		break;
-
+		case 'button':
 		case 'select':
 		case 'custom':
+			$args = [];
+			$call = $vars['function'] ?? (isset($vars['method']) ? [$module->module, $vars['method']] : false);
 
-			if (isset($vars['method']))
+			if ($call)
 			{
-				$call = array($module->module, $vars['method']);
-			}
-			else if (isset($vars['function']))
-			{
-				$call = $vars['function'];
-			}
-			else
-			{
-				break;
-			}
-
-			if (isset($vars['params']))
-			{
-				$args = array();
-				foreach ($vars['params'] as $value)
+				if (isset($vars['params']))
 				{
-					switch ($value)
+					foreach ($vars['params'] as $value)
 					{
-						case '{CONFIG_VALUE}':
-							$value = $new_ary[$config_key];
-						break;
-
-						case '{KEY}':
-							$value = $key;
-						break;
+						switch ($value)
+						{
+							case '{CONFIG_VALUE}':
+								$value = $new_ary[$config_key];
+							break;
+
+							case '{KEY}':
+								$value = $config_key;
+							break;
+						}
+
+						$args[] = $value;
 					}
-
-					$args[] = $value;
 				}
-			}
-			else
-			{
-				$args = array($new_ary[$config_key], $key);
+				else
+				{
+					$args = array($new_ary[$config_key], $config_key);
+				}
 			}
 
-			$return = call_user_func_array($call, $args);
+			$return = $call ? call_user_func_array($call, $args) : [];
 
-			if ($tpl_type[0] == 'select')
+			if (in_array($tpl_type[0], ['select', 'radio', 'button']))
 			{
-				$size = (isset($tpl_type[1])) ? (int) $tpl_type[1] : 1;
-
-				if (is_string($return))
-				{
-					$data_toggle = (!empty($tpl_type[2])) ? ' data-togglable-settings="true"' : '';
+				$tpl_type = array_merge($tpl_type, $return);
 
-					$tpl = '<select id="' . $key . '" name="' . $name . '"' . (($size > 1) ? ' size="' . $size . '"' : '') . $data_toggle . '>' . $return . '</select>';
-				}
-				else
+				if ($tpl_type[0] == 'select')
 				{
 					$tpl = [
 						'tag'			=> 'select',
+						'class'			=> $tpl_type['class'] ?? false,
 						'id'			=> $key,
+						'data'			=> $tpl_type['data'] ?? [],
 						'name'			=> $name,
-						'toggleable'	=> !empty($tpl_type[2]),
-						'options'		=> $return,
+						'toggleable'	=> !empty($tpl_type[2]) || !empty($tpl_type['toggleable']),
+						'options'		=> $tpl_type['options'],
+						'group_only'	=> $tpl_type['group_only'] ?? false,
+						'size'			=> $tpl_type[1] ?? $tpl_type['size'] ?? 1,
+						'multiple'		=> $tpl_type['multiple'] ?? false,
 					];
-
-					// Add size if it differs from default value of 1
-					if ($size != 1)
+				}
+				else if ($tpl_type[0] == 'radio')
+				{
+					// Only assign id to the one (1st) radio button in the list
+					$id_assigned = false;
+					foreach ($tpl_type['buttons'] as $i => $button)
 					{
-						$tpl['size'] = $size;
+						if (!$id_assigned)
+						{
+							$tpl_type['buttons'][$i]['id'] = $key;
+							$id_assigned = true;
+						}
 					}
+
+					$tpl = [
+						'tag'		=> 'radio',
+						'buttons'	=> $tpl_type['buttons'],
+					];
+				}
+				else
+				{
+					$tpl = [
+						'tag'		=> 'input',
+						'class'		=> $tpl_type['options']['class'],
+						'id'		=> $key,
+						'type'		=> $tpl_type['options']['type'],
+						'name'		=> $tpl_type['options']['name'] ?? $name,
+						'value'		=> $tpl_type['options']['value'],
+					];
 				}
 			}
 			else
 			{
 				$tpl = $return;
 			}
-
 		break;
 
 		default:
@@ -539,16 +505,17 @@ function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars)
 	* Overwrite the html code we display for the config value
 	*
 	* @event core.build_config_template
-	* @var	array	tpl_type	Config type array:
-	*						0 => data type
-	*						1 [optional] => string: size, int: minimum
-	*						2 [optional] => string: max. length, int: maximum
-	* @var	string	key			Should be used for the id attribute in html
-	* @var	array	new			Array with the config values we display
-	* @var	string	name		Should be used for the name attribute
-	* @var	array	vars		Array with the options for the config
-	* @var	string	tpl			The resulting html code we display
+	* @var	array			tpl_type	Config type array:
+	*							0 => data type
+	*							1 [optional] => string: size, int: minimum
+	*							2 [optional] => string: max. length, int: maximum
+	* @var	string			key			Should be used for the id attribute in html
+	* @var	array			new			Array with the config values we display
+	* @var	string			name		Should be used for the name attribute
+	* @var	array			vars		Array with the options for the config
+	* @var	array|string	tpl			The resulting html code we display
 	* @since 3.1.0-a1
+	* @changed 4.0.0-a1	The event location's function renamed from build_config_template() to phpbb_build_cfg_template()
 	*/
 	$vars = array('tpl_type', 'key', 'new', 'name', 'vars', 'tpl');
 	extract($phpbb_dispatcher->trigger_event('core.build_config_template', compact($vars)));
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index c5ca053f560..1efc8c9c2ec 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -19,863 +19,6 @@
 	exit;
 }
 
-/**
-* Get user avatar
-*
-* @deprecated 3.1.0-a1 (To be removed: 4.0.0)
-*
-* @param string $avatar Users assigned avatar name
-* @param int $avatar_type Type of avatar
-* @param string $avatar_width Width of users avatar
-* @param string $avatar_height Height of users avatar
-* @param string $alt Optional language string for alt tag within image, can be a language key or text
-* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
-* @param bool $lazy If true, will be lazy loaded (requires JS)
-*
-* @return string Avatar image
-*/
-function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false, $lazy = false)
-{
-	// map arguments to new function phpbb_get_avatar()
-	$row = array(
-		'avatar'		=> $avatar,
-		'avatar_type'	=> $avatar_type,
-		'avatar_width'	=> $avatar_width,
-		'avatar_height'	=> $avatar_height,
-	);
-
-	return phpbb_get_avatar($row, $alt, $ignore_config, $lazy);
-}
-
-/**
-* Hash the password
-*
-* @deprecated 3.1.0-a2 (To be removed: 4.0.0)
-*
-* @param string $password Password to be hashed
-*
-* @return string|bool Password hash or false if something went wrong during hashing
-*/
-function phpbb_hash($password)
-{
-	global $phpbb_container;
-
-	/* @var $passwords_manager \phpbb\passwords\manager */
-	$passwords_manager = $phpbb_container->get('passwords.manager');
-	return $passwords_manager->hash($password);
-}
-
-/**
-* Check for correct password
-*
-* @deprecated 3.1.0-a2 (To be removed: 4.0.0)
-*
-* @param string $password The password in plain text
-* @param string $hash The stored password hash
-*
-* @return bool Returns true if the password is correct, false if not.
-*/
-function phpbb_check_hash($password, $hash)
-{
-	global $phpbb_container;
-
-	/* @var $passwords_manager \phpbb\passwords\manager */
-	$passwords_manager = $phpbb_container->get('passwords.manager');
-	return $passwords_manager->check($password, $hash);
-}
-
-/**
-* Eliminates useless . and .. components from specified path.
-*
-* Deprecated, use storage helper class instead
-*
-* @param string $path Path to clean
-* @return string Cleaned path
-*
-* @deprecated 3.1.0 (To be removed: 4.0.0)
-*/
-function phpbb_clean_path($path)
-{
-	return \phpbb\filesystem\helper::clean_path($path);
-}
-
-/**
-* Pick a timezone
-*
-* @param	string		$default			A timezone to select
-* @param	boolean		$truncate			Shall we truncate the options text
-*
-* @return		string		Returns the options for timezone selector only
-*
-* @deprecated 3.1.0 (To be removed: 4.0.0)
-*/
-function tz_select($default = '', $truncate = false)
-{
-	global $user;
-
-	return phpbb_timezone_select($user, $default, $truncate);
-}
-
-/**
-* Cache moderators. Called whenever permissions are changed
-* via admin_permissions. Changes of usernames and group names
-* must be carried through for the moderators table.
-*
-* @deprecated 3.1.0 (To be removed: 4.0.0)
-* @return void
-*/
-function cache_moderators()
-{
-	global $db, $cache, $auth, $phpbb_container;
-	phpbb_cache_moderators($db, $phpbb_container->get('dbal.tools'), $cache, $auth);
-}
-
-/**
-* Removes moderators and administrators from foe lists.
-*
-* @deprecated 3.1.0 (To be removed: 4.0.0)
-* @param array|bool $group_id If an array, remove all members of this group from foe lists, or false to ignore
-* @param array|bool $user_id If an array, remove this user from foe lists, or false to ignore
-* @return void
-*/
-function update_foes($group_id = false, $user_id = false)
-{
-	global $db, $auth;
-	return phpbb_update_foes($db, $auth, $group_id, $user_id);
-}
-
-/**
-* Get user rank title and image
-*
-* @param int $user_rank the current stored users rank id
-* @param int $user_posts the users number of posts
-* @param string &$rank_title the rank title will be stored here after execution
-* @param string &$rank_img the rank image as full img tag is stored here after execution
-* @param string &$rank_img_src the rank image source is stored here after execution
-*
-* @deprecated 3.1.0-RC5 (To be removed: 4.0.0)
-*
-* Note: since we do not want to break backwards-compatibility, this function will only properly assign ranks to guests if you call it for them with user_posts == false
-*/
-function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank_img_src)
-{
-	global $phpbb_root_path, $phpEx;
-	if (!function_exists('phpbb_get_user_rank'))
-	{
-		include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
-	}
-
-	$rank_data = phpbb_get_user_rank(array('user_rank' => $user_rank), $user_posts);
-	$rank_title = $rank_data['title'];
-	$rank_img = $rank_data['img'];
-	$rank_img_src = $rank_data['img_src'];
-}
-
-/**
- * Retrieve contents from remotely stored file
- *
- * @deprecated	3.1.2	Use file_downloader instead
- */
-function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port = 80, $timeout = 6)
-{
-	global $phpbb_container;
-
-	// Get file downloader and assign $errstr and $errno
-	/* @var $file_downloader \phpbb\file_downloader */
-	$file_downloader = $phpbb_container->get('file_downloader');
-
-	$file_data = $file_downloader->get($host, $directory, $filename, $port, $timeout);
-	$errstr = $file_downloader->get_error_string();
-	$errno = $file_downloader->get_error_number();
-
-	return $file_data;
-}
-
-/**
- * Add log entry
- *
- * string	$mode				The mode defines which log_type is used and from which log the entry is retrieved
- * int		$forum_id			Mode 'mod' ONLY: forum id of the related item, NOT INCLUDED otherwise
- * int		$topic_id			Mode 'mod' ONLY: topic id of the related item, NOT INCLUDED otherwise
- * int		$reportee_id		Mode 'user' ONLY: user id of the reportee, NOT INCLUDED otherwise
- * string	$log_operation		Name of the operation
- * array	$additional_data	More arguments can be added, depending on the log_type
- *
- * @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
- *
- * @deprecated	3.1.0 (To be removed: 4.0.0)
- */
-function add_log()
-{
-	global $phpbb_log, $user;
-
-	$args = func_get_args();
-	$mode = array_shift($args);
-
-	// This looks kind of dirty, but add_log has some additional data before the log_operation
-	$additional_data = array();
-	switch ($mode)
-	{
-		case 'admin':
-		case 'critical':
-			break;
-		case 'mod':
-			$additional_data['forum_id'] = array_shift($args);
-			$additional_data['topic_id'] = array_shift($args);
-			break;
-		case 'user':
-			$additional_data['reportee_id'] = array_shift($args);
-			break;
-	}
-
-	$log_operation = array_shift($args);
-	$additional_data = array_merge($additional_data, $args);
-
-	$user_id = (empty($user->data)) ? ANONYMOUS : $user->data['user_id'];
-	$user_ip = (empty($user->ip)) ? '' : $user->ip;
-
-	return $phpbb_log->add($mode, $user_id, $user_ip, $log_operation, time(), $additional_data);
-}
-
-/**
- * Sets a configuration option's value.
- *
- * Please note that this function does not update the is_dynamic value for
- * an already existing config option.
- *
- * @param string $config_name   The configuration option's name
- * @param string $config_value  New configuration value
- * @param bool   $is_dynamic    Whether this variable should be cached (false) or
- *                              if it changes too frequently (true) to be
- *                              efficiently cached.
- *
- * @return void
- *
- * @deprecated 3.1.0 (To be removed: 4.0.0)
- */
-function set_config($config_name, $config_value, $is_dynamic = false, \phpbb\config\config $set_config = null)
-{
-	static $config = null;
-
-	if ($set_config !== null)
-	{
-		$config = $set_config;
-
-		if (empty($config_name))
-		{
-			return;
-		}
-	}
-
-	$config->set($config_name, $config_value, !$is_dynamic);
-}
-
-/**
- * Increments an integer config value directly in the database.
- *
- * @param string $config_name   The configuration option's name
- * @param int    $increment     Amount to increment by
- * @param bool   $is_dynamic    Whether this variable should be cached (false) or
- *                              if it changes too frequently (true) to be
- *                              efficiently cached.
- *
- * @return void
- *
- * @deprecated 3.1.0 (To be removed: 4.0.0)
- */
-function set_config_count($config_name, $increment, $is_dynamic = false, \phpbb\config\config $set_config = null)
-{
-	static $config = null;
-	if ($set_config !== null)
-	{
-		$config = $set_config;
-		if (empty($config_name))
-		{
-			return;
-		}
-	}
-	$config->increment($config_name, $increment, !$is_dynamic);
-}
-
-/**
- * Wrapper function of \phpbb\request\request::variable which exists for backwards compatability.
- * See {@link \phpbb\request\request_interface::variable \phpbb\request\request_interface::variable} for
- * documentation of this function's use.
- *
- * @deprecated 3.1.0 (To be removed: 4.0.0)
- * @param	mixed			$var_name	The form variable's name from which data shall be retrieved.
- * 										If the value is an array this may be an array of indizes which will give
- * 										direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a")
- * 										then specifying array("var", 1) as the name will return "a".
- * 										If you pass an instance of {@link \phpbb\request\request_interface phpbb_request_interface}
- * 										as this parameter it will overwrite the current request class instance. If you do
- * 										not do so, it will create its own instance (but leave superglobals enabled).
- * @param	mixed			$default	A default value that is returned if the variable was not set.
- * 										This function will always return a value of the same type as the default.
- * @param	bool			$multibyte	If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters
- *										Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks
- * @param	bool			$cookie		This param is mapped to \phpbb\request\request_interface::COOKIE as the last param for
- * 										\phpbb\request\request_interface::variable for backwards compatability reasons.
- * @param	\phpbb\request\request_interface|null|false	$request
- * 										If an instance of \phpbb\request\request_interface is given the instance is stored in
- *										a static variable and used for all further calls where this parameters is null. Until
- *										the function is called with an instance it automatically creates a new \phpbb\request\request
- *										instance on every call. By passing false this per-call instantiation can be restored
- *										after having passed in a \phpbb\request\request_interface instance.
- *
- * @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
- * 					the same as that of $default. If the variable is not set $default is returned.
- */
-function request_var($var_name, $default, $multibyte = false, $cookie = false, $request = null)
-{
-	// This is all just an ugly hack to add "Dependency Injection" to a function
-	// the only real code is the function call which maps this function to a method.
-	static $static_request = null;
-	if ($request instanceof \phpbb\request\request_interface)
-	{
-		$static_request = $request;
-		if (empty($var_name))
-		{
-			return null;
-		}
-	}
-	else if ($request === false)
-	{
-		$static_request = null;
-		if (empty($var_name))
-		{
-			return null;
-		}
-	}
-	$tmp_request = $static_request;
-	// no request class set, create a temporary one ourselves to keep backwards compatibility
-	if ($tmp_request === null)
-	{
-		// false param: enable super globals, so the created request class does not
-		// make super globals inaccessible everywhere outside this function.
-		$tmp_request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false);
-	}
-	return $tmp_request->variable($var_name, $default, $multibyte, ($cookie) ? \phpbb\request\request_interface::COOKIE : \phpbb\request\request_interface::REQUEST);
-}
-
-/**
- * Get tables of a database
- *
- * @deprecated 3.1.0 (To be removed: 4.0.0)
- */
-function get_tables($db)
-{
-	throw new BadFunctionCallException('function removed from phpBB core, use db_tools service instead.');
-}
-
-/**
- * Global function for chmodding directories and files for internal use
- *
- * This function determines owner and group whom the file belongs to and user and group of PHP and then set safest possible file permissions.
- * The function determines owner and group from common.php file and sets the same to the provided file.
- * The function uses bit fields to build the permissions.
- * The function sets the appropiate execute bit on directories.
- *
- * Supported constants representing bit fields are:
- *
- * CHMOD_ALL - all permissions (7)
- * CHMOD_READ - read permission (4)
- * CHMOD_WRITE - write permission (2)
- * CHMOD_EXECUTE - execute permission (1)
- *
- * NOTE: The function uses POSIX extension and fileowner()/filegroup() functions. If any of them is disabled, this function tries to build proper permissions, by calling is_readable() and is_writable() functions.
- *
- * @param string	$filename	The file/directory to be chmodded
- * @param int	$perms		Permissions to set
- *
- * @return bool	true on success, otherwise false
- *
- * @deprecated 3.2.0-dev	use \phpbb\filesystem\filesystem::phpbb_chmod() instead
- */
-function phpbb_chmod($filename, $perms = CHMOD_READ)
-{
-	global $phpbb_filesystem;
-
-	try
-	{
-		$phpbb_filesystem->phpbb_chmod($filename, $perms);
-	}
-	catch (\phpbb\filesystem\exception\filesystem_exception $e)
-	{
-		return false;
-	}
-
-	return true;
-}
-
-/**
- * Test if a file/directory is writable
- *
- * This function calls the native is_writable() when not running under
- * Windows and it is not disabled.
- *
- * @param string $file Path to perform write test on
- * @return bool True when the path is writable, otherwise false.
- *
- * @deprecated 3.2.0-dev	use \phpbb\filesystem\filesystem::is_writable() instead
- */
-function phpbb_is_writable($file)
-{
-	global $phpbb_filesystem;
-
-	return $phpbb_filesystem->is_writable($file);
-}
-
-/**
- * Checks if a path ($path) is absolute or relative
- *
- * @param string $path Path to check absoluteness of
- * @return boolean
- *
- * @deprecated 3.2.0-dev	use \phpbb\filesystem\helper::is_absolute_path() instead
- */
-function phpbb_is_absolute($path)
-{
-	return \phpbb\filesystem\helper::is_absolute_path($path);
-}
-
-/**
- * A wrapper for realpath
- *
- * @deprecated 3.2.0-dev	use \phpbb\filesystem\helper::realpath() instead
- */
-function phpbb_realpath($path)
-{
-	return \phpbb\filesystem\helper::realpath($path);
-}
-
-/**
- * Determine which plural form we should use.
- * For some languages this is not as simple as for English.
- *
- * @param	int			$rule	ID of the plural rule we want to use, see https://area51.phpbb.com/docs/dev/3.3.x/language/plurals.html
- * @param	int|float	$number	The number we want to get the plural case for. Float numbers are floored.
- * @return	int		The plural-case we need to use for the number plural-rule combination
- *
- * @deprecated 3.2.0-dev (To be removed: 4.0.0)
- */
-function phpbb_get_plural_form($rule, $number)
-{
-	global $phpbb_container;
-
-	/** @var \phpbb\language\language $language */
-	$language = $phpbb_container->get('language');
-	return $language->get_plural_form($number, $rule);
-}
-
-/**
-* @return bool Always true
-* @deprecated 3.2.0-dev
-*/
-function phpbb_pcre_utf8_support()
-{
-	return true;
-}
-
-/**
- * Casts a variable to the given type.
- *
- * @deprecated 3.1 (To be removed 4.0.0)
- */
-function set_var(&$result, $var, $type, $multibyte = false)
-{
-	// no need for dependency injection here, if you have the object, call the method yourself!
-	$type_cast_helper = new \phpbb\request\type_cast_helper();
-	$type_cast_helper->set_var($result, $var, $type, $multibyte);
-}
-
-/**
- * Delete Attachments
- *
- * @deprecated 3.2.0-a1 (To be removed: 4.0.0)
- *
- * @param string $mode can be: post|message|topic|attach|user
- * @param mixed $ids can be: post_ids, message_ids, topic_ids, attach_ids, user_ids
- * @param bool $resync set this to false if you are deleting posts or topics
- */
-function delete_attachments($mode, $ids, $resync = true)
-{
-	global $phpbb_container;
-
-	/** @var \phpbb\attachment\manager $attachment_manager */
-	$attachment_manager = $phpbb_container->get('attachment.manager');
-	$num_deleted = $attachment_manager->delete($mode, $ids, $resync);
-
-	unset($attachment_manager);
-
-	return $num_deleted;
-}
-
-/**
- * Delete attached file
- *
- * @deprecated 3.2.0-a1 (To be removed: 4.0.0)
- */
-function phpbb_unlink($filename, $mode = 'file', $entry_removed = false)
-{
-	global $phpbb_container;
-
-	/** @var \phpbb\attachment\manager $attachment_manager */
-	$attachment_manager = $phpbb_container->get('attachment.manager');
-	$unlink = $attachment_manager->unlink($filename, $mode, $entry_removed);
-	unset($attachment_manager);
-
-	return $unlink;
-}
-
-/**
- * Display reasons
- *
- * @deprecated 3.2.0-dev (To be removed: 4.0.0)
- */
-function display_reasons($reason_id = 0)
-{
-	global $phpbb_container;
-
-	$phpbb_container->get('phpbb.report.report_reason_list_provider')->display_reasons($reason_id);
-}
-
-/**
- * Upload Attachment - filedata is generated here
- * Uses upload class
- *
- * @deprecated 3.2.0-a1 (To be removed: 4.0.0)
- *
- * @param string			$form_name		The form name of the file upload input
- * @param int			$forum_id		The id of the forum
- * @param bool			$local			Whether the file is local or not
- * @param string			$local_storage	The path to the local file
- * @param bool			$is_message		Whether it is a PM or not
- * @param array			$local_filedata	A filespec object created for the local file
- *
- * @return array File data array
- */
-function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false)
-{
-	global $phpbb_container;
-
-	/** @var \phpbb\attachment\manager $attachment_manager */
-	$attachment_manager = $phpbb_container->get('attachment.manager');
-	$file = $attachment_manager->upload($form_name, $forum_id, $local, $local_storage, $is_message, $local_filedata);
-	unset($attachment_manager);
-
-	return $file;
-}
-
-/**
-* Wrapper for php's checkdnsrr function.
-*
-* @param string $host	Fully-Qualified Domain Name
-* @param string $type	Resource record type to lookup
-*						Supported types are: MX (default), A, AAAA, NS, TXT, CNAME
-*						Other types may work or may not work
-*
-* @return bool|null	true if entry found,
-*					false if entry not found,
-*					null if this function is not supported by this environment
-*
-* Since null can also be returned, you probably want to compare the result
-* with === true or === false,
-*
-* @deprecated 3.3.0-b2 (To be removed: 4.0.0)
-*/
-function phpbb_checkdnsrr($host, $type = 'MX')
-{
-	return checkdnsrr($host, $type);
-}
-
-/*
- * Wrapper for inet_ntop()
- *
- * Converts a packed internet address to a human readable representation
- * inet_ntop() is supported by PHP since 5.1.0, since 5.3.0 also on Windows.
- *
- * @param string $in_addr	A 32bit IPv4, or 128bit IPv6 address.
- *
- * @return mixed		false on failure,
- *					string otherwise
-  *
- * @deprecated 3.3.0-b2 (To be removed: 4.0.0)
- */
-function phpbb_inet_ntop($in_addr)
-{
-	return inet_ntop($in_addr);
-}
-
-/**
- * Wrapper for inet_pton()
- *
- * Converts a human readable IP address to its packed in_addr representation
- * inet_pton() is supported by PHP since 5.1.0, since 5.3.0 also on Windows.
- *
- * @param string $address	A human readable IPv4 or IPv6 address.
- *
- * @return false|string	false if address is invalid,
- *					in_addr representation of the given address otherwise (string)
- *
- * @deprecated 3.3.0-b2 (To be removed: 4.0.0)
- */
-function phpbb_inet_pton($address)
-{
-	return inet_pton($address);
-}
-
-/**
- * Hashes an email address to a big integer
- *
- * @param string $email		Email address
- *
- * @return string			Unsigned Big Integer
- *
- * @deprecated 3.3.0-b2 (To be removed: 4.0.0)
- */
-function phpbb_email_hash($email)
-{
-	return sprintf('%u', crc32(strtolower($email))) . strlen($email);
-}
-
-/**
- * Load the autoloaders added by the extensions.
- *
- * @param string $phpbb_root_path Path to the phpbb root directory.
- */
-function phpbb_load_extensions_autoloaders($phpbb_root_path)
-{
-	$iterator = new \phpbb\finder\recursive_path_iterator(
-		$phpbb_root_path . 'ext/',
-		\RecursiveIteratorIterator::SELF_FIRST,
-		\FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS
-	);
-	$iterator->setMaxDepth(2);
-
-	foreach ($iterator as $file_info)
-	{
-		if ($file_info->getFilename() === 'vendor' && $iterator->getDepth() === 2)
-		{
-			$filename = $file_info->getRealPath() . '/autoload.php';
-			if (file_exists($filename))
-			{
-				require $filename;
-			}
-		}
-	}
-}
-
-/**
-* Login using http authenticate.
-*
-* @param array	$param		Parameter array, see $param_defaults array.
-*
-* @return void
-*
-* @deprecated 3.2.10 (To be removed 4.0.0)
-*/
-function phpbb_http_login($param)
-{
-	global $auth, $user, $request;
-	global $config;
-
-	$param_defaults = array(
-		'auth_message'	=> '',
-
-		'autologin'		=> false,
-		'viewonline'	=> true,
-		'admin'			=> false,
-	);
-
-	// Overwrite default values with passed values
-	$param = array_merge($param_defaults, $param);
-
-	// User is already logged in
-	// We will not overwrite his session
-	if (!empty($user->data['is_registered']))
-	{
-		return;
-	}
-
-	// $_SERVER keys to check
-	$username_keys = array(
-		'PHP_AUTH_USER',
-		'Authorization',
-		'REMOTE_USER', 'REDIRECT_REMOTE_USER',
-		'HTTP_AUTHORIZATION', 'REDIRECT_HTTP_AUTHORIZATION',
-		'REMOTE_AUTHORIZATION', 'REDIRECT_REMOTE_AUTHORIZATION',
-		'AUTH_USER',
-	);
-
-	$password_keys = array(
-		'PHP_AUTH_PW',
-		'REMOTE_PASSWORD',
-		'AUTH_PASSWORD',
-	);
-
-	$username = null;
-	foreach ($username_keys as $k)
-	{
-		if ($request->is_set($k, \phpbb\request\request_interface::SERVER))
-		{
-			$username = html_entity_decode($request->server($k), ENT_COMPAT);
-			break;
-		}
-	}
-
-	$password = null;
-	foreach ($password_keys as $k)
-	{
-		if ($request->is_set($k, \phpbb\request\request_interface::SERVER))
-		{
-			$password = html_entity_decode($request->server($k), ENT_COMPAT);
-			break;
-		}
-	}
-
-	// Decode encoded information (IIS, CGI, FastCGI etc.)
-	if (!is_null($username) && is_null($password) && strpos($username, 'Basic ') === 0)
-	{
-		list($username, $password) = explode(':', base64_decode(substr($username, 6)), 2);
-	}
-
-	if (!is_null($username) && !is_null($password))
-	{
-		set_var($username, $username, 'string', true);
-		set_var($password, $password, 'string', true);
-
-		$auth_result = $auth->login($username, $password, $param['autologin'], $param['viewonline'], $param['admin']);
-
-		if ($auth_result['status'] == LOGIN_SUCCESS)
-		{
-			return;
-		}
-		else if ($auth_result['status'] == LOGIN_ERROR_ATTEMPTS)
-		{
-			send_status_line(401, 'Unauthorized');
-
-			trigger_error('NOT_AUTHORISED');
-		}
-	}
-
-	// Prepend sitename to auth_message
-	$param['auth_message'] = ($param['auth_message'] === '') ? $config['sitename'] : $config['sitename'] . ' - ' . $param['auth_message'];
-
-	// We should probably filter out non-ASCII characters - RFC2616
-	$param['auth_message'] = preg_replace('/[\x80-\xFF]/', '?', $param['auth_message']);
-
-	header('WWW-Authenticate: Basic realm="' . $param['auth_message'] . '"');
-	send_status_line(401, 'Unauthorized');
-
-	trigger_error('NOT_AUTHORISED');
-}
-
-/**
-* Converts query string (GET) parameters in request into hidden fields.
-*
-* Useful for forwarding GET parameters when submitting forms with GET method.
-*
-* It is possible to omit some of the GET parameters, which is useful if
-* they are specified in the form being submitted.
-*
-* sid is always omitted.
-*
-* @param \phpbb\request\request $request Request object
-* @param array $exclude A list of variable names that should not be forwarded
-* @return string HTML with hidden fields
-*
-* @deprecated 3.2.10 (To be removed 4.0.0)
-*/
-function phpbb_build_hidden_fields_for_query_params($request, $exclude = null)
-{
-	$names = $request->variable_names(\phpbb\request\request_interface::GET);
-	$hidden = '';
-	foreach ($names as $name)
-	{
-		// Sessions are dealt with elsewhere, omit sid always
-		if ($name == 'sid')
-		{
-			continue;
-		}
-
-		// Omit any additional parameters requested
-		if (!empty($exclude) && in_array($name, $exclude))
-		{
-			continue;
-		}
-
-		$escaped_name = phpbb_quoteattr($name);
-
-		// Note: we might retrieve the variable from POST or cookies
-		// here. To avoid exposing cookies, skip variables that are
-		// overwritten somewhere other than GET entirely.
-		$value = $request->variable($name, '', true);
-		$get_value = $request->variable($name, '', true, \phpbb\request\request_interface::GET);
-		if ($value === $get_value)
-		{
-			$escaped_value = phpbb_quoteattr($value);
-			$hidden .= "<input type='hidden' name=$escaped_name value=$escaped_value />";
-		}
-	}
-	return $hidden;
-}
-
-/**
-* Delete all PM(s) for a given user and delete the ones without references
-*
-* @param	int		$user_id	ID of the user whose private messages we want to delete
-*
-* @return	boolean		False if there were no pms found, true otherwise.
-*
-* @deprecated 3.2.10 (To be removed 4.0.0)
-*/
-function phpbb_delete_user_pms($user_id)
-{
-	$user_id = (int) $user_id;
-
-	if (!$user_id)
-	{
-		return false;
-	}
-
-	return phpbb_delete_users_pms(array($user_id));
-}
-
-/**
-* Casts a numeric string $input to an appropriate numeric type (i.e. integer or float)
-*
-* @param string $input		A numeric string.
-*
-* @return int|float			Integer $input if $input fits integer,
-*							float $input otherwise.
-*
-* @deprecated 3.2.10 (To be removed 4.0.0)
-*/
-function phpbb_to_numeric($input)
-{
-	return ($input > PHP_INT_MAX) ? (float) $input : (int) $input;
-}
-
-/**
-* Check and display the SQL report if requested.
-*
-* @param \phpbb\request\request_interface		$request	Request object
-* @param \phpbb\auth\auth						$auth		Auth object
-* @param \phpbb\db\driver\driver_interface		$db			Database connection
-*
-* @deprecated 3.3.1 (To be removed: 4.0.0-a1); use controller helper's display_sql_report()
-*/
-function phpbb_check_and_display_sql_report(\phpbb\request\request_interface $request, \phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db)
-{
-	global $phpbb_container;
-
-	/** @var \phpbb\controller\helper $controller_helper */
-	$controller_helper = $phpbb_container->get('controller.helper');
-
-	$controller_helper->display_sql_report();
-}
-
 /**
  * Parse cfg file
  * @param string $filename
@@ -937,27 +80,3 @@ function parse_cfg_file($filename, $lines = false)
 
 	return $parsed_items;
 }
-
-/**
-* Wraps an url into a simple html page. Used to display attachments in IE.
-* this is a workaround for now; might be moved to template system later
-* direct any complaints to 1 Microsoft Way, Redmond
-*
-* @deprecated: 3.3.0-dev (To be removed: 4.0.0)
-*/
-function wrap_img_in_html($src, $title)
-{
-	echo '<!DOCTYPE html>';
-	echo '<html>';
-	echo '<head>';
-	echo '<meta charset="utf-8">';
-	echo '<meta http-equiv="X-UA-Compatible" content="IE=edge">';
-	echo '<title>' . $title . '</title>';
-	echo '</head>';
-	echo '<body>';
-	echo '<div>';
-	echo '<img src="' . $src . '" alt="' . $title . '" />';
-	echo '</div>';
-	echo '</body>';
-	echo '</html>';
-}
diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php
index 5e588764bd3..c96d67d9d7f 100644
--- a/phpBB/includes/functions_compress.php
+++ b/phpBB/includes/functions_compress.php
@@ -556,6 +556,7 @@ class compress_tar extends compress
 {
 	var $isgz = false;
 	var $isbz = false;
+	var $file = '';
 	var $filename = '';
 	var $mode = '';
 	var $type = '';
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 2f81c0db8da..1e46bf4e9be 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -288,7 +288,27 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list
 */
 function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_poster, $last_topic_poster)
 {
-	global $config, $auth, $user;
+	global $config, $auth, $user, $phpbb_dispatcher;
+
+	/**
+	 * Event to run code before the topic bump checks
+	 *
+	 * @event core.bump_topic_allowed_before
+	 * @var	int		forum_id			ID of the forum
+	 * @var	int		topic_bumped		Flag indicating if the topic was already bumped (0/1)
+	 * @var	int		last_post_time		The time of the topic last post
+	 * @var	int		topic_poster		User ID of the topic author
+	 * @var	int		last_topic_poster	User ID of the topic last post author
+	 * @since 3.3.14-RC1
+	 */
+	$vars = [
+		'forum_id',
+		'topic_bumped',
+		'last_post_time',
+		'topic_poster',
+		'last_topic_poster',
+	];
+	extract($phpbb_dispatcher->trigger_event('core.bump_topic_allowed_before', compact($vars)));
 
 	// Check permission and make sure the last post was not already bumped
 	if (!$auth->acl_get('f_bump', $forum_id) || $topic_bumped)
@@ -311,6 +331,28 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po
 		return false;
 	}
 
+	/**
+	 * Event to run code after the topic bump checks
+	 *
+	 * @event core.bump_topic_allowed_after
+	 * @var	int		forum_id			ID of the forum
+	 * @var	int		topic_bumped		Flag indicating if the topic was already bumped (0/1)
+	 * @var	int		last_post_time		The time of the topic last post
+	 * @var	int		topic_poster		User ID of the topic author
+	 * @var	int		last_topic_poster	User ID of the topic last post author
+	 * @var	int		bump_time			Bump time range
+	 * @since 3.3.14-RC1
+	 */
+	$vars = [
+		'forum_id',
+		'topic_bumped',
+		'last_post_time',
+		'topic_poster',
+		'last_topic_poster',
+		'bump_time',
+	];
+	extract($phpbb_dispatcher->trigger_event('core.bump_topic_allowed_after', compact($vars)));
+
 	// A bump time of 0 will completely disable the bump feature... not intended but might be useful.
 	return $bump_time;
 }
@@ -324,121 +366,95 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po
 *
 * @return	string			Context of the specified words separated by "..."
 */
-function get_context($text, $words, $length = 400)
+function get_context(string $text, array $words, int $length = 400): string
 {
-	// first replace all whitespaces with single spaces
-	$text = preg_replace('/ +/', ' ', strtr($text, "\t\n\r\x0C ", '     '));
+	if ($length <= 0)
+	{
+		return $text;
+	}
 
-	// we need to turn the entities back into their original form, to not cut the message in between them
-	$entities = array('&lt;', '&gt;', '&#91;', '&#93;', '&#46;', '&#58;', '&#058;');
-	$characters = array('<', '>', '[', ']', '.', ':', ':');
-	$text = str_replace($entities, $characters, $text);
+	// We need to turn the entities back into their original form, to not cut the message in between them
+	$text = htmlspecialchars_decode($text);
 
-	$word_indizes = array();
-	if (count($words))
+	// Replace all spaces/invisible characters with single spaces
+	$text = preg_replace("/[\p{Z}\h\v]+/u", ' ', $text);
+
+	$text_length = utf8_strlen($text);
+
+	// Get first occurrence of each word
+	$word_indexes = [];
+	foreach ($words as $word)
 	{
-		$match = '';
-		// find the starting indizes of all words
-		foreach ($words as $word)
-		{
-			if ($word)
-			{
-				if (preg_match('#(?:[^\w]|^)(' . $word . ')(?:[^\w]|$)#i', $text, $match))
-				{
-					if (empty($match[1]))
-					{
-						continue;
-					}
+		$pos = utf8_stripos($text, $word);
 
-					$pos = utf8_strpos($text, $match[1]);
-					if ($pos !== false)
-					{
-						$word_indizes[] = $pos;
-					}
-				}
-			}
+		if ($pos !== false)
+		{
+			$word_indexes[$pos] = $word;
 		}
-		unset($match);
+	}
+	if (!empty($word_indexes))
+	{
+		ksort($word_indexes);
+
+		// Size of the fragment of text per word
+		$num_indexes = count($word_indexes);
+		$characters_per_word = (int) ($length / $num_indexes) + 2; // 2 to leave one character of margin at the sides to don't cut words
 
-		if (count($word_indizes))
+		// Get text fragment indexes
+		$fragments = [];
+		foreach ($word_indexes as $index => $word)
 		{
-			$word_indizes = array_unique($word_indizes);
-			sort($word_indizes);
-
-			$wordnum = count($word_indizes);
-			// number of characters on the right and left side of each word
-			$sequence_length = (int) ($length / (2 * $wordnum)) - 2;
-			$final_text = '';
-			$word = $j = 0;
-			$final_text_index = -1;
-
-			// cycle through every character in the original text
-			for ($i = $word_indizes[$word], $n = utf8_strlen($text); $i < $n; $i++)
-			{
-				// if the current position is the start of one of the words then append $sequence_length characters to the final text
-				if (isset($word_indizes[$word]) && ($i == $word_indizes[$word]))
-				{
-					if ($final_text_index < $i - $sequence_length - 1)
-					{
-						$final_text .= '... ' . preg_replace('#^([^ ]*)#', '', utf8_substr($text, $i - $sequence_length, $sequence_length));
-					}
-					else
-					{
-						// if the final text is already nearer to the current word than $sequence_length we only append the text
-						// from its current index on and distribute the unused length to all other sequenes
-						$sequence_length += (int) (($final_text_index - $i + $sequence_length + 1) / (2 * $wordnum));
-						$final_text .= utf8_substr($text, $final_text_index + 1, $i - $final_text_index - 1);
-					}
-					$final_text_index = $i - 1;
+			$word_length = utf8_strlen($word);
+			$start = max(0, min($text_length - 1 - $characters_per_word, (int) ($index + ($word_length / 2) - ($characters_per_word / 2))));
+			$end = $start + $characters_per_word;
 
-					// add the following characters to the final text (see below)
-					$word++;
-					$j = 1;
-				}
+			// Check if we can merge this fragment into the previous fragment
+			if (!empty($fragments))
+			{
+				[$prev_start, $prev_end] = end($fragments);
 
-				if ($j > 0)
+				if ($prev_end + $characters_per_word >= $index + $word_length)
 				{
-					// add the character to the final text and increment the sequence counter
-					$final_text .= utf8_substr($text, $i, 1);
-					$final_text_index++;
-					$j++;
-
-					// if this is a whitespace then check whether we are done with this sequence
-					if (utf8_substr($text, $i, 1) == ' ')
-					{
-						// only check whether we have to exit the context generation completely if we haven't already reached the end anyway
-						if ($i + 4 < $n)
-						{
-							if (($j > $sequence_length && $word >= $wordnum) || utf8_strlen($final_text) > $length)
-							{
-								$final_text .= ' ...';
-								break;
-							}
-						}
-						else
-						{
-							// make sure the text really reaches the end
-							$j -= 4;
-						}
-
-						// stop context generation and wait for the next word
-						if ($j > $sequence_length)
-						{
-							$j = 0;
-						}
-					}
+					array_pop($fragments);
+					$start = $prev_start;
+					$end = $prev_end + $characters_per_word;
 				}
 			}
-			return str_replace($characters, $entities, $final_text);
+
+			$fragments[] = [$start, $end];
 		}
 	}
+	else
+	{
+		// There is no coincidences, so we just create a fragment with the first $length characters
+		$fragments[] = [0, $length];
+		$end = $length;
+	}
 
-	if (!count($words) || !count($word_indizes))
+	$output = [];
+	foreach ($fragments as [$start, $end])
 	{
-		return str_replace($characters, $entities, ((utf8_strlen($text) >= $length + 3) ? utf8_substr($text, 0, $length) . '...' : $text));
+		$fragment = utf8_substr($text, $start, $end - $start + 1);
+
+		$fragment_start = 0;
+		$fragment_end = $end - $start + 1;
+
+		// Find the first valid alphanumeric character in the fragment to don't cut words
+		if ($start > 0 && preg_match('/[^\p{L}\p{N}][\p{L}\p{N}]/u', $fragment, $matches, PREG_OFFSET_CAPTURE))
+		{
+			$fragment_start = utf8_strlen(substr($fragment, 0, (int) $matches[0][1])) + 1;
+		}
+
+		// Find the last valid alphanumeric character in the fragment to don't cut words
+		if ($end < $text_length - 1 && preg_match_all('/[\p{L}\p{N}][^\p{L}\p{N}]/u', $fragment, $matches, PREG_OFFSET_CAPTURE))
+		{
+			$fragment_end = utf8_strlen(substr($fragment, 0, end($matches[0])[1]));
+		}
+
+		$output[] = utf8_substr($fragment, $fragment_start, $fragment_end - $fragment_start + 1);
 	}
 
-	return '';
+	return ($fragments[0][0] !== 0 ? '... ' : '') . utf8_htmlspecialchars(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : '');
 }
 
 /**
@@ -1260,19 +1276,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a
 				{
 					if ($config['img_display_inlined'])
 					{
-						if ($config['img_link_width'] || $config['img_link_height'])
-						{
-							try
-							{
-								$file_info = $storage_attachment->file_info($filename);
-
-								$display_cat = ($file_info->image_width <= $config['img_link_width'] && $file_info->image_height <= $config['img_link_height']) ? attachment_category::IMAGE : attachment_category::NONE;
-							}
-							catch (\Exception $e)
-							{
-								$display_cat = attachment_category::NONE;
-							}
-						}
+						$display_cat = attachment_category::IMAGE;
 					}
 					else
 					{
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index cf2a659d77d..b2d394b86f8 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -1022,7 +1022,7 @@ function user_group_auth($group, $select_query, $use_src_db)
 /**
 * Retrieves configuration information from the source forum and caches it as an array
 * Both database and file driven configuration formats can be handled
-* (the type used is specified in $config_schema, see convert_phpbb20.php for more details)
+* (the type used is specified in $config_schema)
 */
 function get_config()
 {
@@ -1110,7 +1110,7 @@ function get_config()
 
 /**
 * Transfers the relevant configuration information from the source forum
-* The mapping of fields is specified in $config_schema, see convert_phpbb20.php for more details
+* The mapping of fields is specified in $config_schema
 */
 function restore_config($schema)
 {
@@ -1124,9 +1124,9 @@ function restore_config($schema)
 		{
 			$var = (empty($m[2]) || empty($convert_config[$m[2]])) ? "''" : "'" . addslashes($convert_config[$m[2]]) . "'";
 			$exec = '$config_value = ' . $m[1] . '(' . $var . ');';
-			// @codingStandardsIgnoreStart
+			// phpcs:disable Squiz.PHP.Eval
 			eval($exec);
-			// @codingStandardsIgnoreEnd
+			// phpcs:enable Squiz.PHP.Eval
 		}
 		else
 		{
@@ -1845,7 +1845,7 @@ function update_dynamic_config()
 	$config->set('num_files', (int) $db->sql_fetchfield('stat'), false);
 	$db->sql_freeresult($result);
 
-	$sql = 'SELECT SUM(filesize) as stat
+	$sql = 'SELECT SUM(' . $db->cast_expr_to_bigint('filesize') . ') as stat
 		FROM ' . ATTACHMENTS_TABLE . '
 		WHERE is_orphan = 0';
 	$result = $db->sql_query($sql);
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 7e49ed3ede1..860bb8d89ab 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1081,7 +1081,7 @@ function display_custom_bbcodes()
 	$num_predefined_bbcodes = NUM_PREDEFINED_BBCODES;
 
 	$sql_ary = [
-		'SELECT'	=> 'b.bbcode_id, b.bbcode_tag, b.bbcode_helpline, b.bbcode_match',
+		'SELECT'	=> 'b.bbcode_id, b.bbcode_tag, b.bbcode_helpline, b.bbcode_font_icon, b.bbcode_match',
 		'FROM'		=> [BBCODES_TABLE => 'b'],
 		'WHERE'		=> 'b.display_on_posting = 1',
 		'ORDER_BY'	=> 'b.bbcode_tag',
@@ -1124,6 +1124,7 @@ function display_custom_bbcodes()
 			'BBCODE_TAG'		=> $row['bbcode_tag'],
 			'BBCODE_TAG_CLEAN'	=> str_replace('=', '-', $row['bbcode_tag']),
 			'BBCODE_HELPLINE'	=> $row['bbcode_helpline'],
+			'BBCODE_FONT_ICON'	=> $row['bbcode_font_icon'],
 		];
 
 		/**
@@ -1595,7 +1596,7 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl
 
 	if ($data['user_allow_viewonline'] || $auth->acl_get('u_viewonline'))
 	{
-		$last_active = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit'];
+		$last_active = $data['user_last_active'] ?: ($data['session_time'] ?? 0);
 	}
 	else
 	{
@@ -1680,7 +1681,6 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl
 		'S_ONLINE'			=> ($config['load_onlinetrack'] && $online) ? true : false,
 		'RANK_IMG'			=> $user_rank_data['img'],
 		'RANK_IMG_SRC'		=> $user_rank_data['img_src'],
-		'S_JABBER_ENABLED'	=> ($config['jab_enable']) ? true : false,
 
 		'S_WARNINGS'	=> ($auth->acl_getf_global('m_') || $auth->acl_get('m_warn')) ? true : false,
 
@@ -1689,10 +1689,6 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl
 		'U_WARN'		=> ($warn_user_enabled && $auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&amp;mode=warn_user&amp;u=' . $user_id) : '',
 		'U_PM'			=> ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && $can_receive_pm) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $user_id) : '',
 		'U_EMAIL'		=> $email,
-		'U_JABBER'		=> ($data['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $user_id) : '',
-
-		'USER_JABBER'		=> ($config['jab_enable'] && $auth->acl_get('u_sendim')) ? $data['user_jabber'] : '',
-		'USER_JABBER_IMG'	=> ($config['jab_enable'] && $auth->acl_get('u_sendim') && $data['user_jabber']) ? $user->img('icon_contact_jabber', $data['user_jabber']) : '',
 
 		'L_SEND_EMAIL_USER' => $user->lang('SEND_EMAIL_USER', $username),
 		'L_CONTACT_USER'	=> $user->lang('CONTACT_USER', $username),
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
deleted file mode 100644
index ec7d090257f..00000000000
--- a/phpBB/includes/functions_jabber.php
+++ /dev/null
@@ -1,913 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-*
-* Jabber class from Flyspray project
-*
-* @version class.jabber2.php 1595 2008-09-19 (0.9.9)
-* @copyright 2006 Flyspray.org
-* @author Florian Schmitz (floele)
-*
-* Only slightly modified by Acyd Burn
-*/
-class jabber
-{
-	var $connection = null;
-	var $session = array();
-	var $timeout = 10;
-
-	var $server;
-	var $connect_server;
-	var $port;
-	var $username;
-	var $password;
-	var $use_ssl;
-	var $verify_peer;
-	var $verify_peer_name;
-	var $allow_self_signed;
-	var $resource = 'functions_jabber.phpbb.php';
-
-	var $enable_logging;
-	var $log_array;
-
-	var $features = array();
-
-	/** @var string Stream close handshake */
-	private const STREAM_CLOSE_HANDSHAKE = '</stream:stream>';
-
-	/**
-	* Constructor
-	*
-	* @param string $server Jabber server
-	* @param int $port Jabber server port
-	* @param string $username Jabber username or JID
-	* @param string $password Jabber password
-	* @param bool $use_ssl Use ssl
-	* @param bool $verify_peer Verify SSL certificate
-	* @param bool $verify_peer_name Verify Jabber peer name
-	* @param bool $allow_self_signed Allow self signed certificates
-	*/
-	function __construct($server, $port, $username, $password, $use_ssl = false, $verify_peer = true, $verify_peer_name = true, $allow_self_signed = false)
-	{
-		$this->connect_server		= ($server) ? $server : 'localhost';
-		$this->port					= ($port) ? $port : 5222;
-
-		// Get the server and the username
-		if (strpos($username, '@') === false)
-		{
-			$this->server = $this->connect_server;
-			$this->username = $username;
-		}
-		else
-		{
-			$jid = explode('@', $username, 2);
-
-			$this->username = $jid[0];
-			$this->server = $jid[1];
-		}
-
-		$this->password				= $password;
-		$this->use_ssl				= ($use_ssl && self::can_use_ssl()) ? true : false;
-		$this->verify_peer			= $verify_peer;
-		$this->verify_peer_name		= $verify_peer_name;
-		$this->allow_self_signed	= $allow_self_signed;
-
-		// Change port if we use SSL
-		if ($this->port == 5222 && $this->use_ssl)
-		{
-			$this->port = 5223;
-		}
-
-		$this->enable_logging		= true;
-		$this->log_array			= array();
-	}
-
-	/**
-	* Able to use the SSL functionality?
-	*/
-	public static function can_use_ssl()
-	{
-		return @extension_loaded('openssl');
-	}
-
-	/**
-	* Able to use TLS?
-	*/
-	public static function can_use_tls()
-	{
-		if (!@extension_loaded('openssl') || !function_exists('stream_socket_enable_crypto') || !function_exists('stream_get_meta_data') || !function_exists('stream_set_blocking') || !function_exists('stream_get_wrappers'))
-		{
-			return false;
-		}
-
-		/**
-		* Make sure the encryption stream is supported
-		* Also seem to work without the crypto stream if correctly compiled
-
-		$streams = stream_get_wrappers();
-
-		if (!in_array('streams.crypto', $streams))
-		{
-			return false;
-		}
-		*/
-
-		return true;
-	}
-
-	/**
-	* Sets the resource which is used. No validation is done here, only escaping.
-	* @param string $name
-	* @access public
-	*/
-	function set_resource($name)
-	{
-		$this->resource = $name;
-	}
-
-	/**
-	* Connect
-	*/
-	function connect()
-	{
-/*		if (!$this->check_jid($this->username . '@' . $this->server))
-		{
-			$this->add_to_log('Error: Jabber ID is not valid: ' . $this->username . '@' . $this->server);
-			return false;
-		}*/
-
-		$this->session['ssl'] = $this->use_ssl;
-
-		if ($this->open_socket($this->connect_server, $this->port, $this->use_ssl, $this->verify_peer, $this->verify_peer_name, $this->allow_self_signed))
-		{
-			$this->send("<?xml version='1.0' encoding='UTF-8' ?" . ">\n");
-			$this->send("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n");
-		}
-		else
-		{
-			$this->add_to_log('Error: connect() #2');
-			return false;
-		}
-
-		// Now we listen what the server has to say...and give appropriate responses
-		$this->response($this->listen());
-		return true;
-	}
-
-	/**
-	* Disconnect
-	*/
-	function disconnect()
-	{
-		if ($this->connected())
-		{
-			// disconnect gracefully
-			if (isset($this->session['sent_presence']))
-			{
-				$this->send_presence('offline', '', true);
-			}
-
-			$this->send(self::STREAM_CLOSE_HANDSHAKE);
-			// Check stream close handshake reply
-			$stream_close_reply = $this->listen();
-
-			if ($stream_close_reply != self::STREAM_CLOSE_HANDSHAKE)
-			{
-				$this->add_to_log("Error: Unexpected stream close handshake reply ”{$stream_close_reply}”");
-			}
-
-			$this->session = array();
-			return fclose($this->connection);
-		}
-
-		return false;
-	}
-
-	/**
-	* Connected?
-	*/
-	function connected()
-	{
-		return (is_resource($this->connection) && !feof($this->connection)) ? true : false;
-	}
-
-
-	/**
-	* Initiates login (using data from contructor, after calling connect())
-	* @access public
-	* @return bool
-	*/
-	function login()
-	{
-		if (empty($this->features))
-		{
-			$this->add_to_log('Error: No feature information from server available.');
-			return false;
-		}
-
-		return $this->response($this->features);
-	}
-
-	/**
-	* Send data to the Jabber server
-	* @param string $xml
-	* @access public
-	* @return bool
-	*/
-	function send($xml)
-	{
-		if ($this->connected())
-		{
-			$xml = trim($xml);
-			return fwrite($this->connection, $xml);
-		}
-		else
-		{
-			$this->add_to_log('Error: Could not send, connection lost (flood?).');
-			return false;
-		}
-	}
-
-	/**
-	* OpenSocket
-	* @param string $server host to connect to
-	* @param int $port port number
-	* @param bool $use_ssl use ssl or not
-	* @param bool $verify_peer verify ssl certificate
-	* @param bool $verify_peer_name verify peer name
-	* @param bool $allow_self_signed allow self-signed ssl certificates
-	* @access public
-	* @return bool
-	*/
-	function open_socket($server, $port, $use_ssl, $verify_peer, $verify_peer_name, $allow_self_signed)
-	{
-		if (@function_exists('dns_get_record'))
-		{
-			$record = @dns_get_record("_xmpp-client._tcp.$server", DNS_SRV);
-			if (!empty($record) && !empty($record[0]['target']))
-			{
-				$server = $record[0]['target'];
-			}
-		}
-
-		$options = array();
-
-		if ($use_ssl)
-		{
-			$remote_socket = 'ssl://' . $server . ':' . $port;
-
-			// Set ssl context options, see http://php.net/manual/en/context.ssl.php
-			$options['ssl'] = array('verify_peer' => $verify_peer, 'verify_peer_name' => $verify_peer_name, 'allow_self_signed' => $allow_self_signed);
-		}
-		else
-		{
-			$remote_socket = $server . ':' . $port;
-		}
-
-		$socket_context = stream_context_create($options);
-
-		if ($this->connection = @stream_socket_client($remote_socket, $errorno, $errorstr, $this->timeout, STREAM_CLIENT_CONNECT, $socket_context))
-		{
-			stream_set_blocking($this->connection, 0);
-			stream_set_timeout($this->connection, 60);
-
-			return true;
-		}
-
-		// Apparently an error occurred...
-		$this->add_to_log('Error: open_socket() - ' . $errorstr);
-		return false;
-	}
-
-	/**
-	* Return log
-	*/
-	function get_log()
-	{
-		if ($this->enable_logging && count($this->log_array))
-		{
-			return implode("<br /><br />", $this->log_array);
-		}
-
-		return '';
-	}
-
-	/**
-	* Add information to log
-	*/
-	function add_to_log($string)
-	{
-		if ($this->enable_logging)
-		{
-			$this->log_array[] = utf8_htmlspecialchars($string);
-		}
-	}
-
-	/**
-	* Listens to the connection until it gets data or the timeout is reached.
-	* Thus, it should only be called if data is expected to be received.
-	* @access public
-	* @return mixed either false for timeout or an array with the received data
-	*/
-	function listen($timeout = 10, $wait = false)
-	{
-		if (!$this->connected())
-		{
-			return false;
-		}
-
-		// Wait for a response until timeout is reached
-		$start = time();
-		$data = '';
-
-		do
-		{
-			$read = trim(fread($this->connection, 4096));
-			$data .= $read;
-		}
-		while (time() <= $start + $timeout && !feof($this->connection) && ($wait || $data == '' || $read != '' || (substr(rtrim($data), -1) != '>')));
-
-		if ($data != '')
-		{
-			return $this->xmlize($data);
-		}
-		else
-		{
-			$this->add_to_log('Timeout, no response from server.');
-			return false;
-		}
-	}
-
-	/**
-	* Initiates account registration (based on data used for contructor)
-	* @access public
-	* @return bool
-	*/
-	function register()
-	{
-		if (!isset($this->session['id']) || isset($this->session['jid']))
-		{
-			$this->add_to_log('Error: Cannot initiate registration.');
-			return false;
-		}
-
-		$this->send("<iq type='get' id='reg_1'><query xmlns='jabber:iq:register'/></iq>");
-		return $this->response($this->listen());
-	}
-
-	/**
-	* Sets account presence. No additional info required (default is "online" status)
-	* @param $message online, offline...
-	* @param $type dnd, away, chat, xa or nothing
-	* @param $unavailable set this to true if you want to become unavailable
-	* @access public
-	* @return bool
-	*/
-	function send_presence($message = '', $type = '', $unavailable = false)
-	{
-		if (!isset($this->session['jid']))
-		{
-			$this->add_to_log('ERROR: send_presence() - Cannot set presence at this point, no jid given.');
-			return false;
-		}
-
-		$type = strtolower($type);
-		$type = (in_array($type, array('dnd', 'away', 'chat', 'xa'))) ? '<show>'. $type .'</show>' : '';
-
-		$unavailable = ($unavailable) ? " type='unavailable'" : '';
-		$message = ($message) ? '<status>' . utf8_htmlspecialchars($message) .'</status>' : '';
-
-		$this->session['sent_presence'] = !$unavailable;
-
-		return $this->send("<presence$unavailable>" . $type . $message . '</presence>');
-	}
-
-	/**
-	* This handles all the different XML elements
-	* @param array $xml
-	* @access public
-	* @return bool
-	*/
-	function response($xml)
-	{
-		if (!is_array($xml) || !count($xml))
-		{
-			return false;
-		}
-
-		// did we get multiple elements? do one after another
-		// array('message' => ..., 'presence' => ...)
-		if (count($xml) > 1)
-		{
-			foreach ($xml as $key => $value)
-			{
-				$this->response(array($key => $value));
-			}
-			return;
-		}
-		else
-		{
-			// or even multiple elements of the same type?
-			// array('message' => array(0 => ..., 1 => ...))
-			if (is_array(reset($xml)) && count(reset($xml)) > 1)
-			{
-				foreach (reset($xml) as $value)
-				{
-					$this->response(array(key($xml) => array(0 => $value)));
-				}
-				return;
-			}
-		}
-
-		switch (key($xml))
-		{
-			case 'stream:stream':
-				// Connection initialised (or after authentication). Not much to do here...
-
-				if (isset($xml['stream:stream'][0]['#']['stream:features']))
-				{
-					// we already got all info we need
-					$this->features = $xml['stream:stream'][0]['#'];
-				}
-				else
-				{
-					$this->features = $this->listen();
-				}
-
-				$second_time = isset($this->session['id']);
-				$this->session['id'] = isset($xml['stream:stream'][0]['@']['id']) ? $xml['stream:stream'][0]['@']['id'] : '';
-
-				if ($second_time)
-				{
-					// If we are here for the second time after TLS, we need to continue logging in
-					return $this->login();
-				}
-
-				// go on with authentication?
-				if (isset($this->features['stream:features'][0]['#']['bind']) || !empty($this->session['tls']))
-				{
-					return $this->response($this->features);
-				}
-			break;
-
-			case 'stream:features':
-				// Resource binding after successful authentication
-				if (isset($this->session['authenticated']))
-				{
-					// session required?
-					$this->session['sess_required'] = isset($xml['stream:features'][0]['#']['session']);
-
-					$this->send("<iq type='set' id='bind_1'>
-						<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>
-							<resource>" . utf8_htmlspecialchars($this->resource) . '</resource>
-						</bind>
-					</iq>');
-					return $this->response($this->listen());
-				}
-
-				// Let's use TLS if SSL is not enabled and we can actually use it
-				if (!$this->session['ssl'] && self::can_use_tls() && self::can_use_ssl() && isset($xml['stream:features'][0]['#']['starttls']))
-				{
-					$this->add_to_log('Switching to TLS.');
-					$this->send("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>\n");
-					return $this->response($this->listen());
-				}
-
-				// Does the server support SASL authentication?
-
-				// I hope so, because we do (and no other method).
-				if (isset($xml['stream:features'][0]['#']['mechanisms'][0]['@']['xmlns']) && $xml['stream:features'][0]['#']['mechanisms'][0]['@']['xmlns'] == 'urn:ietf:params:xml:ns:xmpp-sasl')
-				{
-					// Now decide on method
-					$methods = array();
-
-					foreach ($xml['stream:features'][0]['#']['mechanisms'][0]['#']['mechanism'] as $value)
-					{
-						$methods[] = $value['#'];
-					}
-
-					// we prefer DIGEST-MD5
-					// we don't want to use plain authentication (neither does the server usually) if no encryption is in place
-
-					// http://www.xmpp.org/extensions/attic/jep-0078-1.7.html
-					// The plaintext mechanism SHOULD NOT be used unless the underlying stream is encrypted (using SSL or TLS)
-					// and the client has verified that the server certificate is signed by a trusted certificate authority.
-
-					if (in_array('DIGEST-MD5', $methods))
-					{
-						$this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='DIGEST-MD5'/>");
-					}
-					else if (in_array('PLAIN', $methods) && ($this->session['ssl'] || !empty($this->session['tls'])))
-					{
-						// http://www.ietf.org/rfc/rfc4616.txt (PLAIN SASL Mechanism)
-						$this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>"
-							. base64_encode($this->username . '@' . $this->server . chr(0) . $this->username . chr(0) . $this->password) .
-							'</auth>');
-					}
-					else if (in_array('ANONYMOUS', $methods))
-					{
-						$this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='ANONYMOUS'/>");
-					}
-					else
-					{
-						// not good...
-						$this->add_to_log('Error: No authentication method supported.');
-						$this->disconnect();
-						return false;
-					}
-
-					return $this->response($this->listen());
-				}
-				else
-				{
-					// ok, this is it. bye.
-					$this->add_to_log('Error: Server does not offer SASL authentication.');
-					$this->disconnect();
-					return false;
-				}
-			break;
-
-			case 'challenge':
-				// continue with authentication...a challenge literally -_-
-				$decoded = base64_decode($xml['challenge'][0]['#']);
-				$decoded = $this->parse_data($decoded);
-
-				if (!isset($decoded['digest-uri']))
-				{
-					$decoded['digest-uri'] = 'xmpp/'. $this->server;
-				}
-
-				// better generate a cnonce, maybe it's needed
-				$decoded['cnonce'] = base64_encode(md5(uniqid(mt_rand(), true)));
-
-				// second challenge?
-				if (isset($decoded['rspauth']))
-				{
-					$this->send("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'/>");
-				}
-				else
-				{
-					// Make sure we only use 'auth' for qop (relevant for $this->encrypt_password())
-					// If the <response> is choking up on the changed parameter we may need to adjust encrypt_password() directly
-					if (isset($decoded['qop']) && $decoded['qop'] != 'auth' && strpos($decoded['qop'], 'auth') !== false)
-					{
-						$decoded['qop'] = 'auth';
-					}
-
-					$response = array(
-						'username'	=> $this->username,
-						'response'	=> $this->encrypt_password(array_merge($decoded, array('nc' => '00000001'))),
-						'charset'	=> 'utf-8',
-						'nc'		=> '00000001',
-						'qop'		=> 'auth',			// only auth being supported
-					);
-
-					foreach (array('nonce', 'digest-uri', 'realm', 'cnonce') as $key)
-					{
-						if (isset($decoded[$key]))
-						{
-							$response[$key] = $decoded[$key];
-						}
-					}
-
-					$this->send("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>" . base64_encode($this->implode_data($response)) . '</response>');
-				}
-
-				return $this->response($this->listen());
-			break;
-
-			case 'failure':
-				$this->add_to_log('Error: Server sent "failure".');
-				$this->disconnect();
-				return false;
-			break;
-
-			case 'proceed':
-				// continue switching to TLS
-				$meta = stream_get_meta_data($this->connection);
-				stream_set_blocking($this->connection, 1);
-
-				if (!stream_socket_enable_crypto($this->connection, true, STREAM_CRYPTO_METHOD_TLS_CLIENT))
-				{
-					$this->add_to_log('Error: TLS mode change failed.');
-					return false;
-				}
-
-				stream_set_blocking($this->connection, $meta['blocked']);
-				$this->session['tls'] = true;
-
-				// new stream
-				$this->send("<?xml version='1.0' encoding='UTF-8' ?" . ">\n");
-				$this->send("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n");
-
-				return $this->response($this->listen());
-			break;
-
-			case 'success':
-				// Yay, authentication successful.
-				$this->send("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n");
-				$this->session['authenticated'] = true;
-
-				// we have to wait for another response
-				return $this->response($this->listen());
-			break;
-
-			case 'iq':
-				// we are not interested in IQs we did not expect
-				if (!isset($xml['iq'][0]['@']['id']))
-				{
-					return false;
-				}
-
-				// multiple possibilities here
-				switch ($xml['iq'][0]['@']['id'])
-				{
-					case 'bind_1':
-						$this->session['jid'] = $xml['iq'][0]['#']['bind'][0]['#']['jid'][0]['#'];
-
-						// and (maybe) yet another request to be able to send messages *finally*
-						if ($this->session['sess_required'])
-						{
-							$this->send("<iq to='{$this->server}' type='set' id='sess_1'>
-								<session xmlns='urn:ietf:params:xml:ns:xmpp-session'/>
-								</iq>");
-							return $this->response($this->listen());
-						}
-
-						return true;
-					break;
-
-					case 'sess_1':
-						return true;
-					break;
-
-					case 'reg_1':
-						$this->send("<iq type='set' id='reg_2'>
-								<query xmlns='jabber:iq:register'>
-									<username>" . utf8_htmlspecialchars($this->username) . "</username>
-									<password>" . utf8_htmlspecialchars($this->password) . "</password>
-								</query>
-							</iq>");
-						return $this->response($this->listen());
-					break;
-
-					case 'reg_2':
-						// registration end
-						if (isset($xml['iq'][0]['#']['error']))
-						{
-							$this->add_to_log('Warning: Registration failed.');
-							return false;
-						}
-						return true;
-					break;
-
-					case 'unreg_1':
-						return true;
-					break;
-
-					default:
-						$this->add_to_log('Notice: Received unexpected IQ.');
-						return false;
-					break;
-				}
-			break;
-
-			case 'message':
-				// we are only interested in content...
-				if (!isset($xml['message'][0]['#']['body']))
-				{
-					return false;
-				}
-
-				$message['body'] = $xml['message'][0]['#']['body'][0]['#'];
-				$message['from'] = $xml['message'][0]['@']['from'];
-
-				if (isset($xml['message'][0]['#']['subject']))
-				{
-					$message['subject'] = $xml['message'][0]['#']['subject'][0]['#'];
-				}
-				$this->session['messages'][] = $message;
-			break;
-
-			default:
-				// hm...don't know this response
-				$this->add_to_log('Notice: Unknown server response');
-				return false;
-			break;
-		}
-	}
-
-	function send_message($to, $text, $subject = '', $type = 'normal')
-	{
-		if (!isset($this->session['jid']))
-		{
-			return false;
-		}
-
-		if (!in_array($type, array('chat', 'normal', 'error', 'groupchat', 'headline')))
-		{
-			$type = 'normal';
-		}
-
-		return $this->send("<message from='" . utf8_htmlspecialchars($this->session['jid']) . "' to='" . utf8_htmlspecialchars($to) . "' type='$type' id='" . uniqid('msg') . "'>
-			<subject>" . utf8_htmlspecialchars($subject) . "</subject>
-			<body>" . utf8_htmlspecialchars($text) . "</body>
-			</message>"
-		);
-	}
-
-	/**
-	* Encrypts a password as in RFC 2831
-	* @param array $data Needs data from the client-server connection
-	* @access public
-	* @return string
-	*/
-	function encrypt_password($data)
-	{
-		// let's me think about <challenge> again...
-		foreach (array('realm', 'cnonce', 'digest-uri') as $key)
-		{
-			if (!isset($data[$key]))
-			{
-				$data[$key] = '';
-			}
-		}
-
-		$pack = md5($this->username . ':' . $data['realm'] . ':' . $this->password);
-
-		if (isset($data['authzid']))
-		{
-			$a1 = pack('H32', $pack)  . sprintf(':%s:%s:%s', $data['nonce'], $data['cnonce'], $data['authzid']);
-		}
-		else
-		{
-			$a1 = pack('H32', $pack)  . sprintf(':%s:%s', $data['nonce'], $data['cnonce']);
-		}
-
-		// should be: qop = auth
-		$a2 = 'AUTHENTICATE:'. $data['digest-uri'];
-
-		return md5(sprintf('%s:%s:%s:%s:%s:%s', md5($a1), $data['nonce'], $data['nc'], $data['cnonce'], $data['qop'], md5($a2)));
-	}
-
-	/**
-	* parse_data like a="b",c="d",... or like a="a, b", c, d="e", f=g,...
-	* @param string $data
-	* @access public
-	* @return array a => b ...
-	*/
-	function parse_data($data)
-	{
-		$data = explode(',', $data);
-		$pairs = array();
-		$key = false;
-
-		foreach ($data as $pair)
-		{
-			$dd = strpos($pair, '=');
-
-			if ($dd)
-			{
-				$key = trim(substr($pair, 0, $dd));
-				$pairs[$key] = trim(trim(substr($pair, $dd + 1)), '"');
-			}
-			else if (strpos(strrev(trim($pair)), '"') === 0 && $key)
-			{
-				// We are actually having something left from "a, b" values, add it to the last one we handled.
-				$pairs[$key] .= ',' . trim(trim($pair), '"');
-				continue;
-			}
-		}
-
-		return $pairs;
-	}
-
-	/**
-	* opposite of jabber::parse_data()
-	* @param array $data
-	* @access public
-	* @return string
-	*/
-	function implode_data($data)
-	{
-		$return = array();
-		foreach ($data as $key => $value)
-		{
-			$return[] = $key . '="' . $value . '"';
-		}
-		return implode(',', $return);
-	}
-
-	/**
-	* xmlize()
-	* @author Hans Anderson
-	* @copyright Hans Anderson / http://www.hansanderson.com/php/xml/
-	*/
-	function xmlize($data, $skip_white = 1, $encoding = 'UTF-8')
-	{
-		$data = trim($data);
-
-		if (substr($data, 0, 5) != '<?xml')
-		{
-			// mod
-			$data = '<root>'. $data . '</root>';
-		}
-
-		$vals = $index = $array = array();
-		$parser = xml_parser_create($encoding);
-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, $skip_white);
-		xml_parse_into_struct($parser, $data, $vals, $index);
-		xml_parser_free($parser);
-
-		$i = 0;
-		$tagname = $vals[$i]['tag'];
-
-		$array[$tagname][0]['@'] = (isset($vals[$i]['attributes'])) ? $vals[$i]['attributes'] : array();
-		$array[$tagname][0]['#'] = $this->_xml_depth($vals, $i);
-
-		if (substr($data, 0, 5) != '<?xml')
-		{
-			$array = $array['root'][0]['#'];
-		}
-
-		return $array;
-	}
-
-	/**
-	* _xml_depth()
-	* @author Hans Anderson
-	* @copyright Hans Anderson / http://www.hansanderson.com/php/xml/
-	*/
-	function _xml_depth($vals, &$i)
-	{
-		$children = array();
-
-		if (isset($vals[$i]['value']))
-		{
-			array_push($children, $vals[$i]['value']);
-		}
-
-		while (++$i < count($vals))
-		{
-			switch ($vals[$i]['type'])
-			{
-				case 'open':
-
-					$tagname = (isset($vals[$i]['tag'])) ? $vals[$i]['tag'] : '';
-					$size = (isset($children[$tagname])) ? count($children[$tagname]) : 0;
-
-					if (isset($vals[$i]['attributes']))
-					{
-						$children[$tagname][$size]['@'] = $vals[$i]['attributes'];
-					}
-
-					$children[$tagname][$size]['#'] = $this->_xml_depth($vals, $i);
-
-				break;
-
-				case 'cdata':
-					array_push($children, $vals[$i]['value']);
-				break;
-
-				case 'complete':
-
-					$tagname = $vals[$i]['tag'];
-					$size = (isset($children[$tagname])) ? count($children[$tagname]) : 0;
-					$children[$tagname][$size]['#'] = (isset($vals[$i]['value'])) ? $vals[$i]['value'] : array();
-
-					if (isset($vals[$i]['attributes']))
-					{
-						$children[$tagname][$size]['@'] = $vals[$i]['attributes'];
-					}
-
-				break;
-
-				case 'close':
-					return $children;
-				break;
-			}
-		}
-
-		return $children;
-	}
-}
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
deleted file mode 100644
index a3f9ae15794..00000000000
--- a/phpBB/includes/functions_messenger.php
+++ /dev/null
@@ -1,2011 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Messenger
-*/
-class messenger
-{
-	var $msg, $replyto, $from, $subject;
-	var $addresses = array();
-	var $extra_headers = array();
-
-	var $mail_priority = MAIL_NORMAL_PRIORITY;
-	var $use_queue = true;
-
-	/** @var \phpbb\template\template */
-	protected $template;
-
-	/**
-	* Constructor
-	*/
-	function __construct($use_queue = true)
-	{
-		global $config;
-
-		$this->use_queue = (!$config['email_package_size']) ? false : $use_queue;
-		$this->subject = '';
-	}
-
-	/**
-	* Resets all the data (address, template file, etc etc) to default
-	*/
-	function reset()
-	{
-		$this->addresses = $this->extra_headers = array();
-		$this->msg = $this->replyto = $this->from = '';
-		$this->mail_priority = MAIL_NORMAL_PRIORITY;
-	}
-
-	/**
-	* Set addresses for to/im as available
-	*
-	* @param array $user User row
-	*/
-	function set_addresses($user)
-	{
-		if (isset($user['user_email']) && $user['user_email'])
-		{
-			$this->to($user['user_email'], (isset($user['username']) ? $user['username'] : ''));
-		}
-
-		if (isset($user['user_jabber']) && $user['user_jabber'])
-		{
-			$this->im($user['user_jabber'], (isset($user['username']) ? $user['username'] : ''));
-		}
-	}
-
-	/**
-	* Sets an email address to send to
-	*/
-	function to($address, $realname = '')
-	{
-		global $config;
-
-		if (!trim($address))
-		{
-			return;
-		}
-
-		$pos = isset($this->addresses['to']) ? count($this->addresses['to']) : 0;
-
-		$this->addresses['to'][$pos]['email'] = trim($address);
-
-		// If empty sendmail_path on windows, PHP changes the to line
-		if (!$config['smtp_delivery'] && DIRECTORY_SEPARATOR == '\\')
-		{
-			$this->addresses['to'][$pos]['name'] = '';
-		}
-		else
-		{
-			$this->addresses['to'][$pos]['name'] = trim($realname);
-		}
-	}
-
-	/**
-	* Sets an cc address to send to
-	*/
-	function cc($address, $realname = '')
-	{
-		if (!trim($address))
-		{
-			return;
-		}
-
-		$pos = isset($this->addresses['cc']) ? count($this->addresses['cc']) : 0;
-		$this->addresses['cc'][$pos]['email'] = trim($address);
-		$this->addresses['cc'][$pos]['name'] = trim($realname);
-	}
-
-	/**
-	* Sets an bcc address to send to
-	*/
-	function bcc($address, $realname = '')
-	{
-		if (!trim($address))
-		{
-			return;
-		}
-
-		$pos = isset($this->addresses['bcc']) ? count($this->addresses['bcc']) : 0;
-		$this->addresses['bcc'][$pos]['email'] = trim($address);
-		$this->addresses['bcc'][$pos]['name'] = trim($realname);
-	}
-
-	/**
-	* Sets a im contact to send to
-	*/
-	function im($address, $realname = '')
-	{
-		// IM-Addresses could be empty
-		if (!trim($address))
-		{
-			return;
-		}
-
-		$pos = isset($this->addresses['im']) ? count($this->addresses['im']) : 0;
-		$this->addresses['im'][$pos]['uid'] = trim($address);
-		$this->addresses['im'][$pos]['name'] = trim($realname);
-	}
-
-	/**
-	* Set the reply to address
-	*/
-	function replyto($address)
-	{
-		$this->replyto = trim($address);
-	}
-
-	/**
-	* Set the from address
-	*/
-	function from($address)
-	{
-		$this->from = trim($address);
-	}
-
-	/**
-	* set up subject for mail
-	*/
-	function subject($subject = '')
-	{
-		$this->subject = trim($subject);
-	}
-
-	/**
-	* set up extra mail headers
-	*/
-	function headers($headers)
-	{
-		$this->extra_headers[] = trim($headers);
-	}
-
-	/**
-	* Adds X-AntiAbuse headers
-	*
-	* @param \phpbb\config\config	$config		Config object
-	* @param \phpbb\user			$user		User object
-	* @return void
-	*/
-	function anti_abuse_headers($config, $user)
-	{
-		$this->headers('X-AntiAbuse: Board servername - ' . mail_encode($config['server_name']));
-		$this->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-		$this->headers('X-AntiAbuse: Username - ' . mail_encode($user->data['username']));
-		$this->headers('X-AntiAbuse: User IP - ' . $user->ip);
-	}
-
-	/**
-	* Set the email priority
-	*/
-	function set_mail_priority($priority = MAIL_NORMAL_PRIORITY)
-	{
-		$this->mail_priority = $priority;
-	}
-
-	/**
-	* Set email template to use
-	*/
-	function template($template_file, $template_lang = '', $template_path = '', $template_dir_prefix = '')
-	{
-		global $config, $phpbb_root_path, $user;
-
-		$template_dir_prefix = (!$template_dir_prefix || $template_dir_prefix[0] === '/') ? $template_dir_prefix : '/' . $template_dir_prefix;
-
-		$this->setup_template();
-
-		if (!trim($template_file))
-		{
-			trigger_error('No template file for emailing set.', E_USER_ERROR);
-		}
-
-		if (!trim($template_lang))
-		{
-			// fall back to board default language if the user's language is
-			// missing $template_file.  If this does not exist either,
-			// $this->template->set_filenames will do a trigger_error
-			$template_lang = basename($config['default_lang']);
-		}
-
-		$ext_template_paths = array(
-			array(
-				'name' 		=> $template_lang . '_email',
-				'ext_path' 	=> 'language/' . $template_lang . '/email' . $template_dir_prefix,
-			),
-		);
-
-		if ($template_path)
-		{
-			$template_paths = array(
-				$template_path . $template_dir_prefix,
-			);
-		}
-		else
-		{
-			$template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
-			$template_path .= $template_lang . '/email';
-
-			$template_paths = array(
-				$template_path . $template_dir_prefix,
-			);
-
-			$board_language = basename($config['default_lang']);
-
-			// we can only specify default language fallback when the path is not a custom one for which we
-			// do not know the default language alternative
-			if ($template_lang !== $board_language)
-			{
-				$fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
-				$fallback_template_path .= $board_language . '/email';
-
-				$template_paths[] = $fallback_template_path . $template_dir_prefix;
-
-				$ext_template_paths[] = array(
-					'name'		=> $board_language . '_email',
-					'ext_path'	=> 'language/' . $board_language . '/email' . $template_dir_prefix,
-				);
-			}
-			// If everything fails just fall back to en template
-			if ($template_lang !== 'en' && $board_language !== 'en')
-			{
-				$fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
-				$fallback_template_path .= 'en/email';
-
-				$template_paths[] = $fallback_template_path . $template_dir_prefix;
-
-				$ext_template_paths[] = array(
-					'name'		=> 'en_email',
-					'ext_path'	=> 'language/en/email' . $template_dir_prefix,
-				);
-			}
-		}
-
-		$this->set_template_paths($ext_template_paths, $template_paths);
-
-		$this->template->set_filenames(array(
-			'body'		=> $template_file . '.txt',
-		));
-
-		return true;
-	}
-
-	/**
-	* assign variables to email template
-	*/
-	function assign_vars($vars)
-	{
-		$this->setup_template();
-
-		$this->template->assign_vars($vars);
-	}
-
-	function assign_block_vars($blockname, $vars)
-	{
-		$this->setup_template();
-
-		$this->template->assign_block_vars($blockname, $vars);
-	}
-
-	/**
-	* Send the mail out to the recipients set previously in var $this->addresses
-	*
-	* @param int	$method	User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH
-	* @param bool	$break	Flag indicating if the function only formats the subject
-	*						and the message without sending it
-	*
-	* @return bool
-	*/
-	function send($method = NOTIFY_EMAIL, $break = false)
-	{
-		global $config, $user, $phpbb_dispatcher;
-
-		// We add some standard variables we always use, no need to specify them always
-		$this->assign_vars(array(
-			'U_BOARD'	=> generate_board_url(),
-			'EMAIL_SIG'	=> str_replace('<br />', "\n", "-- \n" . html_entity_decode($config['board_email_sig'], ENT_COMPAT)),
-			'SITENAME'	=> html_entity_decode($config['sitename'], ENT_COMPAT),
-		));
-
-		$subject = $this->subject;
-		$template = $this->template;
-		/**
-		* Event to modify the template before parsing
-		*
-		* @event core.modify_notification_template
-		* @var	int						method		User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH
-		* @var	bool					break		Flag indicating if the function only formats the subject
-		*											and the message without sending it
-		* @var	string					subject		The message subject
-		* @var \phpbb\template\template template	The (readonly) template object
-		* @since 3.2.4-RC1
-		*/
-		$vars = array('method', 'break', 'subject', 'template');
-		extract($phpbb_dispatcher->trigger_event('core.modify_notification_template', compact($vars)));
-
-		// Parse message through template
-		$message = trim($this->template->assign_display('body'));
-
-		/**
-		* Event to modify notification message text after parsing
-		*
-		* @event core.modify_notification_message
-		* @var	int		method	User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH
-		* @var	bool	break	Flag indicating if the function only formats the subject
-		*						and the message without sending it
-		* @var	string	subject	The message subject
-		* @var	string	message	The message text
-		* @since 3.1.11-RC1
-		*/
-		$vars = array('method', 'break', 'subject', 'message');
-		extract($phpbb_dispatcher->trigger_event('core.modify_notification_message', compact($vars)));
-
-		$this->subject = $subject;
-		$this->msg = $message;
-		unset($subject, $message, $template);
-
-		// Because we use \n for newlines in the body message we need to fix line encoding errors for those admins who uploaded email template files in the wrong encoding
-		$this->msg = str_replace("\r\n", "\n", $this->msg);
-
-		// We now try and pull a subject from the email body ... if it exists,
-		// do this here because the subject may contain a variable
-		$drop_header = '';
-		$match = array();
-		if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match))
-		{
-			$this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : $user->lang['NO_EMAIL_SUBJECT']);
-			$drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');
-		}
-		else
-		{
-			$this->subject = (($this->subject != '') ? $this->subject : $user->lang['NO_EMAIL_SUBJECT']);
-		}
-
-		if (preg_match('#^(List-Unsubscribe:(.*?))$#m', $this->msg, $match))
-		{
-			$this->extra_headers[] = $match[1];
-			$drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');
-		}
-
-		if ($drop_header)
-		{
-			$this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg));
-		}
-
-		if ($break)
-		{
-			return true;
-		}
-
-		switch ($method)
-		{
-			case NOTIFY_EMAIL:
-				$result = $this->msg_email();
-			break;
-
-			case NOTIFY_IM:
-				$result = $this->msg_jabber();
-			break;
-
-			case NOTIFY_BOTH:
-				$result = $this->msg_email();
-				$this->msg_jabber();
-			break;
-		}
-
-		$this->reset();
-		return $result;
-	}
-
-	/**
-	* Add error message to log
-	*/
-	function error($type, $msg)
-	{
-		global $user, $config, $request, $phpbb_log;
-
-		// Session doesn't exist, create it
-		if (!isset($user->session_id) || $user->session_id === '')
-		{
-			$user->session_begin();
-		}
-
-		$calling_page = html_entity_decode($request->server('REQUEST_URI'), ENT_COMPAT);
-
-		switch ($type)
-		{
-			case 'EMAIL':
-				$message = '<strong>EMAIL/' . (($config['smtp_delivery']) ? 'SMTP' : 'PHP/mail()') . '</strong>';
-			break;
-
-			default:
-				$message = "<strong>$type</strong>";
-			break;
-		}
-
-		$message .= '<br /><em>' . htmlspecialchars($calling_page, ENT_COMPAT) . '</em><br /><br />' . $msg . '<br />';
-		$phpbb_log->add('critical', $user->data['user_id'], $user->ip, 'LOG_ERROR_' . $type, false, array($message));
-	}
-
-	/**
-	* Save to queue
-	*/
-	function save_queue()
-	{
-		global $config;
-
-		if ($config['email_package_size'] && $this->use_queue && !empty($this->queue))
-		{
-			$this->queue->save();
-			return;
-		}
-	}
-
-	/**
-	* Generates a valid message id to be used in emails
-	*
-	* @return string message id
-	*/
-	function generate_message_id()
-	{
-		global $config, $request;
-
-		$domain = ($config['server_name']) ?: $request->server('SERVER_NAME', 'phpbb.generated');
-
-		return md5(unique_id()) . '@' . $domain;
-	}
-
-	/**
-	* Return email header
-	*/
-	function build_header($to, $cc, $bcc)
-	{
-		global $config, $phpbb_dispatcher;
-
-		// We could use keys here, but we won't do this for 3.0.x to retain backwards compatibility
-		$headers = array();
-
-		$headers[] = 'From: ' . $this->from;
-
-		if ($cc)
-		{
-			$headers[] = 'Cc: ' . $cc;
-		}
-
-		if ($bcc)
-		{
-			$headers[] = 'Bcc: ' . $bcc;
-		}
-
-		$headers[] = 'Reply-To: ' . $this->replyto;
-		$headers[] = 'Return-Path: <' . $config['board_email'] . '>';
-		$headers[] = 'Sender: <' . $config['board_email'] . '>';
-		$headers[] = 'MIME-Version: 1.0';
-		$headers[] = 'Message-ID: <' . $this->generate_message_id() . '>';
-		$headers[] = 'Date: ' . date('r', time());
-		$headers[] = 'Content-Type: text/plain; charset=UTF-8'; // format=flowed
-		$headers[] = 'Content-Transfer-Encoding: 8bit'; // 7bit
-
-		$headers[] = 'X-Priority: ' . $this->mail_priority;
-		$headers[] = 'X-MSMail-Priority: ' . (($this->mail_priority == MAIL_LOW_PRIORITY) ? 'Low' : (($this->mail_priority == MAIL_NORMAL_PRIORITY) ? 'Normal' : 'High'));
-		$headers[] = 'X-Mailer: phpBB3';
-		$headers[] = 'X-MimeOLE: phpBB3';
-		$headers[] = 'X-phpBB-Origin: phpbb://' . str_replace(array('http://', 'https://'), array('', ''), generate_board_url());
-
-		/**
-		* Event to modify email header entries
-		*
-		* @event core.modify_email_headers
-		* @var	array	headers	Array containing email header entries
-		* @since 3.1.11-RC1
-		*/
-		$vars = array('headers');
-		extract($phpbb_dispatcher->trigger_event('core.modify_email_headers', compact($vars)));
-
-		if (count($this->extra_headers))
-		{
-			$headers = array_merge($headers, $this->extra_headers);
-		}
-
-		return $headers;
-	}
-
-	/**
-	* Send out emails
-	*/
-	function msg_email()
-	{
-		global $config, $phpbb_dispatcher;
-
-		if (empty($config['email_enable']))
-		{
-			return false;
-		}
-
-		// Addresses to send to?
-		if (empty($this->addresses) || (empty($this->addresses['to']) && empty($this->addresses['cc']) && empty($this->addresses['bcc'])))
-		{
-			// Send was successful. ;)
-			return true;
-		}
-
-		$use_queue = false;
-		if ($config['email_package_size'] && $this->use_queue)
-		{
-			if (empty($this->queue))
-			{
-				$this->queue = new queue();
-				$this->queue->init('email', $config['email_package_size']);
-			}
-			$use_queue = true;
-		}
-
-		$contact_name = html_entity_decode($config['board_contact_name'], ENT_COMPAT);
-		$board_contact = (($contact_name !== '') ? '"' . mail_encode($contact_name) . '" ' : '') . '<' . $config['board_contact'] . '>';
-
-		$break = false;
-		$addresses = $this->addresses;
-		$subject = $this->subject;
-		$msg = $this->msg;
-		/**
-		* Event to send message via external transport
-		*
-		* @event core.notification_message_email
-		* @var	bool	break		Flag indicating if the function return after hook
-		* @var	array	addresses 	The message recipients
-		* @var	string	subject		The message subject
-		* @var	string	msg			The message text
-		* @since 3.2.4-RC1
-		*/
-		$vars = array(
-			'break',
-			'addresses',
-			'subject',
-			'msg',
-		);
-		extract($phpbb_dispatcher->trigger_event('core.notification_message_email', compact($vars)));
-
-		if ($break)
-		{
-			return true;
-		}
-
-		if (empty($this->replyto))
-		{
-			$this->replyto = $board_contact;
-		}
-
-		if (empty($this->from))
-		{
-			$this->from = $board_contact;
-		}
-
-		$encode_eol = $config['smtp_delivery'] || PHP_VERSION_ID >= 80000 ? "\r\n" : PHP_EOL;
-
-		// Build to, cc and bcc strings
-		$to = $cc = $bcc = '';
-		foreach ($this->addresses as $type => $address_ary)
-		{
-			if ($type == 'im')
-			{
-				continue;
-			}
-
-			foreach ($address_ary as $which_ary)
-			{
-				${$type} .= ((${$type} != '') ? ', ' : '') . (($which_ary['name'] != '') ? mail_encode($which_ary['name'], $encode_eol) . ' <' . $which_ary['email'] . '>' : $which_ary['email']);
-			}
-		}
-
-		// Build header
-		$headers = $this->build_header($to, $cc, $bcc);
-
-		// Send message ...
-		if (!$use_queue)
-		{
-			$mail_to = ($to == '') ? 'undisclosed-recipients:;' : $to;
-			$err_msg = '';
-
-			if ($config['smtp_delivery'])
-			{
-				$result = smtpmail($this->addresses, mail_encode($this->subject), wordwrap(utf8_wordwrap($this->msg), 997, "\n", true), $err_msg, $headers);
-			}
-			else
-			{
-				$result = phpbb_mail($mail_to, $this->subject, $this->msg, $headers, $encode_eol, $err_msg);
-			}
-
-			if (!$result)
-			{
-				$this->error('EMAIL', $err_msg);
-				return false;
-			}
-		}
-		else
-		{
-			$this->queue->put('email', array(
-				'to'			=> $to,
-				'addresses'		=> $this->addresses,
-				'subject'		=> $this->subject,
-				'msg'			=> $this->msg,
-				'headers'		=> $headers)
-			);
-		}
-
-		return true;
-	}
-
-	/**
-	* Send jabber message out
-	*/
-	function msg_jabber()
-	{
-		global $config, $user, $phpbb_root_path, $phpEx;
-
-		if (empty($config['jab_enable']) || empty($config['jab_host']) || empty($config['jab_username']) || empty($config['jab_password']))
-		{
-			return false;
-		}
-
-		if (empty($this->addresses['im']))
-		{
-			// Send was successful. ;)
-			return true;
-		}
-
-		$use_queue = false;
-		if ($config['jab_package_size'] && $this->use_queue)
-		{
-			if (empty($this->queue))
-			{
-				$this->queue = new queue();
-				$this->queue->init('jabber', $config['jab_package_size']);
-			}
-			$use_queue = true;
-		}
-
-		$addresses = array();
-		foreach ($this->addresses['im'] as $type => $uid_ary)
-		{
-			$addresses[] = $uid_ary['uid'];
-		}
-		$addresses = array_unique($addresses);
-
-		if (!$use_queue)
-		{
-			include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
-			$this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], html_entity_decode($config['jab_password'], ENT_COMPAT), $config['jab_use_ssl'], $config['jab_verify_peer'], $config['jab_verify_peer_name'], $config['jab_allow_self_signed']);
-
-			if (!$this->jabber->connect())
-			{
-				$this->error('JABBER', $user->lang['ERR_JAB_CONNECT'] . '<br />' . $this->jabber->get_log());
-				return false;
-			}
-
-			if (!$this->jabber->login())
-			{
-				$this->error('JABBER', $user->lang['ERR_JAB_AUTH'] . '<br />' . $this->jabber->get_log());
-				return false;
-			}
-
-			foreach ($addresses as $address)
-			{
-				$this->jabber->send_message($address, $this->msg, $this->subject);
-			}
-
-			$this->jabber->disconnect();
-		}
-		else
-		{
-			$this->queue->put('jabber', array(
-				'addresses'		=> $addresses,
-				'subject'		=> $this->subject,
-				'msg'			=> $this->msg)
-			);
-		}
-		unset($addresses);
-		return true;
-	}
-
-	/**
-	* Setup template engine
-	*/
-	protected function setup_template()
-	{
-		global $phpbb_container, $phpbb_dispatcher;
-
-		if ($this->template instanceof \phpbb\template\template)
-		{
-			return;
-		}
-
-		$template_environment = new \phpbb\template\twig\environment(
-			$phpbb_container->get('assets.bag'),
-			$phpbb_container->get('config'),
-			$phpbb_container->get('filesystem'),
-			$phpbb_container->get('path_helper'),
-			$phpbb_container->getParameter('core.template.cache_path'),
-			$phpbb_container->get('ext.manager'),
-			new \phpbb\template\twig\loader(),
-			$phpbb_dispatcher,
-			array()
-		);
-		$template_environment->setLexer($phpbb_container->get('template.twig.lexer'));
-
-		$this->template = new \phpbb\template\twig\twig(
-			$phpbb_container->get('path_helper'),
-			$phpbb_container->get('config'),
-			new \phpbb\template\context(),
-			$template_environment,
-			$phpbb_container->getParameter('core.template.cache_path'),
-			$phpbb_container->get('user'),
-			$phpbb_container->get('template.twig.extensions.collection'),
-			$phpbb_container->get('ext.manager')
-		);
-	}
-
-	/**
-	* Set template paths to load
-	*/
-	protected function set_template_paths($path_name, $paths)
-	{
-		$this->setup_template();
-
-		$this->template->set_custom_style($path_name, $paths);
-	}
-}
-
-/**
-* handling email and jabber queue
-*/
-class queue
-{
-	var $data = array();
-	var $queue_data = array();
-	var $package_size = 0;
-	var $cache_file = '';
-	var $eol = "\n";
-
-	/**
-	 * @var \phpbb\filesystem\filesystem_interface
-	 */
-	protected $filesystem;
-
-	/**
-	* constructor
-	*/
-	function __construct()
-	{
-		global $phpEx, $phpbb_root_path, $phpbb_filesystem, $phpbb_container;
-
-		$this->data = array();
-		$this->cache_file = $phpbb_container->getParameter('core.cache_dir') . "queue.$phpEx";
-		$this->filesystem = $phpbb_filesystem;
-	}
-
-	/**
-	* Init a queue object
-	*/
-	function init($object, $package_size)
-	{
-		$this->data[$object] = array();
-		$this->data[$object]['package_size'] = $package_size;
-		$this->data[$object]['data'] = array();
-	}
-
-	/**
-	* Put object in queue
-	*/
-	function put($object, $scope)
-	{
-		$this->data[$object]['data'][] = $scope;
-	}
-
-	/**
-	* Process queue
-	* Using lock file
-	*/
-	function process()
-	{
-		global $config, $phpEx, $phpbb_root_path, $user, $phpbb_dispatcher;
-
-		$lock = new \phpbb\lock\flock($this->cache_file);
-		$lock->acquire();
-
-		// avoid races, check file existence once
-		$have_cache_file = file_exists($this->cache_file);
-		if (!$have_cache_file || $config['last_queue_run'] > time() - $config['queue_interval'])
-		{
-			if (!$have_cache_file)
-			{
-				$config->set('last_queue_run', time(), false);
-			}
-
-			$lock->release();
-			return;
-		}
-
-		$config->set('last_queue_run', time(), false);
-
-		include($this->cache_file);
-
-		foreach ($this->queue_data as $object => $data_ary)
-		{
-			@set_time_limit(0);
-
-			if (!isset($data_ary['package_size']))
-			{
-				$data_ary['package_size'] = 0;
-			}
-
-			$package_size = $data_ary['package_size'];
-			$num_items = (!$package_size || count($data_ary['data']) < $package_size) ? count($data_ary['data']) : $package_size;
-
-			/*
-			* This code is commented out because it causes problems on some web hosts.
-			* The core problem is rather restrictive email sending limits.
-			* This code is nly useful if you have no such restrictions from the
-			* web host and the package size setting is wrong.
-
-			// If the amount of emails to be sent is way more than package_size than we need to increase it to prevent backlogs...
-			if (count($data_ary['data']) > $package_size * 2.5)
-			{
-				$num_items = count($data_ary['data']);
-			}
-			*/
-
-			switch ($object)
-			{
-				case 'email':
-					// Delete the email queued objects if mailing is disabled
-					if (!$config['email_enable'])
-					{
-						unset($this->queue_data['email']);
-						continue 2;
-					}
-				break;
-
-				case 'jabber':
-					if (!$config['jab_enable'])
-					{
-						unset($this->queue_data['jabber']);
-						continue 2;
-					}
-
-					include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
-					$this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], html_entity_decode($config['jab_password'], ENT_COMPAT), $config['jab_use_ssl'], $config['jab_verify_peer'], $config['jab_verify_peer_name'], $config['jab_allow_self_signed']);
-
-					if (!$this->jabber->connect())
-					{
-						$messenger = new messenger();
-						$messenger->error('JABBER', $user->lang['ERR_JAB_CONNECT']);
-						continue 2;
-					}
-
-					if (!$this->jabber->login())
-					{
-						$messenger = new messenger();
-						$messenger->error('JABBER', $user->lang['ERR_JAB_AUTH']);
-						continue 2;
-					}
-
-				break;
-
-				default:
-					$lock->release();
-					return;
-			}
-
-			for ($i = 0; $i < $num_items; $i++)
-			{
-				// Make variables available...
-				extract(array_shift($this->queue_data[$object]['data']));
-
-				switch ($object)
-				{
-					case 'email':
-						$break = false;
-						/**
-						* Event to send message via external transport
-						*
-						* @event core.notification_message_process
-						* @var	bool	break		Flag indicating if the function return after hook
-						* @var	array	addresses 	The message recipients
-						* @var	string	subject		The message subject
-						* @var	string	msg			The message text
-						* @since 3.2.4-RC1
-						*/
-						$vars = array(
-							'break',
-							'addresses',
-							'subject',
-							'msg',
-						);
-						extract($phpbb_dispatcher->trigger_event('core.notification_message_process', compact($vars)));
-
-						if (!$break)
-						{
-							$err_msg = '';
-							$to = (!$to) ? 'undisclosed-recipients:;' : $to;
-
-							if ($config['smtp_delivery'])
-							{
-								$result = smtpmail($addresses, mail_encode($subject), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $err_msg, $headers);
-							}
-							else
-							{
-								$encode_eol = $config['smtp_delivery'] || PHP_VERSION_ID >= 80000 ? "\r\n" : PHP_EOL;
-								$result = phpbb_mail($to, $subject, $msg, $headers, $encode_eol, $err_msg);
-							}
-
-							if (!$result)
-							{
-								$messenger = new messenger();
-								$messenger->error('EMAIL', $err_msg);
-								continue 2;
-							}
-						}
-					break;
-
-					case 'jabber':
-						foreach ($addresses as $address)
-						{
-							if ($this->jabber->send_message($address, $msg, $subject) === false)
-							{
-								$messenger = new messenger();
-								$messenger->error('JABBER', $this->jabber->get_log());
-								continue 3;
-							}
-						}
-					break;
-				}
-			}
-
-			// No more data for this object? Unset it
-			if (!count($this->queue_data[$object]['data']))
-			{
-				unset($this->queue_data[$object]);
-			}
-
-			// Post-object processing
-			switch ($object)
-			{
-				case 'jabber':
-					// Hang about a couple of secs to ensure the messages are
-					// handled, then disconnect
-					$this->jabber->disconnect();
-				break;
-			}
-		}
-
-		if (!count($this->queue_data))
-		{
-			@unlink($this->cache_file);
-		}
-		else
-		{
-			if ($fp = @fopen($this->cache_file, 'wb'))
-			{
-				fwrite($fp, "<?php\nif (!defined('IN_PHPBB')) exit;\n\$this->queue_data = unserialize(" . var_export(serialize($this->queue_data), true) . ");\n\n?>");
-				fclose($fp);
-
-				if (function_exists('opcache_invalidate'))
-				{
-					@opcache_invalidate($this->cache_file);
-				}
-
-				try
-				{
-					$this->filesystem->phpbb_chmod($this->cache_file, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
-				}
-				catch (\phpbb\filesystem\exception\filesystem_exception $e)
-				{
-					// Do nothing
-				}
-			}
-		}
-
-		$lock->release();
-	}
-
-	/**
-	* Save queue
-	*/
-	function save()
-	{
-		if (!count($this->data))
-		{
-			return;
-		}
-
-		$lock = new \phpbb\lock\flock($this->cache_file);
-		$lock->acquire();
-
-		if (file_exists($this->cache_file))
-		{
-			include($this->cache_file);
-
-			foreach ($this->queue_data as $object => $data_ary)
-			{
-				if (isset($this->data[$object]) && count($this->data[$object]))
-				{
-					$this->data[$object]['data'] = array_merge($data_ary['data'], $this->data[$object]['data']);
-				}
-				else
-				{
-					$this->data[$object]['data'] = $data_ary['data'];
-				}
-			}
-		}
-
-		if ($fp = @fopen($this->cache_file, 'w'))
-		{
-			fwrite($fp, "<?php\nif (!defined('IN_PHPBB')) exit;\n\$this->queue_data = unserialize(" . var_export(serialize($this->data), true) . ");\n\n?>");
-			fclose($fp);
-
-			if (function_exists('opcache_invalidate'))
-			{
-				@opcache_invalidate($this->cache_file);
-			}
-
-			try
-			{
-				$this->filesystem->phpbb_chmod($this->cache_file, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
-			}
-			catch (\phpbb\filesystem\exception\filesystem_exception $e)
-			{
-				// Do nothing
-			}
-
-			$this->data = array();
-		}
-
-		$lock->release();
-	}
-}
-
-/**
-* Replacement or substitute for PHP's mail command
-*/
-function smtpmail($addresses, $subject, $message, &$err_msg, $headers = false)
-{
-	global $config, $user;
-
-	// Fix any bare linefeeds in the message to make it RFC821 Compliant.
-	$message = preg_replace("#(?<!\r)\n#si", "\r\n", $message);
-
-	if ($headers !== false)
-	{
-		if (!is_array($headers))
-		{
-			// Make sure there are no bare linefeeds in the headers
-			$headers = preg_replace('#(?<!\r)\n#si', "\n", $headers);
-			$headers = explode("\n", $headers);
-		}
-
-		// Ok this is rather confusing all things considered,
-		// but we have to grab bcc and cc headers and treat them differently
-		// Something we really didn't take into consideration originally
-		$headers_used = array();
-
-		foreach ($headers as $header)
-		{
-			if (strpos(strtolower($header), 'cc:') === 0 || strpos(strtolower($header), 'bcc:') === 0)
-			{
-				continue;
-			}
-			$headers_used[] = trim($header);
-		}
-
-		$headers = chop(implode("\r\n", $headers_used));
-	}
-
-	if (trim($subject) == '')
-	{
-		$err_msg = (isset($user->lang['NO_EMAIL_SUBJECT'])) ? $user->lang['NO_EMAIL_SUBJECT'] : 'No email subject specified';
-		return false;
-	}
-
-	if (trim($message) == '')
-	{
-		$err_msg = (isset($user->lang['NO_EMAIL_MESSAGE'])) ? $user->lang['NO_EMAIL_MESSAGE'] : 'Email message was blank';
-		return false;
-	}
-
-	$mail_rcpt = $mail_to = $mail_cc = array();
-
-	// Build correct addresses for RCPT TO command and the client side display (TO, CC)
-	if (isset($addresses['to']) && count($addresses['to']))
-	{
-		foreach ($addresses['to'] as $which_ary)
-		{
-			$mail_to[] = ($which_ary['name'] != '') ? mail_encode(trim($which_ary['name'])) . ' <' . trim($which_ary['email']) . '>' : '<' . trim($which_ary['email']) . '>';
-			$mail_rcpt['to'][] = '<' . trim($which_ary['email']) . '>';
-		}
-	}
-
-	if (isset($addresses['bcc']) && count($addresses['bcc']))
-	{
-		foreach ($addresses['bcc'] as $which_ary)
-		{
-			$mail_rcpt['bcc'][] = '<' . trim($which_ary['email']) . '>';
-		}
-	}
-
-	if (isset($addresses['cc']) && count($addresses['cc']))
-	{
-		foreach ($addresses['cc'] as $which_ary)
-		{
-			$mail_cc[] = ($which_ary['name'] != '') ? mail_encode(trim($which_ary['name'])) . ' <' . trim($which_ary['email']) . '>' : '<' . trim($which_ary['email']) . '>';
-			$mail_rcpt['cc'][] = '<' . trim($which_ary['email']) . '>';
-		}
-	}
-
-	$smtp = new smtp_class();
-
-	$errno = 0;
-	$errstr = '';
-
-	$smtp->add_backtrace('Connecting to ' . $config['smtp_host'] . ':' . $config['smtp_port']);
-
-	// Ok we have error checked as much as we can to this point let's get on it already.
-	if (!class_exists('\phpbb\error_collector'))
-	{
-		global $phpbb_root_path, $phpEx;
-		include($phpbb_root_path . 'includes/error_collector.' . $phpEx);
-	}
-	$collector = new \phpbb\error_collector;
-	$collector->install();
-
-	$options = array();
-	$verify_peer = (bool) $config['smtp_verify_peer'];
-	$verify_peer_name = (bool) $config['smtp_verify_peer_name'];
-	$allow_self_signed = (bool) $config['smtp_allow_self_signed'];
-	$remote_socket = $config['smtp_host'] . ':' . $config['smtp_port'];
-
-	// Set ssl context options, see http://php.net/manual/en/context.ssl.php
-	$options['ssl'] = array('verify_peer' => $verify_peer, 'verify_peer_name' => $verify_peer_name, 'allow_self_signed' => $allow_self_signed);
-	$socket_context = stream_context_create($options);
-
-	$smtp->socket = @stream_socket_client($remote_socket, $errno, $errstr, 20, STREAM_CLIENT_CONNECT, $socket_context);
-	$collector->uninstall();
-	$error_contents = $collector->format_errors();
-
-	if (!$smtp->socket)
-	{
-		if ($errstr)
-		{
-			$errstr = utf8_convert_message($errstr);
-		}
-
-		$err_msg = (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr";
-		$err_msg .= ($error_contents) ? '<br /><br />' . htmlspecialchars($error_contents, ENT_COMPAT) : '';
-		return false;
-	}
-
-	// Wait for reply
-	if ($err_msg = $smtp->server_parse('220', __LINE__))
-	{
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// Let me in. This function handles the complete authentication process
-	if ($err_msg = $smtp->log_into_server($config['smtp_host'], $config['smtp_username'], html_entity_decode($config['smtp_password'], ENT_COMPAT), $config['smtp_auth_method']))
-	{
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// From this point onward most server response codes should be 250
-	// Specify who the mail is from....
-	$smtp->server_send('MAIL FROM:<' . $config['board_email'] . '>');
-	if ($err_msg = $smtp->server_parse('250', __LINE__))
-	{
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// Specify each user to send to and build to header.
-	$to_header = implode(', ', $mail_to);
-	$cc_header = implode(', ', $mail_cc);
-
-	// Now tell the MTA to send the Message to the following people... [TO, BCC, CC]
-	$rcpt = false;
-	foreach ($mail_rcpt as $type => $mail_to_addresses)
-	{
-		foreach ($mail_to_addresses as $mail_to_address)
-		{
-			// Add an additional bit of error checking to the To field.
-			if (preg_match('#[^ ]+\@[^ ]+#', $mail_to_address))
-			{
-				$smtp->server_send("RCPT TO:$mail_to_address");
-				if ($err_msg = $smtp->server_parse('250', __LINE__))
-				{
-					// We continue... if users are not resolved we do not care
-					if ($smtp->numeric_response_code != 550)
-					{
-						$smtp->close_session($err_msg);
-						return false;
-					}
-				}
-				else
-				{
-					$rcpt = true;
-				}
-			}
-		}
-	}
-
-	// We try to send messages even if a few people do not seem to have valid email addresses, but if no one has, we have to exit here.
-	if (!$rcpt)
-	{
-		$user->session_begin();
-		$err_msg .= '<br /><br />';
-		$err_msg .= (isset($user->lang['INVALID_EMAIL_LOG'])) ? sprintf($user->lang['INVALID_EMAIL_LOG'], htmlspecialchars($mail_to_address, ENT_COMPAT)) : '<strong>' . htmlspecialchars($mail_to_address, ENT_COMPAT) . '</strong> possibly an invalid email address?';
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// Ok now we tell the server we are ready to start sending data
-	$smtp->server_send('DATA');
-
-	// This is the last response code we look for until the end of the message.
-	if ($err_msg = $smtp->server_parse('354', __LINE__))
-	{
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// Send the Subject Line...
-	$smtp->server_send("Subject: $subject");
-
-	// Now the To Header.
-	$to_header = ($to_header == '') ? 'undisclosed-recipients:;' : $to_header;
-	$smtp->server_send("To: $to_header");
-
-	// Now the CC Header.
-	if ($cc_header != '')
-	{
-		$smtp->server_send("CC: $cc_header");
-	}
-
-	// Now any custom headers....
-	if ($headers !== false)
-	{
-		$smtp->server_send("$headers\r\n");
-	}
-
-	// Ok now we are ready for the message...
-	$smtp->server_send($message);
-
-	// Ok the all the ingredients are mixed in let's cook this puppy...
-	$smtp->server_send('.');
-	if ($err_msg = $smtp->server_parse('250', __LINE__))
-	{
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// Now tell the server we are done and close the socket...
-	$smtp->server_send('QUIT');
-	$smtp->close_session($err_msg);
-
-	return true;
-}
-
-/**
-* SMTP Class
-* Auth Mechanisms originally taken from the AUTH Modules found within the PHP Extension and Application Repository (PEAR)
-* See docs/AUTHORS for more details
-*/
-class smtp_class
-{
-	var $server_response = '';
-	var $socket = 0;
-	protected $socket_tls = false;
-	var $responses = array();
-	var $commands = array();
-	var $numeric_response_code = 0;
-
-	var $backtrace = false;
-	var $backtrace_log = array();
-
-	function __construct()
-	{
-		// Always create a backtrace for admins to identify SMTP problems
-		$this->backtrace = true;
-		$this->backtrace_log = array();
-	}
-
-	/**
-	* Add backtrace message for debugging
-	*/
-	function add_backtrace($message)
-	{
-		if ($this->backtrace)
-		{
-			$this->backtrace_log[] = utf8_htmlspecialchars($message, ENT_COMPAT);
-		}
-	}
-
-	/**
-	* Send command to smtp server
-	*/
-	function server_send($command, $private_info = false)
-	{
-		fputs($this->socket, $command . "\r\n");
-
-		(!$private_info) ? $this->add_backtrace("# $command") : $this->add_backtrace('# Omitting sensitive information');
-
-		// We could put additional code here
-	}
-
-	/**
-	* We use the line to give the support people an indication at which command the error occurred
-	*/
-	function server_parse($response, $line)
-	{
-		global $user;
-
-		$this->server_response = '';
-		$this->responses = array();
-		$this->numeric_response_code = 0;
-
-		while (substr($this->server_response, 3, 1) != ' ')
-		{
-			if (!($this->server_response = fgets($this->socket, 256)))
-			{
-				return (isset($user->lang['NO_EMAIL_RESPONSE_CODE'])) ? $user->lang['NO_EMAIL_RESPONSE_CODE'] : 'Could not get mail server response codes';
-			}
-			$this->responses[] = substr(rtrim($this->server_response), 4);
-			$this->numeric_response_code = (int) substr($this->server_response, 0, 3);
-
-			$this->add_backtrace("LINE: $line <- {$this->server_response}");
-		}
-
-		if (!(substr($this->server_response, 0, 3) == $response))
-		{
-			$this->numeric_response_code = (int) substr($this->server_response, 0, 3);
-			return (isset($user->lang['EMAIL_SMTP_ERROR_RESPONSE'])) ? sprintf($user->lang['EMAIL_SMTP_ERROR_RESPONSE'], $line, $this->server_response) : "Ran into problems sending Mail at <strong>Line $line</strong>. Response: $this->server_response";
-		}
-
-		return 0;
-	}
-
-	/**
-	* Close session
-	*/
-	function close_session(&$err_msg)
-	{
-		fclose($this->socket);
-
-		if ($this->backtrace)
-		{
-			$message = '<h1>Backtrace</h1><p>' . implode('<br />', $this->backtrace_log) . '</p>';
-			$err_msg .= $message;
-		}
-	}
-
-	/**
-	* Log into server and get possible auth codes if neccessary
-	*/
-	function log_into_server($hostname, $username, $password, $default_auth_method)
-	{
-		global $user;
-
-		// Here we try to determine the *real* hostname (reverse DNS entry preferrably)
-		$local_host = $user->host;
-
-		if (function_exists('php_uname'))
-		{
-			$local_host = php_uname('n');
-
-			// Able to resolve name to IP
-			if (($addr = @gethostbyname($local_host)) !== $local_host)
-			{
-				// Able to resolve IP back to name
-				if (($name = @gethostbyaddr($addr)) !== $addr)
-				{
-					$local_host = $name;
-				}
-			}
-		}
-
-		// If we are authenticating through pop-before-smtp, we
-		// have to login ones before we get authenticated
-		// NOTE: on some configurations the time between an update of the auth database takes so
-		// long that the first email send does not work. This is not a biggie on a live board (only
-		// the install mail will most likely fail) - but on a dynamic ip connection this might produce
-		// severe problems and is not fixable!
-		if ($default_auth_method == 'POP-BEFORE-SMTP' && $username && $password)
-		{
-			global $config;
-
-			$errno = 0;
-			$errstr = '';
-
-			$this->server_send("QUIT");
-			fclose($this->socket);
-
-			$this->pop_before_smtp($hostname, $username, $password);
-			$username = $password = $default_auth_method = '';
-
-			// We need to close the previous session, else the server is not
-			// able to get our ip for matching...
-			if (!$this->socket = @fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 10))
-			{
-				if ($errstr)
-				{
-					$errstr = utf8_convert_message($errstr);
-				}
-
-				$err_msg = (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr";
-				return $err_msg;
-			}
-
-			// Wait for reply
-			if ($err_msg = $this->server_parse('220', __LINE__))
-			{
-				$this->close_session($err_msg);
-				return $err_msg;
-			}
-		}
-
-		$hello_result = $this->hello($local_host);
-		if (!is_null($hello_result))
-		{
-			return $hello_result;
-		}
-
-		// SMTP STARTTLS (RFC 3207)
-		if (!$this->socket_tls)
-		{
-			$this->socket_tls = $this->starttls();
-
-			if ($this->socket_tls)
-			{
-				// Switched to TLS
-				// RFC 3207: "The client MUST discard any knowledge obtained from the server, [...]"
-				// So say hello again
-				$hello_result = $this->hello($local_host);
-
-				if (!is_null($hello_result))
-				{
-					return $hello_result;
-				}
-			}
-		}
-
-		// If we are not authenticated yet, something might be wrong if no username and passwd passed
-		if (!$username || !$password)
-		{
-			return false;
-		}
-
-		if (!isset($this->commands['AUTH']))
-		{
-			return (isset($user->lang['SMTP_NO_AUTH_SUPPORT'])) ? $user->lang['SMTP_NO_AUTH_SUPPORT'] : 'SMTP server does not support authentication';
-		}
-
-		// Get best authentication method
-		$available_methods = explode(' ', $this->commands['AUTH']);
-
-		// Define the auth ordering if the default auth method was not found
-		$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5');
-		$method = '';
-
-		if (in_array($default_auth_method, $available_methods))
-		{
-			$method = $default_auth_method;
-		}
-		else
-		{
-			foreach ($auth_methods as $_method)
-			{
-				if (in_array($_method, $available_methods))
-				{
-					$method = $_method;
-					break;
-				}
-			}
-		}
-
-		if (!$method)
-		{
-			return (isset($user->lang['NO_SUPPORTED_AUTH_METHODS'])) ? $user->lang['NO_SUPPORTED_AUTH_METHODS'] : 'No supported authentication methods';
-		}
-
-		$method = strtolower(str_replace('-', '_', $method));
-		return $this->$method($username, $password);
-	}
-
-	/**
-	* SMTP EHLO/HELO
-	*
-	* @return mixed		Null if the authentication process is supposed to continue
-	*					False if already authenticated
-	*					Error message (string) otherwise
-	*/
-	protected function hello($hostname)
-	{
-		// Try EHLO first
-		$this->server_send("EHLO $hostname");
-		if ($err_msg = $this->server_parse('250', __LINE__))
-		{
-			// a 503 response code means that we're already authenticated
-			if ($this->numeric_response_code == 503)
-			{
-				return false;
-			}
-
-			// If EHLO fails, we try HELO
-			$this->server_send("HELO $hostname");
-			if ($err_msg = $this->server_parse('250', __LINE__))
-			{
-				return ($this->numeric_response_code == 503) ? false : $err_msg;
-			}
-		}
-
-		foreach ($this->responses as $response)
-		{
-			$response = explode(' ', $response);
-			$response_code = $response[0];
-			unset($response[0]);
-			$this->commands[$response_code] = implode(' ', $response);
-		}
-
-		return null;
-	}
-
-	/**
-	* SMTP STARTTLS (RFC 3207)
-	*
-	* @return bool		Returns true if TLS was started
-	*					Otherwise false
-	*/
-	protected function starttls()
-	{
-		global $config;
-
-		// allow SMTPS (what was used by phpBB 3.0) if hostname is prefixed with tls:// or ssl://
-		if (strpos($config['smtp_host'], 'tls://') === 0 || strpos($config['smtp_host'], 'ssl://') === 0)
-		{
-			return true;
-		}
-
-		if (!function_exists('stream_socket_enable_crypto'))
-		{
-			return false;
-		}
-
-		if (!isset($this->commands['STARTTLS']))
-		{
-			return false;
-		}
-
-		$this->server_send('STARTTLS');
-
-		if ($err_msg = $this->server_parse('220', __LINE__))
-		{
-			return false;
-		}
-
-		$result = false;
-		$stream_meta = stream_get_meta_data($this->socket);
-
-		if (socket_set_blocking($this->socket, 1))
-		{
-			// https://secure.php.net/manual/en/function.stream-socket-enable-crypto.php#119122
-			$crypto = (phpbb_version_compare(PHP_VERSION, '5.6.7', '<')) ? STREAM_CRYPTO_METHOD_TLS_CLIENT : STREAM_CRYPTO_METHOD_SSLv23_CLIENT;
-			$result = stream_socket_enable_crypto($this->socket, true, $crypto);
-			socket_set_blocking($this->socket, (int) $stream_meta['blocked']);
-		}
-
-		return $result;
-	}
-
-	/**
-	* Pop before smtp authentication
-	*/
-	function pop_before_smtp($hostname, $username, $password)
-	{
-		global $user;
-
-		if (!$this->socket = @fsockopen($hostname, 110, $errno, $errstr, 10))
-		{
-			if ($errstr)
-			{
-				$errstr = utf8_convert_message($errstr);
-			}
-
-			return (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr";
-		}
-
-		$this->server_send("USER $username", true);
-		if ($err_msg = $this->server_parse('+OK', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		$this->server_send("PASS $password", true);
-		if ($err_msg = $this->server_parse('+OK', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		$this->server_send('QUIT');
-		fclose($this->socket);
-
-		return false;
-	}
-
-	/**
-	* Plain authentication method
-	*/
-	function plain($username, $password)
-	{
-		$this->server_send('AUTH PLAIN');
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return ($this->numeric_response_code == 503) ? false : $err_msg;
-		}
-
-		$base64_method_plain = base64_encode("\0" . $username . "\0" . $password);
-		$this->server_send($base64_method_plain, true);
-		if ($err_msg = $this->server_parse('235', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		return false;
-	}
-
-	/**
-	* Login authentication method
-	*/
-	function login($username, $password)
-	{
-		$this->server_send('AUTH LOGIN');
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return ($this->numeric_response_code == 503) ? false : $err_msg;
-		}
-
-		$this->server_send(base64_encode($username), true);
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		$this->server_send(base64_encode($password), true);
-		if ($err_msg = $this->server_parse('235', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		return false;
-	}
-
-	/**
-	* cram_md5 authentication method
-	*/
-	function cram_md5($username, $password)
-	{
-		$this->server_send('AUTH CRAM-MD5');
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return ($this->numeric_response_code == 503) ? false : $err_msg;
-		}
-
-		$md5_challenge = base64_decode($this->responses[0]);
-		$password = (strlen($password) > 64) ? pack('H32', md5($password)) : ((strlen($password) < 64) ? str_pad($password, 64, chr(0)) : $password);
-		$md5_digest = md5((substr($password, 0, 64) ^ str_repeat(chr(0x5C), 64)) . (pack('H32', md5((substr($password, 0, 64) ^ str_repeat(chr(0x36), 64)) . $md5_challenge))));
-
-		$base64_method_cram_md5 = base64_encode($username . ' ' . $md5_digest);
-
-		$this->server_send($base64_method_cram_md5, true);
-		if ($err_msg = $this->server_parse('235', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		return false;
-	}
-
-	/**
-	* digest_md5 authentication method
-	* A real pain in the ***
-	*/
-	function digest_md5($username, $password)
-	{
-		global $config, $user;
-
-		$this->server_send('AUTH DIGEST-MD5');
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return ($this->numeric_response_code == 503) ? false : $err_msg;
-		}
-
-		$md5_challenge = base64_decode($this->responses[0]);
-
-		// Parse the md5 challenge - from AUTH_SASL (PEAR)
-		$tokens = array();
-		while (preg_match('/^([a-z-]+)=("[^"]+(?<!\\\)"|[^,]+)/i', $md5_challenge, $matches))
-		{
-			// Ignore these as per rfc2831
-			if ($matches[1] == 'opaque' || $matches[1] == 'domain')
-			{
-				$md5_challenge = substr($md5_challenge, strlen($matches[0]) + 1);
-				continue;
-			}
-
-			// Allowed multiple "realm" and "auth-param"
-			if (!empty($tokens[$matches[1]]) && ($matches[1] == 'realm' || $matches[1] == 'auth-param'))
-			{
-				if (is_array($tokens[$matches[1]]))
-				{
-					$tokens[$matches[1]][] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
-				}
-				else
-				{
-					$tokens[$matches[1]] = array($tokens[$matches[1]], preg_replace('/^"(.*)"$/', '\\1', $matches[2]));
-				}
-			}
-			else if (!empty($tokens[$matches[1]])) // Any other multiple instance = failure
-			{
-				$tokens = array();
-				break;
-			}
-			else
-			{
-				$tokens[$matches[1]] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
-			}
-
-			// Remove the just parsed directive from the challenge
-			$md5_challenge = substr($md5_challenge, strlen($matches[0]) + 1);
-		}
-
-		// Realm
-		if (empty($tokens['realm']))
-		{
-			$tokens['realm'] = (function_exists('php_uname')) ? php_uname('n') : $user->host;
-		}
-
-		// Maxbuf
-		if (empty($tokens['maxbuf']))
-		{
-			$tokens['maxbuf'] = 65536;
-		}
-
-		// Required: nonce, algorithm
-		if (empty($tokens['nonce']) || empty($tokens['algorithm']))
-		{
-			$tokens = array();
-		}
-		$md5_challenge = $tokens;
-
-		if (!empty($md5_challenge))
-		{
-			$str = '';
-			for ($i = 0; $i < 32; $i++)
-			{
-				$str .= chr(mt_rand(0, 255));
-			}
-			$cnonce = base64_encode($str);
-
-			$digest_uri = 'smtp/' . $config['smtp_host'];
-
-			$auth_1 = sprintf('%s:%s:%s', pack('H32', md5(sprintf('%s:%s:%s', $username, $md5_challenge['realm'], $password))), $md5_challenge['nonce'], $cnonce);
-			$auth_2 = 'AUTHENTICATE:' . $digest_uri;
-			$response_value = md5(sprintf('%s:%s:00000001:%s:auth:%s', md5($auth_1), $md5_challenge['nonce'], $cnonce, md5($auth_2)));
-
-			$input_string = sprintf('username="%s",realm="%s",nonce="%s",cnonce="%s",nc="00000001",qop=auth,digest-uri="%s",response=%s,%d', $username, $md5_challenge['realm'], $md5_challenge['nonce'], $cnonce, $digest_uri, $response_value, $md5_challenge['maxbuf']);
-		}
-		else
-		{
-			return (isset($user->lang['INVALID_DIGEST_CHALLENGE'])) ? $user->lang['INVALID_DIGEST_CHALLENGE'] : 'Invalid digest challenge';
-		}
-
-		$base64_method_digest_md5 = base64_encode($input_string);
-		$this->server_send($base64_method_digest_md5, true);
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		$this->server_send(' ');
-		if ($err_msg = $this->server_parse('235', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		return false;
-	}
-}
-
-/**
- * Encodes the given string for proper display in UTF-8 or US-ASCII.
- *
- * This version is based on iconv_mime_encode() implementation
- * from symfomy/polyfill-iconv
- * https://github.com/symfony/polyfill-iconv/blob/fd324208ec59a39ebe776e6e9ec5540ad4f40aaa/Iconv.php#L355
- *
- * @param string $str
- * @param string $eol Lines delimiter (optional to be backwards compatible)
- *
- * @return string
- */
-function mail_encode($str, $eol = "\r\n")
-{
-	// Check if string contains ASCII only characters
-	$is_ascii = strlen($str) === utf8_strlen($str);
-
-	$scheme = $is_ascii ? 'Q' : 'B';
-
-	// Define start delimiter, end delimiter
-	// Use the Quoted-Printable encoding for ASCII strings to avoid unnecessary encoding in Base64
-	$start = '=?' . ($is_ascii ? 'US-ASCII' : 'UTF-8') . '?' . $scheme . '?';
-	$end = '?=';
-
-	// Maximum encoded-word length is 75 as per RFC 2047 section 2.
-	// $split_length *must* be a multiple of 4, but <= 75 - strlen($start . $eol . $end)!!!
-	$split_length = 75 - strlen($start . $eol . $end);
-	$split_length = $split_length - $split_length % 4;
-
-	$line_length = strlen($start) + strlen($end);
-	$line_offset = strlen($start) + 1;
-	$line_data = '';
-
-	$is_quoted_printable = 'Q' === $scheme;
-
-	preg_match_all('/./us', $str, $chars);
-	$chars = $chars[0] ?? [];
-
-	$str = [];
-	foreach ($chars as $char)
-	{
-		$encoded_char = $is_quoted_printable
-			? $char = preg_replace_callback(
-				'/[()<>@,;:\\\\".\[\]=_?\x20\x00-\x1F\x80-\xFF]/',
-				function ($matches)
-				{
-					$hex = dechex(ord($matches[0]));
-					$hex = strlen($hex) == 1 ? "0$hex" : $hex;
-					return '=' . strtoupper($hex);
-				},
-				$char
-			)
-			: base64_encode($line_data . $char);
-
-		if (isset($encoded_char[$split_length - $line_length]))
-		{
-			if (!$is_quoted_printable)
-			{
-				$line_data = base64_encode($line_data);
-			}
-			$str[] = $start . $line_data . $end;
-			$line_length = $line_offset;
-			$line_data = '';
-		}
-
-		$line_data .= $char;
-		$is_quoted_printable && $line_length += strlen($char);
-	}
-
-	if ($line_data !== '')
-	{
-		if (!$is_quoted_printable)
-		{
-			$line_data = base64_encode($line_data);
-		}
-		$str[] = $start . $line_data . $end;
-	}
-
-	return implode($eol . ' ', $str);
-}
-
-/**
- * Wrapper for sending out emails with the PHP's mail function
- */
-function phpbb_mail($to, $subject, $msg, $headers, $eol, &$err_msg)
-{
-	global $config, $phpbb_root_path, $phpEx, $phpbb_dispatcher;
-
-	// Convert Numeric Character References to UTF-8 chars (ie. Emojis)
-	$subject = utf8_decode_ncr($subject);
-	$msg = utf8_decode_ncr($msg);
-
-	/**
-	 * We use the EOL character for the OS here because the PHP mail function does not correctly transform line endings.
-	 * On Windows SMTP is used (SMTP is \r\n), on UNIX a command is used...
-	 * Reference: http://bugs.php.net/bug.php?id=15841
-	 */
-	$headers = implode($eol, $headers);
-
-	if (!class_exists('\phpbb\error_collector'))
-	{
-		include($phpbb_root_path . 'includes/error_collector.' . $phpEx);
-	}
-
-	$collector = new \phpbb\error_collector;
-	$collector->install();
-
-	/**
-	 * On some PHP Versions mail() *may* fail if there are newlines within the subject.
-	 * Newlines are used as a delimiter for lines in mail_encode() according to RFC 2045 section 6.8.
-	 * Because PHP can't decide what is wanted we revert back to the non-RFC-compliant way of separating by one space
-	 * (Use '' as parameter to mail_encode() results in SPACE used)
-	 */
-	$additional_parameters = $config['email_force_sender'] ? '-f' . $config['board_email'] : '';
-
-	/**
-	 * Modify data before sending out emails with PHP's mail function
-	 *
-	 * @event core.phpbb_mail_before
-	 * @var	string	to						The message recipient
-	 * @var	string	subject					The message subject
-	 * @var	string	msg						The message text
-	 * @var string	headers					The email headers
-	 * @var string	eol						The endline character
-	 * @var string	additional_parameters	The additional parameters
-	 * @since 3.3.6-RC1
-	 */
-	$vars = [
-		'to',
-		'subject',
-		'msg',
-		'headers',
-		'eol',
-		'additional_parameters',
-	];
-	extract($phpbb_dispatcher->trigger_event('core.phpbb_mail_before', compact($vars)));
-
-	$result = mail($to, mail_encode($subject, ''), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers, $additional_parameters);
-
-	/**
-	 * Execute code after sending out emails with PHP's mail function
-	 *
-	 * @event core.phpbb_mail_after
-	 * @var	string	to						The message recipient
-	 * @var	string	subject					The message subject
-	 * @var	string	msg						The message text
-	 * @var string	headers					The email headers
-	 * @var string	eol						The endline character
-	 * @var string	additional_parameters	The additional parameters
-	 * @var bool	result					True if the email was sent, false otherwise
-	 * @since 3.3.6-RC1
-	 */
-	$vars = [
-		'to',
-		'subject',
-		'msg',
-		'headers',
-		'eol',
-		'additional_parameters',
-		'result',
-	];
-	extract($phpbb_dispatcher->trigger_event('core.phpbb_mail_after', compact($vars)));
-
-	$collector->uninstall();
-	$err_msg = $collector->format_errors();
-
-	return $result;
-}
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index ae4e77e16a6..55e08ec03df 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -468,9 +468,9 @@ static function module_auth($module_auth, $forum_id)
 		);
 
 		$is_auth = false;
-		// @codingStandardsIgnoreStart
+		// phpcs:disable Squiz.PHP.Eval
 		eval('$is_auth = (int) (' .	$module_auth . ');');
-		// @codingStandardsIgnoreEnd
+		// phpcs:enable Squiz.PHP.Eval
 
 		return $is_auth;
 	}
@@ -480,7 +480,7 @@ static function module_auth($module_auth, $forum_id)
 	*/
 	function set_active($id = false, $mode = false)
 	{
-		global $request;
+		global $auth, $request, $user;
 
 		$icat = false;
 		$this->active_module = false;
@@ -502,6 +502,14 @@ function set_active($id = false, $mode = false)
 			$id = $this->p_class . '_' . $id;
 		}
 
+		// Fallback to acp main page for special test permission mode
+		if ($this->p_class === 'acp' && $user->data['user_perm_from'] && $auth->acl_get('a_switchperm'))
+		{
+			$id = '';
+			$mode = '';
+			$icat = false;
+		}
+
 		$category = false;
 		foreach ($this->module_ary as $row_id => $item_ary)
 		{
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index f6428b974f8..9559c10cfd0 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -763,8 +763,6 @@ function create_thumbnail($source, $destination, $mimetype)
 					imagewebp($new_image, $destination);
 				break;
 			}
-
-			imagedestroy($new_image);
 		}
 		else
 		{
@@ -2381,7 +2379,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data
 				VALUES (' . $user->data['user_id'] . ', ' . $data_ary['topic_id'] . ')';
 			$db->sql_query($sql);
 		}
-		else if (($config['email_enable'] || $config['jab_enable']) && $data_ary['notify_set'] && !$data_ary['notify'])
+		else if ($config['email_enable'] && $data_ary['notify_set'] && !$data_ary['notify'])
 		{
 			$sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . '
 				WHERE user_id = ' . $user->data['user_id'] . '
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 5e7033d09c7..1075a5a2bc6 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1691,7 +1691,7 @@ function submit_pm($mode, $subject, &$data_ary, $put_in_outbox = true)
 	}
 
 	// First of all make sure the subject are having the correct length.
-	$subject = truncate_string($subject);
+	$subject = truncate_string($subject, $mode === 'post' ? 120 : 124);
 
 	$db->sql_transaction('begin');
 
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 05b3d83a1e0..f3867d4cd2d 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -11,6 +11,8 @@
 *
 */
 
+use phpbb\messenger\method\messenger_interface;
+
 /**
 * @ignore
 */
@@ -210,18 +212,18 @@ function user_add($user_row, $cp_data = false, $notifications_data = null)
 
 	// These are the additional vars able to be specified
 	$additional_vars = array(
-		'user_permissions'	=> '',
-		'user_timezone'		=> $config['board_timezone'],
-		'user_dateformat'	=> $config['default_dateformat'],
-		'user_lang'			=> $config['default_lang'],
-		'user_style'		=> (int) $config['default_style'],
-		'user_actkey'		=> '',
-		'user_ip'			=> '',
-		'user_regdate'		=> time(),
-		'user_passchg'		=> time(),
-		'user_options'		=> 230271,
+		'user_permissions'			=> '',
+		'user_timezone'				=> $config['board_timezone'],
+		'user_dateformat'			=> $config['default_dateformat'],
+		'user_lang'					=> $config['default_lang'],
+		'user_style'				=> (int) $config['default_style'],
+		'user_actkey'				=> '',
+		'user_ip'					=> '',
+		'user_regdate'				=> time(),
+		'user_passchg'				=> time(),
+		'user_options'				=> 230271,
 		// We do not set the new flag here - registration scripts need to specify it
-		'user_new'			=> 0,
+		'user_new'					=> 0,
 
 		'user_inactive_reason'	=> 0,
 		'user_inactive_time'	=> 0,
@@ -244,7 +246,6 @@ function user_add($user_row, $cp_data = false, $notifications_data = null)
 
 		'user_notify'			=> 0,
 		'user_notify_pm'		=> 1,
-		'user_notify_type'		=> NOTIFY_EMAIL,
 		'user_allow_pm'			=> 1,
 		'user_allow_viewonline'	=> 1,
 		'user_allow_viewemail'	=> 1,
@@ -1025,7 +1026,8 @@ function user_ipwhois($ip)
 	$match = array();
 
 	// Test for referrals from $whois_host to other whois databases, roll on rwhois
-	if (preg_match('#ReferralServer:[\x20]*whois://(.+)#im', $ipwhois, $match))
+	// Search for referral servers with or without the "whois://" prefix
+	if (preg_match('#ReferralServer:[\x20]*whois://(.+)#im', $ipwhois, $match) || preg_match('#ReferralServer:[\x20]*([^/]+)$#im', $ipwhois, $match))
 	{
 		if (strpos($match[1], ':') !== false)
 		{
@@ -1512,208 +1514,6 @@ function validate_user_email($email, $allowed_email = false)
 	return false;
 }
 
-/**
-* Validate jabber address
-* Taken from the jabber class within flyspray (see author notes)
-*
-* @author flyspray.org
-*/
-function validate_jabber($jid)
-{
-	if (!$jid)
-	{
-		return false;
-	}
-
-	$separator_pos = strpos($jid, '@');
-
-	if ($separator_pos === false)
-	{
-		return 'WRONG_DATA';
-	}
-
-	$username = substr($jid, 0, $separator_pos);
-	$realm = substr($jid, $separator_pos + 1);
-
-	if (strlen($username) == 0 || strlen($realm) < 3)
-	{
-		return 'WRONG_DATA';
-	}
-
-	$arr = explode('.', $realm);
-
-	if (count($arr) == 0)
-	{
-		return 'WRONG_DATA';
-	}
-
-	foreach ($arr as $part)
-	{
-		if (substr($part, 0, 1) == '-' || substr($part, -1, 1) == '-')
-		{
-			return 'WRONG_DATA';
-		}
-
-		if (!preg_match("@^[a-zA-Z0-9-.]+$@", $part))
-		{
-			return 'WRONG_DATA';
-		}
-	}
-
-	$boundary = array(array(0, 127), array(192, 223), array(224, 239), array(240, 247), array(248, 251), array(252, 253));
-
-	// Prohibited Characters RFC3454 + RFC3920
-	$prohibited = array(
-		// Table C.1.1
-		array(0x0020, 0x0020),		// SPACE
-		// Table C.1.2
-		array(0x00A0, 0x00A0),		// NO-BREAK SPACE
-		array(0x1680, 0x1680),		// OGHAM SPACE MARK
-		array(0x2000, 0x2001),		// EN QUAD
-		array(0x2001, 0x2001),		// EM QUAD
-		array(0x2002, 0x2002),		// EN SPACE
-		array(0x2003, 0x2003),		// EM SPACE
-		array(0x2004, 0x2004),		// THREE-PER-EM SPACE
-		array(0x2005, 0x2005),		// FOUR-PER-EM SPACE
-		array(0x2006, 0x2006),		// SIX-PER-EM SPACE
-		array(0x2007, 0x2007),		// FIGURE SPACE
-		array(0x2008, 0x2008),		// PUNCTUATION SPACE
-		array(0x2009, 0x2009),		// THIN SPACE
-		array(0x200A, 0x200A),		// HAIR SPACE
-		array(0x200B, 0x200B),		// ZERO WIDTH SPACE
-		array(0x202F, 0x202F),		// NARROW NO-BREAK SPACE
-		array(0x205F, 0x205F),		// MEDIUM MATHEMATICAL SPACE
-		array(0x3000, 0x3000),		// IDEOGRAPHIC SPACE
-		// Table C.2.1
-		array(0x0000, 0x001F),		// [CONTROL CHARACTERS]
-		array(0x007F, 0x007F),		// DELETE
-		// Table C.2.2
-		array(0x0080, 0x009F),		// [CONTROL CHARACTERS]
-		array(0x06DD, 0x06DD),		// ARABIC END OF AYAH
-		array(0x070F, 0x070F),		// SYRIAC ABBREVIATION MARK
-		array(0x180E, 0x180E),		// MONGOLIAN VOWEL SEPARATOR
-		array(0x200C, 0x200C), 		// ZERO WIDTH NON-JOINER
-		array(0x200D, 0x200D),		// ZERO WIDTH JOINER
-		array(0x2028, 0x2028),		// LINE SEPARATOR
-		array(0x2029, 0x2029),		// PARAGRAPH SEPARATOR
-		array(0x2060, 0x2060),		// WORD JOINER
-		array(0x2061, 0x2061),		// FUNCTION APPLICATION
-		array(0x2062, 0x2062),		// INVISIBLE TIMES
-		array(0x2063, 0x2063),		// INVISIBLE SEPARATOR
-		array(0x206A, 0x206F),		// [CONTROL CHARACTERS]
-		array(0xFEFF, 0xFEFF),		// ZERO WIDTH NO-BREAK SPACE
-		array(0xFFF9, 0xFFFC),		// [CONTROL CHARACTERS]
-		array(0x1D173, 0x1D17A),	// [MUSICAL CONTROL CHARACTERS]
-		// Table C.3
-		array(0xE000, 0xF8FF),		// [PRIVATE USE, PLANE 0]
-		array(0xF0000, 0xFFFFD),	// [PRIVATE USE, PLANE 15]
-		array(0x100000, 0x10FFFD),	// [PRIVATE USE, PLANE 16]
-		// Table C.4
-		array(0xFDD0, 0xFDEF),		// [NONCHARACTER CODE POINTS]
-		array(0xFFFE, 0xFFFF),		// [NONCHARACTER CODE POINTS]
-		array(0x1FFFE, 0x1FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x2FFFE, 0x2FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x3FFFE, 0x3FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x4FFFE, 0x4FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x5FFFE, 0x5FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x6FFFE, 0x6FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x7FFFE, 0x7FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x8FFFE, 0x8FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x9FFFE, 0x9FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xAFFFE, 0xAFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xBFFFE, 0xBFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xCFFFE, 0xCFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xDFFFE, 0xDFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xEFFFE, 0xEFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xFFFFE, 0xFFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x10FFFE, 0x10FFFF),	// [NONCHARACTER CODE POINTS]
-		// Table C.5
-		array(0xD800, 0xDFFF),		// [SURROGATE CODES]
-		// Table C.6
-		array(0xFFF9, 0xFFF9),		// INTERLINEAR ANNOTATION ANCHOR
-		array(0xFFFA, 0xFFFA),		// INTERLINEAR ANNOTATION SEPARATOR
-		array(0xFFFB, 0xFFFB),		// INTERLINEAR ANNOTATION TERMINATOR
-		array(0xFFFC, 0xFFFC),		// OBJECT REPLACEMENT CHARACTER
-		array(0xFFFD, 0xFFFD),		// REPLACEMENT CHARACTER
-		// Table C.7
-		array(0x2FF0, 0x2FFB),		// [IDEOGRAPHIC DESCRIPTION CHARACTERS]
-		// Table C.8
-		array(0x0340, 0x0340),		// COMBINING GRAVE TONE MARK
-		array(0x0341, 0x0341),		// COMBINING ACUTE TONE MARK
-		array(0x200E, 0x200E),		// LEFT-TO-RIGHT MARK
-		array(0x200F, 0x200F),		// RIGHT-TO-LEFT MARK
-		array(0x202A, 0x202A),		// LEFT-TO-RIGHT EMBEDDING
-		array(0x202B, 0x202B),		// RIGHT-TO-LEFT EMBEDDING
-		array(0x202C, 0x202C),		// POP DIRECTIONAL FORMATTING
-		array(0x202D, 0x202D),		// LEFT-TO-RIGHT OVERRIDE
-		array(0x202E, 0x202E),		// RIGHT-TO-LEFT OVERRIDE
-		array(0x206A, 0x206A),		// INHIBIT SYMMETRIC SWAPPING
-		array(0x206B, 0x206B),		// ACTIVATE SYMMETRIC SWAPPING
-		array(0x206C, 0x206C),		// INHIBIT ARABIC FORM SHAPING
-		array(0x206D, 0x206D),		// ACTIVATE ARABIC FORM SHAPING
-		array(0x206E, 0x206E),		// NATIONAL DIGIT SHAPES
-		array(0x206F, 0x206F),		// NOMINAL DIGIT SHAPES
-		// Table C.9
-		array(0xE0001, 0xE0001),	// LANGUAGE TAG
-		array(0xE0020, 0xE007F),	// [TAGGING CHARACTERS]
-		// RFC3920
-		array(0x22, 0x22),			// "
-		array(0x26, 0x26),			// &
-		array(0x27, 0x27),			// '
-		array(0x2F, 0x2F),			// /
-		array(0x3A, 0x3A),			// :
-		array(0x3C, 0x3C),			// <
-		array(0x3E, 0x3E),			// >
-		array(0x40, 0x40)			// @
-	);
-
-	$pos = 0;
-	$result = true;
-
-	while ($pos < strlen($username))
-	{
-		$len = $uni = 0;
-		for ($i = 0; $i <= 5; $i++)
-		{
-			if (ord($username[$pos]) >= $boundary[$i][0] && ord($username[$pos]) <= $boundary[$i][1])
-			{
-				$len = $i + 1;
-				$uni = (ord($username[$pos]) - $boundary[$i][0]) * pow(2, $i * 6);
-
-				for ($k = 1; $k < $len; $k++)
-				{
-					$uni += (ord($username[$pos + $k]) - 128) * pow(2, ($i - $k) * 6);
-				}
-
-				break;
-			}
-		}
-
-		if ($len == 0)
-		{
-			return 'WRONG_DATA';
-		}
-
-		foreach ($prohibited as $pval)
-		{
-			if ($uni >= $pval[0] && $uni <= $pval[1])
-			{
-				$result = false;
-				break 2;
-			}
-		}
-
-		$pos = $pos + $len;
-	}
-
-	if (!$result)
-	{
-		return 'WRONG_DATA';
-	}
-
-	return false;
-}
-
 /**
 * Validate hex colour value
 *
@@ -1789,7 +1589,7 @@ function avatar_delete($mode, $row, $clean_db = false)
 
 		return true;
 	}
-	catch (\phpbb\storage\exception\exception $e)
+	catch (\phpbb\storage\exception\storage_exception $e)
 	{
 		// Fail is covered by return statement below
 	}
@@ -2124,14 +1924,15 @@ function group_correct_avatar($group_id, $old_entry)
 
 	try
 	{
-		$storage->rename($old_filename, $new_filename);
+		$storage->write($new_filename, $storage->read($old_filename));
+		$storage->delete($old_filename);
 
 		$sql = 'UPDATE ' . GROUPS_TABLE . '
 			SET group_avatar = \'' . $db->sql_escape($new_entry) . "'
 			WHERE group_id = $group_id";
 		$db->sql_query($sql);
 	}
-	catch (\phpbb\storage\exception\exception $e)
+	catch (\phpbb\storage\exception\storage_exception $e)
 	{
 		// If rename fail, dont execute the query
 	}
@@ -2315,6 +2116,28 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false,
 		return 'GROUP_USERS_EXIST';
 	}
 
+	/**
+	 * Event before users are added to a group
+	 *
+	 * @event core.group_add_user_before
+	 * @var	int		group_id		ID of the group to which users are added
+	 * @var	string 	group_name		Name of the group
+	 * @var	array	user_id_ary		IDs of the users to be added
+	 * @var	array	username_ary	Names of the users to be added
+	 * @var	int		pending			Pending setting, 1 if user(s) added are pending
+	 * @var	array	add_id_ary		IDs of the users to be added who are not members yet
+	 * @since 3.3.15-RC1
+	 */
+	$vars = array(
+		'group_id',
+		'group_name',
+		'user_id_ary',
+		'username_ary',
+		'pending',
+		'add_id_ary',
+	);
+	extract($phpbb_dispatcher->trigger_event('core.group_add_user_before', compact($vars)));
+
 	$db->sql_transaction('begin');
 
 	// Insert the new users
@@ -2705,7 +2528,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
 
 		case 'approve':
 			// Make sure we only approve those which are pending ;)
-			$sql = 'SELECT u.user_id, u.user_email, u.username, u.username_clean, u.user_notify_type, u.user_jabber, u.user_lang
+			$sql = 'SELECT u.user_id
 				FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
 				WHERE ug.group_id = ' . $group_id . '
 					AND ug.user_pending = 1
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index 72e03c00f23..658ac007284 100644
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -234,7 +234,7 @@ function mcp_notes_user_view($action)
 		$avatar_helper = $phpbb_container->get('avatar.helper');
 
 		$avatar = $avatar_helper->get_user_avatar($userrow);
-		$template->assign_vars($avatar_helper->get_template_vars($avatar));
+		$template->assign_vars($avatar_helper->get_template_vars($avatar, 'USER_'));
 
 		$template->assign_vars(array(
 			'U_POST_ACTION'			=> $this->u_action,
@@ -255,6 +255,7 @@ function mcp_notes_user_view($action)
 			'USERNAME_FULL'		=> get_username_string('full', $userrow['user_id'], $userrow['username'], $userrow['user_colour']),
 			'USERNAME_COLOUR'	=> get_username_string('colour', $userrow['user_id'], $userrow['username'], $userrow['user_colour']),
 			'USERNAME'			=> get_username_string('username', $userrow['user_id'], $userrow['username'], $userrow['user_colour']),
+			'USER_ID'			=> $userrow['user_id'],
 			'U_PROFILE'			=> get_username_string('profile', $userrow['user_id'], $userrow['username'], $userrow['user_colour']),
 
 			'RANK_IMG'			=> $rank_data['img'],
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index 63fabb35db7..d78c84d53c6 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -51,8 +51,6 @@ function main($id, $mode)
 		{
 			case 'close':
 			case 'delete':
-				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-
 				$report_id_list = $request->variable('report_id_list', array(0));
 
 				if (!count($report_id_list))
@@ -202,7 +200,7 @@ function main($id, $mode)
 					'POST_SUBJECT'			=> ($pm_info['message_subject']) ? $pm_info['message_subject'] : $user->lang['NO_SUBJECT'],
 					'POST_DATE'				=> $user->format_date($pm_info['message_time']),
 					'POST_IP'				=> $pm_info['author_ip'],
-					'POST_IPADDR'			=> ($auth->acl_getf_global('m_info') && $request->variable('lookup', '')) ? @gethostbyaddr($pm_info['author_ip']) : '',
+					'POST_IPADDR'			=> ($auth->acl_getf_global('m_info') && $request->variable('lookup', '')) ? phpbb_get_host_for_ip($pm_info['author_ip']) : '',
 					'POST_ID'				=> $pm_info['msg_id'],
 
 					'U_LOOKUP_IP'			=> ($auth->acl_getf_global('m_info')) ? $this->u_action . '&amp;r=' . $report_id . '&amp;pm=' . $pm_id . '&amp;lookup=' . $pm_info['author_ip'] . '#ip' : '',
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 8e7c0342e82..4b67735e680 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -222,6 +222,7 @@ function mcp_post_details($id, $mode, $action)
 		'U_POST_ACTION'			=> "$url&amp;i=$id&amp;mode=post_details", // Use this for action parameters
 		'U_APPROVE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&amp;p=$post_id"),
 
+		'S_CAN_APPROVE'			=> $auth->acl_get('m_approve', $post_info['forum_id']),
 		'S_CAN_VIEWIP'			=> $auth->acl_get('m_info', $post_info['forum_id']),
 		'S_CAN_CHGPOSTER'		=> $auth->acl_get('m_chgposter', $post_info['forum_id']),
 		'S_CAN_LOCK_POST'		=> $auth->acl_get('m_lock', $post_info['forum_id']),
@@ -265,7 +266,7 @@ function mcp_post_details($id, $mode, $action)
 		'POST_SUBJECT'			=> $post_info['post_subject'],
 		'POST_DATE'				=> $user->format_date($post_info['post_time']),
 		'POST_IP'				=> $post_info['poster_ip'],
-		'POST_IPADDR'			=> ($auth->acl_get('m_info', $post_info['forum_id']) && $request->variable('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',
+		'POST_IPADDR'			=> ($auth->acl_get('m_info', $post_info['forum_id']) && $request->variable('lookup', '')) ? phpbb_get_host_for_ip($post_info['poster_ip']) : '',
 		'POST_ID'				=> $post_info['post_id'],
 		'SIGNATURE'				=> $post_info['user_sig'],
 
@@ -470,7 +471,7 @@ function mcp_post_details($id, $mode, $action)
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$page_ips++;
-			$hostname = (($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') && $row['poster_ip']) ? @gethostbyaddr($row['poster_ip']) : '';
+			$hostname = (($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') && $row['poster_ip']) ? phpbb_get_host_for_ip($row['poster_ip']) : '';
 
 			$template->assign_block_vars('iprow', array(
 				'IP'			=> $row['poster_ip'],
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 185316a7051..c4ccebde1a7 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -50,8 +50,6 @@ public function main($id, $mode)
 		{
 			case 'approve':
 			case 'restore':
-				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-
 				$post_id_list = $request->variable('post_id_list', array(0));
 				$topic_id_list = $request->variable('topic_id_list', array(0));
 
@@ -113,11 +111,6 @@ public function main($id, $mode)
 					return;
 				}
 
-				if (!class_exists('messenger'))
-				{
-					include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-				}
-
 				if (!empty($topic_id_list))
 				{
 					$post_visibility = ($mode == 'deleted_topics') ? ITEM_DELETED : array(ITEM_UNAPPROVED, ITEM_REAPPROVE);
@@ -284,6 +277,7 @@ public function main($id, $mode)
 				$post_data = array(
 					'S_MCP_QUEUE'			=> true,
 					'U_APPROVE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&amp;p=$post_id"),
+					'S_CAN_APPROVE'			=> $auth->acl_get('m_approve', $post_info['forum_id']),
 					'S_CAN_DELETE_POST'		=> $auth->acl_get('m_delete', $post_info['forum_id']),
 					'S_CAN_VIEWIP'			=> $auth->acl_get('m_info', $post_info['forum_id']),
 					'S_POST_REPORTED'		=> $post_info['post_reported'],
@@ -320,7 +314,7 @@ public function main($id, $mode)
 					'POST_SUBJECT'			=> $post_info['post_subject'],
 					'POST_DATE'				=> $user->format_date($post_info['post_time']),
 					'POST_IP'				=> $post_info['poster_ip'],
-					'POST_IPADDR'			=> ($auth->acl_get('m_info', $post_info['forum_id']) && $request->variable('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',
+					'POST_IPADDR'			=> ($auth->acl_get('m_info', $post_info['forum_id']) && $request->variable('lookup', '')) ? phpbb_get_host_for_ip($post_info['poster_ip']) : '',
 					'POST_ID'				=> $post_info['post_id'],
 					'S_FIRST_POST'			=> ($post_info['topic_first_post_id'] == $post_id),
 
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index d7c5d4715a6..009719af0f2 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -49,8 +49,6 @@ function main($id, $mode)
 		{
 			case 'close':
 			case 'delete':
-				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-
 				$report_id_list = $request->variable('report_id_list', array(0));
 
 				if (!count($report_id_list))
@@ -252,6 +250,7 @@ function main($id, $mode)
 				$report_template = array(
 					'S_MCP_REPORT'			=> true,
 					'S_CLOSE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&amp;mode=report_details&amp;p=' . $post_id),
+					'S_CAN_APPROVE'			=> $auth->acl_get('m_approve', $post_info['forum_id']),
 					'S_CAN_VIEWIP'			=> $auth->acl_get('m_info', $post_info['forum_id']),
 					'S_POST_REPORTED'		=> $post_info['post_reported'],
 					'S_POST_UNAPPROVED'		=> $post_info['post_visibility'] == ITEM_UNAPPROVED || $post_info['post_visibility'] == ITEM_REAPPROVE,
@@ -260,6 +259,7 @@ function main($id, $mode)
 					'S_USER_NOTES'			=> true,
 
 					'U_EDIT'					=> ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&amp;p={$post_info['post_id']}") : '',
+					'U_APPROVE_ACTION'			=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;p=' . $post_id),
 					'U_MCP_APPROVE'				=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=approve_details&amp;p=' . $post_id),
 					'U_MCP_REPORT'				=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&amp;mode=report_details&amp;p=' . $post_id),
 					'U_MCP_REPORTER_NOTES'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&amp;mode=user_notes&amp;u=' . $report['user_id']),
@@ -296,7 +296,7 @@ function main($id, $mode)
 					'POST_SUBJECT'			=> ($post_info['post_subject']) ? $post_info['post_subject'] : $user->lang['NO_SUBJECT'],
 					'POST_DATE'				=> $user->format_date($post_info['post_time']),
 					'POST_IP'				=> $post_info['poster_ip'],
-					'POST_IPADDR'			=> ($auth->acl_get('m_info', $post_info['forum_id']) && $request->variable('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',
+					'POST_IPADDR'			=> ($auth->acl_get('m_info', $post_info['forum_id']) && $request->variable('lookup', '')) ? phpbb_get_host_for_ip($post_info['poster_ip']) : '',
 					'POST_ID'				=> $post_info['post_id'],
 					'SIGNATURE'				=> $post_info['user_sig'],
 
@@ -661,7 +661,7 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 	{
 		$post_info = ($pm) ? phpbb_get_pm_data($post_id_list) : phpbb_get_post_data($post_id_list, 'm_report');
 
-		$sql = "SELECT r.report_id, r.$id_column, r.report_closed, r.user_id, r.user_notify, u.username, u.username_clean, u.user_email, u.user_jabber, u.user_lang, u.user_notify_type
+		$sql = "SELECT r.report_id, r.$id_column, r.report_closed, r.user_id, r.user_notify, u.username, u.username_clean, u.user_email, u.user_lang
 			FROM " . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u
 			WHERE ' . $db->sql_in_set('r.report_id', $report_id_list) . '
 				' . (($action == 'close') ? 'AND r.report_closed = 0' : '') . '
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index cad43866fce..d19d1ad9d7c 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -107,7 +107,6 @@ function mcp_topic_view($id, $mode, $action)
 		}
 
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
-		include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 
 		if (!count($post_id_list))
 		{
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index d555773c0c6..da4aacd11b4 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -347,7 +347,7 @@ function mcp_warn_post_view($action)
 		$avatar_helper = $phpbb_container->get('avatar.helper');
 
 		$avatar = $avatar_helper->get_user_avatar($user_row);
-		$template->assign_vars($avatar_helper->get_template_vars($avatar));
+		$template->assign_vars($avatar_helper->get_template_vars($avatar, 'USER_'));
 
 		$template->assign_vars(array(
 			'U_POST_ACTION'		=> $this->u_action,
@@ -500,7 +500,7 @@ function mcp_warn_user_view($action)
 		$avatar_helper = $phpbb_container->get('avatar.helper');
 
 		$avatar = $avatar_helper->get_user_avatar($user_row);
-		$template->assign_vars($avatar_helper->get_template_vars($avatar));
+		$template->assign_vars($avatar_helper->get_template_vars($avatar, 'USER_'));
 
 		// OK, they didn't submit a warning so lets build the page for them to do so
 		$template->assign_vars(array(
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 337b6ccab81..9b381d22f8f 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1179,8 +1179,6 @@ function parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcod
 		// Set some config values
 		$parser->set_vars(array(
 			'max_font_size'  => $config['max_' . $this->mode . '_font_size'],
-			'max_img_height' => $config['max_' . $this->mode . '_img_height'],
-			'max_img_width'  => $config['max_' . $this->mode . '_img_width'],
 			'max_smilies'    => $config['max_' . $this->mode . '_smilies'],
 			'max_urls'       => $config['max_' . $this->mode . '_urls']
 		));
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index 8ab18ad8c8c..82f435ba35d 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -361,16 +361,11 @@ function get_data()
 			'hot_threshold' => true,
 			'img_create_thumbnail' => true,
 			'img_display_inlined' => true,
-			'img_link_height' => true,
-			'img_link_width' => true,
 			'img_max_height' => true,
 			'img_max_thumb_width' => true,
 			'img_max_width' => true,
 			'img_min_thumb_filesize' => true,
 			'ip_check' => true,
-			'jab_enable' => true,
-			'jab_package_size' => true,
-			'jab_use_ssl' => true,
 			'limit_load' => true,
 			'limit_search_load' => true,
 			'load_anon_lastread' => true,
@@ -406,8 +401,6 @@ function get_data()
 			'max_reg_attempts' => true,
 			'max_sig_chars' => true,
 			'max_sig_font_size' => true,
-			'max_sig_img_height' => true,
-			'max_sig_img_width' => true,
 			'max_sig_smilies' => true,
 			'max_sig_urls' => true,
 			'min_name_chars' => true,
@@ -439,7 +432,6 @@ function get_data()
 			'secure_downloads' => true,
 			'session_gc' => true,
 			'session_length' => true,
-			'smtp_auth_method' => true,
 			'smtp_delivery' => true,
 			'topics_per_page' => true,
 			'version' => true,
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
index dac52a025f1..d0b3567bd33 100644
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -23,11 +23,11 @@
 error_reporting($level);
 
 /**
-* Minimum Requirement: PHP 8.1.0
+* Minimum Requirement: PHP 8.2.0
 */
-if (version_compare(PHP_VERSION, '8.1.0', '<'))
+if (version_compare(PHP_VERSION, '8.2.0', '<'))
 {
-	die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 8.1.0 or higher before trying to install or update to phpBB 4.0');
+	die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 8.2.0 or higher before trying to install or update to phpBB 4.0');
 }
 
 // In PHP 5.3.0 the error level has been raised to E_WARNING which causes problems
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index da25425e3af..9b478b120ad 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -32,10 +32,13 @@ function main($id, $mode)
 		global $config, $phpbb_root_path, $phpEx, $request;
 		global $db, $user, $auth, $phpbb_container, $phpbb_log, $phpbb_dispatcher;
 
+		/** @var \phpbb\controller\helper $controller_helper */
+		$controller_helper = $phpbb_container->get('controller.helper');
+
 		$user_id = $request->variable('u', 0);
 		$key = $request->variable('k', '');
 
-		$sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey, user_inactive_reason
+		$sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_actkey, user_inactive_reason
 			FROM ' . USERS_TABLE . "
 			WHERE user_id = $user_id";
 		$result = $db->sql_query($sql);
@@ -49,7 +52,7 @@ function main($id, $mode)
 
 		if ($user_row['user_type'] <> USER_INACTIVE && !$user_row['user_newpasswd'])
 		{
-			meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
+			meta_refresh(3, $controller_helper->route('phpbb_index_controller'));
 			trigger_error('ALREADY_ACTIVATED');
 		}
 
@@ -131,21 +134,20 @@ function main($id, $mode)
 			$phpbb_notifications = $phpbb_container->get('notification_manager');
 			$phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']);
 
-			include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-
-			$messenger = new messenger(false);
-
-			$messenger->template('admin_welcome_activated', $user_row['user_lang']);
+			/** @var \phpbb\di\service_collection $messenger_collection */
+			$messenger_collection = $phpbb_container->get('messenger.method_collection');
+			/** @var \phpbb\messenger\method\messenger_interface $messenger_method */
+			$messenger_method = $messenger_collection->offsetGet('messenger.method.email');
 
-			$messenger->set_addresses($user_row);
-
-			$messenger->anti_abuse_headers($config, $user);
-
-			$messenger->assign_vars(array(
-				'USERNAME'	=> html_entity_decode($user_row['username'], ENT_COMPAT))
-			);
+			$messenger_method->set_use_queue(false);
+			$messenger_method->template('admin_welcome_activated', $user_row['user_lang']);
+			$messenger_method->set_addresses($user_row);
+			$messenger_method->anti_abuse_headers($config, $user);
+			$messenger_method->assign_vars([
+				'USERNAME'	=> html_entity_decode($user_row['username'], ENT_COMPAT),
+			]);
 
-			$messenger->send($user_row['user_notify_type']);
+			$messenger_method->send();
 
 			$message = 'ACCOUNT_ACTIVE_ADMIN';
 		}
@@ -172,7 +174,7 @@ function main($id, $mode)
 		$vars = array('user_row', 'message');
 		extract($phpbb_dispatcher->trigger_event('core.ucp_activate_after', compact($vars)));
 
-		meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
+		meta_refresh(3, $controller_helper->route('phpbb_index_controller'));
 		trigger_error($user->lang[$message]);
 	}
 }
diff --git a/phpBB/includes/ucp/ucp_auth_link.php b/phpBB/includes/ucp/ucp_auth_link.php
index e069f15eb2d..560ac7f09ba 100644
--- a/phpBB/includes/ucp/ucp_auth_link.php
+++ b/phpBB/includes/ucp/ucp_auth_link.php
@@ -36,6 +36,26 @@ public function main($id, $mode)
 	{
 		global $request, $template, $phpbb_container, $user;
 
+		// Redirect to new oauth_ controller on link requests
+		if ($request->variable('link', false))
+		{
+			$url_params = [
+				'oauth_service'	=> $request->variable('oauth_service', ''),
+				'link'			=> 1,
+			];
+
+			if ($request->is_set('code'))
+			{
+				$url_params += [
+					'code'			=> $request->variable('code', ''),
+					'state'			=> $request->variable('state', ''),
+					'scope'			=> $request->variable('scope', ''),
+				];
+			}
+
+			phpbb_redirect_to_controller('phpbb_ucp_oauth_authenticate_controller', $url_params);
+		}
+
 		$error = array();
 
 		/* @var $provider_collection \phpbb\auth\provider_collection */
@@ -87,20 +107,6 @@ public function main($id, $mode)
 			}
 		}
 
-		// In some cases, a request to an external server may be required. In
-		// these cases, the GET parameter 'link' should exist and should be true
-		if ($request->variable('link', false))
-		{
-			// In this case the link data should only be populated with the
-			// link_method as the provider dictates how data is returned to it.
-			$link_data = array('link_method' => 'auth_link');
-
-			$error[] = $auth_provider->link_account($link_data);
-
-			// Template data may have changed, get new data
-			$provider_data = $auth_provider->get_auth_link_data();
-		}
-
 		if (isset($provider_data['VARS']))
 		{
 			// Handle hidden fields separately
diff --git a/phpBB/includes/ucp/ucp_login_link.php b/phpBB/includes/ucp/ucp_login_link.php
deleted file mode 100644
index c7c66304b0a..00000000000
--- a/phpBB/includes/ucp/ucp_login_link.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_login_link
-* Allows users of external accounts link those accounts to their phpBB accounts
-* during an attempted login.
-*/
-class ucp_login_link
-{
-	/**
-	* @var	string
-	*/
-	public $u_action;
-
-	/**
-	* Generates the ucp_login_link page and handles login link process
-	*
-	* @param	int		$id
-	* @param	string	$mode
-	*/
-	function main($id, $mode)
-	{
-		global $phpbb_container, $request, $template, $user, $phpbb_dispatcher;
-		global $phpbb_root_path, $phpEx;
-
-		// Initialize necessary variables
-		$login_error = null;
-		$login_link_error = null;
-		$login_username = null;
-
-		// Build the data array
-		$data = $this->get_login_link_data_array();
-
-		// Ensure the person was sent here with login_link data
-		if (empty($data))
-		{
-			$login_link_error = $user->lang['LOGIN_LINK_NO_DATA_PROVIDED'];
-		}
-
-		// Use the auth_provider requested even if different from configured
-		/* @var $provider_collection \phpbb\auth\provider_collection */
-		$provider_collection = $phpbb_container->get('auth.provider_collection');
-		$auth_provider = $provider_collection->get_provider($request->variable('auth_provider', ''));
-
-		// Set the link_method to login_link
-		$data['link_method'] = 'login_link';
-
-		// Have the authentication provider check that all necessary data is available
-		$result = $auth_provider->login_link_has_necessary_data($data);
-		if ($result !== null)
-		{
-			$login_link_error = $user->lang[$result];
-		}
-
-		// Perform link action if there is no error
-		if (!$login_link_error)
-		{
-			if ($request->is_set_post('login'))
-			{
-				$login_username = $request->variable('login_username', '', true, \phpbb\request\request_interface::POST);
-				$login_password = $request->untrimmed_variable('login_password', '', true, \phpbb\request\request_interface::POST);
-
-				$login_result = $auth_provider->login($login_username, $login_password);
-
-				// We only care if there is or is not an error
-				$login_error = $this->process_login_result($login_result);
-
-				if (!$login_error)
-				{
-					// Give the user_id to the data
-					$data['user_id'] = $login_result['user_row']['user_id'];
-
-					// The user is now logged in, attempt to link the user to the external account
-					$result = $auth_provider->link_account($data);
-
-					if ($result)
-					{
-						$login_link_error = $user->lang[$result];
-					}
-					else
-					{
-						// Finish login
-						$user->session_create($login_result['user_row']['user_id'], false, false, true);
-
-						// Perform a redirect as the account has been linked
-						$this->perform_redirect();
-					}
-				}
-			}
-		}
-
-		$tpl_ary = array(
-			// Common template elements
-			'LOGIN_LINK_ERROR'		=> $login_link_error,
-			'PASSWORD_CREDENTIAL'	=> 'login_password',
-			'USERNAME_CREDENTIAL'	=> 'login_username',
-			'S_HIDDEN_FIELDS'		=> $this->get_hidden_fields($data),
-
-			// Registration elements
-			'REGISTER_ACTION'	=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),
-
-			// Login elements
-			'LOGIN_ERROR'		=> $login_error,
-			'LOGIN_USERNAME'	=> $login_username,
-		);
-
-		/**
-		* Event to perform additional actions before ucp_login_link is displayed
-		*
-		* @event core.ucp_login_link_template_after
-		* @var	array							data				Login link data
-		* @var	\phpbb\auth\provider_interface	auth_provider		Auth provider
-		* @var	string							login_link_error	Login link error
-		* @var	string							login_error			Login error
-		* @var	string							login_username		Login username
-		* @var	array							tpl_ary				Template variables
-		* @since 3.2.4-RC1
-		*/
-		$vars = array('data', 'auth_provider', 'login_link_error', 'login_error', 'login_username', 'tpl_ary');
-		extract($phpbb_dispatcher->trigger_event('core.ucp_login_link_template_after', compact($vars)));
-
-		$template->assign_vars($tpl_ary);
-
-		$this->tpl_name = 'ucp_login_link';
-		$this->page_title = 'UCP_LOGIN_LINK';
-	}
-
-	/**
-	* Builds the hidden fields string from the data array.
-	*
-	* @param	array	$data	This function only includes data in the array
-	*							that has a key that begins with 'login_link_'
-	* @return	string	A string of hidden fields that can be included in the
-	*					template
-	*/
-	protected function get_hidden_fields($data)
-	{
-		$fields = array();
-
-		foreach ($data as $key => $value)
-		{
-			$fields['login_link_' . $key] = $value;
-		}
-
-		return build_hidden_fields($fields);
-	}
-
-	/**
-	* Builds the login_link data array
-	*
-	* @return	array	All login_link data. This is all GET data whose names
-	*					begin with 'login_link_'
-	*/
-	protected function get_login_link_data_array()
-	{
-		global $request;
-
-		$var_names = $request->variable_names(\phpbb\request\request_interface::GET);
-		$login_link_data = array();
-		$string_start_length = strlen('login_link_');
-
-		foreach ($var_names as $var_name)
-		{
-			if (strpos($var_name, 'login_link_') === 0)
-			{
-				$key_name = substr($var_name, $string_start_length);
-				$login_link_data[$key_name] = $request->variable($var_name, '', false, \phpbb\request\request_interface::GET);
-			}
-		}
-
-		return $login_link_data;
-	}
-
-	/**
-	* Processes the result array from the login process
-	* @param	array	$result	The login result array
-	* @return	string|null	If there was an error in the process, a string is
-	*						returned. If the login was successful, then null is
-	*						returned.
-	*/
-	protected function process_login_result($result)
-	{
-		global $config, $template, $user, $phpbb_container, $phpbb_root_path, $phpEx;
-
-		$login_error = null;
-
-		if ($result['status'] != LOGIN_SUCCESS)
-		{
-			// Handle all errors first
-			if ($result['status'] == LOGIN_BREAK)
-			{
-				trigger_error($result['error_msg']);
-			}
-
-			switch ($result['status'])
-			{
-				case LOGIN_ERROR_ATTEMPTS:
-
-					$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
-					$captcha->init(CONFIRM_LOGIN);
-
-					$template->assign_vars(array(
-						'CAPTCHA_TEMPLATE'			=> $captcha->get_template(),
-					));
-
-					$login_error = $user->lang[$result['error_msg']];
-				break;
-
-				case LOGIN_ERROR_PASSWORD_CONVERT:
-					$login_error = sprintf(
-						$user->lang[$result['error_msg']],
-						($config['email_enable']) ? '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') . '">' : '',
-						($config['email_enable']) ? '</a>' : '',
-						($config['board_contact']) ? '<a href="mailto:' . htmlspecialchars($config['board_contact'], ENT_COMPAT) . '">' : '',
-						($config['board_contact']) ? '</a>' : ''
-					);
-				break;
-
-				// Username, password, etc...
-				default:
-					$login_error = $user->lang[$result['error_msg']];
-
-					// Assign admin contact to some error messages
-					if ($result['error_msg'] == 'LOGIN_ERROR_USERNAME' || $result['error_msg'] == 'LOGIN_ERROR_PASSWORD')
-					{
-						$login_error = (!$config['board_contact']) ? sprintf($user->lang[$result['error_msg']], '', '') : sprintf($user->lang[$result['error_msg']], '<a href="mailto:' . htmlspecialchars($config['board_contact'], ENT_COMPAT) . '">', '</a>');
-					}
-
-				break;
-			}
-		}
-
-		return $login_error;
-	}
-
-	/**
-	* Performs a post login redirect
-	*/
-	protected function perform_redirect()
-	{
-		global $phpbb_root_path, $phpEx;
-		$url = append_sid($phpbb_root_path . 'index.' . $phpEx);
-		redirect($url);
-	}
-}
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 7a46d3e5aa9..94a1586f9fd 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -14,6 +14,11 @@
 /**
 * @ignore
 */
+
+use phpbb\controller\helper;
+use phpbb\form\form_helper;
+use phpbb\notification\method\extended_method_interface;
+
 if (!defined('IN_PHPBB'))
 {
 	exit;
@@ -23,17 +28,28 @@ class ucp_notifications
 {
 	public $u_action;
 
+	private const FORM_TOKEN_NAME = 'ucp_notification';
+
+	/** @var helper */
+	private helper $controller_helper;
+
+	/** @var form_helper */
+	private form_helper $form_helper;
+
 	public function main($id, $mode)
 	{
 		global $config, $template, $user, $request, $phpbb_container, $phpbb_dispatcher;
 		global $phpbb_root_path, $phpEx;
 
-		add_form_key('ucp_notification');
+		add_form_key(self::FORM_TOKEN_NAME);
 
 		$start = $request->variable('start', 0);
 		$form_time = $request->variable('form_time', 0);
 		$form_time = ($form_time <= 0 || $form_time > time()) ? time() : $form_time;
 
+		$this->controller_helper = $phpbb_container->get('controller.helper');
+		$this->form_helper = $phpbb_container->get('form_helper');
+
 		/* @var $phpbb_notifications \phpbb\notification\manager */
 		$phpbb_notifications = $phpbb_container->get('notification_manager');
 
@@ -48,7 +64,7 @@ public function main($id, $mode)
 				// Add/remove subscriptions
 				if ($request->is_set_post('submit'))
 				{
-					if (!check_form_key('ucp_notification'))
+					if (!check_form_key(self::FORM_TOKEN_NAME))
 					{
 						trigger_error('FORM_INVALID');
 					}
@@ -103,11 +119,15 @@ public function main($id, $mode)
 					trigger_error($message);
 				}
 
-				$this->output_notification_methods($phpbb_notifications, $template, $user, 'notification_methods');
+				$this->output_notification_methods($phpbb_notifications, $template, $user);
 
 				$this->output_notification_types($subscriptions, $phpbb_notifications, $template, $user, $phpbb_dispatcher, 'notification_types');
 
-				$this->tpl_name = 'ucp_notifications';
+				$template->assign_vars([
+					'FORM_TOKENS'			=> $this->form_helper->get_form_tokens(self::FORM_TOKEN_NAME),
+				]);
+
+				$this->tpl_name = 'ucp_notifications_options';
 				$this->page_title = 'UCP_NOTIFICATION_OPTIONS';
 			break;
 
@@ -138,7 +158,7 @@ public function main($id, $mode)
 				// Mark specific notifications read
 				if ($request->is_set_post('submit'))
 				{
-					if (!check_form_key('ucp_notification'))
+					if (!check_form_key(self::FORM_TOKEN_NAME))
 					{
 						trigger_error('FORM_INVALID');
 					}
@@ -266,11 +286,16 @@ public function output_notification_methods(\phpbb\notification\manager $phpbb_n
 	{
 		$notification_methods = $phpbb_notifications->get_subscription_methods();
 
-		foreach ($notification_methods as $method => $method_data)
+		foreach ($notification_methods as $method_data)
 		{
+			if ($method_data['method'] instanceof extended_method_interface)
+			{
+				$ucp_template_data = $method_data['method']->get_ucp_template_data($this->controller_helper, $this->form_helper);
+				$template->assign_vars($ucp_template_data);
+			}
+
 			$template->assign_block_vars($block, array(
 				'METHOD'			=> $method_data['id'],
-
 				'NAME'				=> $user->lang($method_data['lang']),
 			));
 		}
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index ec9c1451752..c20004276cd 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -203,7 +203,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 
 			if ($action == 'quotepost')
 			{
-				$sql = 'SELECT p.post_id as msg_id, p.forum_id, p.post_text as message_text, p.poster_id as author_id, p.post_time as message_time, p.bbcode_bitfield, p.bbcode_uid, p.enable_sig, p.enable_smilies, p.enable_magic_url, t.topic_title as message_subject, u.username as quote_username
+				$sql = 'SELECT p.post_id as msg_id, p.forum_id, p.post_text as message_text, p.poster_id as author_id, p.post_time as message_time, p.post_visibility as post_visibility, p.bbcode_bitfield, p.bbcode_uid, p.enable_sig, p.enable_smilies, p.enable_magic_url, t.topic_title as message_subject, u.username as quote_username
 					FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . " u
 					WHERE p.post_id = $msg_id
 						AND t.topic_id = p.topic_id
@@ -369,6 +369,14 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 				trigger_error('NOT_AUTHORISED');
 			}
 
+			/* @var $phpbb_content_visibility \phpbb\content_visibility */
+			$phpbb_content_visibility = $phpbb_container->get('content.visibility');
+
+			if (!$phpbb_content_visibility->is_visible('post', $post['forum_id'], $post))
+			{
+				trigger_error('NO_MESSAGE');
+			}
+
 			/**
 			* Get the result of querying for the post to be quoted in the pm message
 			*
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index 4b6377e0b74..b5da2d23feb 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -314,7 +314,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 						$newline = "\n";
 					}
 
-					$string = '';
+					$string = $export_type == 'CSV_EXCEL' ? "\xEF\xBB\xBF" : ''; // Add UTF-8 BOM mark for Excel
 					foreach ($data as $value)
 					{
 						$recipients = $value['to'];
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 060a9941b39..3aa4dc6ca75 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -201,24 +201,20 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		}
 	}
 
-	$u_pm = $u_jabber = '';
+	$u_pm = '';
 
 	if ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')))
 	{
 		$u_pm = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $author_id);
 	}
 
-	if ($config['jab_enable'] && $user_info['user_jabber'] && $auth->acl_get('u_sendim'))
-	{
-		$u_jabber = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $author_id);
-	}
-
 	$can_edit_pm = ($message_row['message_time'] > time() - ($config['pm_edit_time'] * 60) || !$config['pm_edit_time']) && $folder_id == PRIVMSGS_OUTBOX && $auth->acl_get('u_pm_edit');
 
 	$msg_data = array(
 		'MESSAGE_AUTHOR_FULL'		=> get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
 		'MESSAGE_AUTHOR_COLOUR'		=> get_username_string('colour', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
 		'MESSAGE_AUTHOR'			=> get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
+		'MESSAGE_AUTHOR_ID'			=> $author_id,
 		'U_MESSAGE_AUTHOR'			=> get_username_string('profile', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
 
 		'RANK_TITLE'		=> $user_info['rank_title'],
@@ -248,7 +244,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'MESSAGE_ID'		=> $message_row['msg_id'],
 
 		'U_PM'			=>  $u_pm,
-		'U_JABBER'		=>  $u_jabber,
 
 		'U_DELETE'			=> ($auth->acl_get('u_pm_delete')) ? "$url&amp;mode=compose&amp;action=delete&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
 		'U_EMAIL'			=> $user_info['email'],
@@ -358,11 +353,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 			'NAME'		=> $user->lang['SEND_EMAIL'],
 			'U_CONTACT'	=> $user_info['email'],
 		),
-		array(
-			'ID'		=> 'jabber',
-			'NAME'		=> $user->lang['JABBER'],
-			'U_CONTACT'	=> $u_jabber,
-		),
 	);
 
 	foreach ($contact_fields as $field)
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index dcbd2624f27..a5794870b72 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -11,6 +11,8 @@
 *
 */
 
+use phpbb\messenger\method\messenger_interface;
+
 /**
 * @ignore
 */
@@ -40,7 +42,6 @@ function main($id, $mode)
 			case 'personal':
 				add_form_key('ucp_prefs_personal');
 				$data = array(
-					'notifymethod'	=> $request->variable('notifymethod', $user->data['user_notify_type']),
 					'dateformat'	=> $request->variable('dateformat', $user->data['user_dateformat'], true),
 					'lang'			=> basename($request->variable('lang', $user->data['user_lang'])),
 					'user_style'		=> $request->variable('user_style', (int) $user->data['user_style']),
@@ -52,12 +53,6 @@ function main($id, $mode)
 					'allowpm'		=> $request->variable('allowpm', (bool) $user->data['user_allow_pm']),
 				);
 
-				if ($data['notifymethod'] == NOTIFY_IM && (!$config['jab_enable'] || !$user->data['user_jabber'] || !@extension_loaded('xml')))
-				{
-					// Jabber isnt enabled, or no jabber field filled in. Update the users table to be sure its correct.
-					$data['notifymethod'] = NOTIFY_BOTH;
-				}
-
 				/**
 				* Add UCP edit global settings data before they are assigned to the template or submitted
 				*
@@ -103,7 +98,6 @@ function main($id, $mode)
 							'user_allow_viewemail'	=> $data['viewemail'],
 							'user_allow_massemail'	=> $data['massemail'],
 							'user_allow_viewonline'	=> ($auth->acl_get('u_hideonline')) ? !$data['hideonline'] : $user->data['user_allow_viewonline'],
-							'user_notify_type'		=> $data['notifymethod'],
 							'user_options'			=> $user->data['user_options'],
 
 							'user_dateformat'		=> $data['dateformat'],
@@ -179,12 +173,9 @@ function main($id, $mode)
 
 				$lang_options = phpbb_language_select($db, $data['lang'], $lang_row);
 
-				$template->assign_vars(array(
+				$template->assign_vars([
 					'ERROR'				=> (count($error)) ? implode('<br />', $error) : '',
 
-					'S_NOTIFY_EMAIL'	=> ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false,
-					'S_NOTIFY_IM'		=> ($data['notifymethod'] == NOTIFY_IM) ? true : false,
-					'S_NOTIFY_BOTH'		=> ($data['notifymethod'] == NOTIFY_BOTH) ? true : false,
 					'S_VIEW_EMAIL'		=> $data['viewemail'],
 					'S_MASS_EMAIL'		=> $data['massemail'],
 					'S_ALLOW_PM'		=> $data['allowpm'],
@@ -205,15 +196,18 @@ function main($id, $mode)
 						'name'		=> 'lang',
 						'options'	=> $lang_options,
 					],
-					'S_STYLE_OPTIONS'		=> ($config['override_user_style']) ? '' : style_select($data['user_style'], false, $styles_row),
+					'S_STYLE_OPTIONS'		=> ($config['override_user_style']) ? '' : [
+						'id'		=> 'user_style',
+						'name'		=> 'user_style',
+						'options'	=> style_select($data['user_style'], false, $styles_row)
+					],
 					'TIMEZONE_OPTIONS'	=> [
 						'tag'		=> 'select',
 						'name'		=> 'tz',
 						'options'	=> $timezone_select,
 					],
-					'S_CAN_HIDE_ONLINE'		=> ($auth->acl_get('u_hideonline')) ? true : false,
-					'S_SELECT_NOTIFY'		=> ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false)
-				);
+					'S_CAN_HIDE_ONLINE'	=> (bool) $auth->acl_get('u_hideonline'),
+				]);
 
 			break;
 
@@ -496,6 +490,8 @@ function main($id, $mode)
 				}
 
 				$template->assign_vars(array(
+					'S_SIG_ALLOWED'	=> $config['allow_sig'] && $auth->acl_get('u_sig'),
+
 					'S_BBCODE'	=> $data['bbcode'],
 					'S_SMILIES'	=> $data['smilies'],
 					'S_SIG'		=> $data['sig'],
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 87175889ba7..7802ade5d0a 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -11,6 +11,8 @@
 *
 */
 
+use phpbb\messenger\method\messenger_interface;
+
 /**
 * @ignore
 */
@@ -34,6 +36,9 @@ function main($id, $mode)
 		global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
 		global $request, $phpbb_container, $phpbb_log, $phpbb_dispatcher, $language;
 
+		/** @var \phpbb\controller\helper $controller_helper */
+		$controller_helper = $phpbb_container->get('controller.helper');
+
 		$user->add_lang('posting');
 
 		$submit		= $request->variable('submit', false, false, \phpbb\request\request_interface::POST);
@@ -170,35 +175,29 @@ function main($id, $mode)
 						{
 							$message = ($config['require_activation'] == USER_ACTIVATION_SELF) ? 'ACCOUNT_EMAIL_CHANGED' : 'ACCOUNT_EMAIL_CHANGED_ADMIN';
 
-							include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-
 							$server_url = generate_board_url();
 
 							$user_actkey = gen_rand_string(mt_rand(6, 10));
 
-							$messenger = new messenger(false);
-
+							$email_method = $phpbb_container->get('messenger.method.email');
 							$template_file = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? 'user_activate_inactive' : 'user_activate';
-							$messenger->template($template_file, $user->data['user_lang']);
-
-							$messenger->to($data['email'], $data['username']);
-
-							$messenger->anti_abuse_headers($config, $user);
-
-							$messenger->assign_vars(array(
+							$email_method->template($template_file, $user->data['user_lang']);
+							$email_method->to($data['email'], $data['username']);
+							$email_method->anti_abuse_headers($config, $user);
+							$email_method->assign_vars([
 								'USERNAME'		=> html_entity_decode($data['username'], ENT_COMPAT),
-								'U_ACTIVATE'	=> "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey")
-							);
-
-							$messenger->send(NOTIFY_EMAIL);
+								'U_ACTIVATE'	=> "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey",
+							]);
+							$email_method->send();
 
 							if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
 							{
 								$notifications_manager = $phpbb_container->get('notification_manager');
 								$notifications_manager->add_notifications('notification.type.admin_activate_user', array(
-									'user_id'		=> $user->data['user_id'],
-									'user_actkey'	=> $user_actkey,
-									'user_regdate'	=> time(), // Notification time
+									'user_id'					=> $user->data['user_id'],
+									'user_actkey'				=> $user_actkey,
+									'user_actkey_expiration'	=> $user::get_token_expiration(),
+									'user_regdate'				=> time(), // Notification time
 								));
 							}
 
@@ -237,8 +236,9 @@ function main($id, $mode)
 						// Now, we can remove the user completely (kill the session) - NOT BEFORE!!!
 						if (!empty($sql_ary['user_actkey']))
 						{
-							meta_refresh(5, append_sid($phpbb_root_path . 'index.' . $phpEx));
-							$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid($phpbb_root_path . 'index.' . $phpEx) . '">', '</a>');
+							$index_route = $controller_helper->route('phpbb_index_controller');
+							meta_refresh(5, $index_route);
+							$message = $language->lang($message) . '<br /><br />' . sprintf($language->lang('RETURN_INDEX'), '<a href="' . $index_route . '">', '</a>');
 
 							// Because the user gets deactivated we log him out too, killing his session
 							$user->session_kill();
@@ -246,7 +246,7 @@ function main($id, $mode)
 						else
 						{
 							meta_refresh(3, $this->u_action);
-							$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = $language->lang($message) . '<br /><br />' . sprintf($language->lang('RETURN_UCP'), '<a href="' . $this->u_action . '">', '</a>');
 						}
 
 						trigger_error($message);
@@ -288,9 +288,7 @@ function main($id, $mode)
 
 				$cp_data = $cp_error = array();
 
-				$data = array(
-					'jabber'		=> $request->variable('jabber', $user->data['user_jabber'], true),
-				);
+				$data = [];
 
 				if ($config['allow_birthdays'])
 				{
@@ -322,11 +320,7 @@ function main($id, $mode)
 
 				if ($submit)
 				{
-					$validate_array = array(
-						'jabber'		=> array(
-							array('string', true, 5, 255),
-							array('jabber')),
-					);
+					$validate_array = [];
 
 					if ($config['allow_birthdays'])
 					{
@@ -367,19 +361,7 @@ function main($id, $mode)
 
 					if (!count($error))
 					{
-						$data['notify'] = $user->data['user_notify_type'];
-
-						if ($data['notify'] == NOTIFY_IM && (!$config['jab_enable'] || !$data['jabber'] || !@extension_loaded('xml')))
-						{
-							// User has not filled in a jabber address (Or one of the modules is disabled or jabber is disabled)
-							// Disable notify by Jabber now for this user.
-							$data['notify'] = NOTIFY_EMAIL;
-						}
-
-						$sql_ary = array(
-							'user_jabber'	=> $data['jabber'],
-							'user_notify_type'	=> $data['notify'],
-						);
+						$sql_ary = [];
 
 						if ($config['allow_birthdays'])
 						{
@@ -398,16 +380,20 @@ function main($id, $mode)
 						$vars = array('cp_data', 'data', 'sql_ary');
 						extract($phpbb_dispatcher->trigger_event('core.ucp_profile_info_modify_sql_ary', compact($vars)));
 
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . $user->data['user_id'];
-						$db->sql_query($sql);
+						// Skip query if no data to update
+						if (count($sql_ary))
+						{
+							$sql = 'UPDATE ' . USERS_TABLE . '
+								SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+								WHERE user_id = ' . $user->data['user_id'];
+							$db->sql_query($sql);
+						}
 
-						// Update Custom Fields
+						// Always update custom fields
 						$cp->update_profile_field_data($user->data['user_id'], $cp_data);
 
 						meta_refresh(3, $this->u_action);
-						$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = $language->lang('PROFILE_UPDATED') . '<br /><br />' . sprintf($language->lang('RETURN_UCP'), '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 
@@ -450,8 +436,6 @@ function main($id, $mode)
 
 				$template->assign_vars(array(
 					'ERROR'				=> (count($error)) ? implode('<br />', $error) : '',
-					'S_JABBER_ENABLED'	=> $config['jab_enable'],
-					'JABBER'			=> $data['jabber'],
 				));
 
 				// Get additional profile fields and assign them to the template block var 'profile_fields'
@@ -583,7 +567,7 @@ function main($id, $mode)
 							WHERE user_id = ' . $user->data['user_id'];
 						$db->sql_query($sql);
 
-						$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = $language->lang('PROFILE_UPDATED') . '<br /><br />' . sprintf($language->lang('RETURN_UCP'), '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 				}
@@ -609,9 +593,9 @@ function main($id, $mode)
 					'S_MAGIC_URL_CHECKED' 	=> (!$enable_urls) ? ' checked="checked"' : '',
 
 					'BBCODE_STATUS'			=> $user->lang(($config['allow_sig_bbcode'] ? 'BBCODE_IS_ON' : 'BBCODE_IS_OFF'), '<a href="' . $controller_helper->route('phpbb_help_bbcode_controller') . '">', '</a>'),
-					'SMILIES_STATUS'		=> ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
-					'IMG_STATUS'			=> ($config['allow_sig_img']) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
-					'URL_STATUS'			=> ($config['allow_sig_links']) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
+					'SMILIES_STATUS'		=> ($config['allow_sig_smilies']) ? $language->lang('SMILIES_ARE_ON') : $language->lang('SMILIES_ARE_OFF'),
+					'IMG_STATUS'			=> ($config['allow_sig_img']) ? $language->lang('IMAGES_ARE_ON') : $language->lang('IMAGES_ARE_OFF'),
+					'URL_STATUS'			=> ($config['allow_sig_links']) ? $language->lang('URL_IS_ON') : $language->lang('URL_IS_OFF'),
 					'MAX_FONT_SIZE'			=> (int) $config['max_sig_font_size'],
 
 					'L_SIGNATURE_EXPLAIN'	=> $user->lang('SIGNATURE_EXPLAIN', (int) $config['max_sig_chars']),
@@ -685,18 +669,12 @@ function main($id, $mode)
 
 									if ($request->is_ajax())
 									{
-										/** @var \phpbb\avatar\helper $avatar_helper */
-										$avatar_helper = $phpbb_container->get('avatar.helper');
-
-										$avatar = $avatar_helper->get_user_avatar($user->data, 'USER_AVATAR', true);
-
 										$json_response = new \phpbb\json_response;
 										$json_response->send(array(
 											'success' => true,
 
 											'MESSAGE_TITLE'	=> $language->lang('INFORMATION'),
 											'MESSAGE_TEXT'	=> $language->lang('PROFILE_UPDATED'),
-											'AVATAR'		=> $avatar_helper->get_template_vars($avatar),
 											'REFRESH_DATA'	=> [
 												'time'	=> 3,
 												'url'		=> $this->u_action,
@@ -748,7 +726,7 @@ function main($id, $mode)
 							$phpbb_avatar_manager->handle_avatar_delete($db, $user, $avatar_data, USERS_TABLE, 'user_');
 
 							meta_refresh(3, $this->u_action);
-							$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = $language->lang('PROFILE_UPDATED') . '<br /><br />' . sprintf($language->lang('RETURN_UCP'), '<a href="' . $this->u_action . '">', '</a>');
 							trigger_error($message);
 						}
 					}
@@ -838,7 +816,7 @@ function main($id, $mode)
 							$db->sql_query($sql);
 
 							meta_refresh(3, $this->u_action);
-							$message = $user->lang['AUTOLOGIN_SESSION_KEYS_DELETED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = $language->lang('AUTOLOGIN_SESSION_KEYS_DELETED') . '<br /><br />' . sprintf($language->lang('RETURN_UCP'), '<a href="' . $this->u_action . '">', '</a>');
 							trigger_error($message);
 						}
 					}
@@ -898,7 +876,7 @@ function main($id, $mode)
 		$template->assign_vars(array(
 			'ERROR'		=> (count($error)) ? implode('<br />', $error) : '',
 
-			'L_TITLE'	=> $user->lang['UCP_PROFILE_' . strtoupper($mode)],
+			'L_TITLE'	=> $language->lang('UCP_PROFILE_' . strtoupper($mode)),
 
 			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
 			'S_UCP_ACTION'		=> $this->u_action)
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 3f9a74744a5..1dbec8e3f67 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -32,6 +32,9 @@ function main($id, $mode)
 		global $config, $db, $user, $template, $phpbb_root_path, $phpEx;
 		global $request, $phpbb_container, $phpbb_dispatcher;
 
+		/** @var \phpbb\controller\helper $controller_helper */
+		$controller_helper = $phpbb_container->get('controller.helper');
+
 		//
 		if ($config['require_activation'] == USER_ACTIVATION_DISABLE ||
 			(in_array($config['require_activation'], array(USER_ACTIVATION_SELF, USER_ACTIVATION_ADMIN)) && !$config['email_enable']))
@@ -235,8 +238,10 @@ function main($id, $mode)
 		// The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
 		if ($config['enable_confirm'])
 		{
-			$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
-			$captcha->init(CONFIRM_REG);
+			/** @var \phpbb\captcha\factory $captcha_factory */
+			$captcha_factory = $phpbb_container->get('captcha.factory');
+			$captcha = $captcha_factory->get_instance($config['captcha_plugin']);
+			$captcha->init(\phpbb\captcha\plugins\confirm_type::REGISTRATION);
 		}
 
 		$timezone = $config['board_timezone'];
@@ -291,10 +296,9 @@ function main($id, $mode)
 
 			if ($config['enable_confirm'])
 			{
-				$vc_response = $captcha->validate($data);
-				if ($vc_response !== false)
+				if ($captcha->validate() !== true)
 				{
-					$error[] = $vc_response;
+					$error[] = $captcha->get_error();
 				}
 
 				if ($config['max_reg_attempts'] && $captcha->get_attempt_count() > $config['max_reg_attempts'])
@@ -380,18 +384,19 @@ function main($id, $mode)
 				$passwords_manager = $phpbb_container->get('passwords.manager');
 
 				$user_row = array(
-					'username'				=> $data['username'],
-					'user_password'			=> $passwords_manager->hash($data['new_password']),
-					'user_email'			=> $data['email'],
-					'group_id'				=> (int) $group_id,
-					'user_timezone'			=> $data['tz'],
-					'user_lang'				=> $data['lang'],
-					'user_type'				=> $user_type,
-					'user_actkey'			=> $user_actkey,
-					'user_ip'				=> $user->ip,
-					'user_regdate'			=> time(),
-					'user_inactive_reason'	=> $user_inactive_reason,
-					'user_inactive_time'	=> $user_inactive_time,
+					'username'					=> $data['username'],
+					'user_password'				=> $passwords_manager->hash($data['new_password']),
+					'user_email'				=> $data['email'],
+					'group_id'					=> (int) $group_id,
+					'user_timezone'				=> $data['tz'],
+					'user_lang'					=> $data['lang'],
+					'user_type'					=> $user_type,
+					'user_actkey'				=> $user_actkey,
+					'user_actkey_expiration'	=> $user::get_token_expiration(),
+					'user_ip'					=> $user->ip,
+					'user_regdate'				=> time(),
+					'user_inactive_reason'		=> $user_inactive_reason,
+					'user_inactive_time'		=> $user_inactive_time,
 				);
 
 				if ($config['new_member_post_limit'])
@@ -425,7 +430,7 @@ function main($id, $mode)
 				}
 
 				// Okay, captcha, your job is done.
-				if ($config['enable_confirm'] && isset($captcha))
+				if ($config['enable_confirm'])
 				{
 					$captcha->reset();
 				}
@@ -456,30 +461,26 @@ function main($id, $mode)
 
 				if ($config['email_enable'])
 				{
-					include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-
-					$messenger = new messenger(false);
-
-					$messenger->template($email_template, $data['lang']);
-
-					$messenger->to($data['email'], $data['username']);
-
-					$messenger->anti_abuse_headers($config, $user);
-
-					$messenger->assign_vars(array(
+					/** var \phpbb\messenger\method\email */
+					$email_method = $phpbb_container->get('messenger.method.email');
+					$email_method->set_use_queue(false);
+					$email_method->template($email_template, $data['lang']);
+					$email_method->to($data['email'], $data['username']);
+					$email_method->anti_abuse_headers($config, $user);
+					$email_method->assign_vars([
 						'WELCOME_MSG'	=> html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), ENT_COMPAT),
 						'USERNAME'		=> html_entity_decode($data['username'], ENT_COMPAT),
 						'PASSWORD'		=> html_entity_decode($data['new_password'], ENT_COMPAT),
-						'U_ACTIVATE'	=> "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey")
-					);
+						'U_ACTIVATE'	=> "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey",
+					]);
 
 					if ($coppa)
 					{
-						$messenger->assign_vars(array(
+						$email_method->assign_vars([
 							'FAX_INFO'		=> $config['coppa_fax'],
 							'MAIL_INFO'		=> $config['coppa_mail'],
-							'EMAIL_ADDRESS'	=> $data['email'])
-						);
+							'EMAIL_ADDRESS'	=> $data['email'],
+						]);
 					}
 
 					/**
@@ -493,8 +494,9 @@ function main($id, $mode)
 					* @var	string		server_url	Server URL
 					* @var	int			user_id		New user ID
 					* @var	string		user_actkey	User activation key
-					* @var	messenger	messenger	phpBB Messenger
+					* @var	\phpbb\messenger\method\email	email_method	phpBB email notification method
 					* @since 3.2.4-RC1
+					* @changed 4.0.0-a1 Added vars: email_method. Removed vars: messenger.
 					*/
 					$vars = array(
 						'user_row',
@@ -504,11 +506,11 @@ function main($id, $mode)
 						'server_url',
 						'user_id',
 						'user_actkey',
-						'messenger',
+						'email_method',
 					);
 					extract($phpbb_dispatcher->trigger_event('core.ucp_register_welcome_email_before', compact($vars)));
 
-					$messenger->send(NOTIFY_EMAIL);
+					$email_method->send();
 				}
 
 				if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
@@ -559,7 +561,7 @@ function main($id, $mode)
 				);
 				extract($phpbb_dispatcher->trigger_event('core.ucp_register_register_after', compact($vars)));
 
-				$message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+				$message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . $controller_helper->route('phpbb_index_controller') . '">', '</a>');
 				trigger_error($message);
 			}
 		}
diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php
index 7f952af6c31..699e67b22af 100644
--- a/phpBB/includes/ucp/ucp_resend.php
+++ b/phpBB/includes/ucp/ucp_resend.php
@@ -30,7 +30,10 @@ class ucp_resend
 	function main($id, $mode)
 	{
 		global $config, $phpbb_root_path, $phpEx;
-		global $db, $user, $auth, $template, $request;
+		global $db, $user, $auth, $template, $request, $phpbb_container;
+
+		/** @var \phpbb\controller\helper $controller_helper */
+		$controller_helper = $phpbb_container->get('controller.helper');
 
 		$username	= $request->variable('username', '', true);
 		$email		= strtolower($request->variable('email', ''));
@@ -45,7 +48,7 @@ function main($id, $mode)
 				trigger_error('FORM_INVALID');
 			}
 
-			$sql = 'SELECT user_id, group_id, username, user_email, user_type, user_lang, user_actkey, user_inactive_reason
+			$sql = 'SELECT user_id, group_id, username, user_email, user_type, user_lang, user_actkey, user_actkey_expiration, user_inactive_reason
 				FROM ' . USERS_TABLE . "
 				WHERE user_email = '" . $db->sql_escape($email) . "'
 					AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
@@ -73,6 +76,12 @@ function main($id, $mode)
 				trigger_error('ACCOUNT_DEACTIVATED');
 			}
 
+			// Do not resend activation email if valid one still exists
+			if (!empty($user_row['user_actkey']) && (int) $user_row['user_actkey_expiration'] >= time())
+			{
+				trigger_error('ACTIVATION_ALREADY_SENT');
+			}
+
 			// Determine coppa status on group (REGISTERED(_COPPA))
 			$sql = 'SELECT group_name, group_type
 				FROM ' . GROUPS_TABLE . '
@@ -86,34 +95,35 @@ function main($id, $mode)
 				trigger_error('NO_GROUP');
 			}
 
+			$board_url = generate_board_url();
 			$coppa = ($row['group_name'] == 'REGISTERED_COPPA' && $row['group_type'] == GROUP_SPECIAL) ? true : false;
 
-			include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-			$messenger = new messenger(false);
+			$email_method = $phpbb_container->get('messenger.method.email');
+			$email_method->set_use_queue(false);
 
 			if ($config['require_activation'] == USER_ACTIVATION_SELF || $coppa)
 			{
-				$messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']);
-				$messenger->set_addresses($user_row);
+				$email_method->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']);
+				$email_method->set_addresses($user_row);
 
-				$messenger->anti_abuse_headers($config, $user);
+				$email_method->anti_abuse_headers($config, $user);
 
-				$messenger->assign_vars(array(
+				$email_method->assign_vars([
 					'WELCOME_MSG'	=> html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), ENT_COMPAT),
 					'USERNAME'		=> html_entity_decode($user_row['username'], ENT_COMPAT),
-					'U_ACTIVATE'	=> generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}")
-				);
+					'U_ACTIVATE'	=> $board_url . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}",
+				]);
 
 				if ($coppa)
 				{
-					$messenger->assign_vars(array(
+					$email_method->assign_vars([
 						'FAX_INFO'		=> $config['coppa_fax'],
 						'MAIL_INFO'		=> $config['coppa_mail'],
-						'EMAIL_ADDRESS'	=> $user_row['user_email'])
-					);
+						'EMAIL_ADDRESS'	=> $user_row['user_email'],
+					]);
 				}
 
-				$messenger->send(NOTIFY_EMAIL);
+				$email_method->send();
 			}
 
 			if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
@@ -121,33 +131,39 @@ function main($id, $mode)
 				// Grab an array of user_id's with a_user permissions ... these users can activate a user
 				$admin_ary = $auth->acl_get_list(false, 'a_user', false);
 
-				$sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type
+				$sql = 'SELECT user_id, username, user_email, user_lang
 					FROM ' . USERS_TABLE . '
 					WHERE ' . $db->sql_in_set('user_id', $admin_ary[0]['a_user']);
 				$result = $db->sql_query($sql);
 
+				/** @var \phpbb\di\service_collection $messenger_collection */
+				$messenger_collection = $phpbb_container->get('messenger.method_collection');
+				/** @var \phpbb\messenger\method\messenger_interface $messenger_method */
+				$messenger_method = $messenger_collection->offsetGet('messenger.method.email');
+
 				while ($row = $db->sql_fetchrow($result))
 				{
-					$messenger->template('admin_activate', $row['user_lang']);
-					$messenger->set_addresses($row);
-
-					$messenger->anti_abuse_headers($config, $user);
-
-					$messenger->assign_vars(array(
+					$messenger_method->set_use_queue(false);
+					$messenger_method->template('admin_activate', $row['user_lang']);
+					$messenger_method->set_addresses($row);
+					$messenger_method->anti_abuse_headers($config, $user);
+					$messenger_method->assign_vars([
 						'USERNAME'			=> html_entity_decode($user_row['username'], ENT_COMPAT),
-						'U_USER_DETAILS'	=> generate_board_url() . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}",
-						'U_ACTIVATE'		=> generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}")
-					);
+						'U_USER_DETAILS'	=> $board_url . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}",
+						'U_ACTIVATE'		=> $board_url . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}",
+					]);
 
-					$messenger->send($row['user_notify_type']);
+					$messenger_method->send();
 				}
 				$db->sql_freeresult($result);
 			}
 
-			meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
+			$this->update_activation_expiration();
+
+			meta_refresh(3, $controller_helper->route('phpbb_index_controller'));
 
 			$message = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? $user->lang['ACTIVATION_EMAIL_SENT_ADMIN'] : $user->lang['ACTIVATION_EMAIL_SENT'];
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+			$message .= '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . $controller_helper->route('phpbb_index_controller') . '">', '</a>');
 			trigger_error($message);
 		}
 
@@ -160,4 +176,23 @@ function main($id, $mode)
 		$this->tpl_name = 'ucp_resend';
 		$this->page_title = 'UCP_RESEND';
 	}
+
+	/**
+	 * Update activation expiration to 1 day from now
+	 *
+	 * @return void
+	 */
+	protected function update_activation_expiration(): void
+	{
+		global $db, $user;
+
+		$sql_ary = [
+			'user_actkey_expiration'	=> $user::get_token_expiration(),
+		];
+
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+			WHERE user_id = ' . (int) $user->id();
+		$db->sql_query($sql);
+	}
 }
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php
index b8c35a50481..ed86829b97d 100644
--- a/phpBB/includes/utf/utf_tools.php
+++ b/phpBB/includes/utf/utf_tools.php
@@ -72,6 +72,22 @@ function utf8_strpos($str, $needle, $offset = null)
 	}
 }
 
+/**
+* UTF-8 aware alternative to stripos
+* @ignore
+*/
+function utf8_stripos($str, $needle, $offset = null)
+{
+	if (is_null($offset))
+	{
+		return mb_stripos($str, $needle);
+	}
+	else
+	{
+		return mb_stripos($str, $needle, $offset);
+	}
+}
+
 /**
 * UTF-8 aware alternative to strtolower
 * @ignore
diff --git a/phpBB/index.php b/phpBB/index.php
index bc7c1a4707f..3781bfe0f0e 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -11,9 +11,6 @@
 *
 */
 
-/**
-*/
-
 /**
 * @ignore
 */
@@ -21,191 +18,17 @@
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
-include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 
 // Start session management
 $user->session_begin();
 $auth->acl($user->data);
-$user->setup('viewforum');
-
-// Mark notifications read
-if (($mark_notification = $request->variable('mark_notification', 0)))
-{
-	if ($user->data['user_id'] == ANONYMOUS)
-	{
-		if ($request->is_ajax())
-		{
-			trigger_error('LOGIN_REQUIRED');
-		}
-		login_box('', $user->lang['LOGIN_REQUIRED']);
-	}
-
-	if (check_link_hash($request->variable('hash', ''), 'mark_notification_read'))
-	{
-		/* @var $phpbb_notifications \phpbb\notification\manager */
-		$phpbb_notifications = $phpbb_container->get('notification_manager');
-
-		$notification = $phpbb_notifications->load_notifications('notification.method.board', array(
-			'notification_id'	=> $mark_notification,
-		));
-
-		if (isset($notification['notifications'][$mark_notification]))
-		{
-			$notification = $notification['notifications'][$mark_notification];
-
-			$notification->mark_read();
-
-			/**
-			* You can use this event to perform additional tasks or redirect user elsewhere.
-			*
-			* @event core.index_mark_notification_after
-			* @var	int										mark_notification	Notification ID
-			* @var	\phpbb\notification\type\type_interface	notification		Notification instance
-			* @since 3.2.6-RC1
-			*/
-			$vars = array('mark_notification', 'notification');
-			extract($phpbb_dispatcher->trigger_event('core.index_mark_notification_after', compact($vars)));
-
-			if ($request->is_ajax())
-			{
-				$json_response = new \phpbb\json_response();
-				$json_response->send(array(
-					'success'	=> true,
-				));
-			}
-
-			if (($redirect = $request->variable('redirect', '')))
-			{
-				redirect(append_sid($phpbb_root_path . $redirect));
-			}
-
-			redirect($notification->get_redirect_url());
-		}
-	}
-}
-
-display_forums('', $config['load_moderators']);
-
-/** @var \phpbb\group\helper $group_helper */
-$group_helper = $phpbb_container->get('group_helper');
-
-$group_helper->display_legend($db, $template);
-
-// Generate birthday list if required ...
-$show_birthdays = ($config['load_birthdays'] && $config['allow_birthdays'] && $auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'));
-
-$birthdays = $birthday_list = array();
-if ($show_birthdays)
-{
-	$time = $user->create_datetime();
-	$now = phpbb_gmgetdate($time->getTimestamp() + $time->getOffset());
-
-	// Display birthdays of 29th february on 28th february in non-leap-years
-	$leap_year_birthdays = '';
-	if ($now['mday'] == 28 && $now['mon'] == 2 && !$time->format('L'))
-	{
-		$leap_year_birthdays = " OR u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', 29, 2)) . "%'";
-	}
-
-	$sql_ary = array(
-		'SELECT' => 'u.user_id, u.username, u.user_colour, u.user_birthday',
-		'FROM' => array(
-			USERS_TABLE => 'u',
-		),
-		'LEFT_JOIN' => array(
-			array(
-				'FROM' => array(BANS_TABLE => 'b'),
-				'ON' => 'u.user_id = b.ban_userid',
-			),
-		),
-		'WHERE' => 'b.ban_id IS NULL
-			AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ")
-			AND (u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' $leap_year_birthdays)",
-	);
-
-	/**
-	* Event to modify the SQL query to get birthdays data
-	*
-	* @event core.index_modify_birthdays_sql
-	* @var	array	now			The assoc array with the 'now' local timestamp data
-	* @var	array	sql_ary		The SQL array to get the birthdays data
-	* @var	object	time		The user related Datetime object
-	* @since 3.1.7-RC1
-	*/
-	$vars = array('now', 'sql_ary', 'time');
-	extract($phpbb_dispatcher->trigger_event('core.index_modify_birthdays_sql', compact($vars)));
-
-	$sql = $db->sql_build_query('SELECT', $sql_ary);
-	$result = $db->sql_query($sql);
-	$rows = $db->sql_fetchrowset($result);
-	$db->sql_freeresult($result);
-
-	foreach ($rows as $row)
-	{
-		$birthday_username	= get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
-		$birthday_year		= (int) substr($row['user_birthday'], -4);
-		$birthday_age		= ($birthday_year) ? max(0, $now['year'] - $birthday_year) : '';
-
-		$birthdays[] = array(
-			'USERNAME'	=> $birthday_username,
-			'AGE'		=> $birthday_age,
-		);
-
-		// For 3.0 compatibility
-		$birthday_list[] = $birthday_username . (($birthday_age) ? " ({$birthday_age})" : '');
-	}
-
-	/**
-	* Event to modify the birthdays list
-	*
-	* @event core.index_modify_birthdays_list
-	* @var	array	birthdays		Array with the users birthdays data
-	* @var	array	rows			Array with the birthdays SQL query result
-	* @since 3.1.7-RC1
-	*/
-	$vars = array('birthdays', 'rows');
-	extract($phpbb_dispatcher->trigger_event('core.index_modify_birthdays_list', compact($vars)));
-
-	$template->assign_block_vars_array('birthdays', $birthdays);
-}
-
-$controller_helper = $phpbb_container->get('controller.helper');
-// Assign index specific vars
-$template->assign_vars(array(
-	'TOTAL_POSTS'	=> $user->lang('TOTAL_POSTS_COUNT', (int) $config['num_posts']),
-	'TOTAL_TOPICS'	=> $user->lang('TOTAL_TOPICS', (int) $config['num_topics']),
-	'TOTAL_USERS'	=> $user->lang('TOTAL_USERS', (int) $config['num_users']),
-	'NEWEST_USER'	=> $user->lang('NEWEST_USER', get_username_string('full', $config['newest_user_id'], $config['newest_username'], $config['newest_user_colour'])),
-
-	'BIRTHDAY_LIST'	=> (empty($birthday_list)) ? '' : implode($user->lang['COMMA_SEPARATOR'], $birthday_list),
-
-	'S_LOGIN_ACTION'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'),
-	'U_SEND_PASSWORD'           => ($config['email_enable'] && $config['allow_password_reset']) ? $controller_helper->route('phpbb_ucp_forgot_password_controller') : '',
-	'S_DISPLAY_BIRTHDAY_LIST'	=> $show_birthdays,
-	'S_INDEX'					=> true,
-
-	'U_CANONICAL'		=> generate_board_url() . '/',
-	'U_MARK_FORUMS'		=> ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'hash=' . generate_link_hash('global') . '&amp;mark=forums&amp;mark_time=' . time()) : '',
-	'U_MCP'				=> ($auth->acl_get('m_') || $auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=front') : '')
-);
-
-$page_title = ($config['board_index_text'] !== '') ? $config['board_index_text'] : $user->lang['INDEX'];
-
-/**
-* You can use this event to modify the page title and load data for the index
-*
-* @event core.index_modify_page_title
-* @var	string	page_title		Title of the index page
-* @since 3.1.0-a1
-*/
-$vars = array('page_title');
-extract($phpbb_dispatcher->trigger_event('core.index_modify_page_title', compact($vars)));
-
-// Output page
-page_header($page_title, true);
+$user->setup('app');
 
-$template->set_filenames(array(
-	'body' => 'index_body.html')
-);
+/* @var $http_kernel \Symfony\Component\HttpKernel\HttpKernel */
+$http_kernel = $phpbb_container->get('http_kernel');
 
-page_footer();
+/* @var $symfony_request \phpbb\symfony_request */
+$symfony_request = $phpbb_container->get('symfony_request');
+$response = $http_kernel->handle($symfony_request);
+$response->send();
+$http_kernel->terminate($symfony_request, $response);
diff --git a/phpBB/install/convert/convertor.php b/phpBB/install/convert/convertor.php
index 1f09943b504..f2a9ce51f42 100644
--- a/phpBB/install/convert/convertor.php
+++ b/phpBB/install/convert/convertor.php
@@ -445,9 +445,9 @@ function convert_data($converter)
 			// Now process queries and execute functions that have to be executed prior to the conversion
 			if (!empty($convert->convertor['execute_first']))
 			{
-				// @codingStandardsIgnoreStart
+				// phpcs:disable Squiz.PHP.Eval
 				eval($convert->convertor['execute_first']);
-				// @codingStandardsIgnoreEnd
+				// phpcs:enable Squiz.PHP.Eval
 			}
 
 			if (!empty($convert->convertor['query_first']))
@@ -517,9 +517,9 @@ function convert_data($converter)
 				// process execute_first and query_first for this table...
 				if (!empty($schema['execute_first']))
 				{
-					// @codingStandardsIgnoreStart
+					// phpcs:disable Squiz.PHP.Eval
 					eval($schema['execute_first']);
-					// @codingStandardsIgnoreEnd
+					// phpcs:enable Squiz.PHP.Eval
 				}
 
 				if (!empty($schema['query_first']))
@@ -584,9 +584,9 @@ function convert_data($converter)
 			// it gets split because of time restrictions
 			if (!empty($schema['execute_always']))
 			{
-				// @codingStandardsIgnoreStart
+				// phpcs:disable Squiz.PHP.Eval
 				eval($schema['execute_always']);
-				// @codingStandardsIgnoreEnd
+				// phpcs:enable Squiz.PHP.Eval
 			}
 
 			//
@@ -1101,17 +1101,17 @@ function jump($converter, $jump, $last_statement)
 			{
 				if (!is_array($convert->convertor['execute_last']))
 				{
-					// @codingStandardsIgnoreStart
+					// phpcs:disable Squiz.PHP.Eval
 					eval($convert->convertor['execute_last']);
-					// @codingStandardsIgnoreEnd
+					// phpcs:enable Squiz.PHP.Eval
 				}
 				else
 				{
 					while ($last_statement < count($convert->convertor['execute_last']))
 					{
-						// @codingStandardsIgnoreStart
+						// phpcs:disable Squiz.PHP.Eval
 						eval($convert->convertor['execute_last'][$last_statement]);
-						// @codingStandardsIgnoreEnd
+						// phpcs:enable Squiz.PHP.Eval
 
 						$this->template->assign_block_vars('checks', array(
 							'TITLE'		=> $convert->convertor['execute_last'][$last_statement],
@@ -1477,9 +1477,9 @@ function process_row(&$schema, &$sql_data, &$insert_values)
 
 								$execution = str_replace('{RESULT}', '$value', $execution);
 								$execution = str_replace('{VALUE}', '$value', $execution);
-								// @codingStandardsIgnoreStart
+								// phpcs:disable Squiz.PHP.Eval
 								eval($execution);
-								// @codingStandardsIgnoreEnd
+								// phpcs:enable Squiz.PHP.Eval
 							}
 						}
 					}
@@ -1532,9 +1532,9 @@ function process_row(&$schema, &$sql_data, &$insert_values)
 
 								$execution = str_replace('{RESULT}', '$value', $execution);
 								$execution = str_replace('{VALUE}', '$value', $execution);
-								// @codingStandardsIgnoreStart
+								// phpcs:disable Squiz.PHP.Eval
 								eval($execution);
-								// @codingStandardsIgnoreEnd
+								// phpcs:enable Squiz.PHP.Eval
 							}
 						}
 					}
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
deleted file mode 100644
index afea6a92da0..00000000000
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ /dev/null
@@ -1,983 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-/**
-* NOTE to potential convertor authors. Please use this file to get
-* familiar with the structure since we added some bare explanations here.
-*
-* Since this file gets included more than once on one page you are not able to add functions to it.
-* Instead use a functions_ file.
-*
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
-extract($phpbb_config_php_file->get_all());
-unset($dbpasswd);
-
-$dbms = \phpbb\config_php_file::convert_30_dbms_to_31($dbms);
-
-/**
-* $convertor_data provides some basic information about this convertor which is
-* used on the initial list of convertors and to populate the default settings
-*/
-$convertor_data = array(
-	'forum_name'	=> 'phpBB 2.0.x',
-	'version'		=> '1.0.3',
-	'phpbb_version'	=> '4.0.0-a1-dev',
-	'author'		=> '<a href="https://www.phpbb.com/">phpBB Limited</a>',
-	'dbms'			=> $dbms,
-	'dbhost'		=> $dbhost,
-	'dbport'		=> $dbport,
-	'dbuser'		=> $dbuser,
-	'dbpasswd'		=> '',
-	'dbname'		=> $dbname,
-	'table_prefix'	=> 'phpbb_',
-	'forum_path'	=> '../forums',
-	'author_notes'	=> '',
-);
-
-/**
-* $tables is a list of the tables (minus prefix) which we expect to find in the
-* source forum. It is used to guess the prefix if the specified prefix is incorrect
-*/
-$tables = array(
-	'auth_access',
-	'banlist',
-	'categories',
-	'disallow',
-	'forum_prune',
-	'forums',
-	'groups',
-	'posts',
-	'posts_text',
-	'privmsgs',
-	'privmsgs_text',
-	'ranks',
-	'smilies',
-	'topics',
-	'topics_watch',
-	'user_group',
-	'users',
-	'vote_desc',
-	'vote_results',
-	'vote_voters',
-	'words'
-);
-
-/**
-* $config_schema details how the board configuration information is stored in the source forum.
-*
-* 'table_format' can take the value 'file' to indicate a config file. In this case array_name
-* is set to indicate the name of the array the config values are stored in
-* Example of using a file:
-* $config_schema = array(
-* 	'table_format'	=>	'file',
-* 	'filename'	=>	'NAME OF FILE', // If the file is not in the root directory, the path needs to be added with no leading slash
-* 	'array_name' => 'NAME OF ARRAY', // Only used if the configuration file stores the setting in an array.
-* 	'settings'		=>	array(
-*        'board_email' => 'SUPPORT_EMAIL', // target config name => source target name
-* 	)
-* );
-* 'table_format' can be an array if the values are stored in a table which is an assosciative array
-* (as per phpBB 2.0.x)
-* If left empty, values are assumed to be stored in a table where each config setting is
-* a column (as per phpBB 1.x)
-*
-* In either of the latter cases 'table_name' indicates the name of the table in the database
-*
-* 'settings' is an array which maps the name of the config directive in the source forum
-* to the config directive in phpBB3. It can either be a direct mapping or use a function.
-* Please note that the contents of the old config value are passed to the function, therefore
-* an in-built function requiring the variable passed by reference is not able to be used. Since
-* empty() is such a function we created the function is_empty() to be used instead.
-*/
-$config_schema = array(
-	'table_name'	=>	'config',
-	'table_format'	=>	array('config_name' => 'config_value'),
-	'settings'		=>	array(
-		'allow_bbcode'			=> 'allow_bbcode',
-		'allow_smilies'			=> 'allow_smilies',
-		'allow_sig'				=> 'allow_sig',
-		'allow_namechange'		=> 'allow_namechange',
-		'allow_avatar_local'	=> 'allow_avatar_local',
-		'allow_avatar_upload'	=> 'allow_avatar_upload',
-		'board_disable'			=> 'board_disable',
-		'sitename'				=> 'phpbb_set_encoding(sitename)',
-		'site_desc'				=> 'phpbb_set_encoding(site_desc)',
-		'session_length'		=> 'session_length',
-		'board_email_sig'		=> 'phpbb_set_encoding(board_email_sig)',
-		'posts_per_page'		=> 'posts_per_page',
-		'topics_per_page'		=> 'topics_per_page',
-		'enable_confirm'		=> 'enable_confirm',
-		'board_email_form'		=> 'board_email_form',
-		'override_user_style'	=> 'override_user_style',
-		'hot_threshold'			=> 'hot_threshold',
-		'max_poll_options'		=> 'max_poll_options',
-		'max_sig_chars'			=> 'max_sig_chars',
-		'pm_max_msgs'			=> 'max_inbox_privmsgs',
-		'smtp_delivery'			=> 'smtp_delivery',
-		'smtp_host'				=> 'smtp_host',
-		'smtp_username'			=> 'smtp_username',
-		'smtp_password'			=> 'smtp_password',
-		'require_activation'	=> 'require_activation',
-		'flood_interval'		=> 'flood_interval',
-		'avatar_filesize'		=> 'avatar_filesize',
-		'avatar_max_width'		=> 'avatar_max_width',
-		'avatar_max_height'		=> 'avatar_max_height',
-		'default_dateformat'	=> 'phpbb_set_encoding(default_dateformat)',
-		'board_timezone'		=> 'phpbb_convert_timezone(board_timezone)',
-		'allow_privmsg'			=> 'not(privmsg_disable)',
-		'gzip_compress'			=> 'gzip_compress',
-		'coppa_enable'			=> '!is_empty(coppa_mail)',
-		'coppa_fax'				=> 'coppa_fax',
-		'coppa_mail'			=> 'coppa_mail',
-		'record_online_users'	=> 'record_online_users',
-		'record_online_date'	=> 'record_online_date',
-		'board_startdate'		=> 'board_startdate',
-	)
-);
-
-/**
-* $test_file is the name of a file which is present on the source
-* forum which can be used to check that the path specified by the
-* user was correct
-*/
-$test_file = 'modcp.php';
-
-/**
-* If this is set then we are not generating the first page of information but getting the conversion information.
-*/
-if (!$get_info)
-{
-	// Test to see if the birthday MOD is installed on the source forum
-	// Niels' birthday mod
-	if (get_config_value('birthday_required') !== false || get_config_value('bday_require') !== false)
-	{
-		define('MOD_BIRTHDAY', true);
-	}
-
-	// TerraFrost's validated birthday mod
-	if (get_config_value('bday_require') !== false)
-	{
-		define('MOD_BIRTHDAY_TERRA', true);
-	}
-
-	// Test to see if the attachment MOD is installed on the source forum
-	// If it is, we will convert this data as well
-	$src_db->sql_return_on_error(true);
-
-	$sql = "SELECT config_value
-		FROM {$convert->src_table_prefix}attachments_config
-		WHERE config_name = 'upload_dir'";
-	$result = $src_db->sql_query($sql);
-
-	if ($result && $row = $src_db->sql_fetchrow($result))
-	{
-		// Here the constant is defined
-		define('MOD_ATTACHMENT', true);
-
-		// Here i add more tables to be checked in the old forum
-		$tables += array(
-			'attachments',
-			'attachments_desc',
-			'extensions',
-			'extension_groups'
-		);
-
-		$src_db->sql_freeresult($result);
-	}
-	else if ($result)
-	{
-		$src_db->sql_freeresult($result);
-	}
-
-
-	/**
-	* Tests for further MODs can be included here.
-	* Please use constants for this, prefixing them with MOD_
-	*/
-
-	$src_db->sql_return_on_error(false);
-
-	// Now let us set a temporary config variable for user id incrementing
-	$sql = "SELECT user_id
-		FROM {$convert->src_table_prefix}users
-		WHERE user_id = 1";
-	$result = $src_db->sql_query($sql);
-	$user_id = (int) $src_db->sql_fetchfield('user_id');
-	$src_db->sql_freeresult($result);
-
-	// If there is a user id 1, we need to increment user ids. :/
-	if ($user_id === 1)
-	{
-		// Try to get the maximum user id possible...
-		$sql = "SELECT MAX(user_id) AS max_user_id
-			FROM {$convert->src_table_prefix}users";
-		$result = $src_db->sql_query($sql);
-		$user_id = (int) $src_db->sql_fetchfield('max_user_id');
-		$src_db->sql_freeresult($result);
-
-		$config->set('increment_user_id', ($user_id + 1), false);
-	}
-	else
-	{
-		$config->set('increment_user_id', 0, false);
-	}
-
-	// Overwrite maximum avatar width/height
-	@define('DEFAULT_AVATAR_X_CUSTOM', get_config_value('avatar_max_width'));
-	@define('DEFAULT_AVATAR_Y_CUSTOM', get_config_value('avatar_max_height'));
-
-	// additional table used only during conversion
-	@define('USERCONV_TABLE', $table_prefix . 'userconv');
-
-/**
-*	Description on how to use the convertor framework.
-*
-*	'schema' Syntax Description
-*		-> 'target'			=> Target Table. If not specified the next table will be handled
-*		-> 'primary'		=> Primary Key. If this is specified then this table is processed in batches
-*		-> 'query_first'	=> array('target' or 'src', Query to execute before beginning the process
-*								(if more than one then specified as array))
-*		-> 'function_first'	=> Function to execute before beginning the process (if more than one then specified as array)
-*								(This is mostly useful if variables need to be given to the converting process)
-*		-> 'test_file'		=> This is not used at the moment but should be filled with a file from the old installation
-*
-*		// DB Functions
-*		'distinct'	=> Add DISTINCT to the select query
-*		'where'		=> Add WHERE to the select query
-*		'group_by'	=> Add GROUP BY to the select query
-*		'left_join'	=> Add LEFT JOIN to the select query (if more than one joins specified as array)
-*		'having'	=> Add HAVING to the select query
-*
-*		// DB INSERT array
-*		This one consist of three parameters
-*		First Parameter:
-*							The key need to be filled within the target table
-*							If this is empty, the target table gets not assigned the source value
-*		Second Parameter:
-*							Source value. If the first parameter is specified, it will be assigned this value.
-*							If the first parameter is empty, this only gets added to the select query
-*		Third Parameter:
-*							Custom Function. Function to execute while storing source value into target table.
-*							The functions return value get stored.
-*							The function parameter consist of the value of the second parameter.
-*
-*							types:
-*								- empty string == execute nothing
-*								- string == function to execute
-*								- array == complex execution instructions
-*
-*		Complex execution instructions:
-*		@todo test complex execution instructions - in theory they will work fine
-*
-*							By defining an array as the third parameter you are able to define some statements to be executed. The key
-*							is defining what to execute, numbers can be appended...
-*
-*							'function' => execute function
-*							'execute' => run code, whereby all occurrences of {VALUE} get replaced by the last returned value.
-*										The result *must* be assigned/stored to {RESULT}.
-*							'typecast'	=> typecast value
-*
-*							The returned variables will be made always available to the next function to continue to work with.
-*
-*							example (variable inputted is an integer of 1):
-*
-*							array(
-*								'function1'		=> 'increment_by_one',		// returned variable is 2
-*								'typecast'		=> 'string',				// typecast variable to be a string
-*								'execute'		=> '{RESULT} = {VALUE} . ' is good';', // returned variable is '2 is good'
-*								'function2'		=> 'replace_good_with_bad',				// returned variable is '2 is bad'
-*							),
-*
-*/
-
-	$convertor = array(
-		'test_file'				=> 'viewtopic.php',
-
-		'avatar_path'			=> get_config_value('avatar_path') . '/',
-		'avatar_gallery_path'	=> get_config_value('avatar_gallery_path') . '/',
-		'smilies_path'			=> get_config_value('smilies_path') . '/',
-		'upload_path'			=> (defined('MOD_ATTACHMENT')) ? phpbb_get_files_dir() . '/' : '',
-		'thumbnails'			=> (defined('MOD_ATTACHMENT')) ? array('thumbs/', 't_') : '',
-		'ranks_path'			=> false, // phpBB 2.0.x had no config value for a ranks path
-
-		// We empty some tables to have clean data available
-		'query_first'			=> array(
-			array('target', $convert->truncate_statement . SEARCH_RESULTS_TABLE),
-			array('target', $convert->truncate_statement . SEARCH_WORDLIST_TABLE),
-			array('target', $convert->truncate_statement . SEARCH_WORDMATCH_TABLE),
-			array('target', $convert->truncate_statement . LOG_TABLE),
-		),
-
-//	with this you are able to import all attachment files on the fly. For large boards this is not an option, therefore commented out by default.
-//	Instead every file gets copied while processing the corresponding attachment entry.
-//		if (defined("MOD_ATTACHMENT")) { import_attachment_files(); phpbb_copy_thumbnails(); }
-
-		// phpBB2 allowed some similar usernames to coexist which would have the same
-		// username_clean in phpBB3 which is not possible, so we'll give the admin a list
-		// of user ids and usernames and let him deicde what he wants to do with them
-		'execute_first'	=> '
-			phpbb_create_userconv_table();
-			import_avatar_gallery();
-			if (defined("MOD_ATTACHMENT")) phpbb_import_attach_config();
-			phpbb_insert_forums();
-		',
-
-		'execute_last'	=> array('
-			add_bots();
-		', '
-			update_folder_pm_count();
-		', '
-			update_unread_count();
-		', (defined('MOD_ATTACHMENT')) ? '
-			phpbb_attachment_extension_group_name();
-		' : '
-		', '
-			phpbb_convert_authentication(\'start\');
-		', '
-			phpbb_convert_authentication(\'first\');
-		', '
-			phpbb_convert_authentication(\'second\');
-		', '
-			phpbb_convert_authentication(\'third\');
-		'),
-
-		'schema' => array(
-			array(
-				'target'	=> USERCONV_TABLE,
-				'query_first'   => array('target', $convert->truncate_statement . USERCONV_TABLE),
-
-
-				array('user_id',			'users.user_id', 	''),
-				array('username_clean',		'users.username',	array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_clean_string')),
-			),
-
-			array(
-				'target'		=> (defined('MOD_ATTACHMENT')) ? ATTACHMENTS_TABLE : '',
-				'primary'		=> 'attachments.attach_id',
-				'query_first'	=> (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . ATTACHMENTS_TABLE) : '',
-				'autoincrement'	=> 'attach_id',
-
-				array('attach_id',				'attachments.attach_id',				''),
-				array('post_msg_id',			'attachments.post_id',					''),
-				array('topic_id',				'posts.topic_id',						''),
-				array('in_message',				0,										''),
-				array('is_orphan',				0,										''),
-				array('poster_id',				'attachments.user_id_1 AS poster_id',	'phpbb_user_id'),
-				array('physical_filename',		'attachments_desc.physical_filename',	'import_attachment'),
-				array('real_filename',			'attachments_desc.real_filename',		'phpbb_set_encoding'),
-				array('download_count',			'attachments_desc.download_count',		''),
-				array('attach_comment',			'attachments_desc.comment',				array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
-				array('extension',				'attachments_desc.extension',			''),
-				array('mimetype',				'attachments_desc.mimetype',			''),
-				array('filesize',				'attachments_desc.filesize',			''),
-				array('filetime',				'attachments_desc.filetime',			''),
-				array('thumbnail',				'attachments_desc.thumbnail',			''),
-
-				'where'			=> 'attachments_desc.attach_id = attachments.attach_id AND attachments.privmsgs_id = 0 AND posts.post_id = attachments.post_id',
-				'group_by'		=> 'attachments.attach_id'
-			),
-
-			array(
-				'target'		=> (defined('MOD_ATTACHMENT')) ? ATTACHMENTS_TABLE : '',
-				'primary'		=> 'attachments.attach_id',
-				'autoincrement'	=> 'attach_id',
-
-				array('attach_id',				'attachments.attach_id',				''),
-				array('post_msg_id',			'attachments.privmsgs_id',				''),
-				array('topic_id',				0,										''),
-				array('in_message',				1,										''),
-				array('is_orphan',				0,										''),
-				array('poster_id',				'attachments.user_id_1 AS poster_id',	'phpbb_user_id'),
-				array('physical_filename',		'attachments_desc.physical_filename',	'import_attachment'),
-				array('real_filename',			'attachments_desc.real_filename',		'phpbb_set_encoding'),
-				array('download_count',			'attachments_desc.download_count',		''),
-				array('attach_comment',			'attachments_desc.comment',				array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
-				array('extension',				'attachments_desc.extension',			''),
-				array('mimetype',				'attachments_desc.mimetype',			''),
-				array('filesize',				'attachments_desc.filesize',			''),
-				array('filetime',				'attachments_desc.filetime',			''),
-				array('thumbnail',				'attachments_desc.thumbnail',			''),
-
-				'where'			=> 'attachments_desc.attach_id = attachments.attach_id AND attachments.post_id = 0',
-				'group_by'		=> 'attachments.attach_id'
-			),
-
-			array(
-				'target'		=> (defined('MOD_ATTACHMENT')) ? EXTENSIONS_TABLE : '',
-				'query_first'	=> (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . EXTENSIONS_TABLE) : '',
-				'autoincrement'	=> 'extension_id',
-
-				array('extension_id',			'extensions.ext_id',				''),
-				array('group_id',				'extensions.group_id',				''),
-				array('extension',				'extensions.extension',				''),
-			),
-
-			array(
-				'target'		=> (defined('MOD_ATTACHMENT')) ? EXTENSION_GROUPS_TABLE : '',
-				'query_first'	=> (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . EXTENSION_GROUPS_TABLE) : '',
-				'autoincrement'	=> 'group_id',
-
-				array('group_id',				'extension_groups.group_id',			''),
-				array('group_name',				'extension_groups.group_name',			array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
-				array('cat_id',					'extension_groups.cat_id',				'phpbb_attachment_category'),
-				array('allow_group',			'extension_groups.allow_group',			''),
-				array('upload_icon',			'',										''),
-				array('max_filesize',			'extension_groups.max_filesize',		''),
-				array('allowed_forums',			'extension_groups.forum_permissions',	'phpbb_attachment_forum_perms'),
-				array('allow_in_pm',			1,										''),
-			),
-
-			array(
-				'target'		=> BANS_TABLE,
-				'execute_first' => 'phpbb_check_username_collisions();',
-				'query_first'	=> array('target', $convert->truncate_statement . BANS_TABLE),
-
-				array('ban_mode',				'user',					''),
-				array('ban_item',				'banlist.ban_userid',	'phpbb_user_id'),
-				array('ban_userid',			'banlist.ban_userid',	'phpbb_user_id'),
-				array('ban_reason',				'',						''),
-				array('ban_reason_display',		'',						''),
-
-				'where'			=> "banlist.ban_ip NOT LIKE '%.%'
-										AND banlist.ban_userid <> 0",
-			),
-
-			array(
-				'target'		=> BANS_TABLE,
-
-				array('ban_mode',				'email',				''),
-				array('ban_item',				'banlist.ban_email',	''),
-				array('ban_reason',				'',						''),
-				array('ban_reason_display',		'',						''),
-
-				'where'			=> "banlist.ban_ip NOT LIKE '%.%'
-										AND banlist.ban_email <> ''",
-			),
-
-			array(
-				'target'		=> BANS_TABLE,
-
-				array('ban_mode',				'ip',				''),
-				array('ban_item',				'banlist.ban_ip',	'decode_ban_ip'),
-				array('ban_reason',				'',						''),
-				array('ban_reason_display',		'',						''),
-
-				'where'			=> "banlist.ban_userid = 0
-										AND banlist.ban_ip <> ''",
-			),
-
-			array(
-				'target'		=> DISALLOW_TABLE,
-				'query_first'	=> array('target', $convert->truncate_statement . DISALLOW_TABLE),
-
-				array('disallow_username',		'disallow.disallow_username',				'phpbb_disallowed_username'),
-			),
-
-			array(
-				'target'		=> RANKS_TABLE,
-				'query_first'	=> array('target', $convert->truncate_statement . RANKS_TABLE),
-				'autoincrement'	=> 'rank_id',
-
-				array('rank_id',					'ranks.rank_id',				''),
-				array('rank_title',					'ranks.rank_title',				array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_htmlspecialchars')),
-				array('rank_min',					'ranks.rank_min',				array('typecast' => 'int', 'execute' => '{RESULT} = ({VALUE}[0] < 0) ? 0 : {VALUE}[0];')),
-				array('rank_special',				'ranks.rank_special',			''),
-				array('rank_image',					'ranks.rank_image',				'import_rank'),
-			),
-
-			array(
-				'target'		=> TOPICS_TABLE,
-				'query_first'	=> array('target', $convert->truncate_statement . TOPICS_TABLE),
-				'primary'		=> 'topics.topic_id',
-				'autoincrement'	=> 'topic_id',
-
-				array('topic_id',				'topics.topic_id',					''),
-				array('forum_id',				'topics.forum_id',					''),
-				array('icon_id',				0,									''),
-				array('topic_poster',			'topics.topic_poster AS poster_id',	'phpbb_user_id'),
-				array('topic_attachment',		((defined('MOD_ATTACHMENT')) ? 'topics.topic_attachment' : 0), ''),
-				array('topic_title',			'topics.topic_title',				'phpbb_set_encoding'),
-				array('topic_time',				'topics.topic_time',				''),
-				array('topic_views',			'topics.topic_views',				''),
-				array('topic_posts_approved',	'topics.topic_replies',				'phpbb_topic_replies_to_posts'),
-				array('topic_posts_unapproved',	0,									''),
-				array('topic_posts_softdeleted',0,									''),
-				array('topic_last_post_id',		'topics.topic_last_post_id',		''),
-				array('topic_status',			'topics.topic_status',				'is_topic_locked'),
-				array('topic_moved_id',			0,									''),
-				array('topic_type',				'topics.topic_type',				'phpbb_convert_topic_type'),
-				array('topic_first_post_id',	'topics.topic_first_post_id',		''),
-				array('topic_last_view_time',	'posts.post_time',					'intval'),
-				array('topic_visibility',		ITEM_APPROVED,						''),
-
-				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'htmlspecialchars_decode', 'function4' => 'utf8_htmlspecialchars')),
-				array('poll_start',				'vote_desc.vote_start',				'null_to_zero'),
-				array('poll_length',			'vote_desc.vote_length',			'null_to_zero'),
-				array('poll_max_options',		1,									''),
-				array('poll_vote_change',		0,									''),
-
-				'left_join'		=>	array (	'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1',
-											'topics LEFT JOIN posts ON topics.topic_last_post_id = posts.post_id',
-									),
-				'where'			=> 'topics.topic_moved_id = 0',
-			),
-
-			array(
-				'target'		=> TOPICS_TABLE,
-				'primary'		=> 'topics.topic_id',
-				'autoincrement'	=> 'topic_id',
-
-				array('topic_id',				'topics.topic_id',					''),
-				array('forum_id',				'topics.forum_id',					''),
-				array('icon_id',				0,									''),
-				array('topic_poster',			'topics.topic_poster AS poster_id',	'phpbb_user_id'),
-				array('topic_attachment',		((defined('MOD_ATTACHMENT')) ? 'topics.topic_attachment' : 0), ''),
-				array('topic_title',			'topics.topic_title',				'phpbb_set_encoding'),
-				array('topic_time',				'topics.topic_time',				''),
-				array('topic_views',			'topics.topic_views',				''),
-				array('topic_posts_approved',	'topics.topic_replies',				'phpbb_topic_replies_to_posts'),
-				array('topic_posts_unapproved',	0,									''),
-				array('topic_posts_softdeleted',0,									''),
-				array('topic_last_post_id',		'topics.topic_last_post_id',		''),
-				array('topic_status',			ITEM_MOVED,							''),
-				array('topic_moved_id',			'topics.topic_moved_id',			''),
-				array('topic_type',				'topics.topic_type',				'phpbb_convert_topic_type'),
-				array('topic_first_post_id',	'topics.topic_first_post_id',		''),
-				array('topic_visibility',		ITEM_APPROVED,						''),
-
-				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'htmlspecialchars_decode', 'function4' => 'utf8_htmlspecialchars')),
-				array('poll_start',				'vote_desc.vote_start',				'null_to_zero'),
-				array('poll_length',			'vote_desc.vote_length',			'null_to_zero'),
-				array('poll_max_options',		1,									''),
-				array('poll_vote_change',		0,									''),
-
-				'left_join'		=> 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1',
-				'where'			=> 'topics.topic_moved_id <> 0',
-			),
-
-			array(
-				'target'		=> TOPICS_WATCH_TABLE,
-				'primary'		=> 'topics_watch.topic_id',
-				'query_first'	=> array('target', $convert->truncate_statement . TOPICS_WATCH_TABLE),
-
-				array('topic_id',				'topics_watch.topic_id',			''),
-				array('user_id',				'topics_watch.user_id',				'phpbb_user_id'),
-				array('notify_status',			'topics_watch.notify_status',		''),
-			),
-
-			array(
-				'target'		=> SMILIES_TABLE,
-				'query_first'	=> array('target', $convert->truncate_statement . SMILIES_TABLE),
-				'autoincrement'	=> 'smiley_id',
-
-				array('smiley_id',				'smilies.smilies_id',				''),
-				array('code',					'smilies.code',						array('function1' => 'phpbb_smilie_html_decode', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')),
-				array('emotion',				'smilies.emoticon',					'phpbb_set_encoding'),
-				array('smiley_url',				'smilies.smile_url',				'import_smiley'),
-				array('smiley_width',			'smilies.smile_url',				'get_smiley_width'),
-				array('smiley_height',			'smilies.smile_url',				'get_smiley_height'),
-				array('smiley_order',			'smilies.smilies_id',				''),
-				array('display_on_posting',		'smilies.smilies_id',				'get_smiley_display'),
-
-				'order_by'		=> 'smilies.smilies_id ASC',
-			),
-
-			array(
-				'target'		=> POLL_OPTIONS_TABLE,
-				'primary'		=> 'vote_results.vote_option_id',
-				'query_first'	=> array('target', $convert->truncate_statement . POLL_OPTIONS_TABLE),
-
-				array('poll_option_id',			'vote_results.vote_option_id',		''),
-				array('topic_id',				'vote_desc.topic_id',				''),
-				array('',						'topics.topic_poster AS poster_id',	'phpbb_user_id'),
-				array('poll_option_text',		'vote_results.vote_option_text',	array('function1' => 'phpbb_set_encoding', 'function2' => 'htmlspecialchars_decode', 'function3' => 'utf8_htmlspecialchars')),
-				array('poll_option_total',		'vote_results.vote_result',			''),
-
-				'where'			=> 'vote_results.vote_id = vote_desc.vote_id',
-				'left_join'		=> 'vote_desc LEFT JOIN topics ON topics.topic_id = vote_desc.topic_id',
-			),
-
-			array(
-				'target'		=> POLL_VOTES_TABLE,
-				'primary'		=> 'vote_desc.topic_id',
-				'query_first'	=> array('target', $convert->truncate_statement . POLL_VOTES_TABLE),
-
-				array('poll_option_id',			VOTE_CONVERTED,						''),
-				array('topic_id',				'vote_desc.topic_id',				''),
-				array('vote_user_id',			'vote_voters.vote_user_id',			'phpbb_user_id'),
-				array('vote_user_ip',			'vote_voters.vote_user_ip',			'decode_ip'),
-
-				'where'			=> 'vote_voters.vote_id = vote_desc.vote_id',
-			),
-
-			array(
-				'target'		=> WORDS_TABLE,
-				'primary'		=> 'words.word_id',
-				'query_first'	=> array('target', $convert->truncate_statement . WORDS_TABLE),
-				'autoincrement'	=> 'word_id',
-
-				array('word_id',				'words.word_id',					''),
-				array('word',					'words.word',						'phpbb_set_encoding'),
-				array('replacement',			'words.replacement',				'phpbb_set_encoding'),
-			),
-
-			array(
-				'target'		=> POSTS_TABLE,
-				'primary'		=> 'posts.post_id',
-				'autoincrement'	=> 'post_id',
-				'query_first'	=> array('target', $convert->truncate_statement . POSTS_TABLE),
-				'execute_first'	=> '
-					$config["max_post_chars"] = 0;
-					$config["min_post_chars"] = 0;
-					$config["max_quote_depth"] = 0;
-				',
-
-				array('post_id',				'posts.post_id',					''),
-				array('topic_id',				'posts.topic_id',					''),
-				array('forum_id',				'posts.forum_id',					''),
-				array('poster_id',				'posts.poster_id',					'phpbb_user_id'),
-				array('icon_id',				0,									''),
-				array('poster_ip',				'posts.poster_ip',					'decode_ip'),
-				array('post_time',				'posts.post_time',					''),
-				array('enable_bbcode',			'posts.enable_bbcode',				''),
-				array('',						'posts.enable_html',				''),
-				array('enable_smilies',			'posts.enable_smilies',				''),
-				array('enable_sig',				'posts.enable_sig',					''),
-				array('enable_magic_url',		1,									''),
-				array('post_username',			'posts.post_username',				'phpbb_set_encoding'),
-				array('post_subject',			'posts_text.post_subject',			'phpbb_set_encoding'),
-				array('post_attachment',		((defined('MOD_ATTACHMENT')) ? 'posts.post_attachment' : 0), ''),
-				array('post_edit_time',			'posts.post_edit_time',				array('typecast' => 'int')),
-				array('post_edit_count',		'posts.post_edit_count',			''),
-				array('post_edit_reason',		'',									''),
-				array('post_edit_user',			'',									'phpbb_post_edit_user'),
-				array('post_visibility',		ITEM_APPROVED,						''),
-
-				array('bbcode_uid',				'posts.post_time',					'make_uid'),
-				array('post_text',				'posts_text.post_text',				'phpbb_prepare_message'),
-				array('',						'posts_text.bbcode_uid AS old_bbcode_uid',			''),
-				array('bbcode_bitfield',		'',									'get_bbcode_bitfield'),
-				array('post_checksum',			'',									''),
-
-				// Commented out inline search indexing, this takes up a LOT of time. :D
-				// @todo We either need to enable this or call the rebuild search functionality post convert
-/*				array('',						'',									'search_indexing'),
-				array('',						'posts_text.post_text AS message',	''),
-				array('',						'posts_text.post_subject AS title',	''),*/
-
-				'where'			=>	'posts.post_id = posts_text.post_id'
-			),
-
-			array(
-				'target'		=> PRIVMSGS_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-				'autoincrement'	=> 'msg_id',
-				'query_first'	=> array(
-					array('target', $convert->truncate_statement . PRIVMSGS_TABLE),
-					array('target', $convert->truncate_statement . PRIVMSGS_RULES_TABLE),
-				),
-
-				'execute_first'	=> '
-					$config["max_post_chars"] = 0;
-					$config["min_post_chars"] = 0;
-					$config["max_quote_depth"] = 0;
-				',
-
-				array('msg_id',					'privmsgs.privmsgs_id',				''),
-				array('root_level',				0,									''),
-				array('author_id',				'privmsgs.privmsgs_from_userid AS poster_id',	'phpbb_user_id'),
-				array('icon_id',				0,									''),
-				array('author_ip',				'privmsgs.privmsgs_ip',				'decode_ip'),
-				array('message_time',			'privmsgs.privmsgs_date',			''),
-				array('enable_bbcode',			'privmsgs.privmsgs_enable_bbcode AS enable_bbcode',	''),
-				array('',						'privmsgs.privmsgs_enable_html AS enable_html',	''),
-				array('enable_smilies',			'privmsgs.privmsgs_enable_smilies AS enable_smilies',	''),
-				array('enable_magic_url',		1,									''),
-				array('enable_sig',				'privmsgs.privmsgs_attach_sig',		''),
-				array('message_subject',		'privmsgs.privmsgs_subject',		'phpbb_set_encoding'), // Already specialchared in 2.0.x
-				array('message_attachment',		((defined('MOD_ATTACHMENT')) ? 'privmsgs.privmsgs_attachment' : 0), ''),
-				array('message_edit_reason',	'',									''),
-				array('message_edit_user',		0,									''),
-				array('message_edit_time',		0,									''),
-				array('message_edit_count',		0,									''),
-
-				array('bbcode_uid',				'privmsgs.privmsgs_date AS post_time',	'make_uid'),
-				array('message_text',			'privmsgs_text.privmsgs_text',			'phpbb_prepare_message'),
-				array('',						'privmsgs_text.privmsgs_bbcode_uid AS old_bbcode_uid',			''),
-				array('bbcode_bitfield',		'',										'get_bbcode_bitfield'),
-				array('to_address',				'privmsgs.privmsgs_to_userid',			'phpbb_privmsgs_to_userid'),
-				array('bcc_address',			'',										''),
-
-				'where'			=>	'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id'
-			),
-
-			array(
-				'target'		=> PRIVMSGS_FOLDER_TABLE,
-				'primary'		=> 'users.user_id',
-				'query_first'	=> array('target', $convert->truncate_statement . PRIVMSGS_FOLDER_TABLE),
-
-				array('user_id',				'users.user_id',						'phpbb_user_id'),
-				array('folder_name',			$user->lang['CONV_SAVED_MESSAGES'],		''),
-				array('pm_count',				0,										''),
-
-				'where'			=> 'users.user_id <> -1',
-			),
-
-			// Inbox
-			array(
-				'target'		=> PRIVMSGS_TO_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-				'query_first'	=> array('target', $convert->truncate_statement . PRIVMSGS_TO_TABLE),
-
-				array('msg_id',					'privmsgs.privmsgs_id',					''),
-				array('user_id',				'privmsgs.privmsgs_to_userid',			'phpbb_user_id'),
-				array('author_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('pm_deleted',				0,										''),
-				array('pm_new',					'privmsgs.privmsgs_type',				'phpbb_new_pm'),
-				array('pm_unread',				'privmsgs.privmsgs_type',				'phpbb_unread_pm'),
-				array('pm_replied',				0,										''),
-				array('pm_marked',				0,										''),
-				array('pm_forwarded',			0,										''),
-				array('folder_id',				PRIVMSGS_INBOX,							''),
-
-				'where'			=> 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id
-										AND (privmsgs.privmsgs_type = 0 OR privmsgs.privmsgs_type = 1 OR privmsgs.privmsgs_type = 5)',
-			),
-
-			// Outbox
-			array(
-				'target'		=> PRIVMSGS_TO_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-
-				array('msg_id',					'privmsgs.privmsgs_id',					''),
-				array('user_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('author_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('pm_deleted',				0,										''),
-				array('pm_new',					0,										''),
-				array('pm_unread',				0,										''),
-				array('pm_replied',				0,										''),
-				array('pm_marked',				0,										''),
-				array('pm_forwarded',			0,										''),
-				array('folder_id',				PRIVMSGS_OUTBOX,						''),
-
-				'where'			=> 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id
-										AND (privmsgs.privmsgs_type = 1 OR privmsgs.privmsgs_type = 5)',
-			),
-
-			// Sentbox
-			array(
-				'target'		=> PRIVMSGS_TO_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-
-				array('msg_id',					'privmsgs.privmsgs_id',					''),
-				array('user_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('author_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('pm_deleted',				0,										''),
-				array('pm_new',					'privmsgs.privmsgs_type',				'phpbb_new_pm'),
-				array('pm_unread',				'privmsgs.privmsgs_type',				'phpbb_unread_pm'),
-				array('pm_replied',				0,										''),
-				array('pm_marked',				0,										''),
-				array('pm_forwarded',			0,										''),
-				array('folder_id',				PRIVMSGS_SENTBOX,						''),
-
-				'where'			=> 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id
-										AND privmsgs.privmsgs_type = 2',
-			),
-
-			// Savebox (SAVED IN)
-			array(
-				'target'		=> PRIVMSGS_TO_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-
-				array('msg_id',					'privmsgs.privmsgs_id',					''),
-				array('user_id',				'privmsgs.privmsgs_to_userid',			'phpbb_user_id'),
-				array('author_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('pm_deleted',				0,										''),
-				array('pm_new',					'privmsgs.privmsgs_type',				'phpbb_new_pm'),
-				array('pm_unread',				'privmsgs.privmsgs_type',				'phpbb_unread_pm'),
-				array('pm_replied',				0,										''),
-				array('pm_marked',				0,										''),
-				array('pm_forwarded',			0,										''),
-				array('folder_id',				'privmsgs.privmsgs_to_userid',			'phpbb_get_savebox_id'),
-
-				'where'			=> 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id
-										AND privmsgs.privmsgs_type = 3',
-			),
-
-			// Savebox (SAVED OUT)
-			array(
-				'target'		=> PRIVMSGS_TO_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-
-				array('msg_id',					'privmsgs.privmsgs_id',					''),
-				array('user_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('author_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('pm_deleted',				0,										''),
-				array('pm_new',					'privmsgs.privmsgs_type',				'phpbb_new_pm'),
-				array('pm_unread',				'privmsgs.privmsgs_type',				'phpbb_unread_pm'),
-				array('pm_replied',				0,										''),
-				array('pm_marked',				0,										''),
-				array('pm_forwarded',			0,										''),
-				array('folder_id',				'privmsgs.privmsgs_from_userid',		'phpbb_get_savebox_id'),
-
-				'where'			=> 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id
-										AND privmsgs.privmsgs_type = 4',
-			),
-
-			array(
-				'target'		=> GROUPS_TABLE,
-				'autoincrement'	=> 'group_id',
-				'query_first'	=> array(
-					array('target', $convert->truncate_statement . GROUPS_TABLE),
-					array('target', $convert->truncate_statement . TEAMPAGE_TABLE),
-				),
-
-				array('group_id',				'groups.group_id',					''),
-				array('group_type',				'groups.group_type',				'phpbb_convert_group_type'),
-				array('group_display',			0,									''),
-				array('group_legend',			0,									''),
-				array('group_name',				'groups.group_name',				'phpbb_convert_group_name'), // phpbb_set_encoding called in phpbb_convert_group_name
-				array('group_desc',				'groups.group_description',			'phpbb_set_encoding'),
-
-				'where'			=> 'groups.group_single_user = 0',
-			),
-
-			array(
-				'target'		=> USER_GROUP_TABLE,
-				'query_first'	=> array('target', $convert->truncate_statement . USER_GROUP_TABLE),
-				'execute_first'	=> '
-					add_default_groups();
-					add_groups_to_teampage();
-				',
-
-				array('group_id',		'groups.group_id',					''),
-				array('user_id',		'groups.group_moderator',			'phpbb_user_id'),
-				array('group_leader',	1,									''),
-				array('user_pending',	0,									''),
-
-				'where'			=> 'groups.group_single_user = 0 AND groups.group_moderator <> 0',
-			),
-
-			array(
-				'target'		=> USER_GROUP_TABLE,
-
-				array('group_id',		'user_group.group_id',				''),
-				array('user_id',		'user_group.user_id',				'phpbb_user_id'),
-				array('group_leader',	0,									''),
-				array('user_pending',	'user_group.user_pending',			''),
-
-				'where'			=> 'user_group.group_id = groups.group_id AND groups.group_single_user = 0 AND groups.group_moderator <> user_group.user_id',
-			),
-
-			array(
-				'target'		=> USERS_TABLE,
-				'primary'		=> 'users.user_id',
-				'autoincrement'	=> 'user_id',
-				'query_first'	=> array(
-					array('target', 'DELETE FROM ' . USERS_TABLE . ' WHERE user_id <> ' . ANONYMOUS),
-					array('target', $convert->truncate_statement . BOTS_TABLE),
-					array('target', $convert->truncate_statement . USER_NOTIFICATIONS_TABLE),
-				),
-
-				'execute_last'	=> '
-					remove_invalid_users();
-				',
-
-				array('user_id',				'users.user_id',					'phpbb_user_id'),
-				array('',						'users.user_id AS poster_id',		'phpbb_user_id'),
-				array('user_type',				'users.user_active',				'set_user_type'),
-				array('group_id',				'users.user_level',					'phpbb_set_primary_group'),
-				array('user_regdate',			'users.user_regdate',				''),
-				array('username',				'users.username',					'phpbb_set_default_encoding'), // recode to utf8 with default lang
-				array('username_clean',			'users.username',					array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_clean_string')),
-				array('user_password',			'users.user_password',				'phpbb_convert_password_hash'),
-				array('user_posts',				'users.user_posts',					'intval'),
-				array('user_email',				'users.user_email',					'strtolower'),
-				array('user_birthday',			((defined('MOD_BIRTHDAY')) ? 'users.user_birthday' : ''),	'phpbb_get_birthday'),
-				array('user_lastvisit',			'users.user_lastvisit',				'intval'),
-				array('user_lastmark',			'users.user_lastvisit',				'intval'),
-				array('user_lang',				$config['default_lang'],			''),
-				array('',						'users.user_lang',					''),
-				array('user_timezone',			'users.user_timezone',				'phpbb_convert_timezone'),
-				array('user_dateformat',		'users.user_dateformat',			array('function1' => 'phpbb_set_encoding', 'function2' => 'fill_dateformat')),
-				array('user_inactive_reason',	'',									'phpbb_inactive_reason'),
-				array('user_inactive_time',		'',									'phpbb_inactive_time'),
-
-				array('user_jabber',			'',									''),
-				array('user_rank',				'users.user_rank',					'intval'),
-				array('user_permissions',		'',									''),
-
-				array('user_avatar',			'users.user_avatar',				'phpbb_import_avatar'),
-				array('user_avatar_type',		'users.user_avatar_type',			'phpbb_avatar_type'),
-				array('user_avatar_width',		'users.user_avatar',				'phpbb_get_avatar_width'),
-				array('user_avatar_height',		'users.user_avatar',				'phpbb_get_avatar_height'),
-
-				array('user_new_privmsg',		'users.user_new_privmsg',			''),
-				array('user_unread_privmsg',	0,									''), //'users.user_unread_privmsg'
-				array('user_last_privmsg',		'users.user_last_privmsg',			'intval'),
-				array('user_emailtime',			'users.user_emailtime',				'null_to_zero'),
-				array('user_notify',			'users.user_notify',				'intval'),
-				array('user_notify_pm',			'users.user_notify_pm',				'intval'),
-				array('user_notify_type',		NOTIFY_EMAIL,						''),
-				array('user_allow_pm',			'users.user_allow_pm',				'intval'),
-				array('user_allow_viewonline',	'users.user_allow_viewonline',		'intval'),
-				array('user_allow_viewemail',	'users.user_viewemail',				'intval'),
-				array('user_actkey',			'users.user_actkey',				''),
-				array('user_newpasswd',			'',									''), // Users need to re-request their password...
-				array('user_style',				$config['default_style'],			''),
-
-				array('user_options',			'',									'set_user_options'),
-				array('',						'users.user_popup_pm AS popuppm',	''),
-				array('',						'users.user_allowhtml AS html',		''),
-				array('',						'users.user_allowbbcode AS bbcode',	''),
-				array('',						'users.user_allowsmile AS smile',	''),
-				array('',						'users.user_attachsig AS attachsig',''),
-
-				array('user_sig_bbcode_uid',		'users.user_regdate',							'make_uid'),
-				array('user_sig',					'users.user_sig',								'phpbb_prepare_message'),
-				array('',							'users.user_sig_bbcode_uid AS old_bbcode_uid',	''),
-				array('user_sig_bbcode_bitfield',	'',												'get_bbcode_bitfield'),
-				array('',							'users.user_regdate AS post_time',				''),
-
-				array('',						'users.user_notify_pm',				'phpbb_add_notification_options'),
-
-				'where'			=> 'users.user_id <> -1',
-			),
-
-			array(
-				'target'		=> PROFILE_FIELDS_DATA_TABLE,
-				'primary'		=> 'users.user_id',
-				'query_first'	=> array(
-					array('target', $convert->truncate_statement . PROFILE_FIELDS_DATA_TABLE),
-				),
-
-				array('user_id',				'users.user_id',					'phpbb_user_id'),
-				array('pf_phpbb_occupation',	'users.user_occ',					array('function1' => 'phpbb_set_encoding')),
-				array('pf_phpbb_interests',		'users.user_interests',				array('function1' => 'phpbb_set_encoding')),
-				array('pf_phpbb_location',		'users.user_from',					array('function1' => 'phpbb_set_encoding')),
-				array('pf_phpbb_icq',			'users.user_icq',					array('function1' => 'phpbb_set_encoding')),
-				array('pf_phpbb_yahoo',			'users.user_yim',					array('function1' => 'phpbb_set_encoding')),
-				array('pf_phpbb_website',		'users.user_website',				'validate_website'),
-
-				'where'			=> 'users.user_id <> -1',
-			),
-		),
-	);
-}
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
deleted file mode 100644
index 75a0b8def45..00000000000
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ /dev/null
@@ -1,1931 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-use phpbb\attachment\attachment_category;
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Helper functions for phpBB 2.0.x to phpBB 3.1.x conversion
-*/
-
-/**
-* Set forum flags - only prune old polls by default
-*/
-function phpbb_forum_flags()
-{
-	// Set forum flags
-	$forum_flags = 0;
-
-	// FORUM_FLAG_LINK_TRACK
-	$forum_flags += 0;
-
-	// FORUM_FLAG_PRUNE_POLL
-	$forum_flags += FORUM_FLAG_PRUNE_POLL;
-
-	// FORUM_FLAG_PRUNE_ANNOUNCE
-	$forum_flags += 0;
-
-	// FORUM_FLAG_PRUNE_STICKY
-	$forum_flags += 0;
-
-	// FORUM_FLAG_ACTIVE_TOPICS
-	$forum_flags += 0;
-
-	// FORUM_FLAG_POST_REVIEW
-	$forum_flags += FORUM_FLAG_POST_REVIEW;
-
-	return $forum_flags;
-}
-
-/**
-* Insert/Convert forums
-*/
-function phpbb_insert_forums()
-{
-	global $db, $src_db, $same_db, $convert, $user;
-
-	$db->sql_query($convert->truncate_statement . FORUMS_TABLE);
-
-	// Determine the highest id used within the old forums table (we add the categories after the forum ids)
-	$sql = 'SELECT MAX(forum_id) AS max_forum_id
-		FROM ' . $convert->src_table_prefix . 'forums';
-	$result = $src_db->sql_query($sql);
-	$max_forum_id = (int) $src_db->sql_fetchfield('max_forum_id');
-	$src_db->sql_freeresult($result);
-
-	$max_forum_id++;
-
-	// pruning disabled globally?
-	$sql = "SELECT config_value
-		FROM {$convert->src_table_prefix}config
-		WHERE config_name = 'prune_enable'";
-	$result = $src_db->sql_query($sql);
-	$prune_enabled = (int) $src_db->sql_fetchfield('config_value');
-	$src_db->sql_freeresult($result);
-
-	// Insert categories
-	$sql = 'SELECT cat_id, cat_title
-		FROM ' . $convert->src_table_prefix . 'categories
-		ORDER BY cat_order';
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'binary'");
-	}
-
-	$result = $src_db->sql_query($sql);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'utf8'");
-	}
-
-	switch ($db->get_sql_layer())
-	{
-		case 'mssql_odbc':
-		case 'mssqlnative':
-			$db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' ON');
-		break;
-	}
-
-	$cats_added = array();
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		$sql_ary = array(
-			'forum_id'		=> (int) $max_forum_id,
-			'forum_name'	=> ($row['cat_title']) ? htmlspecialchars(phpbb_set_default_encoding($row['cat_title']), ENT_COMPAT, 'UTF-8') : $user->lang['CATEGORY'],
-			'parent_id'		=> 0,
-			'forum_parents'	=> '',
-			'forum_desc'	=> '',
-			'forum_type'	=> FORUM_CAT,
-			'forum_status'	=> ITEM_UNLOCKED,
-			'forum_rules'	=> '',
-		);
-
-		$sql = 'SELECT MAX(right_id) AS right_id
-			FROM ' . FORUMS_TABLE;
-		$_result = $db->sql_query($sql);
-		$cat_row = $db->sql_fetchrow($_result);
-		$db->sql_freeresult($_result);
-
-		$sql_ary['left_id'] = (int) ($cat_row['right_id'] + 1);
-		$sql_ary['right_id'] = (int) ($cat_row['right_id'] + 2);
-
-		$sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-		$db->sql_query($sql);
-
-		$cats_added[$row['cat_id']] = $max_forum_id;
-		$max_forum_id++;
-	}
-	$src_db->sql_freeresult($result);
-
-	// There may be installations having forums with non-existant category ids.
-	// We try to catch them and add them to an "unknown" category instead of leaving them out.
-	$sql = 'SELECT cat_id
-		FROM ' . $convert->src_table_prefix . 'forums
-		GROUP BY cat_id';
-	$result = $src_db->sql_query($sql);
-
-	$unknown_cat_id = false;
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		// Catch those categories not been added before
-		if (!isset($cats_added[$row['cat_id']]))
-		{
-			$unknown_cat_id = true;
-		}
-	}
-	$src_db->sql_freeresult($result);
-
-	// Is there at least one category not known?
-	if ($unknown_cat_id === true)
-	{
-		$unknown_cat_id = 'ghost';
-
-		$sql_ary = array(
-			'forum_id'		=> (int) $max_forum_id,
-			'forum_name'	=> (string) $user->lang['CATEGORY'],
-			'parent_id'		=> 0,
-			'forum_parents'	=> '',
-			'forum_desc'	=> '',
-			'forum_type'	=> FORUM_CAT,
-			'forum_status'	=> ITEM_UNLOCKED,
-			'forum_rules'	=> '',
-		);
-
-		$sql = 'SELECT MAX(right_id) AS right_id
-			FROM ' . FORUMS_TABLE;
-		$_result = $db->sql_query($sql);
-		$cat_row = $db->sql_fetchrow($_result);
-		$db->sql_freeresult($_result);
-
-		$sql_ary['left_id'] = (int) ($cat_row['right_id'] + 1);
-		$sql_ary['right_id'] = (int) ($cat_row['right_id'] + 2);
-
-		$sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-		$db->sql_query($sql);
-
-		$cats_added[$unknown_cat_id] = $max_forum_id;
-	}
-
-	// Now insert the forums
-	$sql = 'SELECT f.forum_id, f.forum_name, f.cat_id, f.forum_desc, f.forum_status, f.prune_enable, f.prune_next, fp.prune_days, fp.prune_freq FROM ' . $convert->src_table_prefix . 'forums f
-		LEFT JOIN ' . $convert->src_table_prefix . 'forum_prune fp ON f.forum_id = fp.forum_id
-		GROUP BY f.forum_id, f.forum_name, f.cat_id, f.forum_desc, f.forum_status, f.prune_enable, f.prune_next, f.forum_order, fp.prune_days, fp.prune_freq
-		ORDER BY f.cat_id, f.forum_order';
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'binary'");
-	}
-
-	$result = $src_db->sql_query($sql);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'utf8'");
-	}
-
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		// Some might have forums here with an id not being "possible"...
-		// To be somewhat friendly we "change" the category id for those to a previously created ghost category
-		if (!isset($cats_added[$row['cat_id']]) && $unknown_cat_id !== false)
-		{
-			$row['cat_id'] = $unknown_cat_id;
-		}
-
-		if (!isset($cats_added[$row['cat_id']]))
-		{
-			continue;
-		}
-
-		// Define the new forums sql ary
-		$sql_ary = array(
-			'forum_id'			=> (int) $row['forum_id'],
-			'forum_name'		=> htmlspecialchars(phpbb_set_default_encoding($row['forum_name']), ENT_COMPAT, 'UTF-8'),
-			'parent_id'			=> (int) $cats_added[$row['cat_id']],
-			'forum_parents'		=> '',
-			'forum_desc'		=> htmlspecialchars(phpbb_set_default_encoding($row['forum_desc']), ENT_COMPAT, 'UTF-8'),
-			'forum_type'		=> FORUM_POST,
-			'forum_status'		=> is_item_locked($row['forum_status']),
-			'enable_prune'		=> ($prune_enabled) ? (int) $row['prune_enable'] : 0,
-			'prune_next'		=> (int) null_to_zero($row['prune_next']),
-			'prune_days'		=> (int) null_to_zero($row['prune_days']),
-			'prune_viewed'		=> 0,
-			'prune_freq'		=> (int) null_to_zero($row['prune_freq']),
-
-			'forum_flags'		=> phpbb_forum_flags(),
-			'forum_options'		=> 0,
-
-			// Default values
-			'forum_desc_bitfield'		=> '',
-			'forum_desc_options'		=> 7,
-			'forum_desc_uid'			=> '',
-			'forum_link'				=> '',
-			'forum_password'			=> '',
-			'forum_style'				=> 0,
-			'forum_image'				=> '',
-			'forum_rules'				=> '',
-			'forum_rules_link'			=> '',
-			'forum_rules_bitfield'		=> '',
-			'forum_rules_options'		=> 7,
-			'forum_rules_uid'			=> '',
-			'forum_topics_per_page'		=> 0,
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-			'forum_last_poster_id'		=> 0,
-			'forum_last_post_subject'	=> '',
-			'forum_last_post_time'		=> 0,
-			'forum_last_poster_name'	=> '',
-			'forum_last_poster_colour'	=> '',
-			'display_on_index'			=> 1,
-			'enable_indexing'			=> 1,
-			'enable_icons'				=> 0,
-		);
-
-		// Now add the forums with proper left/right ids
-		$sql = 'SELECT left_id, right_id
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_id = ' . $cats_added[$row['cat_id']];
-		$_result = $db->sql_query($sql);
-		$cat_row = $db->sql_fetchrow($_result);
-		$db->sql_freeresult($_result);
-
-		$sql = 'UPDATE ' . FORUMS_TABLE . '
-			SET left_id = left_id + 2, right_id = right_id + 2
-			WHERE left_id > ' . $cat_row['right_id'];
-		$db->sql_query($sql);
-
-		$sql = 'UPDATE ' . FORUMS_TABLE . '
-			SET right_id = right_id + 2
-			WHERE ' . $cat_row['left_id'] . ' BETWEEN left_id AND right_id';
-		$db->sql_query($sql);
-
-		$sql_ary['left_id'] = (int) $cat_row['right_id'];
-		$sql_ary['right_id'] = (int) ($cat_row['right_id'] + 1);
-
-		$sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-		$db->sql_query($sql);
-	}
-	$src_db->sql_freeresult($result);
-
-	switch ($db->get_sql_layer())
-	{
-		case 'postgres':
-			$db->sql_query("SELECT SETVAL('" . FORUMS_TABLE . "_seq',(select case when max(forum_id)>0 then max(forum_id)+1 else 1 end from " . FORUMS_TABLE . '));');
-		break;
-
-		case 'mssql_odbc':
-		case 'mssqlnative':
-			$db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' OFF');
-		break;
-
-		case 'oracle':
-			$result = $db->sql_query('SELECT MAX(forum_id) as max_id FROM ' . FORUMS_TABLE);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			$largest_id = (int) $row['max_id'];
-
-			if ($largest_id)
-			{
-				$db->sql_query('DROP SEQUENCE ' . FORUMS_TABLE . '_seq');
-				$db->sql_query('CREATE SEQUENCE ' . FORUMS_TABLE . '_seq START WITH ' . ($largest_id + 1));
-			}
-		break;
-	}
-}
-
-/**
-* Function for recoding text with the default language
-*
-* @param string $text text to recode to utf8
-* @param bool $grab_user_lang if set to true the function tries to use $convert_row['user_lang'] (and falls back to $convert_row['poster_id']) instead of the boards default language
-*/
-function phpbb_set_encoding($text, $grab_user_lang = true)
-{
-	global $lang_enc_array, $convert_row;
-	global $convert, $phpEx;
-
-	/*static $lang_enc_array = array(
-		'korean'						=> 'euc-kr',
-		'serbian'						=> 'windows-1250',
-		'polish'						=> 'iso-8859-2',
-		'kurdish'						=> 'windows-1254',
-		'slovak'						=> 'Windows-1250',
-		'russian'						=> 'windows-1251',
-		'estonian'						=> 'iso-8859-4',
-		'chinese_simplified'			=> 'gb2312',
-		'macedonian'					=> 'windows-1251',
-		'azerbaijani'					=> 'UTF-8',
-		'romanian'						=> 'iso-8859-2',
-		'romanian_diacritice'			=> 'iso-8859-2',
-		'lithuanian'					=> 'windows-1257',
-		'turkish'						=> 'iso-8859-9',
-		'ukrainian'						=> 'windows-1251',
-		'japanese'						=> 'shift_jis',
-		'hungarian'						=> 'ISO-8859-2',
-		'romanian_no_diacritics'		=> 'iso-8859-2',
-		'mongolian'						=> 'UTF-8',
-		'slovenian'						=> 'windows-1250',
-		'bosnian'						=> 'windows-1250',
-		'czech'							=> 'Windows-1250',
-		'farsi'							=> 'Windows-1256',
-		'croatian'						=> 'windows-1250',
-		'greek'							=> 'iso-8859-7',
-		'russian_tu'					=> 'windows-1251',
-		'sakha'							=> 'UTF-8',
-		'serbian_cyrillic'				=> 'windows-1251',
-		'bulgarian'						=> 'windows-1251',
-		'chinese_traditional_taiwan'	=> 'big5',
-		'chinese_traditional'			=> 'big5',
-		'arabic'						=> 'windows-1256',
-		'hebrew'						=> 'WINDOWS-1255',
-		'thai'							=> 'windows-874',
-		//'chinese_traditional_taiwan'	=> 'utf-8' // custom modified, we may have to do an include :-(
-	);*/
-
-	if (empty($lang_enc_array))
-	{
-		$lang_enc_array = array();
-	}
-
-	$get_lang = trim(get_config_value('default_lang'));
-
-	// Do we need the users language encoding?
-	if ($grab_user_lang && !empty($convert_row))
-	{
-		if (!empty($convert_row['user_lang']))
-		{
-			$get_lang = trim($convert_row['user_lang']);
-		}
-		else if (!empty($convert_row['poster_id']))
-		{
-			global $src_db, $same_db;
-
-			if ($convert->mysql_convert && $same_db)
-			{
-				$src_db->sql_query("SET NAMES 'binary'");
-			}
-
-			$sql = 'SELECT user_lang
-				FROM ' . $convert->src_table_prefix . 'users
-				WHERE user_id = ' . (int) $convert_row['poster_id'];
-			$result = $src_db->sql_query($sql);
-			$get_lang = (string) $src_db->sql_fetchfield('user_lang');
-			$src_db->sql_freeresult($result);
-
-			if ($convert->mysql_convert && $same_db)
-			{
-				$src_db->sql_query("SET NAMES 'utf8'");
-			}
-
-			$get_lang = (!trim($get_lang)) ? trim(get_config_value('default_lang')) : trim($get_lang);
-		}
-	}
-
-	if (!isset($lang_enc_array[$get_lang]))
-	{
-		$filename = $convert->options['forum_path'] . '/language/lang_' . $get_lang . '/lang_main.' . $phpEx;
-
-		if (!file_exists($filename))
-		{
-			$get_lang = trim(get_config_value('default_lang'));
-		}
-
-		if (!isset($lang_enc_array[$get_lang]))
-		{
-			include($convert->options['forum_path'] . '/language/lang_' . $get_lang . '/lang_main.' . $phpEx);
-			$lang_enc_array[$get_lang] = $lang['ENCODING'];
-			unset($lang);
-		}
-	}
-
-	return utf8_recode($text, $lang_enc_array[$get_lang]);
-}
-
-/**
-* Same as phpbb_set_encoding, but forcing boards default language
-*/
-function phpbb_set_default_encoding($text)
-{
-	return phpbb_set_encoding($text, false);
-}
-
-/**
-* Convert Birthday from Birthday MOD to phpBB Format
-*/
-function phpbb_get_birthday($birthday = '')
-{
-	if (defined('MOD_BIRTHDAY_TERRA'))
-	{
-		$birthday = (string) $birthday;
-
-		// stored as month, day, year
-		if (!$birthday)
-		{
-			return ' 0- 0-   0';
-		}
-
-		// We use the original mod code to retrieve the birthday (not ideal)
-		preg_match('/(..)(..)(....)/', sprintf('%08d', $birthday), $birthday_parts);
-
-		$month = $birthday_parts[1];
-		$day = $birthday_parts[2];
-		$year =  $birthday_parts[3];
-
-		return sprintf('%2d-%2d-%4d', $day, $month, $year);
-	}
-	else
-	{
-		$birthday = (int) $birthday;
-
-		if (!$birthday || $birthday == 999999)
-		{
-			return ' 0- 0-   0';
-		}
-
-		// The birthday mod from niels is using this code to transform to day/month/year
-		return sprintf('%2d-%2d-%4d', gmdate('j', $birthday * 86400 + 1), gmdate('n', $birthday * 86400 + 1), gmdate('Y', $birthday * 86400 + 1));
-	}
-}
-
-/**
-* Return correct user id value
-* Everyone's id will be one higher to allow the guest/anonymous user to have a positive id as well
-*/
-function phpbb_user_id($user_id)
-{
-	global $config;
-
-	// Increment user id if the old forum is having a user with the id 1
-	if (!isset($config['increment_user_id']))
-	{
-		global $src_db, $same_db, $convert;
-
-		if ($convert->mysql_convert && $same_db)
-		{
-			$src_db->sql_query("SET NAMES 'binary'");
-		}
-
-		// Now let us set a temporary config variable for user id incrementing
-		$sql = "SELECT user_id
-			FROM {$convert->src_table_prefix}users
-			WHERE user_id = 1";
-		$result = $src_db->sql_query($sql);
-		$id = (int) $src_db->sql_fetchfield('user_id');
-		$src_db->sql_freeresult($result);
-
-		// Try to get the maximum user id possible...
-		$sql = "SELECT MAX(user_id) AS max_user_id
-			FROM {$convert->src_table_prefix}users";
-		$result = $src_db->sql_query($sql);
-		$max_id = (int) $src_db->sql_fetchfield('max_user_id');
-		$src_db->sql_freeresult($result);
-
-		if ($convert->mysql_convert && $same_db)
-		{
-			$src_db->sql_query("SET NAMES 'utf8'");
-		}
-
-		// If there is a user id 1, we need to increment user ids. :/
-		if ($id === 1)
-		{
-			$config->set('increment_user_id', ($max_id + 1), false);
-			$config['increment_user_id'] = $max_id + 1;
-		}
-		else
-		{
-			$config->set('increment_user_id', 0, false);
-			$config['increment_user_id'] = 0;
-		}
-	}
-
-	// If the old user id is -1 in 2.0.x it is the anonymous user...
-	if ($user_id == -1)
-	{
-		return ANONYMOUS;
-	}
-
-	if (!empty($config['increment_user_id']) && $user_id == 1)
-	{
-		return $config['increment_user_id'];
-	}
-
-	// A user id of 0 can happen, for example within the ban table if no user is banned...
-	// Within the posts and topics table this can be "dangerous" but is the fault of the user
-	// having mods installed (a poster id of 0 is not possible in 2.0.x).
-	// Therefore, we return the user id "as is".
-
-	return (int) $user_id;
-}
-
-/**
-* Return correct user id value
-* Everyone's id will be one higher to allow the guest/anonymous user to have a positive id as well
-*/
-function phpbb_topic_replies_to_posts($num_replies)
-{
-	return (int) $num_replies + 1;
-}
-
-/* Copy additional table fields from old forum to new forum if user wants this (for Mod compatibility for example)
-function phpbb_copy_table_fields()
-{
-}
-*/
-
-/**
-* Convert authentication
-* user, group and forum table has to be filled in order to work
-*/
-function phpbb_convert_authentication($mode)
-{
-	global $db, $src_db, $same_db, $convert, $config;
-
-	if ($mode == 'start')
-	{
-		$db->sql_query($convert->truncate_statement . ACL_USERS_TABLE);
-		$db->sql_query($convert->truncate_statement . ACL_GROUPS_TABLE);
-
-		// What we will do is handling all 2.0.x admins as founder to replicate what is common in 2.0.x.
-		// After conversion the main admin need to make sure he is removing permissions and the founder status if wanted.
-
-		// Grab user ids of users with user_level of ADMIN
-		$sql = "SELECT user_id
-			FROM {$convert->src_table_prefix}users
-			WHERE user_level = 1
-			ORDER BY user_regdate ASC";
-		$result = $src_db->sql_query($sql);
-
-		while ($row = $src_db->sql_fetchrow($result))
-		{
-			$user_id = (int) phpbb_user_id($row['user_id']);
-			// Set founder admin...
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_type = ' . USER_FOUNDER . "
-				WHERE user_id = $user_id";
-			$db->sql_query($sql);
-		}
-		$src_db->sql_freeresult($result);
-
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = '" . $db->sql_escape('BOTS') . "'";
-		$result = $db->sql_query($sql);
-		$bot_group_id = (int) $db->sql_fetchfield('group_id');
-		$db->sql_freeresult($result);
-	}
-
-	// Grab forum auth information
-	$sql = "SELECT *
-		FROM {$convert->src_table_prefix}forums";
-	$result = $src_db->sql_query($sql);
-
-	$forum_access = array();
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		$forum_access[$row['forum_id']] = $row;
-	}
-	$src_db->sql_freeresult($result);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'binary'");
-	}
-	// Grab user auth information from 2.0.x board
-	$sql = "SELECT ug.user_id, aa.*
-		FROM {$convert->src_table_prefix}auth_access aa, {$convert->src_table_prefix}user_group ug, {$convert->src_table_prefix}groups g, {$convert->src_table_prefix}forums f
-		WHERE g.group_id = aa.group_id
-			AND g.group_single_user = 1
-			AND ug.group_id = g.group_id
-			AND f.forum_id = aa.forum_id";
-	$result = $src_db->sql_query($sql);
-
-	$user_access = array();
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		$user_access[$row['forum_id']][] = $row;
-	}
-	$src_db->sql_freeresult($result);
-
-	// Grab group auth information
-	$sql = "SELECT g.group_id, aa.*
-		FROM {$convert->src_table_prefix}auth_access aa, {$convert->src_table_prefix}groups g
-		WHERE g.group_id = aa.group_id
-			AND g.group_single_user <> 1";
-	$result = $src_db->sql_query($sql);
-
-	$group_access = array();
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		$group_access[$row['forum_id']][] = $row;
-	}
-	$src_db->sql_freeresult($result);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'utf8'");
-	}
-
-	// Add Forum Access List
-	$auth_map = array(
-		'auth_view'			=> array('f_', 'f_list'),
-		'auth_read'			=> array('f_read', 'f_search'),
-		'auth_post'			=> array('f_post', 'f_bbcode', 'f_smilies', 'f_img', 'f_sigs', 'f_postcount', 'f_report', 'f_subscribe', 'f_print', 'f_email'),
-		'auth_reply'		=> 'f_reply',
-		'auth_edit'			=> 'f_edit',
-		'auth_delete'		=> 'f_delete',
-		'auth_pollcreate'	=> 'f_poll',
-		'auth_vote'			=> 'f_vote',
-		'auth_announce'		=> array('f_announce', 'f_announce_global'),
-		'auth_sticky'		=> 'f_sticky',
-		'auth_attachments'	=> array('f_attach', 'f_download'),
-		'auth_download'		=> 'f_download',
-	);
-
-	// Define the ACL constants used in 2.0 to make the code slightly more readable
-	define('AUTH_ALL', 0);
-	define('AUTH_REG', 1);
-	define('AUTH_ACL', 2);
-	define('AUTH_MOD', 3);
-	define('AUTH_ADMIN', 5);
-
-	// A mapping of the simple permissions used by 2.0
-	$simple_auth_ary = array(
-		'public'			=> array(
-			'auth_view'			=> AUTH_ALL,
-			'auth_read'			=> AUTH_ALL,
-			'auth_post'			=> AUTH_ALL,
-			'auth_reply'		=> AUTH_ALL,
-			'auth_edit'			=> AUTH_REG,
-			'auth_delete'		=> AUTH_REG,
-			'auth_sticky'		=> AUTH_MOD,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_REG,
-			'auth_pollcreate'	=> AUTH_REG,
-		),
-		'registered'		=> array(
-			'auth_view'			=> AUTH_ALL,
-			'auth_read'			=> AUTH_ALL,
-			'auth_post'			=> AUTH_REG,
-			'auth_reply'		=> AUTH_REG,
-			'auth_edit'			=> AUTH_REG,
-			'auth_delete'		=> AUTH_REG,
-			'auth_sticky'		=> AUTH_MOD,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_REG,
-			'auth_pollcreate'	=> AUTH_REG,
-		),
-		'registered_hidden'	=> array(
-			'auth_view'			=> AUTH_REG,
-			'auth_read'			=> AUTH_REG,
-			'auth_post'			=> AUTH_REG,
-			'auth_reply'		=> AUTH_REG,
-			'auth_edit'			=> AUTH_REG,
-			'auth_delete'		=> AUTH_REG,
-			'auth_sticky'		=> AUTH_MOD,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_REG,
-			'auth_pollcreate'	=> AUTH_REG,
-		),
-		'private'			=> array(
-			'auth_view'			=> AUTH_ALL,
-			'auth_read'			=> AUTH_ACL,
-			'auth_post'			=> AUTH_ACL,
-			'auth_reply'		=> AUTH_ACL,
-			'auth_edit'			=> AUTH_ACL,
-			'auth_delete'		=> AUTH_ACL,
-			'auth_sticky'		=> AUTH_ACL,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_ACL,
-			'auth_pollcreate'	=> AUTH_ACL,
-		),
-		'private_hidden'	=> array(
-			'auth_view'			=> AUTH_ACL,
-			'auth_read'			=> AUTH_ACL,
-			'auth_post'			=> AUTH_ACL,
-			'auth_reply'		=> AUTH_ACL,
-			'auth_edit'			=> AUTH_ACL,
-			'auth_delete'		=> AUTH_ACL,
-			'auth_sticky'		=> AUTH_ACL,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_ACL,
-			'auth_pollcreate'	=> AUTH_ACL,
-		),
-		'moderator'			=> array(
-			'auth_view'			=> AUTH_ALL,
-			'auth_read'			=> AUTH_MOD,
-			'auth_post'			=> AUTH_MOD,
-			'auth_reply'		=> AUTH_MOD,
-			'auth_edit'			=> AUTH_MOD,
-			'auth_delete'		=> AUTH_MOD,
-			'auth_sticky'		=> AUTH_MOD,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_MOD,
-			'auth_pollcreate'	=> AUTH_MOD,
-		),
-		'moderator_hidden'	=> array(
-			'auth_view'			=> AUTH_MOD,
-			'auth_read'			=> AUTH_MOD,
-			'auth_post'			=> AUTH_MOD,
-			'auth_reply'		=> AUTH_MOD,
-			'auth_edit'			=> AUTH_MOD,
-			'auth_delete'		=> AUTH_MOD,
-			'auth_sticky'		=> AUTH_MOD,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_MOD,
-			'auth_pollcreate'	=> AUTH_MOD,
-		),
-	);
-
-	if ($mode == 'start')
-	{
-		user_group_auth('guests', 'SELECT user_id, {GUESTS} FROM ' . USERS_TABLE . ' WHERE user_id = ' . ANONYMOUS, false);
-		user_group_auth('registered', 'SELECT user_id, {REGISTERED} FROM ' . USERS_TABLE . ' WHERE user_id <> ' . ANONYMOUS . " AND group_id <> $bot_group_id", false);
-
-		// Selecting from old table
-		if (!empty($config['increment_user_id']))
-		{
-			$auth_sql = 'SELECT user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id <> 1';
-			user_group_auth('administrators', $auth_sql, true);
-
-			$auth_sql = 'SELECT ' . $config['increment_user_id'] . ' as user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id = 1';
-			user_group_auth('administrators', $auth_sql, true);
-		}
-		else
-		{
-			$auth_sql = 'SELECT user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1';
-			user_group_auth('administrators', $auth_sql, true);
-		}
-
-		if (!empty($config['increment_user_id']))
-		{
-			$auth_sql = 'SELECT user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id <> 1';
-			user_group_auth('global_moderators', $auth_sql, true);
-
-			$auth_sql = 'SELECT ' . $config['increment_user_id'] . ' as user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id = 1';
-			user_group_auth('global_moderators', $auth_sql, true);
-		}
-		else
-		{
-			$auth_sql = 'SELECT user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1';
-			user_group_auth('global_moderators', $auth_sql, true);
-		}
-	}
-	else if ($mode == 'first')
-	{
-		// Go through all 2.0.x forums
-		foreach ($forum_access as $forum)
-		{
-			$new_forum_id = (int) $forum['forum_id'];
-
-			// Administrators have full access to all forums whatever happens
-			mass_auth('group_role', $new_forum_id, 'administrators', 'FORUM_FULL');
-
-			$matched_type = '';
-			foreach ($simple_auth_ary as $key => $auth_levels)
-			{
-				$matched = 1;
-				foreach ($auth_levels as $k => $level)
-				{
-					if ($forum[$k] != $auth_levels[$k])
-					{
-						$matched = 0;
-					}
-				}
-
-				if ($matched)
-				{
-					$matched_type = $key;
-					break;
-				}
-			}
-
-			switch ($matched_type)
-			{
-				case 'public':
-					mass_auth('group_role', $new_forum_id, 'guests', 'FORUM_LIMITED');
-					mass_auth('group_role', $new_forum_id, 'registered', 'FORUM_LIMITED_POLLS');
-					mass_auth('group_role', $new_forum_id, 'bots', 'FORUM_BOT');
-				break;
-
-				case 'registered':
-					mass_auth('group_role', $new_forum_id, 'guests', 'FORUM_READONLY');
-					mass_auth('group_role', $new_forum_id, 'bots', 'FORUM_BOT');
-
-				// no break;
-
-				case 'registered_hidden':
-					mass_auth('group_role', $new_forum_id, 'registered', 'FORUM_POLLS');
-				break;
-
-				case 'private':
-				case 'private_hidden':
-				case 'moderator':
-				case 'moderator_hidden':
-				default:
-					// The permissions don't match a simple set, so we're going to have to map them directly
-
-					// No post approval for all, in 2.0.x this feature does not exist
-					mass_auth('group', $new_forum_id, 'guests', 'f_noapprove', ACL_YES);
-					mass_auth('group', $new_forum_id, 'registered', 'f_noapprove', ACL_YES);
-
-					// Go through authentication map
-					foreach ($auth_map as $old_auth_key => $new_acl)
-					{
-						// If old authentication key does not exist we continue
-						// This is helpful for mods adding additional authentication fields, we need to add them to the auth_map array
-						if (!isset($forum[$old_auth_key]))
-						{
-							continue;
-						}
-
-						// Now set the new ACL correctly
-						switch ($forum[$old_auth_key])
-						{
-							// AUTH_ALL
-							case AUTH_ALL:
-								mass_auth('group', $new_forum_id, 'guests', $new_acl, ACL_YES);
-								mass_auth('group', $new_forum_id, 'bots', $new_acl, ACL_YES);
-								mass_auth('group', $new_forum_id, 'registered', $new_acl, ACL_YES);
-							break;
-
-							// AUTH_REG
-							case AUTH_REG:
-								mass_auth('group', $new_forum_id, 'registered', $new_acl, ACL_YES);
-							break;
-
-							// AUTH_ACL
-							case AUTH_ACL:
-								// Go through the old group access list for this forum
-								if (isset($group_access[$forum['forum_id']]))
-								{
-									foreach ($group_access[$forum['forum_id']] as $index => $access)
-									{
-										// We only check for ACL_YES equivalence entry
-										if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
-										{
-											mass_auth('group', $new_forum_id, (int) $access['group_id'], $new_acl, ACL_YES);
-										}
-									}
-								}
-
-								if (isset($user_access[$forum['forum_id']]))
-								{
-									foreach ($user_access[$forum['forum_id']] as $index => $access)
-									{
-										// We only check for ACL_YES equivalence entry
-										if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
-										{
-											mass_auth('user', $new_forum_id, (int) phpbb_user_id($access['user_id']), $new_acl, ACL_YES);
-										}
-									}
-								}
-							break;
-
-							// AUTH_MOD
-							case AUTH_MOD:
-								if (isset($group_access[$forum['forum_id']]))
-								{
-									foreach ($group_access[$forum['forum_id']] as $index => $access)
-									{
-										// We only check for ACL_YES equivalence entry
-										if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
-										{
-											mass_auth('group', $new_forum_id, (int) $access['group_id'], $new_acl, ACL_YES);
-										}
-									}
-								}
-
-								if (isset($user_access[$forum['forum_id']]))
-								{
-									foreach ($user_access[$forum['forum_id']] as $index => $access)
-									{
-										// We only check for ACL_YES equivalence entry
-										if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
-										{
-											mass_auth('user', $new_forum_id, (int) phpbb_user_id($access['user_id']), $new_acl, ACL_YES);
-										}
-									}
-								}
-							break;
-						}
-					}
-				break;
-			}
-		}
-	}
-	else if ($mode == 'second')
-	{
-		// Assign permission roles and other default permissions
-
-		// guests having u_download and u_search ability
-		$db->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) SELECT ' . get_group_id('guests') . ', 0, auth_option_id, 0, 1 FROM ' . ACL_OPTIONS_TABLE . " WHERE auth_option IN ('u_', 'u_download', 'u_search')");
-
-		// administrators/global mods having full user features
-		mass_auth('group_role', 0, 'administrators', 'USER_FULL');
-		mass_auth('group_role', 0, 'global_moderators', 'USER_FULL');
-
-		// By default all converted administrators are given full access
-		mass_auth('group_role', 0, 'administrators', 'ADMIN_FULL');
-
-		// All registered users are assigned the standard user role
-		mass_auth('group_role', 0, 'registered', 'USER_STANDARD');
-		mass_auth('group_role', 0, 'registered_coppa', 'USER_STANDARD');
-
-		// Instead of administrators being global moderators we give the MOD_FULL role to global mods (admins already assigned to this group)
-		mass_auth('group_role', 0, 'global_moderators', 'MOD_FULL');
-
-		// And now those who have had their avatar rights removed get assigned a more restrictive role
-		$sql = 'SELECT user_id FROM ' . $convert->src_table_prefix . 'users
-			WHERE user_allowavatar = 0
-				AND user_id > 0';
-		$result = $src_db->sql_query($sql);
-
-		while ($row = $src_db->sql_fetchrow($result))
-		{
-			mass_auth('user_role', 0, (int) phpbb_user_id($row['user_id']), 'USER_NOAVATAR');
-		}
-		$src_db->sql_freeresult($result);
-
-		// And the same for those who have had their PM rights removed
-		$sql = 'SELECT user_id FROM ' . $convert->src_table_prefix . 'users
-			WHERE user_allow_pm = 0
-				AND user_id > 0';
-		$result = $src_db->sql_query($sql);
-
-		while ($row = $src_db->sql_fetchrow($result))
-		{
-			mass_auth('user_role', 0, (int) phpbb_user_id($row['user_id']), 'USER_NOPM');
-		}
-		$src_db->sql_freeresult($result);
-	}
-	else if ($mode == 'third')
-	{
-		// And now the moderators
-		// We make sure that they have at least standard access to the forums they moderate in addition to the moderating permissions
-
-		$mod_post_map = array(
-			'auth_announce'		=> array('f_announce', 'f_announce_global'),
-			'auth_sticky'		=> 'f_sticky'
-		);
-
-		foreach ($user_access as $forum_id => $access_map)
-		{
-			$forum_id = (int) $forum_id;
-
-			foreach ($access_map as $access)
-			{
-				if (isset($access['auth_mod']) && $access['auth_mod'] == 1)
-				{
-					mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'MOD_STANDARD');
-					mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'FORUM_STANDARD');
-					foreach ($mod_post_map as $old => $new)
-					{
-						if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD)
-						{
-							mass_auth('user', $forum_id, (int) phpbb_user_id($access['user_id']), $new, ACL_YES);
-						}
-					}
-				}
-			}
-		}
-
-		foreach ($group_access as $forum_id => $access_map)
-		{
-			$forum_id = (int) $forum_id;
-
-			foreach ($access_map as $access)
-			{
-				if (isset($access['auth_mod']) && $access['auth_mod'] == 1)
-				{
-					mass_auth('group_role', $forum_id, (int) $access['group_id'], 'MOD_STANDARD');
-					mass_auth('group_role', $forum_id, (int) $access['group_id'], 'FORUM_STANDARD');
-					foreach ($mod_post_map as $old => $new)
-					{
-						if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD)
-						{
-							mass_auth('group', $forum_id, (int) $access['group_id'], $new, ACL_YES);
-						}
-					}
-				}
-			}
-		}
-
-		// We grant everyone readonly access to the categories to ensure that the forums are visible
-		$sql = 'SELECT forum_id, forum_name, parent_id, left_id, right_id
-			FROM ' . FORUMS_TABLE . '
-			ORDER BY left_id ASC';
-		$result = $db->sql_query($sql);
-
-		$parent_forums = $forums = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if ($row['parent_id'] == 0)
-			{
-				mass_auth('group_role', $row['forum_id'], 'administrators', 'FORUM_FULL');
-				mass_auth('group_role', $row['forum_id'], 'global_moderators', 'FORUM_FULL');
-				$parent_forums[] = $row;
-			}
-			else
-			{
-				$forums[] = $row;
-			}
-		}
-		$db->sql_freeresult($result);
-
-		global $auth;
-
-		// Let us see which groups have access to these forums...
-		foreach ($parent_forums as $row)
-		{
-			// Get the children
-			$branch = $forum_ids = array();
-
-			foreach ($forums as $key => $_row)
-			{
-				if ($_row['left_id'] > $row['left_id'] && $_row['left_id'] < $row['right_id'])
-				{
-					$branch[] = $_row;
-					$forum_ids[] = $_row['forum_id'];
-					continue;
-				}
-			}
-
-			if (count($forum_ids))
-			{
-				// Now make sure the user is able to read these forums
-				$hold_ary = $auth->acl_group_raw_data(false, 'f_list', $forum_ids);
-
-				if (empty($hold_ary))
-				{
-					continue;
-				}
-
-				foreach ($hold_ary as $g_id => $f_id_ary)
-				{
-					$set_group = false;
-
-					foreach ($f_id_ary as $f_id => $auth_ary)
-					{
-						foreach ($auth_ary as $auth_option => $setting)
-						{
-							if ($setting == ACL_YES)
-							{
-								$set_group = true;
-								break 2;
-							}
-						}
-					}
-
-					if ($set_group)
-					{
-						mass_auth('group', $row['forum_id'], $g_id, 'f_list', ACL_YES);
-					}
-				}
-			}
-		}
-	}
-}
-
-/**
-* Set primary group.
-* Really simple and only based on user_level (remaining groups will be assigned later)
-*/
-function phpbb_set_primary_group($user_level)
-{
-	global $convert_row;
-
-	if ($user_level == 1)
-	{
-		return get_group_id('administrators');
-	}
-/*	else if ($user_level == 2)
-	{
-		return get_group_id('global_moderators');
-	}
-	else if ($user_level == 0 && $convert_row['user_active'])*/
-	else if ($convert_row['user_active'])
-	{
-		return get_group_id('registered');
-	}
-
-	return 0;
-}
-
-/**
-* Convert the group name, making sure to avoid conflicts with 3.0 special groups
-*/
-function phpbb_convert_group_name($group_name)
-{
-	$default_groups = array(
-		'GUESTS',
-		'REGISTERED',
-		'REGISTERED_COPPA',
-		'GLOBAL_MODERATORS',
-		'ADMINISTRATORS',
-		'BOTS',
-	);
-
-	if (in_array(strtoupper($group_name), $default_groups))
-	{
-		return 'phpBB2 - ' . $group_name;
-	}
-
-	return phpbb_set_default_encoding($group_name);
-}
-
-/**
-* Convert the group type constants
-*/
-function phpbb_convert_group_type($group_type)
-{
-	switch ($group_type)
-	{
-		case 0:
-			return GROUP_OPEN;
-		break;
-
-		case 1:
-			return GROUP_CLOSED;
-		break;
-
-		case 2:
-			return GROUP_HIDDEN;
-		break;
-	}
-
-	// Never return GROUP_SPECIAL here, because only phpBB3's default groups are allowed to have this type set.
-	return GROUP_HIDDEN;
-}
-
-/**
-* Convert the topic type constants
-*/
-function phpbb_convert_topic_type($topic_type)
-{
-	switch ($topic_type)
-	{
-		case 0:
-			return POST_NORMAL;
-		break;
-
-		case 1:
-			return POST_STICKY;
-		break;
-
-		case 2:
-			return POST_ANNOUNCE;
-		break;
-
-		case 3:
-			return POST_GLOBAL;
-		break;
-	}
-
-	return POST_NORMAL;
-}
-
-function phpbb_replace_size($matches)
-{
-	return '[size=' . min(200, ceil(100.0 * (((double) $matches[1])/12.0))) . ':' . $matches[2] . ']';
-}
-
-/**
-* Reparse the message stripping out the bbcode_uid values and adding new ones and setting the bitfield
-* @todo What do we want to do about HTML in messages - currently it gets converted to the entities, but there may be some objections to this
-*/
-function phpbb_prepare_message($message)
-{
-	global $convert, $user, $convert_row, $message_parser;
-
-	if (!$message)
-	{
-		$convert->row['mp_bbcode_bitfield'] = $convert_row['mp_bbcode_bitfield'] = 0;
-		return '';
-	}
-
-	// Decode phpBB 2.0.x Message
-	if (isset($convert->row['old_bbcode_uid']) && $convert->row['old_bbcode_uid'] != '')
-	{
-		// Adjust size...
-		if (strpos($message, '[size=') !== false)
-		{
-			$message = preg_replace_callback('/\[size=(\d*):(' . $convert->row['old_bbcode_uid'] . ')\]/', 'phpbb_replace_size', $message);
-		}
-
-		$message = preg_replace('/\:(([a-z0-9]:)?)' . $convert->row['old_bbcode_uid'] . '/s', '', $message);
-	}
-
-	if (strpos($message, '[quote=') !== false)
-	{
-		$message = preg_replace('/\[quote="(.*?)"\]/s', '[quote=&quot;\1&quot;]', $message);
-		$message = preg_replace('/\[quote=\\\"(.*?)\\\"\]/s', '[quote=&quot;\1&quot;]', $message);
-
-		// let's hope that this solves more problems than it causes. Deal with escaped quotes.
-		$message = str_replace('\"', '&quot;', $message);
-		$message = str_replace('\&quot;', '&quot;', $message);
-	}
-
-	$message = str_replace('<br />', "\n", $message);
-	$message = str_replace('<', '&lt;', $message);
-	$message = str_replace('>', '&gt;', $message);
-
-	// make the post UTF-8
-	$message = phpbb_set_encoding($message);
-
-	$message_parser->warn_msg = array(); // Reset the errors from the previous message
-	$message_parser->bbcode_uid = make_uid($convert->row['post_time']);
-	$message_parser->message = $message;
-	unset($message);
-
-	// Make sure options are set.
-//	$enable_html = (!isset($row['enable_html'])) ? false : $row['enable_html'];
-	$enable_bbcode = (!isset($convert->row['enable_bbcode'])) ? true : $convert->row['enable_bbcode'];
-	$enable_smilies = (!isset($convert->row['enable_smilies'])) ? true : $convert->row['enable_smilies'];
-	$enable_magic_url = (!isset($convert->row['enable_magic_url'])) ? true : $convert->row['enable_magic_url'];
-
-	// parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $update_this_message = true, $mode = 'post')
-	$message_parser->parse($enable_bbcode, $enable_magic_url, $enable_smilies);
-
-	if (count($message_parser->warn_msg))
-	{
-		$msg_id = isset($convert->row['post_id']) ? $convert->row['post_id'] : $convert->row['privmsgs_id'];
-		$convert->p_master->error('<span style="color:red">' . $user->lang['POST_ID'] . ': ' . $msg_id . ' ' . $user->lang['CONV_ERROR_MESSAGE_PARSER'] . ': <br /><br />' . implode('<br />', $message_parser->warn_msg), __LINE__, __FILE__, true);
-	}
-
-	$convert->row['mp_bbcode_bitfield'] = $convert_row['mp_bbcode_bitfield'] = $message_parser->bbcode_bitfield;
-
-	$message = $message_parser->message;
-	unset($message_parser->message);
-
-	return $message;
-}
-
-/**
-* Return the bitfield calculated by the previous function
-*/
-function get_bbcode_bitfield()
-{
-	global $convert_row;
-
-	return $convert_row['mp_bbcode_bitfield'];
-}
-
-/**
-* Determine the last user to edit a post
-* In practice we only tracked edits by the original poster in 2.0.x so this will only be set if they had edited their own post
-*/
-function phpbb_post_edit_user()
-{
-	global $convert_row;
-
-	if (isset($convert_row['post_edit_count']))
-	{
-		return phpbb_user_id($convert_row['poster_id']);
-	}
-
-	return 0;
-}
-
-/**
-* Obtain the path to uploaded files on the 2.0.x forum
-* This is only used if the Attachment MOD was installed
-*/
-function phpbb_get_files_dir()
-{
-	if (!defined('MOD_ATTACHMENT'))
-	{
-		return '';
-	}
-
-	global $src_db, $same_db, $convert, $user;
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'binary'");
-	}
-	$sql = 'SELECT config_value AS upload_dir
-		FROM ' . $convert->src_table_prefix . "attachments_config
-		WHERE config_name = 'upload_dir'";
-	$result = $src_db->sql_query($sql);
-	$upload_path = $src_db->sql_fetchfield('upload_dir');
-	$src_db->sql_freeresult($result);
-
-	$sql = 'SELECT config_value AS ftp_upload
-		FROM ' . $convert->src_table_prefix . "attachments_config
-		WHERE config_name = 'allow_ftp_upload'";
-	$result = $src_db->sql_query($sql);
-	$ftp_upload = (int) $src_db->sql_fetchfield('ftp_upload');
-	$src_db->sql_freeresult($result);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'utf8'");
-	}
-
-	if ($ftp_upload)
-	{
-		$convert->p_master->error($user->lang['CONV_ERROR_ATTACH_FTP_DIR'], __LINE__, __FILE__);
-	}
-
-	return $upload_path;
-}
-
-/**
-* Copy thumbnails of uploaded images from the 2.0.x forum
-* This is only used if the Attachment MOD was installed
-*/
-function phpbb_copy_thumbnails()
-{
-	global $convert, $config, $phpbb_root_path;
-
-	$src_path = $convert->options['forum_path'] . '/' . phpbb_get_files_dir() . '/thumbs/';
-
-	if ($handle = @opendir($src_path))
-	{
-		while ($entry = readdir($handle))
-		{
-			if ($entry[0] == '.')
-			{
-				continue;
-			}
-
-			if (is_dir($src_path . $entry))
-			{
-				continue;
-			}
-			else
-			{
-				copy_file($src_path . $entry, $config['upload_path'] . '/' . preg_replace('/^t_/', 'thumb_', $entry));
-				@unlink($phpbb_root_path . $config['upload_path'] . '/thumbs/' . $entry);
-			}
-		}
-		closedir($handle);
-	}
-}
-
-/**
-* Convert the attachment category constants
-* This is only used if the Attachment MOD was installed
-*/
-function phpbb_attachment_category($cat_id)
-{
-	switch ($cat_id)
-	{
-		case 1:
-			return attachment_category::IMAGE;
-		break;
-
-		case 2:
-			return ATTACHMENT_CATEGORY_WM;
-		break;
-	}
-
-	return attachment_category::NONE;
-}
-
-/**
-* Convert the attachment extension names
-* This is only used if the Attachment MOD was installed
-*/
-function phpbb_attachment_extension_group_name()
-{
-	global $db, $phpbb_root_path, $phpEx;
-
-	// Update file extension group names to use language strings.
-	$sql = 'SELECT lang_dir
-		FROM ' . LANG_TABLE;
-	$result = $db->sql_query($sql);
-
-	$extension_groups_updated = array();
-	while ($lang_dir = $db->sql_fetchfield('lang_dir'))
-	{
-		$lang_dir = basename($lang_dir);
-		$lang_file = $phpbb_root_path . 'language/' . $lang_dir . '/acp/attachments.' . $phpEx;
-
-		if (!file_exists($lang_file))
-		{
-			continue;
-		}
-
-		$lang = array();
-		include($lang_file);
-
-		foreach ($lang as $lang_key => $lang_val)
-		{
-			if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
-			{
-				continue;
-			}
-
-			$sql_ary = array(
-				'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
-			);
-
-			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-				SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
-					WHERE group_name = '" . $db->sql_escape($lang_val) . "'";
-			$db->sql_query($sql);
-
-			$extension_groups_updated[$lang_key] = true;
-		}
-	}
-	$db->sql_freeresult($result);
-}
-
-/**
-* Obtain list of forums in which different attachment categories can be used
-*/
-function phpbb_attachment_forum_perms($forum_permissions)
-{
-	if (empty($forum_permissions))
-	{
-		return '';
-	}
-
-	// Decode forum permissions
-	$forum_ids = array();
-
-	$one_char_encoding = '#';
-	$two_char_encoding = '.';
-
-	$auth_len = 1;
-	for ($pos = 0; $pos < strlen($forum_permissions); $pos += $auth_len)
-	{
-		$forum_auth = substr($forum_permissions, $pos, 1);
-		if ($forum_auth == $one_char_encoding)
-		{
-			$auth_len = 1;
-			continue;
-		}
-		else if ($forum_auth == $two_char_encoding)
-		{
-			$auth_len = 2;
-			$pos--;
-			continue;
-		}
-
-		$forum_auth = substr($forum_permissions, $pos, $auth_len);
-		$forum_id = base64_unpack($forum_auth);
-
-		$forum_ids[] = (int) $forum_id;
-	}
-
-	if (count($forum_ids))
-	{
-		return attachment_forum_perms($forum_ids);
-	}
-
-	return '';
-}
-
-/**
-* Convert the avatar type constants
-*/
-function phpbb_avatar_type($type)
-{
-	switch ($type)
-	{
-		case 1:
-			return AVATAR_UPLOAD;
-
-		case 3:
-			return AVATAR_GALLERY;
-	}
-
-	return 0;
-}
-
-
-/**
-* Just undos the replacing of '<' and '>'
-*/
-function  phpbb_smilie_html_decode($code)
-{
-	$code = str_replace('&lt;', '<', $code);
-	return str_replace('&gt;', '>', $code);
-}
-
-/**
-* Transfer avatars, copying the image if it was uploaded
-*/
-function phpbb_import_avatar($user_avatar)
-{
-	global $convert_row;
-
-	if (!$convert_row['user_avatar_type'])
-	{
-		return '';
-	}
-	else if ($convert_row['user_avatar_type'] == 1)
-	{
-		// Uploaded avatar
-		return import_avatar($user_avatar, false, $convert_row['user_id']);
-	}
-	else if ($convert_row['user_avatar_type'] == 3)
-	{
-		// Gallery avatar
-		return $user_avatar;
-	}
-
-	return '';
-}
-
-
-/**
-* Find out about the avatar's dimensions
-*/
-function phpbb_get_avatar_height($user_avatar)
-{
-	global $convert_row;
-
-	if (empty($convert_row['user_avatar_type']))
-	{
-		return 0;
-	}
-	return get_avatar_height($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']);
-}
-
-
-/**
-* Find out about the avatar's dimensions
-*/
-function phpbb_get_avatar_width($user_avatar)
-{
-	global $convert_row;
-
-	if (empty($convert_row['user_avatar_type']))
-	{
-		return 0;
-	}
-
-	return get_avatar_width($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']);
-}
-
-
-/**
-* Calculate the correct to_address field for private messages
-*/
-function phpbb_privmsgs_to_userid($to_userid)
-{
-	return 'u_' . phpbb_user_id($to_userid);
-}
-
-/**
-* Calculate whether a private message was unread using the bitfield
-*/
-function phpbb_unread_pm($pm_type)
-{
-	return ($pm_type == 5) ? 1 : 0;
-}
-
-/**
-* Calculate whether a private message was new using the bitfield
-*/
-function phpbb_new_pm($pm_type)
-{
-	return ($pm_type == 1) ? 1 : 0;
-}
-
-/**
-* Obtain the folder_id for the custom folder created to replace the savebox from 2.0.x (used to store saved private messages)
-*/
-function phpbb_get_savebox_id($user_id)
-{
-	global $db;
-
-	$user_id = phpbb_user_id($user_id);
-
-	// Only one custom folder, check only one
-	$sql = 'SELECT folder_id
-		FROM ' . PRIVMSGS_FOLDER_TABLE . '
-		WHERE user_id = ' . $user_id;
-	$result = $db->sql_query_limit($sql, 1);
-	$folder_id = (int) $db->sql_fetchfield('folder_id');
-	$db->sql_freeresult($result);
-
-	return $folder_id;
-}
-
-/**
-* Transfer attachment specific configuration options
-* These were not stored in the main config table on 2.0.x
-* This is only used if the Attachment MOD was installed
-*/
-function phpbb_import_attach_config()
-{
-	global $src_db, $same_db, $convert, $config;
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'binary'");
-	}
-
-	$sql = 'SELECT *
-		FROM ' . $convert->src_table_prefix . 'attachments_config';
-	$result = $src_db->sql_query($sql);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'utf8'");
-	}
-
-	$attach_config = array();
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		$attach_config[$row['config_name']] = $row['config_value'];
-	}
-	$src_db->sql_freeresult($result);
-
-	$config->set('allow_attachments', 1);
-
-	// old attachment mod? Must be very old if this entry do not exist...
-	if (!empty($attach_config['display_order']))
-	{
-		$config->set('display_order', $attach_config['display_order']);
-	}
-	$config->set('max_filesize', $attach_config['max_filesize']);
-	$config->set('max_filesize_pm', $attach_config['max_filesize_pm']);
-	$config->set('attachment_quota', $attach_config['attachment_quota']);
-	$config->set('max_attachments', $attach_config['max_attachments']);
-	$config->set('max_attachments_pm', $attach_config['max_attachments_pm']);
-	$config->set('allow_pm_attach', $attach_config['allow_pm_attach']);
-
-	$config->set('img_display_inlined', $attach_config['img_display_inlined']);
-	$config->set('img_max_width', $attach_config['img_max_width']);
-	$config->set('img_max_height', $attach_config['img_max_height']);
-	$config->set('img_link_width', $attach_config['img_link_width']);
-	$config->set('img_link_height', $attach_config['img_link_height']);
-	$config->set('img_create_thumbnail', $attach_config['img_create_thumbnail']);
-	$config->set('img_max_thumb_width', 400);
-	$config->set('img_min_thumb_filesize', $attach_config['img_min_thumb_filesize']);
-}
-
-/**
-* Calculate the date a user became inactive
-*/
-function phpbb_inactive_time()
-{
-	global $convert_row;
-
-	if ($convert_row['user_active'])
-	{
-		return 0;
-	}
-
-	if ($convert_row['user_lastvisit'])
-	{
-		return $convert_row['user_lastvisit'];
-	}
-
-	return $convert_row['user_regdate'];
-}
-
-/**
-* Calculate the reason a user became inactive
-* We can't actually tell the difference between a manual deactivation and one for profile changes
-* from the data available to assume the latter
-*/
-function phpbb_inactive_reason()
-{
-	global $convert_row;
-
-	if ($convert_row['user_active'])
-	{
-		return 0;
-	}
-
-	if ($convert_row['user_lastvisit'])
-	{
-		return INACTIVE_PROFILE;
-	}
-
-	return INACTIVE_REGISTER;
-}
-
-/**
-* Adjust 2.0.x disallowed names to 3.0.x format
-*/
-function phpbb_disallowed_username($username)
-{
-	// Replace * with %
-	$username = phpbb_set_default_encoding(str_replace('*', '%', $username));
-	return utf8_htmlspecialchars($username);
-}
-
-/**
-* Checks whether there are any usernames on the old board that would map to the same
-* username_clean on phpBB3. Prints out a list if any exist and exits.
-*/
-function phpbb_create_userconv_table()
-{
-	global $db;
-
-	switch ($db->get_sql_layer())
-	{
-		case 'mysqli':
-			$map_dbms = 'mysql_41';
-		break;
-
-		case 'mssql_odbc':
-		case 'mssqlnative':
-			$map_dbms = 'mssql';
-		break;
-
-		default:
-			$map_dbms = $db->get_sql_layer();
-		break;
-	}
-
-	// create a temporary table in which we store the clean usernames
-	$drop_sql = 'DROP TABLE ' . USERCONV_TABLE;
-	switch ($map_dbms)
-	{
-		case 'mssql':
-			$create_sql = 'CREATE TABLE [' . USERCONV_TABLE . '] (
-				[user_id] [int] NOT NULL ,
-				[username_clean] [varchar] (255) DEFAULT (\'\') NOT NULL
-			)';
-		break;
-
-		case 'mysql_41':
-			$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
-				user_id mediumint(8) NOT NULL,
-				username_clean varchar(255) DEFAULT \'\' NOT NULL
-			) CHARACTER SET `utf8` COLLATE `utf8_bin`';
-		break;
-
-		case 'oracle':
-			$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
-				user_id number(8) NOT NULL,
-				username_clean varchar2(255) DEFAULT \'\'
-			)';
-		break;
-
-		case 'postgres':
-			$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
-				user_id INT4 DEFAULT \'0\',
-				username_clean varchar_ci DEFAULT \'\' NOT NULL
-			)';
-		break;
-
-		case 'sqlite3':
-			$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
-				user_id INTEGER NOT NULL DEFAULT \'0\',
-				username_clean varchar(255) NOT NULL DEFAULT \'\'
-			)';
-		break;
-	}
-
-	$db->sql_return_on_error(true);
-	$db->sql_query($drop_sql);
-	$db->sql_return_on_error(false);
-	$db->sql_query($create_sql);
-}
-
-function phpbb_check_username_collisions()
-{
-	global $db, $src_db, $convert, $user, $lang;
-
-	// now find the clean version of the usernames that collide
-	$sql = 'SELECT username_clean
-		FROM ' . USERCONV_TABLE .'
-		GROUP BY username_clean
-		HAVING COUNT(user_id) > 1';
-	$result = $db->sql_query($sql);
-
-	$colliding_names = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$colliding_names[] = $row['username_clean'];
-	}
-	$db->sql_freeresult($result);
-
-	// there was at least one collision, the admin will have to solve it before conversion can continue
-	if (count($colliding_names))
-	{
-		$sql = 'SELECT user_id, username_clean
-			FROM ' . USERCONV_TABLE . '
-			WHERE ' . $db->sql_in_set('username_clean', $colliding_names);
-		$result = $db->sql_query($sql);
-		unset($colliding_names);
-
-		$colliding_user_ids = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$colliding_user_ids[(int) $row['user_id']] = $row['username_clean'];
-		}
-		$db->sql_freeresult($result);
-
-		$sql = 'SELECT username, user_id, user_posts
-			FROM ' . $convert->src_table_prefix . 'users
-			WHERE ' . $src_db->sql_in_set('user_id', array_keys($colliding_user_ids));
-		$result = $src_db->sql_query($sql);
-
-		$colliding_users = array();
-		while ($row = $src_db->sql_fetchrow($result))
-		{
-			$row['user_id'] = (int) $row['user_id'];
-			if (isset($colliding_user_ids[$row['user_id']]))
-			{
-				$colliding_users[$colliding_user_ids[$row['user_id']]][] = $row;
-			}
-		}
-		$src_db->sql_freeresult($result);
-		unset($colliding_user_ids);
-
-		$list = '';
-		foreach ($colliding_users as $username_clean => $users)
-		{
-			$list .= sprintf($user->lang['COLLIDING_CLEAN_USERNAME'], $username_clean) . "<br />\n";
-			foreach ($users as $i => $row)
-			{
-				$list .= sprintf($user->lang['COLLIDING_USER'], $row['user_id'], phpbb_set_default_encoding($row['username']), $row['user_posts']) . "<br />\n";
-			}
-		}
-
-		$lang['INST_ERR_FATAL'] = $user->lang['CONV_ERR_FATAL'];
-		$convert->p_master->error('<span style="color:red">' . $user->lang['COLLIDING_USERNAMES_FOUND'] . '</span></b><br /><br />' . $list . '<b>', __LINE__, __FILE__);
-	}
-
-	$drop_sql = 'DROP TABLE ' . USERCONV_TABLE;
-	$db->sql_query($drop_sql);
-}
-
-function phpbb_convert_timezone($timezone)
-{
-	return \phpbb\db\migration\data\v310\timezone::convert_phpbb30_timezone($timezone, 0);
-}
-
-function phpbb_add_notification_options($user_notify_pm)
-{
-	global $convert_row, $db;
-
-	$user_id = phpbb_user_id($convert_row['user_id']);
-	if ($user_id == ANONYMOUS)
-	{
-		return;
-	}
-
-	$rows = array();
-
-	$rows[] = array(
-		'item_type'		=> 'post',
-		'item_id'		=> 0,
-		'user_id'		=> (int) $user_id,
-		'notify'		=> 1,
-		'method'		=> 'email',
-	);
-	$rows[] = array(
-		'item_type'		=> 'topic',
-		'item_id'		=> 0,
-		'user_id'		=> (int) $user_id,
-		'notify'		=> 1,
-		'method'		=> 'email',
-	);
-	if ($user_notify_pm)
-	{
-		$rows[] = array(
-			'item_type'		=> 'pm',
-			'item_id'		=> 0,
-			'user_id'		=> (int) $user_id,
-			'notify'		=> 1,
-			'method'		=> 'email',
-		);
-	}
-
-	$db->sql_multi_insert(USER_NOTIFICATIONS_TABLE, $rows);
-}
-
-function phpbb_convert_password_hash($hash)
-{
-	global $phpbb_container;
-
-	/* @var $manager \phpbb\passwords\manager */
-	$manager = $phpbb_container->get('passwords.manager');
-	$hash = $manager->hash($hash, '$H$');
-
-	return '$CP$' . $hash;
-}
diff --git a/phpBB/install/index.html b/phpBB/install/convertors/index.htm
similarity index 74%
rename from phpBB/install/index.html
rename to phpBB/install/convertors/index.htm
index 8f8bfb4fb21..ee1f723a7dd 100644
--- a/phpBB/install/index.html
+++ b/phpBB/install/convertors/index.htm
@@ -2,7 +2,6 @@
 <head>
 <title></title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="refresh" content="0; url=./app.php" />
 </head>
 
 <body bgcolor="#FFFFFF" text="#000000">
diff --git a/phpBB/install/app.php b/phpBB/install/index.php
similarity index 100%
rename from phpBB/install/app.php
rename to phpBB/install/index.php
diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php
index c13efb604bb..3fbfedee379 100755
--- a/phpBB/install/phpbbcli.php
+++ b/phpBB/install/phpbbcli.php
@@ -23,7 +23,7 @@
 define('IN_PHPBB', true);
 define('IN_INSTALL', true);
 define('PHPBB_ENVIRONMENT', 'production');
-define('PHPBB_VERSION', '4.0.0-a1-dev');
+define('PHPBB_VERSION', '4.0.0-a3-dev');
 $phpbb_root_path = __DIR__ . '/../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 844ba402b39..15dbdf7a303 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -76,14 +76,17 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_foregro
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_wave', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_x_grid', '25');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_y_grid', '25');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_plugin', 'core.captcha.plugins.nogd');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_plugin', 'core.captcha.plugins.incomplete');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_turnstile_sitekey', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_turnstile_secret', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_turnstile_theme', 'light');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('check_attachment_content', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('check_dnsbl', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('chg_passforce', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('confirm_refresh', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('contact_admin_form_enable', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name', 'phpbb3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name', 'phpbb');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_notice', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path', '/');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure', '0');
@@ -155,8 +158,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold', '2
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path', 'images/icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_create_thumbnail', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_display_inlined', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_height', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_width', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_height', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_thumb_width', '400');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_width', '0');
@@ -167,16 +168,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '3');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_max', '50');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_time', '21600');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_use_forwarded', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_allow_self_signed', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_enable', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_host', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_package_size', '20');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_password', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_port', '5222');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_use_ssl', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_username', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_verify_peer', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_verify_peer_name', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_base_dn', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_email', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_password', '');
@@ -197,7 +188,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewtopic
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_track', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_font_awesome_url', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jumpbox', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_moderators', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_notifications', '1');
@@ -227,8 +218,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_quote_depth',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_reg_attempts', '5');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars', '255');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_font_size', '200');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_img_height', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_img_width', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_smilies', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_urls', '5');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('mention_batch_size', '50');
@@ -240,8 +229,9 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_post_chars', '
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_search_author_chars', '3');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('new_member_group_default', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('new_member_post_limit', '3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('oauth_states_last_gc', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', 'PASS_TYPE_ANY');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', 'PASS_TYPE_ALPHA');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('plupload_salt', 'phpbb_plupload');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_boxes', '4');
@@ -284,10 +274,10 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc', '{L_CO
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_home_text', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_home_url', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename', '{L_CONFIG_SITENAME}');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename_short', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path', 'images/smilies');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_per_page', '50');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_allow_self_signed', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_auth_method', 'PLAIN');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port', '25');
@@ -310,10 +300,10 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_last
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a1-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a3-dev');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_repositories', '[]');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_repositories', '["https://satis.phpbb.com/","https://www.phpbb.com/customise/db/composer/40/"]');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_packagist', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_json_file', 'composer-ext.json');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_vendor_dir', 'vendor-ext/');
@@ -326,6 +316,11 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('storage\avatar\pro
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('storage\avatar\config\path', 'images/avatars/upload');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('storage\backup\provider', 'phpbb\storage\provider\local');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('storage\backup\config\path', 'store');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_enable', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_public', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_private', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_method_default_enable', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_dropdown_subscribe', '1');
 
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cache_last_gc', '0', 1);
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cron_lock', '0', 1);
@@ -435,7 +430,6 @@ INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_group', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_groupadd', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_groupdel', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_icons', 1);
-INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_jabber', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_language', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_mauth', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_modules', 1);
@@ -489,7 +483,6 @@ INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_readpm', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_savedrafts', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_search', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendemail', 1);
-INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendim', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendpm', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sig', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_viewonline', 1);
@@ -535,10 +528,10 @@ INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id,
 INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts_approved, forum_posts_unapproved, forum_posts_softdeleted, forum_topics_approved, forum_topics_unapproved, forum_topics_softdeleted, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_subject, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_freq, prune_days, prune_viewed, forum_parents, forum_flags) VALUES ('{L_FORUMS_TEST_FORUM_TITLE}', '{L_FORUMS_TEST_FORUM_DESC}', 2, 3, 1, 1, 1, 0, 0, 1, 0, 0, 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, '', '', '', '', '', '', '', 1, 7, 7, '', 48);
 
 # -- Users / Anonymous user
-INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_jabber, user_actkey, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', 0);
+INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_actkey, user_actkey_expiration, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', 0, '', 0);
 
 # -- username: Admin    password: admin (change this or remove it once everything is working!)
-INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_jabber, user_actkey, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '');
+INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_actkey, user_actkey_expiration, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', 0, '');
 
 # -- Groups
 INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('GUESTS', 3, 0, '', 0, '', '', '', 5);
@@ -565,7 +558,7 @@ INSERT INTO phpbb_ranks (rank_title, rank_min, rank_special, rank_image) VALUES
 # -- Roles data
 
 # Standard Admin (a_)
-INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 1, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option NOT IN ('a_switchperm', 'a_jabber', 'a_phpinfo', 'a_server', 'a_backup', 'a_styles', 'a_clearlogs', 'a_modules', 'a_language', 'a_email', 'a_bots', 'a_search', 'a_aauth', 'a_roles');
+INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 1, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option NOT IN ('a_switchperm', 'a_phpinfo', 'a_server', 'a_backup', 'a_styles', 'a_clearlogs', 'a_modules', 'a_language', 'a_email', 'a_bots', 'a_search', 'a_aauth', 'a_roles');
 
 # Forum admin (a_)
 INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 2, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_fauth', 'a_forum', 'a_forumadd', 'a_forumdel', 'a_mauth', 'a_prune', 'a_uauth', 'a_viewauth', 'a_viewlogs');
@@ -583,14 +576,14 @@ INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT
 INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 6, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_forward');
 
 # Limited Features (u_)
-INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 7, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim', 'u_masspm', 'u_masspm_group');
+INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 7, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_masspm', 'u_masspm_group');
 
 # No Private Messages (u_)
 INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_', 'u_chgavatar', 'u_chgcensors', 'u_chgemail', 'u_chgpasswd', 'u_download', 'u_hideonline', 'u_mention', 'u_sig', 'u_viewprofile');
 INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_readpm', 'u_sendpm', 'u_masspm', 'u_masspm_group');
 
 # No Avatar (u_)
-INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim', 'u_masspm', 'u_masspm_group');
+INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_masspm', 'u_masspm_group');
 INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_chgavatar');
 
 # Full Moderator (m_)
@@ -707,60 +700,60 @@ INSERT INTO phpbb_posts (topic_id, forum_id, poster_id, icon_id, post_time, post
 INSERT INTO phpbb_topics_posted (user_id, topic_id, topic_posted) VALUES (2, 1, 1);
 
 # -- Smilies
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':D', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 1);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-D', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 2);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':grin:', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 3);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':)', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 4);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-)', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 5);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':smile:', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 6);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (';)', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 7);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (';-)', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 8);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':wink:', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 9);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':(', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 10);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-(', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 11);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':sad:', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 12);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 13);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 14);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':eek:', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':shock:', 'icon_eek.gif', '{L_SMILIES_SHOCKED}', 15, 17, 16);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 17);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-?', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 18);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':???:', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 19);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES ('8-)', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 17, 20);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cool:', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 17, 21);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':lol:', 'icon_lol.gif', '{L_SMILIES_LAUGHING}', 15, 17, 22);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 23);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 24);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mad:', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 25);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 26);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 27);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':razz:', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 28);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':oops:', 'icon_redface.gif', '{L_SMILIES_EMARRASSED}', 15, 17, 29);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cry:', 'icon_cry.gif', '{L_SMILIES_CRYING}', 15, 17, 30);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':evil:', 'icon_evil.gif', '{L_SMILIES_EVIL}', 15, 17, 31);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':twisted:', 'icon_twisted.gif', '{L_SMILIES_TWISTED_EVIL}', 15, 17, 32);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':roll:', 'icon_rolleyes.gif', '{L_SMILIES_ROLLING_EYES}', 15, 17, 33);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':!:', 'icon_exclaim.gif', '{L_SMILIES_EXCLAMATION}', 15, 17, 34);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?:', 'icon_question.gif', '{L_SMILIES_QUESTION}', 15, 17, 35);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':idea:', 'icon_idea.gif', '{L_SMILIES_IDEA}', 15, 17, 36);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':arrow:', 'icon_arrow.gif', '{L_SMILIES_ARROW}', 15, 17, 37);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 17, 38);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 17, 39);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mrgreen:', 'icon_mrgreen.gif', '{L_SMILIES_MR_GREEN}', 15, 17, 40);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':geek:', 'icon_e_geek.gif', '{L_SMILIES_GEEK}', 17, 17, 41);
-INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':ugeek:', 'icon_e_ugeek.gif', '{L_SMILIES_UBER_GEEK}', 17, 18, 42);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':D', 'icon_e_biggrin.svg', '{L_SMILIES_VERY_HAPPY}', 15, 17, 1);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-D', 'icon_e_biggrin.svg', '{L_SMILIES_VERY_HAPPY}', 15, 17, 2);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':grin:', 'icon_e_biggrin.svg', '{L_SMILIES_VERY_HAPPY}', 15, 17, 3);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':)', 'icon_e_smile.svg', '{L_SMILIES_SMILE}', 15, 17, 4);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-)', 'icon_e_smile.svg', '{L_SMILIES_SMILE}', 15, 17, 5);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':smile:', 'icon_e_smile.svg', '{L_SMILIES_SMILE}', 15, 17, 6);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (';)', 'icon_e_wink.svg', '{L_SMILIES_WINK}', 15, 17, 7);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (';-)', 'icon_e_wink.svg', '{L_SMILIES_WINK}', 15, 17, 8);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':wink:', 'icon_e_wink.svg', '{L_SMILIES_WINK}', 15, 17, 9);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':(', 'icon_e_sad.svg', '{L_SMILIES_SAD}', 15, 17, 10);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-(', 'icon_e_sad.svg', '{L_SMILIES_SAD}', 15, 17, 11);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':sad:', 'icon_e_sad.svg', '{L_SMILIES_SAD}', 15, 17, 12);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':o', 'icon_e_surprised.svg', '{L_SMILIES_SURPRISED}', 15, 17, 13);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-o', 'icon_e_surprised.svg', '{L_SMILIES_SURPRISED}', 15, 17, 14);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':eek:', 'icon_e_surprised.svg', '{L_SMILIES_SURPRISED}', 15, 17, 15);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':shock:', 'icon_eek.svg', '{L_SMILIES_SHOCKED}', 15, 17, 16);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?', 'icon_e_confused.svg', '{L_SMILIES_CONFUSED}', 15, 17, 17);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-?', 'icon_e_confused.svg', '{L_SMILIES_CONFUSED}', 15, 17, 18);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':???:', 'icon_e_confused.svg', '{L_SMILIES_CONFUSED}', 15, 17, 19);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES ('8-)', 'icon_cool.svg', '{L_SMILIES_COOL}', 15, 17, 20);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cool:', 'icon_cool.svg', '{L_SMILIES_COOL}', 15, 17, 21);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':lol:', 'icon_lol.svg', '{L_SMILIES_LAUGHING}', 15, 17, 22);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':x', 'icon_mad.svg', '{L_SMILIES_MAD}', 15, 17, 23);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-x', 'icon_mad.svg', '{L_SMILIES_MAD}', 15, 17, 24);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mad:', 'icon_mad.svg', '{L_SMILIES_MAD}', 15, 17, 25);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':P', 'icon_razz.svg', '{L_SMILIES_RAZZ}', 15, 17, 26);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-P', 'icon_razz.svg', '{L_SMILIES_RAZZ}', 15, 17, 27);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':razz:', 'icon_razz.svg', '{L_SMILIES_RAZZ}', 15, 17, 28);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':oops:', 'icon_redface.svg', '{L_SMILIES_EMARRASSED}', 15, 17, 29);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cry:', 'icon_cry.svg', '{L_SMILIES_CRYING}', 15, 17, 30);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':evil:', 'icon_evil.svg', '{L_SMILIES_EVIL}', 15, 17, 31);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':twisted:', 'icon_twisted.svg', '{L_SMILIES_TWISTED_EVIL}', 15, 17, 32);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':roll:', 'icon_rolleyes.svg', '{L_SMILIES_ROLLING_EYES}', 15, 17, 33);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':!:', 'icon_exclaim.svg', '{L_SMILIES_EXCLAMATION}', 15, 17, 34);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?:', 'icon_question.svg', '{L_SMILIES_QUESTION}', 15, 17, 35);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':idea:', 'icon_idea.svg', '{L_SMILIES_IDEA}', 15, 17, 36);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':arrow:', 'icon_arrow.svg', '{L_SMILIES_ARROW}', 15, 17, 37);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':|', 'icon_neutral.svg', '{L_SMILIES_NEUTRAL}', 15, 17, 38);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-|', 'icon_neutral.svg', '{L_SMILIES_NEUTRAL}', 15, 17, 39);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mrgreen:', 'icon_mrgreen.svg', '{L_SMILIES_MR_GREEN}', 15, 17, 40);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':geek:', 'icon_e_geek.svg', '{L_SMILIES_GEEK}', 17, 17, 41);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':ugeek:', 'icon_e_ugeek.svg', '{L_SMILIES_UBER_GEEK}', 17, 18, 42);
 
 # -- icons
-INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/fire.gif', 16, 16, 1, 1);
-INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/redface.gif', 16, 16, 9, 1);
-INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/mrgreen.gif', 16, 16, 10, 1);
-INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/heart.gif', 16, 16, 4, 1);
-INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/star.gif', 16, 16, 2, 1);
-INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/radioactive.gif', 16, 16, 3, 1);
-INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/thinking.gif', 16, 16, 5, 1);
-INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/info.gif', 16, 16, 8, 1);
-INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/question.gif', 16, 16, 6, 1);
-INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/alert.gif', 16, 16, 7, 1);
+INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/fire.svg', 16, 16, 1, 1);
+INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/redface.svg', 16, 16, 9, 1);
+INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/mrgreen.svg', 16, 16, 10, 1);
+INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/heart.svg', 16, 16, 4, 1);
+INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/star.svg', 16, 16, 2, 1);
+INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/radioactive.svg', 16, 16, 3, 1);
+INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/thinking.svg', 16, 16, 5, 1);
+INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/info.svg', 16, 16, 8, 1);
+INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/question.svg', 16, 16, 6, 1);
+INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/alert.svg', 16, 16, 7, 1);
 
 # -- reasons
 INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_order) VALUES ('warez', '{L_REPORT_WAREZ}', 1);
diff --git a/phpBB/install/startup.php b/phpBB/install/startup.php
index 71f5744678f..f2013a70fba 100644
--- a/phpBB/install/startup.php
+++ b/phpBB/install/startup.php
@@ -51,7 +51,15 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline): bool
 {
 	global $phpbb_installer_container, $msg_long_text;
 
-	if (error_reporting() == 0)
+	// Acording to https://www.php.net/manual/en/language.operators.errorcontrol.php
+	// error_reporting() return a different error code inside the error handler after php 8.0
+	$suppresed = E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE;
+	if (PHP_VERSION_ID < 80000)
+	{
+		$suppresed = 0;
+	}
+
+	if (error_reporting() == $suppresed)
 	{
 		return true;
 	}
@@ -99,7 +107,7 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline): bool
 				{
 					/** @var \phpbb\install\helper\iohandler\iohandler_interface $iohandler */
 					$iohandler = $phpbb_installer_container->get('installer.helper.iohandler');
-					$iohandler->add_error_message($msg);
+					$iohandler->add_error_message($msg, get_backtrace());
 					$iohandler->send_response(true);
 					exit();
 				}
@@ -152,7 +160,7 @@ function installer_shutdown_function($display_errors)
 		@ini_set('display_errors', $display_errors);
 
 		// Manually define phpBB root path and phpEx. These will not be passed
-		// on from app.php
+		// on from index.php
 		$phpbb_root_path = __DIR__ . '/../';
 		$phpEx = 'php';
 
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 351f61dbef6..546b596f417 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -111,8 +111,6 @@
 	'GO_TO_EXTENSIONS'		=> 'Go to extension management screen',
 	'GROUP_NAME'			=> 'Group name',
 
-	'IMAGE_LINK_SIZE'			=> 'Image link dimensions',
-	'IMAGE_LINK_SIZE_EXPLAIN'	=> 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.',
 	'IMAGE_QUALITY'				=> 'Quality of uploaded image attachments (JPEG only)',
 	'IMAGE_QUALITY_EXPLAIN'		=> 'Specify value between 50% (smaller file size) and 90% (higher quality). Quality higher than 90% increases filesize and is disabled. Setting only applies if maximum image dimensions are set to a value other than 0px by 0px.',
 	'IMAGE_STRIP_METADATA'		=> 'Strip image metadata (JPEG only)',
@@ -122,7 +120,7 @@
 	'MAX_ATTACHMENTS_PM'			=> 'Maximum number of attachments per private message',
 	'MAX_EXTGROUP_FILESIZE'			=> 'Maximum file size',
 	'MAX_IMAGE_SIZE'				=> 'Maximum image dimensions',
-	'MAX_IMAGE_SIZE_EXPLAIN'		=> 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.',
+	'MAX_IMAGE_SIZE_EXPLAIN'		=> 'Maximum dimensions of image attachments. phpBB may try to automatically resize images before upload to these maximum image dimensions. Set both values to 0px by 0px to disable dimension checking and automatic resizing.',
 	'MAX_THUMB_WIDTH'				=> 'Maximum thumbnail width/height in pixel',
 	'MAX_THUMB_WIDTH_EXPLAIN'		=> 'A generated thumbnail will not exceed the width set here.',
 	'MIN_THUMB_FILESIZE'			=> 'Minimum thumbnail file size',
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index ec2d0236ecb..ecadf39ad21 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -69,6 +69,8 @@
 	'SITE_HOME_URL'					=> 'Main website URL',
 	'SITE_HOME_URL_EXPLAIN'			=> 'If specified, a link to this URL will be prepended to your board’s breadcrumbs and the board logo will link to this URL instead of the forum index. An absolute URL is required, e.g. <samp>http://www.phpbb.com</samp>.',
 	'SITE_NAME'						=> 'Site name',
+	'SITE_NAME_SHORT'				=> 'Short site name',
+	'SITE_NAME_SHORT_EXPLAIN'		=> 'Short name will be used if your site is added to a mobile device’s home screen. It can not exceed 12 characters (Emoji is supported).',
 	'SYSTEM_TIMEZONE'				=> 'Guest timezone',
 	'SYSTEM_TIMEZONE_EXPLAIN'			=> 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.',
 	'WARNINGS_EXPIRE'				=> 'Warning duration',
@@ -206,10 +208,6 @@
 
 	'MAX_SIG_FONT_SIZE'				=> 'Maximum signature font size',
 	'MAX_SIG_FONT_SIZE_EXPLAIN'		=> 'Maximum font size allowed in user signatures. Set to 0 for unlimited size.',
-	'MAX_SIG_IMG_HEIGHT'			=> 'Maximum signature image height',
-	'MAX_SIG_IMG_HEIGHT_EXPLAIN'	=> 'Maximum height of an image file in user signatures. Set to 0 for unlimited height.',
-	'MAX_SIG_IMG_WIDTH'				=> 'Maximum signature image width',
-	'MAX_SIG_IMG_WIDTH_EXPLAIN'		=> 'Maximum width of an image file in user signatures. Set to 0 for unlimited width.',
 	'MAX_SIG_LENGTH'				=> 'Maximum signature length',
 	'MAX_SIG_LENGTH_EXPLAIN'		=> 'Maximum number of characters in user signatures.',
 	'MAX_SIG_SMILIES'				=> 'Maximum smilies per signature',
@@ -295,7 +293,7 @@
 	'ACP_FEED_OVERALL_FORUMS_EXPLAIN'	=> 'Enables the “All forums” feed, which displays a list of forums.',
 
 	'ACP_FEED_HTTP_AUTH'				=> 'Allow HTTP Authentication',
-	'ACP_FEED_HTTP_AUTH_EXPLAIN'		=> 'Enables HTTP authentication, which allows users to receive content that is hidden to guest users by adding the <samp>auth=http</samp> parameter to the feed URL. Please note that some PHP setups require additional changes to the .htaccess file. Instructions can be found in that file.',
+	'ACP_FEED_HTTP_AUTH_EXPLAIN'		=> 'Enables HTTP authentication, allowing users to access content hidden from guests by adding the <samp>auth=http</samp> parameter to the feed URL. Please note that some PHP configurations may require additional changes to the .htaccess file; refer to that file for guidance. HTTP authentication is only supported over encrypted (https) connections.',
 	'ACP_FEED_ITEM_STATISTICS'			=> 'Item statistics',
 	'ACP_FEED_ITEM_STATISTICS_EXPLAIN'	=> 'Display individual statistics underneath feed items<br>(e.g. posted by, date and time, replies, views)',
 	'ACP_FEED_EXCLUDE_ID'				=> 'Exclude these forums',
@@ -304,29 +302,11 @@
 
 // Visual Confirmation Settings
 $lang = array_merge($lang, array(
-	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a <em>CAPTCHA</em>, a test which is designed to be difficult for computers to solve.',
+	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a <em>CAPTCHA</em>, a test which is designed to be difficult for computers to solve. phpBB defaults to "Incomplete Captcha," disabling verification and preventing functionality like registration that require CAPTCHA verification.',
 	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the <a href="https://www.phpbb.com/go/anti-spam-ext"><strong>phpBB.com Extensions Database</strong></a>. For more information on preventing spam on your board, visit the <a href="https://www.phpbb.com/go/anti-spam"><strong>phpBB.com Knowledge Base</strong></a>.',
 	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
 	'CAPTCHA_UNAVAILABLE'					=> 'The plugin cannot be selected as its requirements are not met.',
-	'CAPTCHA_GD'							=> 'GD image',
-	'CAPTCHA_GD_3D'							=> 'GD 3D image',
-	'CAPTCHA_GD_FOREGROUND_NOISE'			=> 'Foreground noise',
-	'CAPTCHA_GD_EXPLAIN'					=> 'Uses GD to make a more advanced anti-spambot image.',
-	'CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN'	=> 'Use foreground noise to make the image harder to read.',
-	'CAPTCHA_GD_X_GRID'						=> 'Background noise x-axis',
-	'CAPTCHA_GD_X_GRID_EXPLAIN'				=> 'Use lower settings of this to make the image harder to read. 0 will disable x-axis background noise.',
-	'CAPTCHA_GD_Y_GRID'						=> 'Background noise y-axis',
-	'CAPTCHA_GD_Y_GRID_EXPLAIN'				=> 'Use lower settings of this to make the image harder to read. 0 will disable y-axis background noise.',
-	'CAPTCHA_GD_WAVE'						=> 'Wave distortion',
-	'CAPTCHA_GD_WAVE_EXPLAIN'				=> 'This applies a wave distortion to the image.',
-	'CAPTCHA_GD_3D_NOISE'					=> 'Add 3D-noise objects',
-	'CAPTCHA_GD_3D_NOISE_EXPLAIN'			=> 'This adds additional objects to the image, over the letters.',
-	'CAPTCHA_GD_FONTS'						=> 'Use different fonts',
-	'CAPTCHA_GD_FONTS_EXPLAIN'				=> 'This setting controls how many different letter shapes are used. You can just use the default shapes or introduce altered letters. Adding lowercase letters is also possible.',
-	'CAPTCHA_FONT_DEFAULT'					=> 'Default',
-	'CAPTCHA_FONT_NEW'						=> 'New Shapes',
-	'CAPTCHA_FONT_LOWER'					=> 'Also use lowercase',
-	'CAPTCHA_NO_GD'							=> 'Simple image',
+	'CAPTCHA_INCOMPLETE'					=> 'Incomplete Captcha (Not configured)',
 	'CAPTCHA_PREVIEW_MSG'					=> 'Your changes have not been saved, this is just a preview.',
 	'CAPTCHA_PREVIEW_EXPLAIN'				=> 'The plugin as it would look like using the current selection.',
 
@@ -471,14 +451,14 @@
 	'ICONS_PATH'				=> 'Post icons storage path',
 	'ICONS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/icons</samp>.',
 	'MOD_REWRITE_ENABLE'		=> 'Enable URL Rewriting',
-	'MOD_REWRITE_ENABLE_EXPLAIN' => 'When enabled, URLs containing ’app.php’ will be rewritten to remove the filename (i.e. app.php/foo will become /foo). <strong>Apache server’s mod_rewrite module is required for this functionality to work; if this option is enabled without mod_rewrite support, URLs on your board may be broken.</strong>',
+	'MOD_REWRITE_ENABLE_EXPLAIN' => 'When enabled, URLs containing ’index.php’ will be rewritten to remove the filename (i.e. index.php/foo will become /foo). <strong>Apache server’s mod_rewrite module is required for this functionality to work; if this option is enabled without mod_rewrite support, URLs on your board may be broken.</strong>',
 	'MOD_REWRITE_DISABLED'		=> 'The <strong>mod_rewrite</strong> module on your Apache web server is disabled. Enable the module or contact your web hosting provider if you wish to enable this feature.',
 	'MOD_REWRITE_INFORMATION_UNAVAILABLE' => 'We are unable to determine whether or not this server supports URL rewriting. This setting may be enabled but if URL rewriting is not available, paths generated by this board (such as for use in links) may be broken. Contact your web hosting provider if you are unsure whether or not you can safely enable this feature.',
 	'PATH_SETTINGS'				=> 'Path settings',
 	'RANKS_PATH'				=> 'Rank image storage path',
 	'RANKS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/ranks</samp>.',
 	'SCRIPT_PATH'				=> 'Script path',
-	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.',
+	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB</samp>.',
 	'SERVER_NAME'				=> 'Domain name',
 	'SERVER_NAME_EXPLAIN'		=> 'The domain name this board runs from (for example: <samp>example.com</samp>).',
 	'SERVER_PORT'				=> 'Server port',
@@ -490,8 +470,8 @@
 	'SMILIES_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/smilies</samp>.',
 	'UPLOAD_ICONS_PATH'			=> 'Extension group icons storage path',
 	'UPLOAD_ICONS_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>.',
-	'USE_SYSTEM_CRON'		=> 'Run periodic tasks from system cron',
-	'USE_SYSTEM_CRON_EXPLAIN'		=> 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for <code>bin/phpbbcli.php cron:run</code> to be run by the system cron facility at regular intervals (e.g. every 5 minutes).',
+	'USE_SYSTEM_CRON'			=> 'Run periodic tasks from operating system cron',
+	'USE_SYSTEM_CRON_EXPLAIN'	=> 'When disabled, phpBB will arrange for periodic tasks to be run automatically. When enabled, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for <code>bin/phpbbcli.php cron:run</code> to be run by the operating system cron facility at regular intervals (e.g. every 5 minutes).',
 ));
 
 // Security Settings
@@ -573,15 +553,8 @@
 	'SEND_TEST_EMAIL_EXPLAIN'		=> 'This will send a test email to the address defined in your account.',
 	'SMTP_ALLOW_SELF_SIGNED'		=> 'Allow self-signed SSL certificates',
 	'SMTP_ALLOW_SELF_SIGNED_EXPLAIN'=> 'Allow connections to SMTP server with self-signed SSL certificate. <br><em><strong>Warning:</strong> Allowing self-signed SSL certificates may cause security implications.</em>',
-	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
-	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
-	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',
-	'SMTP_DIGEST_MD5'				=> 'DIGEST-MD5',
-	'SMTP_LOGIN'					=> 'LOGIN',
 	'SMTP_PASSWORD'					=> 'SMTP password',
 	'SMTP_PASSWORD_EXPLAIN'			=> 'Only enter a password if your SMTP server requires it.<br><em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
-	'SMTP_PLAIN'					=> 'PLAIN',
-	'SMTP_POP_BEFORE_SMTP'			=> 'POP-BEFORE-SMTP',
 	'SMTP_PORT'						=> 'SMTP server port',
 	'SMTP_PORT_EXPLAIN'				=> 'Only change this if you know your SMTP server is on a different port.',
 	'SMTP_SERVER'					=> 'SMTP server address',
@@ -599,30 +572,17 @@
 	'USE_SMTP_EXPLAIN'				=> 'Select “Yes” if you want or have to send email via a named server instead of the local mail function.',
 ));
 
-// Jabber settings
-$lang = array_merge($lang, array(
-	'ACP_JABBER_SETTINGS_EXPLAIN'	=> 'Here you can enable and control the use of Jabber for instant messaging and board notifications. Jabber is an open source protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Please be sure to enter already registered account details - phpBB will use the details you enter here as is.',
-
-	'JAB_ALLOW_SELF_SIGNED'			=> 'Allow self-signed SSL certificates',
-	'JAB_ALLOW_SELF_SIGNED_EXPLAIN'	=> 'Allow connections to Jabber server with self-signed SSL certificate. <br><em><strong>Warning:</strong> Allowing self-signed SSL certificates may cause security implications.</em>',
-	'JAB_ENABLE'					=> 'Enable Jabber',
-	'JAB_ENABLE_EXPLAIN'			=> 'Enables use of Jabber messaging and notifications.',
-	'JAB_GTALK_NOTE'				=> 'Please note that GTalk will not work because the <samp>dns_get_record</samp> function could not be found. This function is not available in PHP4, and is not implemented on Windows platforms. It currently does not work on BSD-based systems, including Mac OS.',
-	'JAB_PACKAGE_SIZE'				=> 'Jabber package size',
-	'JAB_PACKAGE_SIZE_EXPLAIN'		=> 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
-	'JAB_PASSWORD'					=> 'Jabber password',
-	'JAB_PASSWORD_EXPLAIN'			=> '<em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
-	'JAB_PORT'						=> 'Jabber port',
-	'JAB_PORT_EXPLAIN'				=> 'Leave blank unless you know it is not port 5222.',
-	'JAB_SERVER'					=> 'Jabber server',
-	'JAB_SERVER_EXPLAIN'			=> 'See %sjabber.org%s for a list of servers.',
-	'JAB_SETTINGS_CHANGED'			=> 'Jabber settings changed successfully.',
-	'JAB_USE_SSL'					=> 'Use SSL to connect',
-	'JAB_USE_SSL_EXPLAIN'			=> 'If enabled a secure connection is tried to be established. The Jabber port will be modified to 5223 if port 5222 is specified.',
-	'JAB_USERNAME'					=> 'Jabber username or JID',
-	'JAB_USERNAME_EXPLAIN'			=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',
-	'JAB_VERIFY_PEER'				=> 'Verify SSL certificate',
-	'JAB_VERIFY_PEER_EXPLAIN'		=> 'Require verification of SSL certificate used by Jabber server. <br><em><strong>Warning:</strong> Connecting peers with unverified SSL certificates may cause security implications.</em>',
-	'JAB_VERIFY_PEER_NAME'			=> 'Verify Jabber peer name',
-	'JAB_VERIFY_PEER_NAME_EXPLAIN'	=> 'Require verification of peer name for Jabber servers using SSL / TLS connections. <br><em><strong>Warning:</strong> Connecting to unverified peers may cause security implications.</em>',
-));
+$lang = array_merge($lang, [
+	'ACP_WEBPUSH_SETTINGS_EXPLAIN'	=> 'Here you can enable Web Push for board notifications. Web Push is a protocol for the real-time delivery of events to user agents, commonly referred to as push messages. It is compatible with the majority of modern browsers on both desktop and mobile devices. Users can opt to receive Web Push alerts in their browser by subscribing and enabling their preferred notifications in the UCP.',
+	'WEBPUSH_ENABLE'				=> 'Enable Web Push',
+	'WEBPUSH_ENABLE_EXPLAIN'		=> 'Allow users to receive notifications in their browser or device via Web Push. To utilize Web Push, you must input or generate valid VAPID identification keys.',
+	'WEBPUSH_GENERATE_VAPID_KEYS'	=> 'Generate Identification keys',
+	'WEBPUSH_VAPID_PUBLIC'			=> 'Server identification public key',
+	'WEBPUSH_VAPID_PUBLIC_EXPLAIN'	=> 'The Voluntary Application Server Identification (VAPID) public key is shared to authenticate push messages from your site.<br><em><strong>Caution:</strong> Modifying the VAPID public key will automatically render all Web Push subscriptions invalid.</em>',
+	'WEBPUSH_VAPID_PRIVATE'			=> 'Server identification private key',
+	'WEBPUSH_VAPID_PRIVATE_EXPLAIN'	=> 'The Voluntary Application Server Identification (VAPID) private key is used to generate authenticated push messages dispatched from your site. The VAPID private key <strong>must</strong> form a valid public-private key pair alongside the VAPID public key.<br><em><strong>Caution:</strong> Modifying the VAPID private key will automatically render all Web Push subscriptions invalid.</em>',
+	'WEBPUSH_METHOD_DEFAULT_ENABLE'	=> 'Enable all user-based web push notification options by default',
+	'WEBPUSH_METHOD_DEFAULT_ENABLE_EXPLAIN'	=> 'When this setting is enabled, users who subscribe and allow browser notifications will start receiving them automatically. Users only need to visit the UCP Notification settings to disable any unwanted notifications.<br><br>If this setting is disabled, users will not receive any notifications, even if they have subscribed, until they visit the UCP Notification settings to enable the specific notification options they wish to receive.',
+	'WEBPUSH_DROPDOWN_SUBSCRIBE'	=> 'Show “Subscribe” button in notification dropdown',
+	'WEBPUSH_DROPDOWN_SUBSCRIBE_EXPLAIN'	=> 'Display a “Subscribe” button in the Notification dropdown, allowing users to easily subscribe to push notifications from anywhere in the forum.',
+]);
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index aeab0af262c..e2bbef019e9 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -120,8 +120,6 @@
 	'ACP_INACTIVE_USERS'		=> 'Inactive users',
 	'ACP_INDEX'					=> 'ACP index',
 
-	'ACP_JABBER_SETTINGS'		=> 'Jabber settings',
-
 	'ACP_LANGUAGE'				=> 'Language management',
 	'ACP_LANGUAGE_PACKS'		=> 'Language packs',
 	'ACP_LOAD_SETTINGS'			=> 'Load settings',
@@ -219,6 +217,7 @@
 	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS'	=> 'View global moderation permissions',
 	'ACP_VIEW_USER_PERMISSIONS'			=> 'View user-based permissions',
 
+	'ACP_WEBPUSH_SETTINGS'		=> 'Web Push settings',
 	'ACP_WORDS'					=> 'Word censoring',
 
 	'ACTION'				=> 'Action',
@@ -234,6 +233,9 @@
 
 	'BACK'					=> 'Back',
 
+	'CAPTCHA_UNSAFE_WARNING'		=> 'Your board is currently vulnerable to spam submissions because the Spambot countermeasures are either disabled or not configured correctly.',
+	'CAPTCHA_INCOMPLETE_WARNING'	=> '“Incomplete Captcha“ is currently enabled. This placeholder CAPTCHA will prevent all form submissions requiring CAPTCHA verification, e.g. user registration. Please configure a proper CAPTCHA solution like Q&amp;A or reCaptcha to ensure intended functionality.',
+
 	'CONTAINER_EXCEPTION' => 'phpBB encountered an error building the container due to an installed extension. For this reason, all extensions have been temporarily disabled. Please try purging your forum cache. All extensions will automatically be re-enabled once the container error is resolved. If this error continues, please visit <a href="https://www.phpbb.com/support">phpBB.com</a> for support.',
 	'EXCEPTION' => 'Exception',
 
@@ -592,6 +594,7 @@
 	'LOG_CONFIG_SETTINGS'		=> '<strong>Altered board settings</strong>',
 	'LOG_CONFIG_SIGNATURE'		=> '<strong>Altered signature settings</strong>',
 	'LOG_CONFIG_VISUAL'			=> '<strong>Altered anti-spambot settings</strong>',
+	'LOG_CONFIG_WEBPUSH'		=> '<strong>Altered Web Push settings</strong>',
 
 	'LOG_APPROVE_TOPIC'			=> '<strong>Approved topic</strong><br />» %s',
 	'LOG_BUMP_TOPIC'			=> '<strong>User bumped topic</strong><br />» %s',
@@ -637,7 +640,6 @@
 	'LOG_DOWNLOAD_IP'			=> '<strong>Added IP/hostname to download list</strong><br />» %s',
 	'LOG_DOWNLOAD_REMOVE_IP'	=> '<strong>Removed IP/hostname from download list</strong><br />» %s',
 
-	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br />» %s',
 	'LOG_ERROR_EMAIL'		=> '<strong>Email error</strong><br />» %s',
 	'LOG_ERROR_CAPTCHA'		=> '<strong>CAPTCHA error</strong><br />» %s',
 
@@ -681,11 +683,6 @@
 
 	'LOG_IP_BROWSER_FORWARDED_CHECK'	=> '<strong>Session IP/browser/X_FORWARDED_FOR check failed</strong><br />»User IP “<em>%1$s</em>” checked against session IP “<em>%2$s</em>”, user browser string “<em>%3$s</em>” checked against session browser string “<em>%4$s</em>” and user X_FORWARDED_FOR string “<em>%5$s</em>” checked against session X_FORWARDED_FOR string “<em>%6$s</em>”.',
 
-	'LOG_JAB_CHANGED'			=> '<strong>Jabber account changed</strong>',
-	'LOG_JAB_PASSCHG'			=> '<strong>Jabber password changed</strong>',
-	'LOG_JAB_REGISTER'			=> '<strong>Jabber account registered</strong>',
-	'LOG_JAB_SETTINGS_CHANGED'	=> '<strong>Jabber settings changed</strong>',
-
 	'LOG_LANGUAGE_PACK_DELETED'		=> '<strong>Deleted language pack</strong><br />» %s',
 	'LOG_LANGUAGE_PACK_INSTALLED'	=> '<strong>Installed language pack</strong><br />» %s',
 	'LOG_LANGUAGE_PACK_UPDATED'		=> '<strong>Updated language pack details</strong><br />» %s',
@@ -763,6 +760,8 @@
 	'LOG_STYLE_EDIT_DETAILS'	=> '<strong>Edited style</strong><br />» %s',
 	'LOG_STYLE_EXPORT'			=> '<strong>Exported style</strong><br />» %s',
 
+	'LOG_STORAGE_UPDATE'		=> '<strong>Storage updated</strong><br />» %s',
+
 	'LOG_UPDATE_DATABASE'	=> '<strong>Updated Database from version %1$s to version %2$s</strong>',
 	'LOG_UPDATE_PHPBB'		=> '<strong>Updated phpBB from version %1$s to version %2$s</strong>',
 
@@ -812,6 +811,9 @@
 	),
 	'LOG_WARNINGS_DELETED_ALL'	=> '<strong>Deleted all user warnings</strong><br />» %s',
 
+	'LOG_WEBPUSH_MESSAGE_FAIL'			=> '<strong>Web Push message could not be sent:</strong> %s',
+	'LOG_WEBPUSH_SUBSCRIPTION_REMOVED'	=> '<strong>Removed Web Push subscription:</strong>» %s',
+
 	'LOG_WORD_ADD'			=> '<strong>Added word censor</strong><br />» %s',
 	'LOG_WORD_DELETE'		=> '<strong>Deleted word censor</strong><br />» %s',
 	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index c6eb147b86e..d1107564dfb 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -36,14 +36,15 @@
 
 $lang = array_merge($lang, array(
 
-	'EXTENSION_ALREADY_INSTALLED'				=> 'The “%s” extension has already been installed.',
-	'EXTENSION_ALREADY_INSTALLED_MANUALLY'		=> 'The “%s” extension has already been installed manually.',
-	'EXTENSION_ALREADY_MANAGED'					=> 'The “%s” extension is already managed.',
-	'EXTENSION_CANNOT_MANAGE_FILESYSTEM_ERROR'	=> 'The “%s” extension cannot be managed because the existing files could not be removed from the filesystem.',
-	'EXTENSION_CANNOT_MANAGE_INSTALL_ERROR'		=> 'The “%s” extension could not be installed. The prior installation of this extension has been restored.',
-	'EXTENSION_MANAGED_WITH_CLEAN_ERROR'		=> 'The “%1$s” extension has been installed but an error occurred and the old files could not be removed. You might want to delete the “%2$s” files manually.',
-	'EXTENSION_MANAGED_WITH_ENABLE_ERROR'		=> 'The “%s” extension has been installed but an error occurred while enabling it.',
-	'EXTENSION_NOT_INSTALLED'					=> 'The “%s” extension is not installed.',
+	'EXTENSIONS_ALREADY_INSTALLED'				=> 'The “%s” extension has already been installed.',
+	'EXTENSIONS_ALREADY_INSTALLED_MANUALLY'		=> 'The “%s” extension has already been installed manually.',
+	'EXTENSIONS_ALREADY_MANAGED'				=> 'The “%s” extension is already managed.',
+	'EXTENSIONS_CANNOT_MANAGE_FILESYSTEM_ERROR'	=> 'The “%s” extension cannot be managed because the existing files could not be removed from the filesystem.',
+	'EXTENSIONS_CANNOT_MANAGE_INSTALL_ERROR'	=> 'The “%s” extension could not be installed. The prior installation of this extension has been restored.',
+	'EXTENSIONS_MANAGED_WITH_CLEAN_ERROR'		=> 'The “%1$s” extension has been installed but an error occurred and the old files could not be removed. You might want to delete the “%2$s” files manually.',
+	'EXTENSIONS_MANAGED_WITH_ENABLE_ERROR'		=> 'The “%s” extension has been installed but an error occurred while enabling it.',
+	'EXTENSIONS_NOT_INSTALLED'					=> 'The “%s” extension is not installed.',
+	'EXTENSIONS_NOT_MANAGED'					=> 'The “%s” extension is not being managed.',
 
 	'ENABLING_EXTENSIONS'	=> 'Enabling extensions',
 	'DISABLING_EXTENSIONS'	=> 'Disabling extensions',
@@ -62,8 +63,9 @@
 
 	'DETAILS'				=> 'Details',
 
-	'EXTENSIONS_DISABLED'	=> 'Disabled Extensions',
-	'EXTENSIONS_ENABLED'	=> 'Enabled Extensions',
+	'EXTENSIONS_NOT_INSTALLED'	=> 'Not installed Extensions',
+	'EXTENSIONS_DISABLED'		=> 'Disabled Extensions',
+	'EXTENSIONS_ENABLED'		=> 'Enabled Extensions',
 
 	'EXTENSION_DELETE_DATA'	=> 'Delete data',
 	'EXTENSION_DISABLE'		=> 'Disable',
@@ -74,6 +76,8 @@
 	'EXTENSION_DELETE_DATA_EXPLAIN'	=> 'Deleting an extension’s data removes all of its data and settings. The extension files are retained so it can be enabled again.',
 	'EXTENSION_DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.',
 	'EXTENSION_ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
+	'EXTENSION_REMOVE_EXPLAIN'		=> 'Removing an extension removes all of its files, data and settings.',
+	'EXTENSION_UPDATE_EXPLAIN'		=> 'Updating an extension will install the latest version compatible with your board, removing old files and replacing them with new ones, and updating the database if necessary.',
 
 	'EXTENSION_DELETE_DATA_IN_PROGRESS'	=> 'The extension’s data is currently being deleted. Please do not leave or refresh this page until it is completed.',
 	'EXTENSION_DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled. Please do not leave or refresh this page until it is completed.',
@@ -86,25 +90,23 @@
 	'EXTENSION_NAME'			=> 'Extension Name',
 	'EXTENSION_ACTIONS'			=> 'Actions',
 	'EXTENSION_OPTIONS'			=> 'Options',
-	'EXTENSION_INSTALL_HEADLINE'=> 'Installing an extension',
-	'EXTENSION_INSTALL_EXPLAIN'	=> '<ol>
-			<li>Download an extension from phpBB’s extensions database</li>
-			<li>Unzip the extension and upload it to the <samp>ext/</samp> directory of your phpBB board</li>
-			<li>Enable the extension, here in the Extensions manager</li>
-		</ol>',
-	'EXTENSION_UPDATE_HEADLINE'	=> 'Updating an extension',
-	'EXTENSION_UPDATE_EXPLAIN'	=> '<ol>
-			<li>Disable the extension</li>
-			<li>Delete the extension’s files from the filesystem</li>
-			<li>Upload the new files</li>
-			<li>Enable the extension</li>
-		</ol>',
-	'EXTENSION_REMOVE_HEADLINE'	=> 'Completely removing an extension from your board',
-	'EXTENSION_REMOVE_EXPLAIN'	=> '<ol>
-			<li>Disable the extension</li>
-			<li>Delete the extension’s data</li>
-			<li>Delete the extension’s files from the filesystem</li>
-		</ol>',
+
+	'EXTENSION_INSTALLING_HEADLINE'			=> 'Installing an extension',
+	'EXTENSION_INSTALLING_EXPLAIN_STEP1'	=> 'Download an extension from phpBB’s extensions database',
+	'EXTENSION_INSTALLING_EXPLAIN_STEP2'	=> 'Unzip the extension and upload it to the <samp>ext/</samp> directory of your phpBB board',
+	'EXTENSION_INSTALLING_EXPLAIN_STEP3'	=> 'Enable the extension, here in the Extensions manager',
+
+	'EXTENSION_REMOVING_HEADLINE'			=> 'Deleting an extension from your board',
+	'EXTENSION_REMOVING_EXPLAIN_STEP1'		=> 'Disable the extension',
+	'EXTENSION_REMOVING_EXPLAIN_STEP2'		=> 'Delete the extension’s data',
+	'EXTENSION_REMOVING_EXPLAIN_STEP3'		=> 'Delete the extension‘s files from the filesystem',
+
+	'EXTENSION_UPDATING_HEADLINE'			=> 'Updating an extension',
+	'EXTENSION_UPDATING_EXPLAIN_STEP1'		=> 'Disable the extension',
+	'EXTENSION_UPDATING_EXPLAIN_STEP2'		=> 'Delete the extension’s files from the filesystem',
+	'EXTENSION_UPDATING_EXPLAIN_STEP3'		=> 'Upload the new files',
+	'EXTENSION_UPDATING_EXPLAIN_STEP4'		=> 'Enable the extension',
+
 
 	'EXTENSION_DELETE_DATA_CONFIRM'	=> 'Are you sure that you wish to delete the data associated with “%s”?<br /><br />This removes all of its data and settings and cannot be undone!',
 	'EXTENSION_DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable the “%s” extension?',
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 3ab152345cb..6810273f1d7 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -77,7 +77,7 @@
 	'ENABLE_TOPIC_ICONS'			=> 'Enable topic icons',
 
 	'FORUM_ADMIN'						=> 'Forum administration',
-	'FORUM_ADMIN_EXPLAIN'				=> 'In phpBB3 everything is forum based. A category is just a special type of forum. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum. <strong>You need to copy or set appropriate permissions for newly created forums to have them displayed.</strong>',
+	'FORUM_ADMIN_EXPLAIN'				=> 'In phpBB everything is forum based. A category is just a special type of forum. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum. <strong>You need to copy or set appropriate permissions for newly created forums to have them displayed.</strong>',
 	'FORUM_AUTO_PRUNE'					=> 'Enable auto-pruning',
 	'FORUM_AUTO_PRUNE_EXPLAIN'			=> 'Prunes the forum of topics, set the frequency/age parameters below.',
 	'FORUM_CREATED'						=> 'Forum created successfully.',
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 693090139fc..cd4085d7461 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -54,7 +54,7 @@
 
 		<br />
 
-		<p>For further information on setting up and managing permissions on your phpBB3 board, please see the section on <a href="https://www.phpbb.com/support/docs/en/3.3/ug/quickstart/permissions/">Setting permissions of our Quick Start Guide</a>.</p>
+		<p>For further information on setting up and managing permissions on your phpBB board, please see the section on <a href="https://www.phpbb.com/support/docs/en/3.3/ug/quickstart/permissions/">Setting permissions of our Quick Start Guide</a>.</p>
 	',
 
 	'ACL_NEVER'				=> 'Never',
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 01523487b4b..17361e1a3b4 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -98,7 +98,6 @@
 	'ACL_U_PM_IMG'		=> 'Can use [img] BBCode tag in private messages',
 
 	'ACL_U_SENDEMAIL'	=> 'Can send emails',
-	'ACL_U_SENDIM'		=> 'Can send instant messages',
 	'ACL_U_IGNOREFLOOD'	=> 'Can ignore flood limit',
 	'ACL_U_HIDEONLINE'	=> 'Can hide online status',
 	'ACL_U_VIEWONLINE'	=> 'Can view hidden online users',
@@ -159,16 +158,15 @@
 	'ACL_M_MERGE'	=> 'Can merge topics',
 
 	'ACL_M_INFO'		=> 'Can view post details',
-	'ACL_M_WARN'		=> 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
-	'ACL_M_PM_REPORT'	=> 'Can close and delete reports of private messages<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
-	'ACL_M_BAN'			=> 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
+	'ACL_M_WARN'		=> 'Can issue warnings',
+	'ACL_M_PM_REPORT'	=> 'Can close and delete reports of private messages',
+	'ACL_M_BAN'			=> 'Can manage bans',
 ));
 
 // Admin Permissions
 $lang = array_merge($lang, array(
 	'ACL_A_BOARD'		=> 'Can alter board settings/check for updates',
 	'ACL_A_SERVER'		=> 'Can alter server/communication settings',
-	'ACL_A_JABBER'		=> 'Can alter Jabber settings',
 	'ACL_A_PHPINFO'		=> 'Can view php settings',
 
 	'ACL_A_FORUM'		=> 'Can manage forums',
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 3bff6b9185a..6420f9aa199 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -53,7 +53,10 @@
 	'BBCODE_HELPLINE_EXPLAIN'	=> 'This field contains the mouse over text of the BBCode.',
 	'BBCODE_HELPLINE_TEXT'		=> 'Help line text',
 	'BBCODE_HELPLINE_TOO_LONG'	=> 'The help line you entered is too long.',
-
+	'BBCODE_FONT_ICON'			=> 'BBCode icon',
+	'BBCODE_FONT_ICON_EXPLAIN'	=> 'Enter the name of a Font Awesome icon (without the fa prefix) to display instead of the BBCode name appearing on the button. %1$sClick here%2$s to view the list of available icons. Only solid style icons are supported.',
+	'BBCODE_FONT_ICON_INVALID'	=> 'The icon name you have entered is invalid.',
+	'BBCODE_FONT_ICON_TOO_LONG'	=> 'The icon name you have entered is too long.',
 	'BBCODE_INVALID_TAG_NAME'	=> 'The BBCode tag name that you selected already exists.',
 	'BBCODE_INVALID'			=> 'Your BBCode is constructed in an invalid form.',
 	'BBCODE_INVALID_TEMPLATE'	=> 'Your BBCode’s template is invalid.',
@@ -88,6 +91,20 @@
 		'LOCAL_URL'		=> 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol, as links are prefixed with “%s”',
 		'RELATIVE_URL'	=> 'A relative URL. You can use this to match parts of a URL, but be careful: a full URL is a valid relative URL. When you want to use relative URLs of your board, use the LOCAL_URL token.',
 		'COLOR'			=> 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>',
+		'ALNUM'			=> 'Characters from the latin alphabet (A-Z) and numbers.',
+		'CHOICE'		=> 'A choice of specified values, e.g. <samp>{CHOICE=spades,hearts,diamonds,clubs}</samp>. The values are treated as case-insensitive by default and can be treated case-sensitive by specifying the <samp>caseSensitive</samp> option: <samp>{CHOICE=Spades,Hearts,Diamonds,Clubs;caseSensitive}</samp>',
+		'FLOAT'			=> 'A decimal value, e.g. <samp>0.5</samp>.',
+		'HASHMAP'		=> 'Maps strings to their replacement in the form <samp>{HASHMAP=string1:replacement1,string2:replacement2}</samp>. Case-sensitive. Preserves unknown values by default.',
+		'INT'			=> 'An integer value, e.g. <samp>2</samp>.',
+		'IP'			=> 'A valid IPv4 or IPv6 address.',
+		'IPPORT'		=> 'A valid IPv4 or IPv6 address with port number.',
+		'IPV4'			=> 'A valid IPv4 address.',
+		'IPV6'			=> 'A valid IPv6 address.',
+		'MAP'			=> 'Maps strings to their replacement in the form <samp>{MAP=string1:replacement1,string2:replacement2}</samp>. Case-insensitive. Preserves unknown values by default.',
+		'RANGE'			=> 'Accepts an integer in the given range, e.g. <samp>{RANGE=-10,42}</samp>.',
+		'REGEXP'		=> 'Validates its value against a given regexp, e.g. <samp>{REGEXP=/^foo\w+bar$/}</samp>.',
+		'TIMESTAMP'		=> 'A timestamp such as <samp>1h30m10s</samp> which will be converted to a number of seconds. Also accepts a number.',
+		'UINT'			=> 'An unsigned integer value. Same as <samp>{INT}</samp>, but rejects values less than 0.',
 	),
 ));
 
diff --git a/phpBB/language/en/acp/storage.php b/phpBB/language/en/acp/storage.php
index 98ad84df536..575805e6503 100644
--- a/phpBB/language/en/acp/storage.php
+++ b/phpBB/language/en/acp/storage.php
@@ -36,18 +36,26 @@
 // equally where a string contains only two placeholders which are used to wrap text
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, [
 
 	// Template
-	'STORAGE_TITLE'					=> 'Storage Settings',
-	'STORAGE_TITLE_EXPLAIN'			=> 'Change storage providers for the file storage types of phpBB. Choose local or remote providers to store files added to or created by phpBB.',
-	'STORAGE_SELECT'				=> 'Select storage',
-	'STORAGE_SELECT_DESC'			=> 'Select a storage from the list.',
-	'STORAGE_NAME'					=> 'Storage name',
-	'STORAGE_NUM_FILES'				=> 'Number of files',
-	'STORAGE_SIZE'					=> 'Size',
-	'STORAGE_FREE'					=> 'Available space',
-	'STORAGE_UNKNOWN'				=> 'Unknown',
+	'STORAGE_TITLE'							=> 'Storage Settings',
+	'STORAGE_TITLE_EXPLAIN'					=> 'Change storage providers for the file storage types of phpBB. Choose local or remote providers to store files added to or created by phpBB.',
+	'STORAGE_SELECT'						=> 'Select storage',
+	'STORAGE_SELECT_DESC'					=> 'Select a storage from the list.',
+	'STORAGE_NAME'							=> 'Storage name',
+	'STORAGE_NUM_FILES'						=> 'Number of files',
+	'STORAGE_SIZE'							=> 'Size',
+	'STORAGE_FREE'							=> 'Available space',
+	'STORAGE_UNKNOWN'						=> 'Unknown',
+	'STORAGE_UPDATE_TYPE'					=> 'Update type',
+	'STORAGE_UPDATE_TYPE_CONFIG'			=> 'Update configuration only',
+	'STORAGE_UPDATE_TYPE_COPY'				=> 'Update configuration and copy files',
+	'STORAGE_UPDATE_TYPE_MOVE'				=> 'Update configuration and move files',
+
+	// Template progress bar
+	'STORAGE_UPDATE_IN_PROGRESS'			=> 'Storage update in progress',
+	'STORAGE_UPDATE_IN_PROGRESS_EXPLAIN'	=> 'Files are being moved between storages. This can take some minutes.',
 
 	// Storage names
 	'STORAGE_ATTACHMENT_TITLE'		=> 'Attachments storage',
@@ -57,6 +65,7 @@
 	// Local adapter
 	'STORAGE_ADAPTER_LOCAL_NAME'						=> 'Local',
 	'STORAGE_ADAPTER_LOCAL_OPTION_PATH'					=> 'Path',
+	'STORAGE_ADAPTER_LOCAL_OPTION_PATH_EXPLAIN'			=> 'Storage path for files.<br>For example: <samp>files</samp>, <samp>images/avatars/upload</samp> or <samp>store</samp>.',
 
 	// Form validation
 	'STORAGE_UPDATE_SUCCESSFUL' 				=>	'All storage types were successfully updated.',
@@ -69,4 +78,4 @@
 
 	'STORAGE_PATH_NOT_EXISTS'		=> '“%1$s” path does not exist or is not writable.',
 	'STORAGE_PATH_NOT_SET'			=> '“%1$s” path is not set.',
-));
+]);
diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php
index 637c4e035e4..b8831661593 100644
--- a/phpBB/language/en/captcha_qa.php
+++ b/phpBB/language/en/captcha_qa.php
@@ -61,4 +61,5 @@
 
 	'QA_ERROR_MSG'				=> 'Please fill in all fields and enter at least one answer.',
 	'QA_LAST_QUESTION'			=> 'You cannot delete all questions while the plugin is active.',
+	'QA_NO_QUESTIONS'			=> 'There are no questions yet.',
 ));
diff --git a/phpBB/language/en/captcha_turnstile.php b/phpBB/language/en/captcha_turnstile.php
new file mode 100644
index 00000000000..687ba4499de
--- /dev/null
+++ b/phpBB/language/en/captcha_turnstile.php
@@ -0,0 +1,53 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = [];
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+$lang = array_merge($lang, [
+	'CAPTCHA_TURNSTILE'						=> 'Turnstile',
+	'CAPTCHA_TURNSTILE_INCORRECT'			=> 'The solution you provided was incorrect',
+	'CAPTCHA_TURNSTILE_NOSCRIPT'			=> 'Please enable JavaScript in your browser to load the challenge.',
+	'CAPTCHA_TURNSTILE_NOT_AVAILABLE'		=> 'In order to use Turnstile you must create a <a href="https://www.cloudflare.com/products/turnstile/">Cloudflare account</a>.',
+	'CAPTCHA_TURNSTILE_SECRET'				=> 'Secret key',
+	'CAPTCHA_TURNSTILE_SECRET_EXPLAIN'		=> 'Your Turnstile secret key. The secret key can be retrieved from your <a href="https://dash.cloudflare.com/?to=/:account/turnstile">Cloudflare dashboard</a>.',
+	'CAPTCHA_TURNSTILE_SITEKEY'				=> 'Sitekey',
+	'CAPTCHA_TURNSTILE_SITEKEY_EXPLAIN'		=> 'Your Turnstile sitekey. The sitekey can be retrieved from your <a href="https://dash.cloudflare.com/?to=/:account/turnstile">Cloudflare dashboard</a>.',
+	'CAPTCHA_TURNSTILE_THEME'				=> 'Widget theme',
+	'CAPTCHA_TURNSTILE_THEME_EXPLAIN'		=> 'The theme of the CAPTCHA widget. By default, <samp>light</samp> will be used. Other possibilities are <samp>dark</samp> and <samp>auto</samp>, which respects the user’s preference.',
+	'CAPTCHA_TURNSTILE_THEME_AUTO'			=> 'Auto',
+	'CAPTCHA_TURNSTILE_THEME_DARK'			=> 'Dark',
+	'CAPTCHA_TURNSTILE_THEME_LIGHT'			=> 'Light',
+]);
diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index 7eb71d9e6d1..700bf9799df 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -75,6 +75,7 @@
 	'CLI_DESCRIPTION_REPARSER_REPARSE'					=> 'Reparses stored text with the current text_formatter services.',
 	'CLI_DESCRIPTION_REPARSER_REPARSE_ARG_1'			=> 'Type of text to reparse. Leave blank to reparse everything.',
 	'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_DRY_RUN'		=> 'Do not save any changes; just print what would happen',
+	'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_FORCE_BBCODE'	=> 'Re-parse all BBCodes without exception. Note that any previously disabled BBCodes will be reprocessed, enabled, and fully rendered.',
 	'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_MIN'	=> 'Lowest record ID to process',
 	'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_MAX'	=> 'Highest record ID to process',
 	'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_SIZE'	=> 'Approximate number of records to process at a time',
@@ -112,6 +113,8 @@
 	'CLI_DESCRIPTION_USER_ADD_OPTION_NOTIFY'	=> 'Send account activation email to the new user (not sent by default)',
 	'CLI_DESCRIPTION_USER_DELETE'				=> 'Delete a user account.',
 	'CLI_DESCRIPTION_USER_DELETE_USERNAME'		=> 'Username of the user to delete',
+	'CLI_DESCRIPTION_USER_DELETE_ID'			=> 'Delete user accounts by ID.',
+	'CLI_DESCRIPTION_USER_DELETE_ID_OPTION_ID'	=> 'User IDs of the users to delete',
 	'CLI_DESCRIPTION_USER_DELETE_OPTION_POSTS'	=> 'Delete all posts by the user. Without this option, the user’s posts will be retained.',
 	'CLI_DESCRIPTION_USER_RECLEAN'				=> 'Re-clean usernames.',
 
@@ -171,10 +174,14 @@
 	'CLI_THUMBNAIL_NOTHING_TO_GENERATE'	=> 'No thumbnails to generate.',
 	'CLI_THUMBNAIL_NOTHING_TO_DELETE'	=> 'No thumbnails to delete.',
 
-	'CLI_USER_ADD_SUCCESS'		=> 'Successfully added user %s.',
-	'CLI_USER_DELETE_CONFIRM'	=> 'Are you sure you want to delete ‘%s’? [y/N]',
-	'CLI_USER_RECLEAN_START'	=> 'Re-cleaning usernames',
-	'CLI_USER_RECLEAN_DONE'		=> [
+	'CLI_USER_ADD_SUCCESS'			=> 'Successfully added user %s.',
+	'CLI_USER_DELETE_CONFIRM'		=> 'Are you sure you want to delete ‘%s’? [y/N]',
+	'CLI_USER_DELETE_ID_CONFIRM'	=> 'Are you sure you want to delete the user IDs ‘%s’? [y/N]',
+	'CLI_USER_DELETE_ID_SUCCESS'	=> 'Successfully deleted user IDs.',
+	'CLI_USER_DELETE_ID_START'		=> 'Deleting users by ID',
+	'CLI_USER_DELETE_NONE'			=> 'No users were deleted by user ID.',
+	'CLI_USER_RECLEAN_START'		=> 'Re-cleaning usernames',
+	'CLI_USER_RECLEAN_DONE'			=> [
 		0	=> 'Re-cleaning complete. No usernames needed to be cleaned.',
 		1	=> 'Re-cleaning complete. %d username was cleaned.',
 		2	=> 'Re-cleaning complete. %d usernames were cleaned.',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5799137f5fb..3cb5913863d 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -57,6 +57,7 @@
 	'ACCOUNT_DEACTIVATED'			=> 'Your account has been manually deactivated and is only able to be reactivated by an administrator.',
 	'ACP'							=> 'Administration Control Panel',
 	'ACP_SHORT'						=> 'ACP',
+	'ACTIVATION_ALREADY_SENT'		=> 'The activation email has already been sent to your email address. You can try again after 24 hours. If you continue to have problems activating your account, please contact a board administrator.',
 	'ACTIVE'						=> 'active',
 	'ACTIVE_ERROR'					=> 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.',
 	'ADMINISTRATOR'					=> 'Administrator',
@@ -77,6 +78,7 @@
 	'ALL_TOPICS'					=> 'All Topics',
 	'ALT_TEXT'						=> 'Alternative text',
 	'AND'							=> 'And',
+	'APPEARANCE'					=> 'Appearance',
 	'ARE_WATCHING_FORUM'			=> 'You have subscribed to be notified of new posts in this forum.',
 	'ARE_WATCHING_TOPIC'			=> 'You have subscribed to be notified of new posts in this topic.',
 	'ASCENDING'						=> 'Ascending',
@@ -173,6 +175,7 @@
 	'CONFIRM_CODE'			=> 'Confirmation code',
 	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as it appears. All letters are case insensitive.',
 	'CONFIRM_CODE_WRONG'	=> 'The confirmation code you entered was incorrect.',
+	'CONFIRM_INCOMPLETE'	=> 'To prevent automated registrations the board requires you to enter a confirmation code. This has not been configured yet and hence cannot be used. Please try again later or contact the %sBoard Administrator%s.',
 	'CONFIRM_OPERATION'		=> 'Are you sure you wish to carry out this operation?',
 	'CONFIRM_AVATAR_DELETE' => 'Are you sure you wish to delete this avatar?',
 	'CONGRATULATIONS'		=> 'Congratulations to',
@@ -229,8 +232,6 @@
 	'ENTER_USERNAME'					=> 'Enter username',
 	'ERR_CHANGING_DIRECTORY'			=> 'Unable to change directory.',
 	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
-	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
-	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
 	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
 	'ERR_UNWATCHING'					=> 'An error occurred while trying to unsubscribe.',
 	'ERR_WATCHING'						=> 'An error occurred while trying to subscribe.',
@@ -349,6 +350,7 @@
 	'HIDE_ME'						=> 'Hide my online status this session',
 	'HOURS'							=> 'Hours',
 	'HOME'							=> 'Home',
+	'HTTP_HANDLER_NOT_FOUND'		=> 'The operation could not be completed because the cURL PHP extension and allow_url_fopen PHP ini setting have been disabled and no other HTTP handler could be found.',
 
 	'ICQ'						=> 'ICQ',
 	'IF'						=> 'If',
@@ -368,7 +370,6 @@
 	'IP'						=> 'IP',
 	'IP_BLACKLISTED'			=> 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.',
 
-	'JABBER'				=> 'Jabber',
 	'JOINED'				=> 'Joined',
 	'JUMP_PAGE'				=> 'Enter the page number you wish to go to',
 	'JUMP_TO'				=> 'Jump to',
@@ -510,6 +511,14 @@
 	),
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
+
+	'NOTIFY_WEB_PUSH_DENIED'				=> 'You have denied notifications from this site. To subscribe, please allow notifications in your browser settings.',
+	'NOTIFY_WEB_PUSH_DISABLED'				=> 'Web Push not supported',
+	'NOTIFY_WEB_PUSH_ENABLE'				=> 'Enable web push notifications',
+	'NOTIFY_WEB_PUSH_SUBSCRIBE'				=> 'Subscribe',
+	'NOTIFY_WEB_PUSH_SUBSCRIBED'			=> 'Subscribed',
+	'NOTIFY_WEB_PUSH_UNSUPPORTED_SERVICE'	=> 'The requested web push service is not supported.',
+
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
 	'NO_ACTION'					=> 'No action specified.',
 	'NO_ADMINISTRATORS'			=> 'There are no administrators.',
@@ -524,6 +533,7 @@
 	'NO_EMAIL_SUBJECT'			=> 'No email subject specified.',
 	'NO_FORUM'					=> 'The forum you selected does not exist.',
 	'NO_FORUMS'					=> 'This board has no forums.',
+	'NO_GENERATOR_CLASS'		=> 'No generator class given.',
 	'NO_GROUP'					=> 'The requested usergroup does not exist.',
 	'NO_GROUP_MEMBERS'			=> 'This group currently has no members.',
 	'NO_IPS_DEFINED'			=> 'No IP addresses or hostnames defined',
@@ -791,7 +801,6 @@
 
 	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',
 	'TOO_LONG_DATEFORMAT'			=> 'The date format you entered is too long.',
-	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
 	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
 	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
 	'TOO_LONG_USER_PASSWORD'		=> 'The password you entered is too long.',
@@ -804,7 +813,6 @@
 
 	'TOO_SHORT_CONFIRM_CODE'		=> 'The confirm code you entered is too short.',
 	'TOO_SHORT_DATEFORMAT'			=> 'The date format you entered is too short.',
-	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
 	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
 	'TOO_SHORT_USER_PASSWORD'		=> 'The password you entered is too short.',
@@ -933,7 +941,6 @@
 	'WRONG_PASSWORD'	=> 'You entered an incorrect password.',
 
 	'WRONG_DATA_COLOUR'			=> 'The colour value you entered is invalid.',
-	'WRONG_DATA_JABBER'			=> 'The name you entered is not a valid Jabber account name.',
 	'WRONG_DATA_LANG'			=> 'The language you specified is not valid.',
 	'WRONG_DATA_POST_SD'		=> 'The post sort direction you specified is not valid.',
 	'WRONG_DATA_POST_SK'		=> 'The post sort option you specified is not valid.',
diff --git a/phpBB/language/en/composer.json b/phpBB/language/en/composer.json
index 7402e5efa5f..71268e0f6d5 100644
--- a/phpBB/language/en/composer.json
+++ b/phpBB/language/en/composer.json
@@ -4,7 +4,7 @@
 	"type": "phpbb-language",
 	"version": "4.0.0-a1-dev",
 	"homepage": "https://www.phpbb.com",
-	"license": "GPL-2.0",
+	"license": "GPL-2.0-only",
 	"authors": [
 		{
 			"name": "phpBB Limited",
@@ -26,6 +26,7 @@
 		"direction": "ltr",
 		"user-lang": "en-gb",
 		"plural-rule": 1,
-		"recaptcha-lang": "en-GB"
+		"recaptcha-lang": "en-GB",
+		"turnstile-lang": "en"
 	}
 }
diff --git a/phpBB/language/en/email/short/bookmark.txt b/phpBB/language/en/email/short/bookmark.txt
deleted file mode 100644
index 963b644415d..00000000000
--- a/phpBB/language/en/email/short/bookmark.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: Reply in "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-Your bookmarked topic "{TOPIC_TITLE}" received a new reply since your last visit to "{SITENAME}". No more notifications will be sent until you visit the topic.
-
-If you want to view the newest post made since your last visit, click the following link:
-{U_NEWEST_POST}
-
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt
deleted file mode 100644
index e8f8c25b9e1..00000000000
--- a/phpBB/language/en/email/short/newtopic_notify.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Subject: New topic in "{FORUM_NAME}"
-
-Hello {USERNAME},
-
-The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit to "{SITENAME}". No more notifications will be sent until you visit the forum.
-{U_FORUM}
-
-If you no longer wish to watch this forum click the following link:
-{U_STOP_WATCHING_FORUM}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/post_approved.txt b/phpBB/language/en/email/short/post_approved.txt
deleted file mode 100644
index 87e8acebb62..00000000000
--- a/phpBB/language/en/email/short/post_approved.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: Post approved - "{POST_SUBJECT}"
-
-Hello {USERNAME},
-
-Your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator.
-
-If you want to view the post, click the following link:
-{U_VIEW_POST}
-
-If you want to view the topic, click the following link:
-{U_VIEW_TOPIC}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt
deleted file mode 100644
index 11a0564cb83..00000000000
--- a/phpBB/language/en/email/short/post_disapproved.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Subject: Post disapproved - "{POST_SUBJECT}"
-
-Hello {USERNAME},
-
-Your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator.
-
-The following reason was given for the disapproval:
-
-{REASON}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/post_in_queue.txt b/phpBB/language/en/email/short/post_in_queue.txt
deleted file mode 100644
index 8ccbc8e9bbc..00000000000
--- a/phpBB/language/en/email/short/post_in_queue.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: Post needs approval - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-The post "{POST_SUBJECT}" at "{SITENAME}" needs approval.
-
-If you want to view the post, click the following link:
-{U_VIEW_POST}
-
-If you want to view the topic, click the following link:
-{U_TOPIC}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt
deleted file mode 100644
index 0c579fa51cb..00000000000
--- a/phpBB/language/en/email/short/privmsg_notify.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: New private message
-
-Hello {USERNAME},
-
-A new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject has arrived:
-{SUBJECT}
-
-You can view your new message by clicking on the following link:
-{U_VIEW_MESSAGE}
-
-You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/quote.txt b/phpBB/language/en/email/short/quote.txt
deleted file mode 100644
index 871f4710371..00000000000
--- a/phpBB/language/en/email/short/quote.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: Quoted in "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-"{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}".
-
-If you want to view the quoted post, click the following link:
-{U_VIEW_POST}
-
-If you no longer wish to receive updates about replies quoting you, please update your notification settings here:
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/report_pm.txt b/phpBB/language/en/email/short/report_pm.txt
deleted file mode 100644
index 771646046b5..00000000000
--- a/phpBB/language/en/email/short/report_pm.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Subject: Private Message report - "{SUBJECT}"
-
-Hello {USERNAME},
-
-A Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
-
-If you want to view the report, click the following link:
-{U_VIEW_REPORT}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/report_post.txt b/phpBB/language/en/email/short/report_post.txt
deleted file mode 100644
index 1e50af16151..00000000000
--- a/phpBB/language/en/email/short/report_post.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: Post report - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-The post "{POST_SUBJECT}" at "{SITENAME}" was reported.
-
-If you want to view the report, click the following link:
-{U_VIEW_REPORT}
-
-If you want to view the post, click the following link:
-{U_VIEW_POST}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt
deleted file mode 100644
index 132a15ea246..00000000000
--- a/phpBB/language/en/email/short/topic_approved.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Subject: Topic approved - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-Your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator.
-
-If you want to view the topic, click the following link:
-{U_VIEW_TOPIC}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt
deleted file mode 100644
index dfb0f292283..00000000000
--- a/phpBB/language/en/email/short/topic_disapproved.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Subject: Topic disapproved - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-Your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator.
-
-The following reason was given for the disapproval:
-
-{REASON}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_in_queue.txt b/phpBB/language/en/email/short/topic_in_queue.txt
deleted file mode 100644
index f4ed7b2ace0..00000000000
--- a/phpBB/language/en/email/short/topic_in_queue.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: Topic needs approval - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-The topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
-
-If you want to view the topic, click the following link:
-{U_VIEW_TOPIC}
-
-If you want to view the forum, click the following link:
-{U_FORUM}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt
deleted file mode 100644
index d92b342f33c..00000000000
--- a/phpBB/language/en/email/short/topic_notify.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: Reply in "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-The topic "{TOPIC_TITLE}" received a new reply<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit to "{SITENAME}". No more emails will be sent until you visit the topic.
-
-If you want to view the newest post made since your last visit, click the following link:
-{U_NEWEST_POST}
-
-If you no longer wish to watch this topic click the following link:
-{U_STOP_WATCHING_TOPIC}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/help/faq.php b/phpBB/language/en/help/faq.php
index 175f9eb1645..666c0ad0b72 100644
--- a/phpBB/language/en/help/faq.php
+++ b/phpBB/language/en/help/faq.php
@@ -41,6 +41,7 @@
 	'HELP_FAQ_BLOCK_POSTING'	=> 'Posting Issues',
 	'HELP_FAQ_BLOCK_SEARCH'	=> 'Searching the Forums',
 	'HELP_FAQ_BLOCK_USERSETTINGS'	=> 'User Preferences and settings',
+	'HELP_FAQ_BLOCK_WEBPUSH'	=> 'Web Push Notifications for Browsers',
 
 	'HELP_FAQ_BOOKMARKS_DIFFERENCE_ANSWER'	=> 'In phpBB 3.0, bookmarking topics worked much like bookmarking in a web browser. You were not alerted when there was an update. As of phpBB 3.1, bookmarking is more like subscribing to a topic. You can be notified when a bookmarked topic is updated. Subscribing, however, will notify you when there is an update to a topic or forum on the board. Notification options for bookmarks and subscriptions can be configured in the User Control Panel, under “Board preferences”.',
 	'HELP_FAQ_BOOKMARKS_DIFFERENCE_QUESTION'	=> 'What is the difference between bookmarking and subscribing?',
@@ -158,7 +159,7 @@
 	'HELP_FAQ_SEARCH_BLANK_QUESTION'	=> 'Why does my search return a blank page!?',
 	'HELP_FAQ_SEARCH_FORUM_ANSWER'	=> 'Enter a search term in the search box located on the index, forum or topic pages. Advanced search can be accessed by clicking the “Advance Search” link which is available on all pages on the forum. How to access the search may depend on the style used.',
 	'HELP_FAQ_SEARCH_FORUM_QUESTION'	=> 'How can I search a forum or forums?',
-	'HELP_FAQ_SEARCH_MEMBERS_ANSWER'	=> 'Visit to the “Members” page and click the “Find a member” link.',
+	'HELP_FAQ_SEARCH_MEMBERS_ANSWER'	=> 'Visit the memberlist and click the “Find a member” link.',
 	'HELP_FAQ_SEARCH_MEMBERS_QUESTION'	=> 'How do I search for members?',
 	'HELP_FAQ_SEARCH_NO_RESULT_ANSWER'	=> 'Your search was probably too vague and included many common terms which are not indexed by phpBB. Be more specific and use the options available within Advanced search.',
 	'HELP_FAQ_SEARCH_NO_RESULT_QUESTION'	=> 'Why does my search return no results?',
@@ -183,4 +184,15 @@
 	'HELP_FAQ_USERSETTINGS_SERVERTIME_QUESTION'	=> 'I changed the timezone and the time is still wrong!',
 	'HELP_FAQ_USERSETTINGS_TIMEZONE_ANSWER'	=> 'It is possible the time displayed is from a timezone different from the one you are in. If this is the case, visit your User Control Panel and change your timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings, can only be done by registered users. If you are not registered, this is a good time to do so.',
 	'HELP_FAQ_USERSETTINGS_TIMEZONE_QUESTION'	=> 'The times are not correct!',
+
+	'HELP_FAQ_WEBPUSH_GENERAL_ANSWER'	=> 'Make sure this forum is allowed to send notifications in your browser settings. Also, verify that your device’s system settings permit notifications from your web browser or app. Some browsers deliver notifications even when closed, whilst others only do so when the browser is open. <a href="https://caniuse.com/push-api" target="_blank">View this table for browser support information.</a> Finally, if you’re using an ad blocker, review its settings to make sure it’s not configured to block push notifications.',
+	'HELP_FAQ_WEBPUSH_GENERAL_QUESTION'	=> 'What if I’m still having trouble receiving notifications?',
+	'HELP_FAQ_WEBPUSH_HOW_ANSWER'		=> 'Navigate to “Notification options” in your UCP (User Control Panel) and click “Subscribe.” Your browser may ask for permission to send notifications — be sure to allow it. If you’re still not receiving notifications, check your device’s system settings to ensure notifications are enabled for your browser. For mobile devices such as iPhone or iPad, you may need to add the forum site to your Home Screen for push notifications to work, effectively turning it into a standalone web app. Follow your mobile device’s instructions to enable push notifications for <a href="https://www.xda-developers.com/how-enable-safari-notifications-iphone/" target="_blank">iPhone/iPad</a> or <a href="https://support.google.com/chrome/answer/3220216?hl=en&co=GENIE.Platform%3DAndroid&oco=0" target="_blank">Android</a>.',
+	'HELP_FAQ_WEBPUSH_HOW_QUESTION'		=> 'How can I receive forum notification alerts on my computer or mobile device?',
+	'HELP_FAQ_WEBPUSH_SESSION_ANSWER'	=> 'Yes, you will continue to receive notifications even if you’re logged out.',
+	'HELP_FAQ_WEBPUSH_SESSION_QUESTION'	=> 'Will I receive notifications if I am logged out?',
+	'HELP_FAQ_WEBPUSH_SUBBING_ANSWER'	=> 'If the “Subscribe” button is visible but cannot be clicked, your browser or device likely doesn’t support push notifications. Try using a different browser or device that supports this feature.',
+	'HELP_FAQ_WEBPUSH_SUBBING_QUESTION'	=> 'Why is the “Subscribe” button disabled?',
+	'HELP_FAQ_WEBPUSH_WHAT_ANSWER'		=> 'Web push notifications enhance phpBB’s notification system by allowing real-time notifications to be sent directly to your desktop or mobile device, even if you’re not actively browsing the forum. These notifications function like app alerts, providing instant updates for private messages, post interactions, moderation actions, and more.',
+	'HELP_FAQ_WEBPUSH_WHAT_QUESTION'	=> 'What are web push notifications?',
 ));
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 5b8b38f4ccc..d62b124adf5 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -45,18 +45,18 @@
 
 	// Introduction page
 	'INTRODUCTION_TITLE'	=> 'Introduction',
-	'INTRODUCTION_BODY'		=> 'Welcome to phpBB3!<br /><br />phpBB® is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="%1$s">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
+	'INTRODUCTION_BODY'		=> 'Welcome to phpBB!<br /><br />phpBB® is the most widely used open source bulletin board solution in the world. phpBB is the latest installment in a package line started in 2000. Like its predecessors, phpBB is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB greatly improves on what made phpBB2 and phpBB3 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB, updating to the latest version of phpBB from past releases, as well as converting to phpBB from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="%1$s">the installation guide</a>.<br /><br />To read the phpBB license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
 
 	// Support page
 	'SUPPORT_TITLE'		=> 'Support',
-	'SUPPORT_BODY'		=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="https://www.phpbb.com/community/viewforum.php?f=486">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>Extensions / Styles</h2><p>For issues relating to Extensions, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=451">Extensions Forum</a>.<br />For issues relating to styles, templates and themes, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=471">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="https://www.phpbb.com/support/">Support Section</a><br /><a href="https://www.phpbb.com/support/docs/en/3.3/ug/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, follow us on <a href="https://www.twitter.com/phpbb/">Twitter</a> and <a href="https://www.facebook.com/phpbb/">Facebook</a><br /><br />',
+	'SUPPORT_BODY'		=> 'Full support will be provided for the current stable release of phpBB, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB</li><li>converting from other discussion board software to phpBB (please see the <a href="https://www.phpbb.com/community/viewforum.php?f=486">Convertors Forum</a>)</li></ul><p>We encourage users still running pre-release versions of phpBB to replace their installation with a fresh copy of the latest version.</p><h2>Extensions / Styles</h2><p>For issues relating to Extensions, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=451">Extensions Forum</a>.<br />For issues relating to styles, templates and themes, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=471">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="https://www.phpbb.com/support/">Support Section</a><br /><a href="https://www.phpbb.com/support/docs/en/3.3/ug/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, follow us on <a href="https://www.twitter.com/phpbb/">Twitter</a> and <a href="https://www.facebook.com/phpbb/">Facebook</a><br /><br />',
 
 	// License
 	'LICENSE_TITLE'		=> 'General Public License',
 
 	// Install page
 	'INSTALL_INTRO'			=> 'Welcome to Installation',
-	'INSTALL_INTRO_BODY'	=> 'With this option, it is possible to install phpBB3 onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
+	'INSTALL_INTRO_BODY'	=> 'With this option, it is possible to install phpBB onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
 
 	<ul>
 		<li>The Database Type - the database you will be using.</li>
@@ -68,13 +68,13 @@
 
 	<p><strong>Note:</strong> if you are installing using SQLite, you should enter the full path to your database file in the DSN field and leave the username and password fields blank. For security reasons, you should make sure that the database file is not stored in a location accessible from the web.</p>
 
-	<p>phpBB3 supports the following databases:</p>
+	<p>phpBB supports the following databases:</p>
 	<ul>
-		<li>MySQL 4.1.3 or above (MySQLi required)</li>
-		<li>PostgreSQL 8.3+</li>
-		<li>SQLite 3.6.15+</li>
-		<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
-		<li>MS SQL Server 2005 or above (native)</li>
+		<li>MySQL 5.6 or above</li>
+		<li>MariaDB 10.2.7 or above</li>
+		<li>PostgreSQL 9.4 or above</li>
+		<li>SQLite 3.8.3 or above</li>
+		<li>MS SQL Server 2012 or above (via ODBC or the native adapter)</li>
 		<li>Oracle</li>
 	</ul>
 
@@ -84,6 +84,7 @@
 
 	'INSTALL_PHPBB_INSTALLED'		=> 'phpBB is already installed.',
 	'INSTALL_PHPBB_NOT_INSTALLED'	=> 'phpBB is not installed yet.',
+	'INSTALL_RESTART'				=> 'Restart installation',
 ));
 
 // Requirements translation
@@ -105,13 +106,11 @@
 
 	// Server requirements
 	'PHP_VERSION_REQD'					=> 'PHP version',
-	'PHP_VERSION_REQD_EXPLAIN'			=> 'phpBB requires PHP version 7.2.0 or higher.',
+	'PHP_VERSION_REQD_EXPLAIN'			=> 'phpBB requires PHP version 8.2.0 or higher.',
 	'PHP_GETIMAGESIZE_SUPPORT'			=> 'PHP getimagesize() function is required',
 	'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN'	=> 'In order for phpBB to function correctly, the getimagesize function needs to be available.',
 	'PCRE_UTF_SUPPORT'					=> 'PCRE UTF-8 support',
 	'PCRE_UTF_SUPPORT_EXPLAIN'			=> 'phpBB will not run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',
-	'PHP_JSON_SUPPORT'					=> 'PHP JSON support',
-	'PHP_JSON_SUPPORT_EXPLAIN'			=> 'In order for phpBB to function correctly, the PHP JSON extension needs to be available.',
 	'PHP_MBSTRING_SUPPORT'				=> 'PHP mbstring support',
 	'PHP_MBSTRING_SUPPORT_EXPLAIN'		=> 'In order for phpBB to function correctly, the PHP mbstring extension needs to be available.',
 	'PHP_XML_SUPPORT'					=> 'PHP XML/DOM support',
@@ -186,9 +185,9 @@
 	'TABLE_PREFIX_EXPLAIN'	=> 'The prefix must start with a letter and must only contain letters, numbers and underscores.',
 
 	// Database options
-	'DB_OPTION_MSSQL_ODBC'	=> 'MSSQL Server 2000+ via ODBC',
-	'DB_OPTION_MSSQLNATIVE'	=> 'MSSQL Server 2005+ [ Native ]',
-	'DB_OPTION_MYSQLI'		=> 'MySQL with MySQLi Extension',
+	'DB_OPTION_MSSQL_ODBC'	=> 'MSSQL Server via ODBC',
+	'DB_OPTION_MSSQLNATIVE'	=> 'MSSQL Server [ Native ]',
+	'DB_OPTION_MYSQLI'		=> 'MySQL',
 	'DB_OPTION_ORACLE'		=> 'Oracle',
 	'DB_OPTION_POSTGRES'	=> 'PostgreSQL',
 	'DB_OPTION_SQLITE3'		=> 'SQLite 3',
@@ -204,10 +203,13 @@
 	'INST_ERR_DB_NO_WRITABLE'		=> 'Both the database and the directory containing it must be writable.',
 	'INST_ERR_DB_NO_ERROR'			=> 'No error message given.',
 	'INST_ERR_PREFIX'				=> 'Tables with the specified prefix already exist, please choose an alternative.',
-	'INST_ERR_DB_NO_MYSQLI'			=> 'The version of MySQL installed on this machine is incompatible with the “MySQL with MySQLi Extension” option you have selected. Please try the “MySQL” option instead.',
-	'INST_ERR_DB_NO_SQLITE3'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 3.6.15.',
-	'INST_ERR_DB_NO_ORACLE'			=> 'The version of Oracle installed on this machine requires you to set the <var>NLS_CHARACTERSET</var> parameter to <var>UTF8</var>. Either upgrade your installation to 9.2+ or change the parameter.',
-	'INST_ERR_DB_NO_POSTGRES'		=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
+	'INST_ERR_DB_NO_MARIADB'		=> 'The version of MariaDB installed on this machine is too old, it must be upgraded to at least 10.2.7.',
+	'INST_ERR_DB_NO_MYSQLI'			=> 'The version of MySQL installed on this machine is too old, it must be upgraded to at least 5.6.',
+	'INST_ERR_DB_NO_MSSQL'			=> 'The version of Microsoft SQL Server installed on this machine is too old, it must be upgraded to at least SQL Server 2012 (11.0.2100.60)',
+	'INST_ERR_DB_NO_SQLITE3'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 3.8.3.',
+	'INST_ERR_DB_NO_ORACLE'			=> 'The version of Oracle installed is too old, it must be upgraded to at least 12.1.0.2.',
+	'INST_ERR_DB_NO_POSTGRES'		=> 'The version of the PostgreSQL you have installed is too old, it must be upgraded to at least 9.4.',
+	'INST_ERR_DB_NO_POSTGRES_UTF8'	=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
 	'INST_SCHEMA_FILE_NOT_WRITABLE'	=> 'The schema file is not writable',
 
 	//
@@ -223,6 +225,13 @@
 
 		<p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">database updater</a>, ensure <em>Update database only</em> is selected and click on <strong>Submit</strong>. Don\'t forget to delete the "install"-directory after you have updated the database successfully.</p>',
 
+	// Auto update
+	'UPDATE_PACKAGE_DOWNLOAD_FAILURE'		=> 'Failed to download the update package.',
+	'UPDATE_SIGNATURE_DOWNLOAD_FAILURE'		=> 'Failed to download the update package signature.',
+	'UPDATE_SIGNATURE_INVALID'				=> 'The update package is corrupted.',
+	'UPDATE_PACKAGE_EXTRACT_FAILURE'		=> 'Could not extract files from the update package.',
+	'UPDATE_FILES_COPY_FAILURE'				=> 'Could not copy files from the update package.',
+
 	//
 	// Server data
 	//
@@ -230,7 +239,7 @@
 	'UPGRADE_INSTRUCTIONS'			=> 'A new feature release <strong>%1$s</strong> is available. Please read <a href="%2$s" title="%2$s"><strong>the release announcement</strong></a> to learn about what it has to offer, and how to upgrade.',
 	'SERVER_CONFIG'				=> 'Server configuration',
 	'SCRIPT_PATH'				=> 'Script path',
-	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.',
+	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB</samp>.',
 ));
 
 // Default database schema entries...
@@ -239,7 +248,7 @@
 	'CONFIG_SITE_DESC'				=> 'A short text to describe your forum',
 	'CONFIG_SITENAME'				=> 'yourdomain.com',
 
-	'DEFAULT_INSTALL_POST'			=> '<t>This is an example post in your phpBB3 installation. Everything seems to be working. You may delete this post if you like and continue to set up your board. During the installation process your first category and your first forum are assigned an appropriate set of permissions for the predefined usergroups administrators, bots, global moderators, guests, registered users and registered COPPA users. If you also choose to delete your first category and your first forum, do not forget to assign permissions for all these usergroups for all new categories and forums you create. It is recommended to rename your first category and your first forum and copy permissions from these while creating new categories and forums. Have fun!</t>',
+	'DEFAULT_INSTALL_POST'			=> '<t>This is an example post in your phpBB installation. Everything seems to be working. You may delete this post if you like and continue to set up your board. During the installation process your first category and your first forum are assigned an appropriate set of permissions for the predefined usergroups administrators, bots, global moderators, guests, registered users and registered COPPA users. If you also choose to delete your first category and your first forum, do not forget to assign permissions for all these usergroups for all new categories and forums you create. It is recommended to rename your first category and your first forum and copy permissions from these while creating new categories and forums. Have fun!</t>',
 
 	'FORUMS_FIRST_CATEGORY'			=> 'Your first category',
 	'FORUMS_TEST_FORUM_DESC'		=> 'Description of your first forum.',
@@ -276,7 +285,7 @@
 	'SMILIES_VERY_HAPPY'			=> 'Very Happy',
 	'SMILIES_WINK'					=> 'Wink',
 
-	'TOPICS_TOPIC_TITLE'			=> 'Welcome to phpBB3',
+	'TOPICS_TOPIC_TITLE'			=> 'Welcome to phpBB',
 ));
 
 // Common navigation items' translation
@@ -360,7 +369,7 @@
 
 		<h1>How to update your installation with the Full Package</h1>
 
-		<p>The recommended way of updating your installation is using the full package. If core phpBB files have been modified in your installation you may wish to use the advanced update package in order to not lose these changes. You are also able to update your installation using the other methods listed within the INSTALL.html document. The steps for updating phpBB3 using the full package are:</p>
+		<p>The recommended way of updating your installation is using the full package. If core phpBB files have been modified in your installation you may wish to use the advanced update package in order to not lose these changes. You are also able to update your installation using the other methods listed within the INSTALL.html document. The steps for updating phpBB using the full package are:</p>
 
 		<ol style="margin-left: 20px; font-size: 1.1em;">
 			<li><strong class="error">Backup all board files and the database.</strong></li>
@@ -369,7 +378,7 @@
 			<li>Remove (delete) the <code class="inline">config.php</code> file, and the <code class="inline">/images</code>, <code class="inline">/store</code> and <code class="inline">/files</code> folders <em>from the package</em> (not your site).</li>
 			<li>Go to the ACP, Board settings, and make sure prosilver is set as the default style. If not, set it to prosilver.</li>
 			<li>Delete the <code class="inline">/vendor</code> and <code class="inline">/cache</code> folders from the board’s root folder on the host.</li>
-			<li>Via FTP or SSH upload the remaining files and folders (that is, the remaining CONTENTS of the phpBB3 folder) to the root folder of your board installation on the server, overwriting the existing files. (Note: take care not to delete any extensions in your <code class="inline">/ext</code> folder when uploading the new phpBB3 contents.)</li>
+			<li>Via FTP or SSH upload the remaining files and folders (that is, the remaining CONTENTS of the phpBB folder) to the root folder of your board installation on the server, overwriting the existing files. (Note: take care not to delete any extensions in your <code class="inline">/ext</code> folder when uploading the new phpBB contents.)</li>
 			<li><strong><a href="%1$s" title="%1$s">Now start the update process by pointing your browser to the install folder</a>.</strong></li>
 			<li>Follow the steps to update the database and let that run to completion.</li>
 			<li>Via FTP or SSH delete the <code class="inline">/install</code> folder from the root of your board installation.<br><br></li>
@@ -383,7 +392,7 @@
 
 		<h1>How to update your installation with the Advanced Update Package</h1>
 
-		<p>The advanced update package is only recommended for expert users in case core phpBB files have been modified in your installation. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB3 using the advanced update package are:</p>
+		<p>The advanced update package is only recommended for expert users in case core phpBB files have been modified in your installation. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB using the advanced update package are:</p>
 
 		<ol style="margin-left: 20px; font-size: 1.1em;">
 			<li>Go to the <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">phpBB.com downloads page</a> and download the "Advanced Update Package" archive.</li>
@@ -498,7 +507,7 @@
 	'CONVERT_NOT_EXIST'			=> 'The specified convertor does not exist.',
 	'DEV_NO_TEST_FILE'			=> 'No value has been specified for the test_file variable in the convertor. If you are a user of this convertor, you should not be seeing this error, please report this message to the convertor author. If you are a convertor author, you must specify the name of a file which exists in the source board to allow the path to it to be verified.',
 	'COULD_NOT_FIND_PATH'		=> 'Could not find path to your former board. Please check your settings and try again.<br />» %s was specified as the source path.',
-	'CONFIG_PHPBB_EMPTY'		=> 'The phpBB3 config variable for “%s” is empty.',
+	'CONFIG_PHPBB_EMPTY'		=> 'The phpBB config variable for “%s” is empty.',
 
 	'MAKE_FOLDER_WRITABLE'		=> 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<strong>%s</strong>.',
 	'MAKE_FOLDERS_WRITABLE'		=> 'Please make sure that these folders exist and are writable by the webserver then try again:<br />»<strong>%s</strong>.',
@@ -534,7 +543,7 @@
 	'DEFAULT_PREFIX_IS'			=> 'The convertor was not able to find tables with the specified prefix. Please make sure you have entered the correct details for the board you are converting from. The default table prefix for %1$s is <strong>%2$s</strong>.',
 	'SPECIFY_OPTIONS'			=> 'Specify conversion options',
 	'FORUM_PATH'				=> 'Board path',
-	'FORUM_PATH_EXPLAIN'		=> 'This is the <strong>relative</strong> path on disk to your former board from the <strong>root of this phpBB3 installation</strong>.',
+	'FORUM_PATH_EXPLAIN'		=> 'This is the <strong>relative</strong> path on disk to your former board from the <strong>root of this phpBB installation</strong>.',
 	'REFRESH_PAGE'				=> 'Refresh page to continue conversion',
 	'REFRESH_PAGE_EXPLAIN'		=> 'If set to yes, the convertor will refresh the page to continue the conversion after having finished a step. If this is your first conversion for testing purposes and to determine any errors in advance, we suggest to set this to No.',
 
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 2e757043bb9..09675d80958 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -78,16 +78,12 @@
 
 	'IM_ADD_CONTACT'		=> 'Add Contact',
 	'IM_DOWNLOAD_APP'		=> 'Download application',
-	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
-	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
 	'IM_MESSAGE'			=> 'Your message',
 	'IM_NAME'				=> 'Your Name',
 	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
-	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
 	'IM_RECIPIENT'			=> 'Recipient',
 	'IM_SEND'				=> 'Send message',
 	'IM_SEND_MESSAGE'		=> 'Send message',
-	'IM_SENT_JABBER'		=> 'Your message to %1$s has been sent successfully.',
 	'IM_USER'				=> 'Send an instant message',
 
 	'LAST_ACTIVE'				=> 'Last active',
@@ -125,7 +121,6 @@
 	'SENDER_NAME'			=> 'Your name',
 	'SEND_ICQ_MESSAGE'		=> 'Send ICQ message',
 	'SEND_IM'				=> 'Instant messaging',
-	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
 	'SEND_MESSAGE'			=> 'Message',
 	'SEND_YIM_MESSAGE'		=> 'Send YIM message',
 	'SORT_EMAIL'			=> 'Email',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index fd629f4aef4..6b96f0977b0 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -158,6 +158,7 @@
 		2	=> 'Your images may only be up to %d pixels wide.',
 	),
 
+	'MENTION_NO_MATCH_FOUND'	=> 'No match found',
 	'MESSAGE_BODY_EXPLAIN'		=> array(
 		0	=> '', // zero means no limit, so we don't view a message here.
 		1	=> 'Enter your message here, it may contain no more than <strong>%d</strong> character.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index a4dcdf775d1..327be3140f6 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -38,22 +38,26 @@
 
 // Privacy policy and T&C
 $lang = array_merge($lang, array(
-	'TERMS_OF_USE_CONTENT'	=> 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.
+	'TERMS_OF_USE_CONTENT'	=> 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all the following terms, please do not access or use “%1$s”. We may change these terms at any time and will make every effort to inform you of such changes. However, it is your responsibility to review this document regularly, as your continued use of “%1$s” after changes are made constitutes your agreement to be legally bound by the updated and/or amended terms.
 	<br><br>
-	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>” (hereinafter “GPL”) and can be downloaded from <a href="https://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions; phpBB Limited is not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="https://www.phpbb.com/">https://www.phpbb.com/</a>.
+	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”), a bulletin board solution released under the “<a href="https://opensource.org/license/gpl-2-0">GNU General Public License v2</a>” (hereinafter “GPL”), which can be downloaded from <a href="https://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet-based discussions; phpBB Limited is not responsible for the content or conduct permitted or disallowed on this site. For further information about phpBB, please see: <a href="https://www.phpbb.com/">https://www.phpbb.com/</a>.
 	<br><br>
-	You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised.
+	You agree not to post any abusive, obscene, vulgar, libellous, hateful, threatening, sexually oriented, or otherwise unlawful material, whether under the laws of your country, the country in which “%1$s” is hosted, or under international law. Doing so may result in your immediate and permanent ban, with notification of your Internet Service Provider if deemed necessary by us. The IP address of all posts is recorded to aid in enforcing these conditions.
+	<br><br>
+	You agree that “%1$s” reserves the right to remove, edit, move, or close any topic at any time, at our sole discretion. As a user, you agree that any information you enter may be stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to data being compromised.
 	',
 
-	'PRIVACY_POLICY'		=> 'This policy explains in detail how “%1$s” along with its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) use any information collected during any session of usage by you (hereinafter “your information”).
+	'PRIVACY_POLICY'		=> 'This policy explains in detail how “%1$s” and its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) use information collected during your use of this site (hereinafter “your information”).
+	<br><br>
+	Your information is collected in two ways. When you browse “%1$s”, the phpBB software will create several cookies. Cookies are small text files stored in your web browser’s temporary files. The first two cookies contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), both automatically assigned by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s”. It stores information about which topics you have read, thereby improving your user experience.
 	<br><br>
-	Your information is collected via two ways. Firstly, by browsing “%1$s” will cause the phpBB software to create a number of cookies, which are small text files that are downloaded on to your computer’s web browser temporary files. The first two cookies just contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), automatically assigned to you by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s” and is used to store which topics have been read, thereby improving your user experience.
+	We may also create cookies external to the phpBB software while you are browsing “%1$s”. These fall outside the scope of this document, which only covers cookies created by the phpBB software.
 	<br><br>
-	We may also create cookies external to the phpBB software whilst browsing “%1$s”, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”) and posts submitted by you after registration and whilst logged in (hereinafter “your posts”).
+	The second way we collect information is through what you submit to us. This includes but is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”), posts you submit after registering and while logged in (hereinafter “your posts”).
 	<br><br>
-	Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid email address (hereinafter “your email”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your email address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated emails from the phpBB software.
+	Your account will contain at a minimum: a unique username (hereinafter “your username”), a personal password used to log in (hereinafter “your password”), a valid email address (hereinafter “your email”). Your account information on “%1$s” is protected by the data-protection laws applicable in the country that hosts us. Any information beyond your username, password, and email address that is requested during registration may be mandatory or optional, at the discretion of “%1$s”. In all cases, you may choose what information in your account is publicly displayed. You may also opt in or out of automatically generated emails from the phpBB software.
 	<br><br>
-	Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your email, then the phpBB software will generate a new password to reclaim your account.
+	Your password is stored as a one-way hash to ensure security. However, we recommend that you do not reuse the same password across multiple websites. Your password is the key to your account on “%1$s”, so please keep it secure. Under no circumstances will anyone affiliated with “%1$s”, phpBB, or any third party legitimately ask for your password. If you forget your password, you can use the “I forgot my password” feature provided by the phpBB software. This process requires you to submit your username and email address, after which the phpBB software will generate a new password for you to regain access to your account.
 	',
 ));
 
@@ -331,7 +335,7 @@
 	'NOTIFICATION_GROUP_POSTING'						=> 'Posting Notifications',
 	'NOTIFICATION_METHOD_BOARD'							=> 'Notifications',
 	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
-	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
+	'NOTIFICATION_METHOD_WEBPUSH'						=> 'Web Push',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
 	'NOTIFICATION_TYPE_BOOKMARK'						=> 'Someone replies to a topic you have bookmarked',
 	'NOTIFICATION_TYPE_GROUP_REQUEST'					=> 'Someone requests to join a group you lead',
@@ -353,8 +357,11 @@
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
 	'NOTIFY_METHOD_EMAIL'			=> 'Email only',
 	'NOTIFY_METHOD_EXPLAIN'			=> 'Method for sending messages sent via this board.',
-	'NOTIFY_METHOD_IM'				=> 'Jabber only',
 	'NOTIFY_ON_PM'					=> 'Notify me on new private messages',
+	'NOTIFY_WEBPUSH_ENABLE'			=> 'Enable receiving Web Push notifications',
+	'NOTIFY_WEBPUSH_ENABLE_EXPLAIN'	=> 'Enable receiving browser-based push notifications.<br>The notifications can be turned off at any time in your browser settings, by unsubscribing, or by disabling the push notifications below.',
+	'NOTIFY_WEBPUSH_SUBSCRIBE'		=> 'Subscribe',
+	'NOTIFY_WEBPUSH_UNSUBSCRIBE'	=> 'Unsubscribe',
 	'NOT_ADDED_FRIENDS_ANONYMOUS'	=> 'You cannot add the anonymous user to your friends list.',
 	'NOT_ADDED_FRIENDS_BOTS'		=> 'You cannot add bots to your friends list.',
 	'NOT_ADDED_FRIENDS_FOES'		=> 'You cannot add users to your friends list who are on your foes list.',
@@ -529,7 +536,6 @@
 	'UCP_COPPA_BEFORE'			=> 'Before %s',
 	'UCP_COPPA_ON_AFTER'		=> 'On or after %s',
 	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.',
-	'UCP_JABBER'				=> 'Jabber address',
 	'UCP_LOGIN_LINK'			=> 'Set up an external account association',
 
 	'UCP_MAIN'					=> 'Overview',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index e5c9be05174..9334a633d45 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -112,6 +112,7 @@
 	'VIEW_INFO'				=> 'Post details',
 	'VIEW_NEXT_TOPIC'		=> 'Next topic',
 	'VIEW_PREVIOUS_TOPIC'	=> 'Previous topic',
+	'VIEW_QUOTED_POST'		=> 'View quoted post',
 	'VIEW_RESULTS'			=> 'View results',
 	'VIEW_TOPIC_POSTS'		=> array(
 		1	=> '%d post',
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index 582c8ed10bf..f42a79451ae 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -43,7 +43,9 @@
 {
 	if ($user->data['is_bot'])
 	{
-		redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+		/** @var \phpbb\controller\helper $controller_helper */
+		$controller_helper = $phpbb_container->get('controller.helper');
+		redirect($controller_helper->route('phpbb_index_controller'));
 	}
 
 	login_box('', $user->lang['LOGIN_EXPLAIN_MCP']);
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index f693942c396..4cf4cac950c 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -43,11 +43,14 @@
 $group_id	= $request->variable('g', 0);
 $topic_id	= $request->variable('t', 0);
 
+/** @var \phpbb\controller\helper $controller_helper */
+$controller_helper = $phpbb_container->get('controller.helper');
+
 // Redirect when old mode is used
 if ($mode == 'leaders')
 {
 	send_status_line(301, 'Moved Permanently');
-	redirect(append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'));
+	redirect($controller_helper->route('phpbb_members_team', [], false));
 }
 
 // Check our mode...
@@ -62,6 +65,11 @@
 	case 'contactadmin':
 	break;
 
+	case 'team':
+		send_status_line(301, 'Moved Permanently');
+		redirect($controller_helper->route('phpbb_members_team', [], false));
+	break;
+
 	case 'livesearch':
 		if (!$config['allow_live_searches'])
 		{
@@ -102,394 +110,6 @@
 // What do you want to do today? ... oops, I think that line is taken ...
 switch ($mode)
 {
-	case 'team':
-		// Display a listing of board admins, moderators
-		if (!function_exists('user_get_id_name'))
-		{
-			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-		}
-
-		$page_title = $user->lang['THE_TEAM'];
-		$template_html = 'memberlist_team.html';
-
-		$sql = 'SELECT *
-			FROM ' . TEAMPAGE_TABLE . '
-			ORDER BY teampage_position ASC';
-		$result = $db->sql_query($sql, 3600);
-		$teampage_data = $db->sql_fetchrowset($result);
-		$db->sql_freeresult($result);
-
-		$sql_ary = array(
-			'SELECT'	=> 'g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id as ug_user_id, t.teampage_id',
-
-			'FROM'		=> array(GROUPS_TABLE => 'g'),
-
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(TEAMPAGE_TABLE => 't'),
-					'ON'	=> 't.group_id = g.group_id',
-				),
-				array(
-					'FROM'	=> array(USER_GROUP_TABLE => 'ug'),
-					'ON'	=> 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . (int) $user->data['user_id'],
-				),
-			),
-		);
-
-		$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
-
-		$group_ids = $groups_ary = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if ($row['group_type'] == GROUP_HIDDEN && !$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $user->data['user_id'])
-			{
-				$row['group_name'] = $user->lang['GROUP_UNDISCLOSED'];
-				$row['u_group'] = '';
-			}
-			else
-			{
-				$row['group_name'] = $group_helper->get_name($row['group_name']);
-				$row['u_group'] = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;g=' . $row['group_id']);
-			}
-
-			if ($row['teampage_id'])
-			{
-				// Only put groups into the array we want to display.
-				// We are fetching all groups, to ensure we got all data for default groups.
-				$group_ids[] = (int) $row['group_id'];
-			}
-			$groups_ary[(int) $row['group_id']] = $row;
-		}
-		$db->sql_freeresult($result);
-
-		$sql_ary = array(
-			'SELECT'	=> 'u.user_id, u.group_id as default_group, u.username, u.username_clean, u.user_colour, u.user_type, u.user_rank, u.user_posts, u.user_allow_pm, g.group_id',
-
-			'FROM'		=> array(
-				USER_GROUP_TABLE => 'ug',
-			),
-
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(USERS_TABLE => 'u'),
-					'ON'	=> 'ug.user_id = u.user_id',
-				),
-				array(
-					'FROM'	=> array(GROUPS_TABLE => 'g'),
-					'ON'	=> 'ug.group_id = g.group_id',
-				),
-			),
-
-			'WHERE'		=> $db->sql_in_set('g.group_id', $group_ids, false, true) . ' AND ug.user_pending = 0',
-
-			'ORDER_BY'	=> 'u.username_clean ASC',
-		);
-
-		/**
-		 * Modify the query used to get the users for the team page
-		 *
-		 * @event core.memberlist_team_modify_query
-		 * @var array	sql_ary			Array containing the query
-		 * @var array	group_ids		Array of group ids
-		 * @var array	teampage_data	The teampage data
-		 * @since 3.1.3-RC1
-		 */
-		$vars = array(
-			'sql_ary',
-			'group_ids',
-			'teampage_data',
-		);
-		extract($phpbb_dispatcher->trigger_event('core.memberlist_team_modify_query', compact($vars)));
-
-		$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
-
-		$user_ary = $user_ids = $group_users = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$row['forums'] = '';
-			$row['forums_ary'] = array();
-			$user_ary[(int) $row['user_id']] = $row;
-			$user_ids[] = (int) $row['user_id'];
-			$group_users[(int) $row['group_id']][] = (int) $row['user_id'];
-		}
-		$db->sql_freeresult($result);
-
-		$user_ids = array_unique($user_ids);
-
-		if (!empty($user_ids) && $config['teampage_forums'])
-		{
-			$template->assign_var('S_DISPLAY_MODERATOR_FORUMS', true);
-			// Get all moderators
-			$perm_ary = $auth->acl_get_list($user_ids, array('m_'), false);
-
-			foreach ($perm_ary as $forum_id => $forum_ary)
-			{
-				foreach ($forum_ary as $auth_option => $id_ary)
-				{
-					foreach ($id_ary as $id)
-					{
-						if (!$forum_id)
-						{
-							$user_ary[$id]['forums'] = $user->lang['ALL_FORUMS'];
-						}
-						else
-						{
-							$user_ary[$id]['forums_ary'][] = $forum_id;
-						}
-					}
-				}
-			}
-
-			$sql = 'SELECT forum_id, forum_name
-				FROM ' . FORUMS_TABLE;
-			$result = $db->sql_query($sql);
-
-			$forums = array();
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$forums[$row['forum_id']] = $row['forum_name'];
-			}
-			$db->sql_freeresult($result);
-
-			foreach ($user_ary as $user_id => $user_data)
-			{
-				if (!$user_data['forums'])
-				{
-					foreach ($user_data['forums_ary'] as $forum_id)
-					{
-						$user_ary[$user_id]['forums_options'] = true;
-						if (isset($forums[$forum_id]))
-						{
-							if ($auth->acl_get('f_list', $forum_id))
-							{
-								$user_ary[$user_id]['forums'] .= '<option value="">' . $forums[$forum_id] . '</option>';
-							}
-						}
-					}
-				}
-			}
-		}
-
-		$parent_team = 0;
-		foreach ($teampage_data as $team_data)
-		{
-			// If this team entry has no group, it's a category
-			if (!$team_data['group_id'])
-			{
-				$template->assign_block_vars('group', array(
-					'GROUP_NAME'  => $team_data['teampage_name'],
-				));
-
-				$parent_team = (int) $team_data['teampage_id'];
-				continue;
-			}
-
-			$group_data = $groups_ary[(int) $team_data['group_id']];
-			$group_id = (int) $team_data['group_id'];
-
-			if (!$team_data['teampage_parent'])
-			{
-				// If the group does not have a parent category, we display the groupname as category
-				$template->assign_block_vars('group', array(
-					'GROUP_NAME'	=> $group_data['group_name'],
-					'GROUP_COLOR'	=> $group_data['group_colour'],
-					'U_GROUP'		=> $group_data['u_group'],
-				));
-			}
-
-			// Display group members.
-			if (!empty($group_users[$group_id]))
-			{
-				foreach ($group_users[$group_id] as $user_id)
-				{
-					if (isset($user_ary[$user_id]))
-					{
-						$row = $user_ary[$user_id];
-						if ($config['teampage_memberships'] == 1 && ($group_id != $groups_ary[$row['default_group']]['group_id']) && $groups_ary[$row['default_group']]['teampage_id'])
-						{
-							// Display users in their primary group, instead of the first group, when it is displayed on the teampage.
-							continue;
-						}
-
-						$user_rank_data = phpbb_get_user_rank($row, (($row['user_id'] == ANONYMOUS) ? false : $row['user_posts']));
-
-						$template_vars = array(
-							'USER_ID'		=> $row['user_id'],
-							'FORUMS'		=> $row['forums'],
-							'FORUM_OPTIONS'	=> (isset($row['forums_options'])) ? true : false,
-							'RANK_TITLE'	=> $user_rank_data['title'],
-
-							'GROUP_NAME'	=> $groups_ary[$row['default_group']]['group_name'],
-							'GROUP_COLOR'	=> $groups_ary[$row['default_group']]['group_colour'],
-							'U_GROUP'		=> $groups_ary[$row['default_group']]['u_group'],
-
-							'RANK_IMG'		=> $user_rank_data['img'],
-							'RANK_IMG_SRC'	=> $user_rank_data['img_src'],
-
-							'S_INACTIVE'	=> $row['user_type'] == USER_INACTIVE,
-
-							'U_PM'			=> ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($row['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $row['user_id']) : '',
-
-							'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
-							'USERNAME'			=> get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
-							'USER_COLOR'		=> get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
-							'U_VIEW_PROFILE'	=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
-						);
-
-						/**
-						 * Modify the template vars for displaying the user in the groups on the teampage
-						 *
-						 * @event core.memberlist_team_modify_template_vars
-						 * @var array	template_vars		Array containing the query
-						 * @var array	row					Array containing the action user row
-						 * @var array	groups_ary			Array of groups with all users that should be displayed
-						 * @since 3.1.3-RC1
-						 */
-						$vars = array(
-							'template_vars',
-							'row',
-							'groups_ary',
-						);
-						extract($phpbb_dispatcher->trigger_event('core.memberlist_team_modify_template_vars', compact($vars)));
-
-						$template->assign_block_vars('group.user', $template_vars);
-
-						if ($config['teampage_memberships'] != 2)
-						{
-							unset($user_ary[$user_id]);
-						}
-					}
-				}
-			}
-		}
-
-		$template->assign_block_vars('navlinks', array(
-			'BREADCRUMB_NAME'	=> $page_title,
-			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"),
-		));
-
-		$template->assign_vars(array(
-			'PM_IMG'		=> $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']))
-		);
-	break;
-
-	case 'contact':
-
-		$page_title = $user->lang['IM_USER'];
-		$template_html = 'memberlist_im.html';
-
-		if (!$auth->acl_get('u_sendim'))
-		{
-			send_status_line(403, 'Forbidden');
-			trigger_error('NOT_AUTHORISED');
-		}
-
-		$presence_img = '';
-		switch ($action)
-		{
-			case 'jabber':
-				$lang = 'JABBER';
-				$sql_field = 'user_jabber';
-				$s_select = (@extension_loaded('xml') && $config['jab_enable']) ? 'S_SEND_JABBER' : 'S_NO_SEND_JABBER';
-				$s_action = append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=$action&amp;u=$user_id");
-			break;
-
-			default:
-				trigger_error('NO_MODE', E_USER_ERROR);
-			break;
-		}
-
-		// Grab relevant data
-		$sql = "SELECT user_id, username, user_email, user_lang, $sql_field
-			FROM " . USERS_TABLE . "
-			WHERE user_id = $user_id
-				AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			trigger_error('NO_USER');
-		}
-		else if (empty($row[$sql_field]))
-		{
-			trigger_error('IM_NO_DATA');
-		}
-
-		// Post data grab actions
-		switch ($action)
-		{
-			case 'jabber':
-				add_form_key('memberlist_messaging');
-
-				if ($submit && @extension_loaded('xml') && $config['jab_enable'])
-				{
-					if (check_form_key('memberlist_messaging'))
-					{
-
-						include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-
-						$subject = sprintf($user->lang['IM_JABBER_SUBJECT'], $user->data['username'], $config['server_name']);
-						$message = $request->variable('message', '', true);
-
-						if (empty($message))
-						{
-							trigger_error('EMPTY_MESSAGE_IM');
-						}
-
-						$messenger = new messenger(false);
-
-						$messenger->template('profile_send_im', $row['user_lang']);
-						$messenger->subject(html_entity_decode($subject, ENT_COMPAT));
-
-						$messenger->replyto($user->data['user_email']);
-						$messenger->set_addresses($row);
-
-						$messenger->assign_vars(array(
-							'BOARD_CONTACT'	=> phpbb_get_board_contact($config, $phpEx),
-							'FROM_USERNAME'	=> html_entity_decode($user->data['username'], ENT_COMPAT),
-							'TO_USERNAME'	=> html_entity_decode($row['username'], ENT_COMPAT),
-							'MESSAGE'		=> html_entity_decode($message, ENT_COMPAT))
-						);
-
-						$messenger->send(NOTIFY_IM);
-
-						$s_select = 'S_SENT_JABBER';
-					}
-					else
-					{
-						trigger_error('FORM_INVALID');
-					}
-				}
-			break;
-		}
-
-		$template->assign_block_vars('navlinks', array(
-			'BREADCRUMB_NAME'	=> $page_title,
-			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=$action&amp;u=$user_id"),
-		));
-
-		// Send vars to the template
-		$template->assign_vars(array(
-			'IM_CONTACT'	=> $row[$sql_field],
-			'A_IM_CONTACT'	=> addslashes($row[$sql_field]),
-
-			'USERNAME'		=> $row['username'],
-			'CONTACT_NAME'	=> $row[$sql_field],
-			'SITENAME'		=> $config['sitename'],
-
-			'PRESENCE_IMG'		=> $presence_img,
-
-			'L_SEND_IM_EXPLAIN'	=> $user->lang['IM_' . $lang],
-			'L_IM_SENT_JABBER'	=> sprintf($user->lang['IM_SENT_JABBER'], $row['username']),
-
-			$s_select			=> true,
-			'S_IM_ACTION'		=> $s_action)
-		);
-
-	break;
-
 	case 'viewprofile':
 		// Display a profile
 		if ($user_id == ANONYMOUS && !$username)
@@ -786,7 +406,6 @@
 			'PM_IMG'					=> $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']),
 			'L_SEND_EMAIL_USER'			=> $user->lang('SEND_EMAIL_USER', $member['username']),
 			'EMAIL_IMG'					=> $user->img('icon_contact_email', $user->lang['EMAIL']),
-			'JABBER_IMG'				=> $user->img('icon_contact_jabber', $user->lang['JABBER']),
 			'SEARCH_IMG'				=> $user->img('icon_user_search', $user->lang['SEARCH']),
 
 			'S_PROFILE_ACTION'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group'),
@@ -809,17 +428,33 @@
 			'U_REMOVE_FOE'				=> ($foe && $foes_enabled) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&amp;remove=1&amp;mode=foes&amp;usernames[]=' . $user_id) : '',
 
 			'U_CANONICAL'				=> generate_board_url() . '/' . append_sid("memberlist.$phpEx", 'mode=viewprofile&amp;u=' . $user_id, true, ''),
+			'USER_ID'					=> $user_id,
 		);
 
 		/**
 		* Modify user's template vars before we display the profile
 		*
 		* @event core.memberlist_modify_view_profile_template_vars
-		* @var	array	template_ary	Array with user's template vars
+		* @var	array	template_ary			Array with user's template vars
+		* @var	int		user_id					The user ID
+		* @var	bool	user_notes_enabled		Is the mcp user notes module enabled?
+		* @var	bool	warn_user_enabled		Is the mcp warnings module enabled?
+		* @var	bool	friends_enabled			Is the ucp friends module enabled?
+		* @var	bool	foes_enabled			Is the ucp foes module enabled?
+		* @var	bool    friend					Is the user friend?
+		* @var	bool	foe						Is the user foe?
 		* @since 3.2.6-RC1
+		* @changed 3.3.15-RC1 Added vars user_id, user_notes_enabled, warn_user_enabled, friend, friends_enabled, foe, foes_enabled
 		*/
 		$vars = array(
 			'template_ary',
+			'user_id',
+			'user_notes_enabled',
+			'warn_user_enabled',
+			'friend',
+			'friends_enabled',
+			'foe',
+			'foes_enabled',
 		);
 		extract($phpbb_dispatcher->trigger_event('core.memberlist_modify_view_profile_template_vars', compact($vars)));
 
@@ -888,10 +523,7 @@
 
 	case 'contactadmin':
 	case 'email':
-		if (!class_exists('messenger'))
-		{
-			include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-		}
+		$messenger = $phpbb_container->get('messenger.method_collection');
 
 		$user_id	= $request->variable('u', 0);
 		$topic_id	= $request->variable('t', 0);
@@ -925,7 +557,6 @@
 
 		if ($request->is_set_post('submit'))
 		{
-			$messenger = new messenger(false);
 			$form->submit($messenger);
 		}
 
@@ -940,10 +571,19 @@
 		}
 		else if ($topic_id)
 		{
-			$sql = 'SELECT f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name, f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options, f.forum_options, t.topic_title
-					FROM ' . FORUMS_TABLE . ' as f,
-						' . TOPICS_TABLE . ' as t
-					WHERE t.forum_id = f.forum_id';
+			// Generate the navlinks based on the selected topic
+			$navlinks_sql_array = [
+				'SELECT'    => 'f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name,
+					f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options,
+					f.forum_options, t.topic_title',
+				'FROM'      => [
+					FORUMS_TABLE  => 'f',
+					TOPICS_TABLE  => 't',
+				],
+				'WHERE'     => 't.forum_id = f.forum_id AND t.topic_id = ' . (int) $topic_id,
+			];
+
+			$sql = $db->sql_build_query('SELECT', $navlinks_sql_array);
 			$result = $db->sql_query($sql);
 			$topic_data = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
@@ -1020,12 +660,6 @@
 		$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'c' => $user->lang['SORT_JOINED'], 'd' => $user->lang['SORT_POST_COUNT']);
 		$sort_key_sql = array('a' => 'u.username_clean', 'c' => 'u.user_regdate', 'd' => 'u.user_posts');
 
-		if ($config['jab_enable'] && $auth->acl_get('u_sendim'))
-		{
-			$sort_key_text['k'] = $user->lang['JABBER'];
-			$sort_key_sql['k'] = 'u.user_jabber';
-		}
-
 		if ($auth->acl_get('a_user'))
 		{
 			$sort_key_text['e'] = $user->lang['SORT_EMAIL'];
@@ -1035,7 +669,7 @@
 		if ($auth->acl_get('u_viewonline'))
 		{
 			$sort_key_text['l'] = $user->lang['SORT_LAST_ACTIVE'];
-			$sort_key_sql['l'] = 'u.user_lastvisit';
+			$sort_key_sql['l'] = 'u.user_last_active';
 		}
 
 		$sort_key_text['m'] = $user->lang['SORT_RANK'];
@@ -1067,7 +701,7 @@
 		$select_single 	= $request->variable('select_single', false);
 
 		// Search URL parameters, if any of these are in the URL we do a search
-		$search_params = array('username', 'email', 'jabber', 'search_group_id', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'ip');
+		$search_params = array('username', 'email', 'search_group_id', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'ip');
 
 		// We validate form and field here, only id/class allowed
 		$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form;
@@ -1076,7 +710,6 @@
 		{
 			$username	= $request->variable('username', '', true);
 			$email		= strtolower($request->variable('email', ''));
-			$jabber		= $request->variable('jabber', '');
 			$search_group_id	= $request->variable('search_group_id', 0);
 
 			// when using these, make sure that we actually have values defined in $find_key_match
@@ -1116,7 +749,6 @@
 
 			$sql_where .= ($username) ? ' AND u.username_clean ' . $db->sql_like_expression(str_replace('*', $db->get_any_char(), utf8_clean_string($username))) : '';
 			$sql_where .= ($auth->acl_get('a_user') && $email) ? ' AND u.user_email ' . $db->sql_like_expression(str_replace('*', $db->get_any_char(), $email)) . ' ' : '';
-			$sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->get_any_char(), $jabber)) . ' ' : '';
 			$sql_where .= (is_numeric($count) && isset($find_key_match[$count_select])) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : '';
 
 			if (isset($find_key_match[$joined_select]) && count($joined) == 3)
@@ -1137,15 +769,15 @@
 				{
 					if ($active_select === 'lt' && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0)
 					{
-						$sql_where .= ' AND u.user_lastvisit = 0';
+						$sql_where .= ' AND u.user_last_active = 0';
 					}
 					else if ($active_select === 'gt')
 					{
-						$sql_where .= ' AND u.user_lastvisit ' . $find_key_match[$active_select] . ' ' . $active_time;
+						$sql_where .= ' AND u.user_last_active ' . $find_key_match[$active_select] . ' ' . $active_time;
 					}
 					else
 					{
-						$sql_where .= ' AND (u.user_lastvisit > 0 AND u.user_lastvisit < ' . $active_time . ')';
+						$sql_where .= ' AND (u.user_last_active > 0 AND u.user_last_active < ' . $active_time . ')';
 					}
 				}
 			}
@@ -1368,10 +1000,10 @@
 
 		$order_by .= $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
 
-		// Unfortunately we must do this here for sorting by rank, else the sort order is applied wrongly
-		if ($sort_key == 'm')
+		// For sorting by non-unique columns (rank, posts) add unique sort key to avoid duplicated rows in results
+		if ($sort_key == 'm' || $sort_key == 'd')
 		{
-			$order_by .= ', u.user_posts DESC';
+			$order_by .= ', u.user_id ASC';
 		}
 
 		/**
@@ -1422,7 +1054,6 @@
 			'select_single'	=> array('select_single', $select_single),
 			'username'		=> array('username', '', true),
 			'email'			=> array('email', ''),
-			'jabber'		=> array('jabber', ''),
 			'search_group_id'	=> array('search_group_id', 0),
 			'joined_select'	=> array('joined_select', 'lt'),
 			'active_select'	=> array('active_select', 'lt'),
@@ -1577,7 +1208,6 @@
 			$template->assign_vars(array(
 				'USERNAME'	=> $username,
 				'EMAIL'		=> $email,
-				'JABBER'	=> $jabber,
 				'JOINED'	=> implode('-', $joined),
 				'ACTIVE'	=> implode('-', $active),
 				'COUNT'		=> $count,
@@ -1585,7 +1215,6 @@
 
 				'S_IP_SEARCH_ALLOWED'	=> ($auth->acl_getf_global('m_info')) ? true : false,
 				'S_EMAIL_SEARCH_ALLOWED'=> ($auth->acl_get('a_user')) ? true : false,
-				'S_JABBER_ENABLED'		=> $config['jab_enable'],
 				'S_IN_SEARCH_POPUP'		=> ($form && $field) ? true : false,
 				'S_SEARCH_USER'			=> ($mode == 'searchuser' || ($mode == '' && $submit)),
 				'S_FORM_NAME'			=> $form,
@@ -1715,7 +1344,7 @@
 			{
 				$row['session_time'] = $session_ary[$row['user_id']]['session_time'] ?? 0;
 				$row['session_viewonline'] = $session_ary[$row['user_id']]['session_viewonline'] ?? 0;
-				$row['last_visit'] = (!empty($row['session_time'])) ? $row['session_time'] : $row['user_lastvisit'];
+				$row['last_visit'] = $row['user_last_active'] ?: $row['session_time'];
 
 				$id_cache[$row['user_id']] = $row;
 			}
@@ -1790,6 +1419,18 @@
 					$memberrow = array_merge($memberrow, $cp_row['row']);
 				}
 
+				/**
+				 * Modify the memberrow data before template variables are assigned.
+				 *
+				 * @event core.memberlist_modify_memberrow
+				 * @var int		user_id		The current user ID.
+				 * @var array	row			Array of raw user data.
+				 * @var array	memberrow	Array of member template variables.
+				 * @since 3.3.16-RC1
+				 */
+				$vars = ['user_id', 'row', 'memberrow'];
+				extract($phpbb_dispatcher->trigger_event('core.memberlist_modify_memberrow', compact($vars)));
+
 				$template->assign_block_vars('memberrow', $memberrow);
 
 				if (isset($cp_row['blockrow']) && count($cp_row['blockrow']))
@@ -1813,7 +1454,6 @@
 			'PROFILE_IMG'	=> $user->img('icon_user_profile', $user->lang['PROFILE']),
 			'PM_IMG'		=> $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']),
 			'EMAIL_IMG'		=> $user->img('icon_contact_email', $user->lang['EMAIL']),
-			'JABBER_IMG'	=> $user->img('icon_contact_jabber', $user->lang['JABBER']),
 			'SEARCH_IMG'	=> $user->img('icon_user_search', $user->lang['SEARCH']),
 
 			'U_FIND_MEMBER'			=> ($config['load_search'] || $auth->acl_get('a_')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser' . (($start) ? "&amp;start=$start" : '') . (!empty($params) ? '&amp;' . implode('&amp;', $params) : '')) : '',
diff --git a/phpBB/phpbb/.htaccess b/phpBB/phpbb/.htaccess
new file mode 100644
index 00000000000..92e78ba1a7f
--- /dev/null
+++ b/phpBB/phpbb/.htaccess
@@ -0,0 +1,25 @@
+# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
+# module mod_authz_host to a new module called mod_access_compat (which may be
+# disabled) and a new "Require" syntax has been introduced to mod_authz_core.
+# We could just conditionally provide both versions, but unfortunately Apache
+# does not explicitly tell us its version if the module mod_version is not
+# available. In this case, we check for the availability of module
+# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
+<IfModule mod_version.c>
+	<IfVersion < 2.4>
+		Order Allow,Deny
+		Deny from All
+	</IfVersion>
+	<IfVersion >= 2.4>
+		Require all denied
+	</IfVersion>
+</IfModule>
+<IfModule !mod_version.c>
+	<IfModule !mod_authz_core.c>
+		Order Allow,Deny
+		Deny from All
+	</IfModule>
+	<IfModule mod_authz_core.c>
+		Require all denied
+	</IfModule>
+</IfModule>
diff --git a/phpBB/phpbb/attachment/delete.php b/phpBB/phpbb/attachment/delete.php
index 80fd6b62d4b..2620a7a94f4 100644
--- a/phpBB/phpbb/attachment/delete.php
+++ b/phpBB/phpbb/attachment/delete.php
@@ -464,7 +464,7 @@ public function unlink_attachment($filename, $mode = 'file', $entry_removed = fa
 				return true;
 			}
 		}
-		catch (\phpbb\storage\exception\exception $exception)
+		catch (\phpbb\storage\exception\storage_exception $exception)
 		{
 			// Fail is covered by return statement below
 		}
diff --git a/phpBB/phpbb/attachment/upload.php b/phpBB/phpbb/attachment/upload.php
index d5b961de5f6..f1ae0b8533a 100644
--- a/phpBB/phpbb/attachment/upload.php
+++ b/phpBB/phpbb/attachment/upload.php
@@ -245,12 +245,7 @@ protected function create_thumbnail()
 				// Move the thumbnail from temp folder to the storage
 				$fp = fopen($destination, 'rb');
 
-				$this->storage->write_stream($destination_name, $fp);
-
-				if (is_resource($fp))
-				{
-					fclose($fp);
-				}
+				$this->storage->write($destination_name, $fp);
 			}
 			else
 			{
@@ -351,7 +346,7 @@ protected function check_disk_space()
 				return false;
 			}
 		}
-		catch (\phpbb\storage\exception\exception $e)
+		catch (\phpbb\storage\exception\storage_exception $e)
 		{
 			// Do nothing
 		}
diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php
index 0482ae46a47..77777967364 100644
--- a/phpBB/phpbb/auth/auth.php
+++ b/phpBB/phpbb/auth/auth.php
@@ -772,6 +772,7 @@ function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false)
 
 		$sql_group = ($group_id !== false) ? ((!is_array($group_id)) ? 'group_id = ' . (int) $group_id : $db->sql_in_set('group_id', array_map('intval', $group_id))) : '';
 		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : '';
+		$sql_is_local = !empty($forum_id) ? 'AND ao.is_local <> 0' : '';
 
 		$sql_opts = '';
 		$hold_ary = $sql_ary = array();
@@ -783,9 +784,10 @@ function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false)
 
 		// Grab group settings - non-role specific...
 		$sql_ary[] = 'SELECT a.group_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao
+			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . " ao
 			WHERE a.auth_role_id = 0
-				AND a.auth_option_id = ao.auth_option_id ' .
+				AND a.auth_option_id = ao.auth_option_id
+				$sql_is_local " .
 				(($sql_group) ? 'AND a.' . $sql_group : '') . "
 				$sql_forum
 				$sql_opts
@@ -793,9 +795,10 @@ function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false)
 
 		// Now grab group settings - role specific...
 		$sql_ary[] = 'SELECT a.group_id, a.forum_id, r.auth_setting, r.auth_option_id, ao.auth_option
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao
+			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . " ao
 			WHERE a.auth_role_id = r.role_id
-				AND r.auth_option_id = ao.auth_option_id ' .
+				$sql_is_local
+				AND r.auth_option_id = ao.auth_option_id " .
 				(($sql_group) ? 'AND a.' . $sql_group : '') . "
 				$sql_forum
 				$sql_opts
diff --git a/phpBB/phpbb/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php
index 4da0ec8637b..1f3a9f86eba 100644
--- a/phpBB/phpbb/auth/provider/apache.php
+++ b/phpBB/phpbb/auth/provider/apache.php
@@ -21,7 +21,7 @@
 use phpbb\user;
 
 /**
-* Apache authentication provider for phpBB3
+* Apache authentication provider for phpBB
 */
 class apache extends base
 {
diff --git a/phpBB/phpbb/auth/provider/base.php b/phpBB/phpbb/auth/provider/base.php
index 98945a2ddf5..9f983a114c0 100644
--- a/phpBB/phpbb/auth/provider/base.php
+++ b/phpBB/phpbb/auth/provider/base.php
@@ -58,6 +58,7 @@ public function get_login_data()
 	*/
 	public function get_auth_link_data($user_id = 0)
 	{
+		return null;
 	}
 
 	/**
@@ -79,7 +80,7 @@ public function validate_session($user)
 	*/
 	public function login_link_has_necessary_data(array $login_link_data)
 	{
-		return null;
+		return 'LOGIN_LINK_MISSING_DATA';
 	}
 
 	/**
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
index ae9d9680769..2666a4768df 100644
--- a/phpBB/phpbb/auth/provider/db.php
+++ b/phpBB/phpbb/auth/provider/db.php
@@ -21,7 +21,7 @@
 use phpbb\user;
 
 /**
- * Database authentication provider for phpBB3
+ * Database authentication provider for phpBB
  * This is for authentication via the integrated user table
  */
 class db extends base
@@ -176,9 +176,8 @@ public function login($username, $password)
 		// Every auth module is able to define what to do by itself...
 		if ($show_captcha)
 		{
-			$captcha->init(CONFIRM_LOGIN);
-			$vc_response = $captcha->validate($row);
-			if ($vc_response)
+			$captcha->init(\phpbb\captcha\plugins\confirm_type::LOGIN);
+			if ($captcha->validate() !== true)
 			{
 				return array(
 					'status'		=> LOGIN_ERROR_ATTEMPTS,
diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php
index 69c0952f1dc..ce23714036f 100644
--- a/phpBB/phpbb/auth/provider/ldap.php
+++ b/phpBB/phpbb/auth/provider/ldap.php
@@ -20,7 +20,7 @@
 use phpbb\user;
 
 /**
- * Database authentication provider for phpBB3
+ * Database authentication provider for phpBB
  * This is for authentication via the integrated user table
  */
 class ldap extends base
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index a9fd2783b69..f081c3780bd 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -22,16 +22,18 @@
 use phpbb\auth\provider\base;
 use phpbb\auth\provider\db;
 use phpbb\auth\provider\oauth\service\exception;
+use phpbb\auth\provider\oauth\service\service_interface;
 use phpbb\config\config;
 use phpbb\db\driver\driver_interface;
 use phpbb\di\service_collection;
 use phpbb\event\dispatcher;
 use phpbb\language\language;
 use phpbb\request\request_interface;
+use phpbb\routing\helper as routing_helper;
 use phpbb\user;
 
 /**
- * OAuth authentication provider for phpBB3
+ * OAuth authentication provider for phpBB
  */
 class oauth extends base
 {
@@ -53,6 +55,9 @@ class oauth extends base
 	/** @var request_interface */
 	protected $request;
 
+	/** @var routing_helper */
+	protected $routing_helper;
+
 	/** @var service_collection */
 	protected $service_providers;
 
@@ -86,6 +91,7 @@ class oauth extends base
 	 * @param dispatcher			$dispatcher				Event dispatcher object
 	 * @param language			$language				Language object
 	 * @param request_interface	$request				Request object
+	 * @param routing_helper	$routing_helper			Routing helper object
 	 * @param service_collection		$service_providers		OAuth providers service collection
 	 * @param user						$user					User object
 	 * @param string							$oauth_token_table		OAuth table: token storage
@@ -102,6 +108,7 @@ public function __construct(
 		dispatcher $dispatcher,
 		language $language,
 		request_interface $request,
+		routing_helper $routing_helper,
 		service_collection $service_providers,
 		user $user,
 		$oauth_token_table,
@@ -119,6 +126,7 @@ public function __construct(
 		$this->language				= $language;
 		$this->service_providers	= $service_providers;
 		$this->request				= $request;
+		$this->routing_helper		= $routing_helper;
 		$this->user					= $user;
 
 		$this->oauth_token_table	= $oauth_token_table;
@@ -160,10 +168,11 @@ public function login($username, $password)
 		}
 
 		// Request the name of the OAuth service
-		$provider = $this->request->variable('oauth_service', '', false);
+		$provider = $this->request->variable('oauth_service', '');
 		$service_name = $this->get_service_name($provider);
+		$service_provider = $this->get_service_provider($service_name);
 
-		if ($provider === '' || !$this->service_providers->offsetExists($service_name))
+		if ($provider === '' || !$service_provider)
 		{
 			return [
 				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
@@ -174,7 +183,7 @@ public function login($username, $password)
 
 		// Get the service credentials for the given service
 		$storage = new token_storage($this->db, $this->user, $this->oauth_token_table, $this->oauth_state_table);
-		$query = 'mode=login&login=external&oauth_service=' . $provider;
+		$query = ['oauth_service' => $provider];
 
 		try
 		{
@@ -192,11 +201,11 @@ public function login($username, $password)
 
 		if ($this->is_set_code($service))
 		{
-			$this->service_providers[$service_name]->set_external_service_provider($service);
+			$service_provider->set_external_service_provider($service);
 
 			try
 			{
-				$unique_id = $this->service_providers[$service_name]->perform_auth_login();
+				$unique_id = $service_provider->perform_auth_login();
 			}
 			catch (exception $e)
 			{
@@ -349,12 +358,11 @@ public function get_login_data()
 
 			if ($credentials['key'] && $credentials['secret'])
 			{
-				$provider = $this->get_provider($service_name);
-				$redirect_url = generate_board_url() . '/ucp.' . $this->php_ext . '?mode=login&login=external&oauth_service=' . $provider;
+				$oauth_service = $this->get_provider($service_name);
 
 				$login_data['BLOCK_VARS'][$service_name] = [
-					'REDIRECT_URL'	=> redirect($redirect_url, true),
-					'SERVICE_NAME'	=> $this->get_provider_title($provider),
+					'LOGIN_URL'		=> $this->routing_helper->route('phpbb_ucp_oauth_login_controller', ['oauth_service' => $oauth_service]),
+					'SERVICE_NAME'	=> $this->get_provider_title($oauth_service),
 				];
 			}
 		}
@@ -573,7 +581,7 @@ protected function link_account_login_link(array $link_data, $service_name)
 		}
 
 		// Prepare for an authentication request
-		$query = 'mode=login_link&login_link_oauth_service=' . $link_data['oauth_service'];
+		$query = ['oauth_service' => $link_data['oauth_service']];
 
 		try
 		{
@@ -584,12 +592,14 @@ protected function link_account_login_link(array $link_data, $service_name)
 			return $e->getMessage();
 		}
 
-		$this->service_providers[$service_name]->set_external_service_provider($service);
+		/** @var service_interface $service_provider */
+		$service_provider = $this->service_providers[$service_name];
+		$service_provider->set_external_service_provider($service);
 
 		try
 		{
 			// The user has already authenticated successfully, request to authenticate again
-			$unique_id = $this->service_providers[$service_name]->perform_token_auth();
+			$unique_id = $service_provider->perform_token_auth();
 		}
 		catch (exception $e)
 		{
@@ -623,7 +633,9 @@ protected function link_account_login_link(array $link_data, $service_name)
 	protected function link_account_auth_link(array $link_data, $service_name)
 	{
 		$storage = new token_storage($this->db, $this->user, $this->oauth_token_table, $this->oauth_state_table);
-		$query = 'i=ucp_auth_link&mode=auth_link&link=1&oauth_service=' . $link_data['oauth_service'];
+		$query = [
+			'oauth_service' => $link_data['oauth_service'],
+		];
 
 		try
 		{
@@ -711,7 +723,7 @@ protected function link_account_perform_link(array $data)
 	 *
 	 * @param string			$provider		The name of the provider
 	 * @param token_storage		$storage		Token storage object
-	 * @param string			$query			The query string used for the redirect uri
+	 * @param array				$query			The query parameters used for the redirect uri
 	 * @return ServiceInterface
 	 * @throws exception						When OAuth service was not created
 	 */
@@ -719,13 +731,13 @@ protected function get_service($provider, token_storage $storage, $query)
 	{
 		$service_name = $this->get_service_name($provider);
 
-		/** @see \phpbb\auth\provider\oauth\service\service_interface::get_service_credentials */
+		/** @see service_interface::get_service_credentials */
 		$service_credentials = $this->service_providers[$service_name]->get_service_credentials();
 
-		/** @see \phpbb\auth\provider\oauth\service\service_interface::get_auth_scope */
+		/** @see service_interface::get_auth_scope */
 		$scopes = $this->service_providers[$service_name]->get_auth_scope();
 
-		$callback = generate_board_url() . "/ucp.{$this->php_ext}?{$query}";
+		$callback = generate_board_url(true) . $this->routing_helper->route('phpbb_ucp_oauth_authenticate_controller', $query);
 
 		// Setup the credentials for the requests
 		$credentials = new Credentials(
@@ -782,6 +794,28 @@ protected function get_service_name($provider)
 		return $provider;
 	}
 
+	/**
+	 * Get service provider for provider name
+	 *
+	 * @param string $provider
+	 * @return service_interface|null Service provider instance or null if not properly configured
+	 */
+	protected function get_service_provider(string $provider): service_interface|null
+	{
+		if ($this->service_providers->offsetExists($provider))
+		{
+			/** @var service_interface $service_provider */
+			$service_provider = $this->service_providers->offsetGet($provider);
+			$service_credentials = $service_provider->get_service_credentials();
+			if ($service_credentials['key'] && $service_credentials['secret'])
+			{
+				return $service_provider;
+			}
+		}
+
+		return null;
+	}
+
 	/**
 	 * Returns the OAuth provider name from a service name.
 	 *
diff --git a/phpBB/phpbb/auth/provider/oauth/service/bitly.php b/phpBB/phpbb/auth/provider/oauth/service/bitly.php
index 0169de098e7..f3b159ba487 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/bitly.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/bitly.php
@@ -13,6 +13,9 @@
 
 namespace phpbb\auth\provider\oauth\service;
 
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\OAuth2\Service\Exception\InvalidAuthorizationStateException;
+
 /**
  * Bitly OAuth service
  */
@@ -59,10 +62,13 @@ public function perform_auth_login()
 
 		try
 		{
-			// This was a callback request, get the token
-			$this->service_provider->requestAccessToken($this->request->variable('code', ''));
+			// This was a callback request, get the token and state
+			$this->service_provider->requestAccessToken(
+				$this->request->variable('code', ''),
+				$this->request->variable('state', '')
+			);
 		}
-		catch (\OAuth\Common\Http\Exception\TokenResponseException $e)
+		catch (InvalidAuthorizationStateException|TokenResponseException $e)
 		{
 			throw new exception('AUTH_PROVIDER_OAUTH_ERROR_REQUEST');
 		}
diff --git a/phpBB/phpbb/auth/provider/oauth/service/facebook.php b/phpBB/phpbb/auth/provider/oauth/service/facebook.php
index f7dbe307eb8..fda71fc0183 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/facebook.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/facebook.php
@@ -13,6 +13,9 @@
 
 namespace phpbb\auth\provider\oauth\service;
 
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\OAuth2\Service\Exception\InvalidAuthorizationStateException;
+
 /**
  * Facebook OAuth service
  */
@@ -59,10 +62,13 @@ public function perform_auth_login()
 
 		try
 		{
-			// This was a callback request, get the token
-			$this->service_provider->requestAccessToken($this->request->variable('code', ''));
+			// This was a callback request, get the token and state
+			$this->service_provider->requestAccessToken(
+				$this->request->variable('code', ''),
+				$this->request->variable('state', '')
+			);
 		}
-		catch (\OAuth\Common\Http\Exception\TokenResponseException $e)
+		catch (InvalidAuthorizationStateException|TokenResponseException $e)
 		{
 			throw new exception('AUTH_PROVIDER_OAUTH_ERROR_REQUEST');
 		}
diff --git a/phpBB/phpbb/auth/provider/oauth/service/google.php b/phpBB/phpbb/auth/provider/oauth/service/google.php
index 6e671ab13e9..8097d8c3793 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/google.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/google.php
@@ -13,6 +13,9 @@
 
 namespace phpbb\auth\provider\oauth\service;
 
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\OAuth2\Service\Exception\InvalidAuthorizationStateException;
+
 /**
  * Google OAuth service
  */
@@ -70,10 +73,13 @@ public function perform_auth_login()
 
 		try
 		{
-			// This was a callback request, get the token
-			$this->service_provider->requestAccessToken($this->request->variable('code', ''));
+			// Get token and state
+			$this->service_provider->requestAccessToken(
+				$this->request->variable('code', ''),
+				$this->request->variable('state', '')
+			);
 		}
-		catch (\OAuth\Common\Http\Exception\TokenResponseException $e)
+		catch (InvalidAuthorizationStateException|TokenResponseException $e)
 		{
 			throw new exception('AUTH_PROVIDER_OAUTH_ERROR_REQUEST');
 		}
diff --git a/phpBB/phpbb/auth/provider/oauth/token_storage.php b/phpBB/phpbb/auth/provider/oauth/token_storage.php
index 73eb194b0fe..d764d1d269d 100644
--- a/phpBB/phpbb/auth/provider/oauth/token_storage.php
+++ b/phpBB/phpbb/auth/provider/oauth/token_storage.php
@@ -17,7 +17,6 @@
 use OAuth\Common\Token\TokenInterface;
 use OAuth\Common\Storage\TokenStorageInterface;
 use OAuth\Common\Storage\Exception\TokenNotFoundException;
-use OAuth\Common\Storage\Exception\AuthorizationStateNotFoundException;
 
 /**
  * OAuth storage wrapper for phpBB's cache
@@ -208,6 +207,7 @@ public function storeAuthorizationState($service, $state)
 			'provider'		=> $service,
 			'oauth_state'	=> $state,
 			'session_id'	=> $this->user->data['session_id'],
+			'state_time'	=> time(),
 		];
 
 		$sql = 'INSERT INTO ' . $this->oauth_state_table . ' ' . $this->db->sql_build_array('INSERT', $data);
@@ -254,16 +254,12 @@ public function retrieveAuthorizationState($service)
 		}
 
 		$data = [
-			'user_id'	=> (int) $this->user->data['user_id'],
-			'provider'	=> $service,
+			'user_id'		=> (int) $this->user->data['user_id'],
+			'provider'		=> $service,
+			'session_id'	=> $this->user->data['session_id'],
 		];
 
-		if ((int) $this->user->data['user_id'] === ANONYMOUS)
-		{
-			$data['session_id']	= $this->user->data['session_id'];
-		}
-
-		return $this->get_state_row($data)['oauth_state'] ?? '';
+		return $this->_retrieve_state($data);
 	}
 
 	/**
@@ -422,8 +418,7 @@ public function retrieve_access_token_by_session($service)
 	 * A helper function that performs the query for retrieving state functions by session.
 	 *
 	 * @param string	$service	The OAuth service provider name
-	 * @return string				The OAuth state
-	 * @throws AuthorizationStateNotFoundException
+	 * @return string|null			The OAuth state, or null if not stored
 	 */
 	public function retrieve_state_by_session($service)
 	{
@@ -477,17 +472,16 @@ protected function _retrieve_access_token($data)
 	/**
 	 * A helper function that performs the query for retrieve state functions.
 	 *
-	 * @param array		$data		The SQL WHERE data
-	 * @return string				The OAuth state
-	 * @throws AuthorizationStateNotFoundException
+	 * @param array $data		The SQL WHERE data
+	 * @return string				The OAuth state, or empty string if not stored
 	 */
-	protected function _retrieve_state($data)
+	protected function _retrieve_state(array $data): string
 	{
 		$row = $this->get_state_row($data);
 
 		if (!$row)
 		{
-			throw new AuthorizationStateNotFoundException();
+			return '';
 		}
 
 		$this->cachedState = $row['oauth_state'];
@@ -517,16 +511,17 @@ protected function get_access_token_row($data)
 	/**
 	 * A helper function that performs the query for retrieving a state.
 	 *
-	 * @param array		$data		The SQL WHERE data
+	 * @param array $data		The SQL WHERE data
 	 * @return array|false			array with the OAuth state row,
 	 *								false if the state does not exist
 	 */
-	protected function get_state_row($data)
+	protected function get_state_row(array $data)
 	{
-		$sql = 'SELECT oauth_state
+		$sql = 'SELECT oauth_state, state_time
 			FROM ' . $this->oauth_state_table . '
-			WHERE ' . $this->db->sql_build_array('SELECT', $data);
-		$result = $this->db->sql_query($sql);
+			WHERE ' . $this->db->sql_build_array('SELECT', $data) . '
+			ORDER BY state_time DESC';
+		$result = $this->db->sql_query_limit($sql, 1);
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
 
@@ -537,9 +532,9 @@ protected function get_state_row($data)
 	 * A helper function that JSON encodes a TokenInterface's data.
 	 *
 	 * @param TokenInterface	$token
-	 * @return string					The json encoded TokenInterface's data
+	 * @return false|string		The json encoded TokenInterface's data
 	 */
-	public function json_encode_token(TokenInterface $token)
+	public function json_encode_token(TokenInterface $token): false|string
 	{
 		$members = [
 			'accessToken'	=> $token->getAccessToken(),
diff --git a/phpBB/phpbb/auth/provider_collection.php b/phpBB/phpbb/auth/provider_collection.php
index 8e7e9e2cc10..ac41d3810f1 100644
--- a/phpBB/phpbb/auth/provider_collection.php
+++ b/phpBB/phpbb/auth/provider_collection.php
@@ -39,7 +39,7 @@ public function __construct(ContainerInterface $container, \phpbb\config\config
 	* Get an auth provider.
 	*
 	* @param string $provider_name The name of the auth provider
-	* @return object	Default auth provider selected in config if it
+	* @return provider\provider_interface	Default auth provider selected in config if it
 	*			does exist. Otherwise the standard db auth
 	*			provider.
 	* @throws \RuntimeException If neither the auth provider that
diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php
index 03c4790a6e8..d1e02ff7bcd 100644
--- a/phpBB/phpbb/avatar/driver/driver.php
+++ b/phpBB/phpbb/avatar/driver/driver.php
@@ -82,7 +82,7 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface
 	* @param \phpbb\path_helper $path_helper phpBB path helper
 	* @param \phpbb\cache\driver\driver_interface|null $cache Cache driver
 	*/
-	public function __construct(\phpbb\config\config $config, \FastImageSize\FastImageSize $imagesize, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\cache\driver\driver_interface $cache = null)
+	public function __construct(\phpbb\config\config $config, \FastImageSize\FastImageSize $imagesize, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\cache\driver\driver_interface|null $cache = null)
 	{
 		$this->config = $config;
 		$this->imagesize = $imagesize;
@@ -129,7 +129,7 @@ public function get_name()
 	*/
 	public function get_config_name()
 	{
-		return preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($this));
+		return preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($this)) ?: '';
 	}
 
 	/**
diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php
index ea774973907..d72e6df604e 100644
--- a/phpBB/phpbb/avatar/driver/gravatar.php
+++ b/phpBB/phpbb/avatar/driver/gravatar.php
@@ -21,7 +21,7 @@ class gravatar extends \phpbb\avatar\driver\driver
 	/**
 	* The URL for the gravatar service
 	*/
-	const GRAVATAR_URL = '//secure.gravatar.com/avatar/';
+	const GRAVATAR_URL = '//gravatar.com/avatar/';
 
 	/**
 	* {@inheritdoc}
@@ -29,7 +29,7 @@ class gravatar extends \phpbb\avatar\driver\driver
 	public function get_data($row)
 	{
 		return array(
-			'src' => $row['avatar'],
+			'src' => $this->get_gravatar_url($row),
 			'width' => $row['avatar_width'],
 			'height' => $row['avatar_height'],
 		);
@@ -53,7 +53,7 @@ public function prepare_form($request, $template, $user, $row, &$error)
 	{
 		$template->assign_vars(array(
 			'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_gravatar_width', ''),
-			'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_gravatar_width', ''),
+			'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_gravatar_height', ''),
 			'AVATAR_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
 		));
 
@@ -175,7 +175,7 @@ protected function get_gravatar_url($row)
 		global $phpbb_dispatcher;
 
 		$url = self::GRAVATAR_URL;
-		$url .=  md5(strtolower(trim($row['avatar'])));
+		$url .= hash('sha256', strtolower(trim($row['avatar'])));
 
 		if ($row['avatar_width'] || $row['avatar_height'])
 		{
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index 416034b6741..51425b506ff 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -15,11 +15,11 @@
 
 use bantu\IniGetWrapper\IniGetWrapper;
 use phpbb\config\config;
-use phpbb\controller\helper;
 use phpbb\event\dispatcher_interface;
 use phpbb\files\factory;
 use phpbb\path_helper;
-use phpbb\storage\exception\exception as storage_exception;
+use phpbb\routing\helper;
+use phpbb\storage\exception\storage_exception;
 use phpbb\storage\storage;
 
 /**
@@ -30,7 +30,7 @@ class upload extends \phpbb\avatar\driver\driver
 	/**
 	 * @var helper
 	 */
-	private $controller_helper;
+	private $routing_helper;
 
 	/**
 	 * @var storage
@@ -56,23 +56,23 @@ class upload extends \phpbb\avatar\driver\driver
 	 * Construct a driver object
 	 *
 	 * @param config $config phpBB configuration
-	 * @param helper $controller_helper
 	 * @param string $phpbb_root_path Path to the phpBB root
 	 * @param string $php_ext PHP file extension
 	 * @param storage $storage phpBB avatar storage
 	 * @param path_helper $path_helper phpBB path helper
+	 * @param helper $routing_helper phpBB routing helper
 	 * @param dispatcher_interface $dispatcher phpBB Event dispatcher object
 	 * @param factory $files_factory File classes factory
 	 * @param IniGetWrapper $php_ini ini_get() wrapper
 	 */
-	public function __construct(config $config, helper $controller_helper, string $phpbb_root_path, string $php_ext, storage $storage, path_helper $path_helper, dispatcher_interface $dispatcher, factory $files_factory, IniGetWrapper $php_ini)
+	public function __construct(config $config, string $phpbb_root_path, string $php_ext, storage $storage, path_helper $path_helper, helper $routing_helper, dispatcher_interface $dispatcher, factory $files_factory, IniGetWrapper $php_ini)
 	{
 		$this->config = $config;
-		$this->controller_helper = $controller_helper;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 		$this->storage = $storage;
 		$this->path_helper = $path_helper;
+		$this->routing_helper = $routing_helper;
 		$this->dispatcher = $dispatcher;
 		$this->files_factory = $files_factory;
 		$this->php_ini = $php_ini;
@@ -84,7 +84,7 @@ public function __construct(config $config, helper $controller_helper, string $p
 	public function get_data($row)
 	{
 		return array(
-			'src' => $this->controller_helper->route('phpbb_storage_avatar', ['file' => $row['avatar']]),
+			'src' => $this->routing_helper->route('phpbb_storage_avatar', ['file' => $row['avatar']]),
 			'width' => $row['avatar_width'],
 			'height' => $row['avatar_height'],
 		);
diff --git a/phpBB/phpbb/avatar/helper.php b/phpBB/phpbb/avatar/helper.php
index 51592b584fe..119cd5dc210 100644
--- a/phpBB/phpbb/avatar/helper.php
+++ b/phpBB/phpbb/avatar/helper.php
@@ -81,7 +81,7 @@ public function __construct(
 	 */
 	public function get_template_vars(array $avatar, string $prefix = ''): array
 	{
-		$prefix = $prefix && substr($prefix, -1) !== '_' ? "{$prefix}_" : $prefix;
+		$prefix = $prefix && !str_ends_with($prefix, '_') ? "{$prefix}_" : $prefix;
 
 		return [
 			"{$prefix}AVATAR"			=> $avatar,
@@ -94,7 +94,6 @@ public function get_template_vars(array $avatar, string $prefix = ''): array
 			"{$prefix}AVATAR_HEIGHT"	=> $avatar['height'],
 
 			"{$prefix}AVATAR_LAZY"		=> $avatar['lazy'],
-			"{$prefix}AVATAR_HTML"		=> $avatar['html'],
 		];
 	}
 
@@ -144,7 +143,8 @@ public function get_avatar(array $row, string $title, bool $ignore_config = fals
 		if (!$this->config['allow_avatar'] && !$ignore_config)
 		{
 			return [
-				'html'		=> '',
+				'id'		=> 0,
+				'username'	=> '',
 				'lazy'		=> false,
 				'src'		=> '',
 				'title'		=> '',
@@ -155,6 +155,8 @@ public function get_avatar(array $row, string $title, bool $ignore_config = fals
 		}
 
 		$data = [
+			'id'		=> $row['id'] ?? 0,
+			'username'	=> $row['username'] ?? '',
 			'src'		=> $row['avatar'],
 			'width'		=> $row['avatar_width'],
 			'height'	=> $row['avatar_height'],
@@ -252,7 +254,7 @@ private function get_avatar_html(array $data): string
 	{
 		if ($data['lazy'])
 		{
-			$data['src'] = $this->get_no_avatar_source() . ' data-src="' . $data['src'];
+			$data['src'] = $this->get_no_avatar_source() . '" data-src="' . $data['src'];
 		}
 
 		$src = ' src="' . $data['src'] . '"';
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php
index f4fc16ab52c..c4bc49de43b 100644
--- a/phpBB/phpbb/avatar/manager.php
+++ b/phpBB/phpbb/avatar/manager.php
@@ -202,9 +202,15 @@ public static function clean_row($row, $prefix = '')
 			return self::$default_row;
 		}
 
+		$required_keys = ['user_id', 'group_id', 'username'];
 		$output = [];
 		foreach ($row as $key => $value)
 		{
+			if (!str_starts_with($key, $prefix ? "{$prefix}_avatar": 'avatar') && !in_array($key, $required_keys))
+			{
+				continue;
+			}
+
 			$key = preg_replace("#^(?:{$prefix}_)#", '', (string) $key);
 			$output[$key] = $value;
 		}
diff --git a/phpBB/phpbb/ban/type/email.php b/phpBB/phpbb/ban/type/email.php
index 213084fc244..5eef248eb32 100644
--- a/phpBB/phpbb/ban/type/email.php
+++ b/phpBB/phpbb/ban/type/email.php
@@ -28,7 +28,7 @@ public function get_type(): string
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_user_column(): ?string
+	public function get_user_column(): string|null
 	{
 		return 'user_email';
 	}
diff --git a/phpBB/phpbb/ban/type/ip.php b/phpBB/phpbb/ban/type/ip.php
index 7f8c6ee81dc..6dfa807a30a 100644
--- a/phpBB/phpbb/ban/type/ip.php
+++ b/phpBB/phpbb/ban/type/ip.php
@@ -31,7 +31,7 @@ public function get_type(): string
 	/**
 	 * @inheritDoc
 	 */
-	public function get_user_column(): ?string
+	public function get_user_column(): string|null
 	{
 		return null;
 	}
diff --git a/phpBB/phpbb/ban/type/type_interface.php b/phpBB/phpbb/ban/type/type_interface.php
index db86fc8ae77..346b57072e6 100644
--- a/phpBB/phpbb/ban/type/type_interface.php
+++ b/phpBB/phpbb/ban/type/type_interface.php
@@ -33,7 +33,7 @@ public function get_type(): string;
 	 *
 	 * @return string|null
 	 */
-	public function get_user_column(): ?string;
+	public function get_user_column(): string|null;
 
 	/**
 	 * Sets a user object to the ban type to have it excluded
diff --git a/phpBB/phpbb/cache/driver/base.php b/phpBB/phpbb/cache/driver/base.php
index a93e6ce08c0..9dfc28b3f65 100644
--- a/phpBB/phpbb/cache/driver/base.php
+++ b/phpBB/phpbb/cache/driver/base.php
@@ -31,33 +31,33 @@ function purge()
 		try
 		{
 			$iterator = new \DirectoryIterator($this->cache_dir);
-		}
-		catch (\Exception $e)
-		{
-			return;
-		}
 
-		foreach ($iterator as $fileInfo)
-		{
-			if ($fileInfo->isDot())
+			foreach ($iterator as $fileInfo)
 			{
-				continue;
-			}
-			$filename = $fileInfo->getFilename();
-			if ($fileInfo->isDir())
-			{
-				$this->remove_dir($fileInfo->getPathname());
-			}
-			else if (strpos($filename, 'container_') === 0 ||
-				strpos($filename, 'autoload_') === 0 ||
-				strpos($filename, 'url_matcher') === 0 ||
-				strpos($filename, 'url_generator') === 0 ||
-				strpos($filename, 'sql_') === 0 ||
-				strpos($filename, 'data_') === 0)
-			{
-				$this->remove_file($fileInfo->getPathname());
+				if ($fileInfo->isDot())
+				{
+					continue;
+				}
+				$filename = $fileInfo->getFilename();
+				if ($fileInfo->isDir())
+				{
+					$this->remove_dir($fileInfo->getPathname());
+				}
+				else if (strpos($filename, 'container_') === 0 ||
+					strpos($filename, 'autoload_') === 0 ||
+					strpos($filename, 'url_matcher') === 0 ||
+					strpos($filename, 'url_generator') === 0 ||
+					strpos($filename, 'sql_') === 0 ||
+					strpos($filename, 'data_') === 0)
+				{
+					$this->remove_file($fileInfo->getPathname());
+				}
 			}
 		}
+		catch (\Exception $e)
+		{
+			// Do not return, to purge vars cached in memory
+		}
 
 		unset($this->vars);
 		unset($this->sql_rowset);
diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
index 0a4f0ae31e9..ef62cd3d259 100644
--- a/phpBB/phpbb/cache/driver/file.php
+++ b/phpBB/phpbb/cache/driver/file.php
@@ -330,6 +330,27 @@ function sql_save(\phpbb\db\driver\driver_interface $db, $query, $query_result,
 		return $query_result;
 	}
 
+	/**
+	 * Cleanup when loading invalid data global file
+	 *
+	 * @param string $file Filename
+	 * @param resource $handle
+	 *
+	 * @return void
+	 */
+	private function cleanup_invalid_data_global(string $file, $handle): void
+	{
+		if (is_resource($handle))
+		{
+			fclose($handle);
+		}
+
+		$this->vars = $this->var_expires = [];
+		$this->is_modified = false;
+
+		$this->remove_file($file);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -368,14 +389,7 @@ protected function _read(string $var)
 
 				if (!is_numeric($bytes) || ($bytes = (int) $bytes) === 0)
 				{
-					// We cannot process the file without a valid number of bytes
-					// so we discard it
-					fclose($handle);
-
-					$this->vars = $this->var_expires = array();
-					$this->is_modified = false;
-
-					$this->remove_file($file);
+					$this->cleanup_invalid_data_global($file, $handle);
 
 					return false;
 				}
@@ -388,9 +402,17 @@ protected function _read(string $var)
 				}
 
 				$var_name = substr(fgets($handle), 0, -1);
+				$data_length = $bytes - strlen($var_name);
+
+				if ($data_length <= 0)
+				{
+					$this->cleanup_invalid_data_global($file, $handle);
+
+					return false;
+				}
 
 				// Read the length of bytes that consists of data.
-				$data = fread($handle, $bytes - strlen($var_name));
+				$data = fread($handle, $data_length);
 				$data = @unserialize($data);
 
 				// Don't use the data if it was invalid
diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php
index 0a4ea304ad7..feee5888608 100644
--- a/phpBB/phpbb/cache/driver/memory.php
+++ b/phpBB/phpbb/cache/driver/memory.php
@@ -45,6 +45,19 @@ function __construct()
 		}
 	}
 
+	/**
+	* {@inheritDoc}
+	*/
+	function purge()
+	{
+		parent::purge();
+
+		$this->is_modified = true;
+
+		// We save here to let the following cache hits succeed
+		$this->save();
+	}
+
 	/**
 	* {@inheritDoc}
 	*/
diff --git a/phpBB/phpbb/cache/driver/redis.php b/phpBB/phpbb/cache/driver/redis.php
index c0b47dae46c..5a8332a15b9 100644
--- a/phpBB/phpbb/cache/driver/redis.php
+++ b/phpBB/phpbb/cache/driver/redis.php
@@ -123,15 +123,17 @@ protected function _read(string $var)
 	}
 
 	/**
-	* {@inheritDoc}
-	*/
+	 * Store data in the cache
+	 *
+	 * For the info, see https://phpredis.github.io/phpredis/Redis.html#method_set,
+	 * https://redis.io/docs/latest/commands/set/
+	 * and https://redis.io/docs/latest/commands/expire/#appendix-redis-expires
+	 *
+	 * {@inheritDoc}
+	 */
 	protected function _write(string $var, $data, int $ttl = 2592000): bool
 	{
-		if ($ttl == 0)
-		{
-			return $this->redis->set($var, $data);
-		}
-		return $this->redis->setex($var, $ttl, $data);
+		return $this->redis->set($var, $data, ['EXAT' => time() + $ttl]);
 	}
 
 	/**
@@ -139,7 +141,7 @@ protected function _write(string $var, $data, int $ttl = 2592000): bool
 	 */
 	protected function _delete(string $var): bool
 	{
-		if ($this->redis->delete($var) > 0)
+		if ($this->redis->del($var) > 0)
 		{
 			return true;
 		}
diff --git a/phpBB/phpbb/captcha/char_cube3d.php b/phpBB/phpbb/captcha/char_cube3d.php
deleted file mode 100644
index 0255259ac4f..00000000000
--- a/phpBB/phpbb/captcha/char_cube3d.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\captcha;
-
-class char_cube3d
-{
-	var $bitmap;
-	var $bitmap_width;
-	var $bitmap_height;
-
-	var $basis_matrix = array(array(1, 0, 0), array(0, 1, 0), array(0, 0, 1));
-	var $abs_x = array(1, 0);
-	var $abs_y = array(0, 1);
-	var $x = 0;
-	var $y = 1;
-	var $z = 2;
-	var $letter = '';
-
-	/**
-	*/
-	function __construct(&$bitmaps, $letter)
-	{
-		$this->bitmap			= $bitmaps['data'][$letter];
-		$this->bitmap_width		= $bitmaps['width'];
-		$this->bitmap_height	= $bitmaps['height'];
-
-		$this->basis_matrix[0][0] = mt_rand(-600, 600);
-		$this->basis_matrix[0][1] = mt_rand(-600, 600);
-		$this->basis_matrix[0][2] = (mt_rand(0, 1) * 2000) - 1000;
-		$this->basis_matrix[1][0] = mt_rand(-1000, 1000);
-		$this->basis_matrix[1][1] = mt_rand(-1000, 1000);
-		$this->basis_matrix[1][2] = mt_rand(-1000, 1000);
-
-		$this->normalize($this->basis_matrix[0]);
-		$this->normalize($this->basis_matrix[1]);
-		$this->basis_matrix[2] = $this->cross_product($this->basis_matrix[0], $this->basis_matrix[1]);
-		$this->normalize($this->basis_matrix[2]);
-
-		// $this->basis_matrix[1] might not be (probably isn't) orthogonal to $basis_matrix[0]
-		$this->basis_matrix[1] = $this->cross_product($this->basis_matrix[0], $this->basis_matrix[2]);
-		$this->normalize($this->basis_matrix[1]);
-
-		// Make sure our cube is facing into the canvas (assuming +z == in)
-		for ($i = 0; $i < 3; ++$i)
-		{
-			if ($this->basis_matrix[$i][2] < 0)
-			{
-				$this->basis_matrix[$i][0] *= -1;
-				$this->basis_matrix[$i][1] *= -1;
-				$this->basis_matrix[$i][2] *= -1;
-			}
-		}
-
-		// Force our "z" basis vector to be the one with greatest absolute z value
-		$this->x = 0;
-		$this->y = 1;
-		$this->z = 2;
-
-		// Swap "y" with "z"
-		if ($this->basis_matrix[1][2] > $this->basis_matrix[2][2])
-		{
-			$this->z = 1;
-			$this->y = 2;
-		}
-
-		// Swap "x" with "z"
-		if ($this->basis_matrix[0][2] > $this->basis_matrix[$this->z][2])
-		{
-			$this->x = $this->z;
-			$this->z = 0;
-		}
-
-		// Still need to determine which of $x,$y are which.
-		// wrong orientation if y's y-component is less than it's x-component
-		// likewise if x's x-component is less than it's y-component
-		// if they disagree, go with the one with the greater weight difference.
-		// rotate if positive
-		$weight = (abs($this->basis_matrix[$this->x][1]) - abs($this->basis_matrix[$this->x][0])) + (abs($this->basis_matrix[$this->y][0]) - abs($this->basis_matrix[$this->y][1]));
-
-		// Swap "x" with "y"
-		if ($weight > 0)
-		{
-			list($this->x, $this->y) = array($this->y, $this->x);
-		}
-
-		$this->abs_x = array($this->basis_matrix[$this->x][0], $this->basis_matrix[$this->x][1]);
-		$this->abs_y = array($this->basis_matrix[$this->y][0], $this->basis_matrix[$this->y][1]);
-
-		if ($this->abs_x[0] < 0)
-		{
-			$this->abs_x[0] *= -1;
-			$this->abs_x[1] *= -1;
-		}
-
-		if ($this->abs_y[1] > 0)
-		{
-			$this->abs_y[0] *= -1;
-			$this->abs_y[1] *= -1;
-		}
-
-		$this->letter = $letter;
-	}
-
-	/**
-	* Draw a character
-	*/
-	function drawchar($scale, $xoff, $yoff, $img, $background, $colours)
-	{
-		$width	= $this->bitmap_width;
-		$height	= $this->bitmap_height;
-		$bitmap	= $this->bitmap;
-
-		$colour1 = $colours[array_rand($colours)];
-		$colour2 = $colours[array_rand($colours)];
-
-		$swapx = ($this->basis_matrix[$this->x][0] > 0);
-		$swapy = ($this->basis_matrix[$this->y][1] < 0);
-
-		for ($y = 0; $y < $height; ++$y)
-		{
-			for ($x = 0; $x < $width; ++$x)
-			{
-				$xp = ($swapx) ? ($width - $x - 1) : $x;
-				$yp = ($swapy) ? ($height - $y - 1) : $y;
-
-				if ($bitmap[$height - $yp - 1][$xp])
-				{
-					$dx = $this->scale($this->abs_x, ($xp - ($swapx ? ($width / 2) : ($width / 2) - 1)) * $scale);
-					$dy = $this->scale($this->abs_y, ($yp - ($swapy ? ($height / 2) : ($height / 2) - 1)) * $scale);
-					$xo = $xoff + $dx[0] + $dy[0];
-					$yo = $yoff + $dx[1] + $dy[1];
-
-					$origin = array(0, 0, 0);
-					$xvec = $this->scale($this->basis_matrix[$this->x], $scale);
-					$yvec = $this->scale($this->basis_matrix[$this->y], $scale);
-					$face_corner = $this->sum2($xvec, $yvec);
-
-					$zvec = $this->scale($this->basis_matrix[$this->z], $scale);
-					$x_corner = $this->sum2($xvec, $zvec);
-					$y_corner = $this->sum2($yvec, $zvec);
-
-					imagefilledpolygon($img, $this->gen_poly($xo, $yo, $origin, $xvec, $x_corner,$zvec), 4, $colour1);
-					imagefilledpolygon($img, $this->gen_poly($xo, $yo, $origin, $yvec, $y_corner,$zvec), 4, $colour2);
-
-					$face = $this->gen_poly($xo, $yo, $origin, $xvec, $face_corner, $yvec);
-
-					imagefilledpolygon($img, $face, 4, $background);
-					imagepolygon($img, $face, 4, $colour1);
-				}
-			}
-		}
-	}
-
-	/*
-	* return a roughly acceptable range of sizes for rendering with this texttype
-	*/
-	function range()
-	{
-		return array(3, 4);
-	}
-
-	/**
-	* Vector length
-	*/
-	function vectorlen($vector)
-	{
-		return sqrt(pow($vector[0], 2) + pow($vector[1], 2) + pow($vector[2], 2));
-	}
-
-	/**
-	* Normalize
-	*/
-	function normalize(&$vector, $length = 1)
-	{
-		$length = (( $length < 1) ? 1 : $length);
-		$length /= $this->vectorlen($vector);
-		$vector[0] *= $length;
-		$vector[1] *= $length;
-		$vector[2] *= $length;
-	}
-
-	/**
-	*/
-	function cross_product($vector1, $vector2)
-	{
-		$retval = array(0, 0, 0);
-		$retval[0] =  (($vector1[1] * $vector2[2]) - ($vector1[2] * $vector2[1]));
-		$retval[1] = -(($vector1[0] * $vector2[2]) - ($vector1[2] * $vector2[0]));
-		$retval[2] =  (($vector1[0] * $vector2[1]) - ($vector1[1] * $vector2[0]));
-
-		return $retval;
-	}
-
-	/**
-	*/
-	function sum($vector1, $vector2)
-	{
-		return array($vector1[0] + $vector2[0], $vector1[1] + $vector2[1], $vector1[2] + $vector2[2]);
-	}
-
-	/**
-	*/
-	function sum2($vector1, $vector2)
-	{
-		return array($vector1[0] + $vector2[0], $vector1[1] + $vector2[1]);
-	}
-
-	/**
-	*/
-	function scale($vector, $length)
-	{
-		if (count($vector) == 2)
-		{
-			return array($vector[0] * $length, $vector[1] * $length);
-		}
-
-		return array($vector[0] * $length, $vector[1] * $length, $vector[2] * $length);
-	}
-
-	/**
-	*/
-	function gen_poly($xoff, $yoff, &$vec1, &$vec2, &$vec3, &$vec4)
-	{
-		$poly = array();
-		$poly[0] = $xoff + $vec1[0];
-		$poly[1] = $yoff + $vec1[1];
-		$poly[2] = $xoff + $vec2[0];
-		$poly[3] = $yoff + $vec2[1];
-		$poly[4] = $xoff + $vec3[0];
-		$poly[5] = $yoff + $vec3[1];
-		$poly[6] = $xoff + $vec4[0];
-		$poly[7] = $yoff + $vec4[1];
-
-		return $poly;
-	}
-
-	/**
-	* dimensions
-	*/
-	function dimensions($size)
-	{
-		$xn = $this->scale($this->basis_matrix[$this->x], -($this->bitmap_width / 2) * $size);
-		$xp = $this->scale($this->basis_matrix[$this->x], ($this->bitmap_width / 2) * $size);
-		$yn = $this->scale($this->basis_matrix[$this->y], -($this->bitmap_height / 2) * $size);
-		$yp = $this->scale($this->basis_matrix[$this->y], ($this->bitmap_height / 2) * $size);
-
-		$p = array();
-		$p[0] = $this->sum2($xn, $yn);
-		$p[1] = $this->sum2($xp, $yn);
-		$p[2] = $this->sum2($xp, $yp);
-		$p[3] = $this->sum2($xn, $yp);
-
-		$min_x = $max_x = $p[0][0];
-		$min_y = $max_y = $p[0][1];
-
-		for ($i = 1; $i < 4; ++$i)
-		{
-			$min_x = ($min_x > $p[$i][0]) ? $p[$i][0] : $min_x;
-			$min_y = ($min_y > $p[$i][1]) ? $p[$i][1] : $min_y;
-			$max_x = ($max_x < $p[$i][0]) ? $p[$i][0] : $max_x;
-			$max_y = ($max_y < $p[$i][1]) ? $p[$i][1] : $max_y;
-		}
-
-		return array($min_x, $min_y, $max_x, $max_y);
-	}
-}
diff --git a/phpBB/phpbb/captcha/colour_manager.php b/phpBB/phpbb/captcha/colour_manager.php
deleted file mode 100644
index 82332da8103..00000000000
--- a/phpBB/phpbb/captcha/colour_manager.php
+++ /dev/null
@@ -1,527 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\captcha;
-
-class colour_manager
-{
-	var $img;
-	var $mode;
-	var $colours;
-	var $named_colours;
-
-	/**
-	* Create the colour manager, link it to the image resource
-	*/
-	function __construct($img, $background = false, $mode = 'ahsv')
-	{
-		$this->img = $img;
-		$this->mode = $mode;
-		$this->colours = array();
-		$this->named_colours = array();
-
-		if ($background !== false)
-		{
-			$bg = $this->allocate_named('background', $background);
-			imagefill($this->img, 0, 0, $bg);
-		}
-	}
-
-	/**
-	* Lookup a named colour resource
-	*/
-	function get_resource($named_colour)
-	{
-		if (isset($this->named_colours[$named_colour]))
-		{
-			return $this->named_colours[$named_colour];
-		}
-
-		if (isset($this->named_rgb[$named_colour]))
-		{
-			return $this->allocate_named($named_colour, $this->named_rgb[$named_colour], 'rgb');
-		}
-
-		return false;
-	}
-
-	/**
-	* Assign a name to a colour resource
-	*/
-	function name_colour($name, $resource)
-	{
-		$this->named_colours[$name] = $resource;
-	}
-
-	/**
-	* names and allocates a colour resource
-	*/
-	function allocate_named($name, $colour, $mode = false)
-	{
-		$resource = $this->allocate($colour, $mode);
-
-		if ($resource !== false)
-		{
-			$this->name_colour($name, $resource);
-		}
-		return $resource;
-	}
-
-	/**
-	* allocates a specified colour into the image
-	*/
-	function allocate($colour, $mode = false)
-	{
-		if ($mode === false)
-		{
-			$mode = $this->mode;
-		}
-
-		if (!is_array($colour))
-		{
-			if (isset($this->named_rgb[$colour]))
-			{
-				return $this->allocate_named($colour, $this->named_rgb[$colour], 'rgb');
-			}
-
-			if (!is_int($colour))
-			{
-				return false;
-			}
-
-			$mode = 'rgb';
-			$colour = array(255 & ($colour >> 16), 255 & ($colour >>  8), 255 & $colour);
-		}
-
-		if (isset($colour['mode']))
-		{
-			$mode = $colour['mode'];
-			unset($colour['mode']);
-		}
-
-		if (isset($colour['random']))
-		{
-			unset($colour['random']);
-			// everything else is params
-			return $this->random_colour($colour, $mode);
-		}
-
-		$rgb		= $this->model_convert($colour, $mode, 'rgb');
-		$store		= ($this->mode == 'rgb') ? $rgb : $this->model_convert($colour, $mode, $this->mode);
-		$resource	= imagecolorallocate($this->img, $rgb[0], $rgb[1], $rgb[2]);
-		$this->colours[$resource] = $store;
-
-		return $resource;
-	}
-
-	/**
-	* randomly generates a colour, with optional params
-	*/
-	function random_colour($params = array(), $mode = false)
-	{
-		if ($mode === false)
-		{
-			$mode = $this->mode;
-		}
-
-		switch ($mode)
-		{
-			case 'rgb':
-				// @TODO random rgb generation. do we intend to do this, or is it just too tedious?
-				break;
-
-			case 'ahsv':
-			case 'hsv':
-			default:
-
-				$default_params = array(
-					'hue_bias'			=> false,	// degree / 'r'/'g'/'b'/'c'/'m'/'y'   /'o'
-					'hue_range'			=> false,	// if hue bias, then difference range +/- from bias
-					'min_saturation'	=> 30,		// 0 - 100
-					'max_saturation'	=> 80,		// 0 - 100
-					'min_value'			=> 30,		// 0 - 100
-					'max_value'			=> 80,		// 0 - 100
-				);
-
-				$alt = ($mode == 'ahsv') ? true : false;
-				$params = array_merge($default_params, $params);
-
-				$min_hue		= 0;
-				$max_hue		= 359;
-				$min_saturation	= max(0, $params['min_saturation']);
-				$max_saturation	= min(100, $params['max_saturation']);
-				$min_value		= max(0, $params['min_value']);
-				$max_value		= min(100, $params['max_value']);
-
-				if ($params['hue_bias'] !== false)
-				{
-					if (is_numeric($params['hue_bias']))
-					{
-						$h = intval($params['hue_bias']) % 360;
-					}
-					else
-					{
-						switch ($params['hue_bias'])
-						{
-							case 'o':
-								$h = $alt ?  60 :  30;
-								break;
-
-							case 'y':
-								$h = $alt ? 120 :  60;
-								break;
-
-							case 'g':
-								$h = $alt ? 180 : 120;
-								break;
-
-							case 'c':
-								$h = $alt ? 210 : 180;
-								break;
-
-							case 'b':
-								$h = 240;
-								break;
-
-							case 'm':
-								$h = 300;
-								break;
-
-							case 'r':
-							default:
-								$h = 0;
-								break;
-						}
-					}
-
-					$min_hue = $h + 360;
-					$max_hue = $h + 360;
-
-					if ($params['hue_range'])
-					{
-						$min_hue -= min(180, $params['hue_range']);
-						$max_hue += min(180, $params['hue_range']);
-					}
-				}
-
-				$h = mt_rand($min_hue, $max_hue);
-				$s = mt_rand($min_saturation, $max_saturation);
-				$v = mt_rand($min_value, $max_value);
-
-				return $this->allocate(array($h, $s, $v), $mode);
-
-				break;
-		}
-	}
-
-	/**
-	*/
-	function colour_scheme($resource, $include_original = true)
-	{
-		$mode = 'hsv';
-
-		if (($pre = $this->get_resource($resource)) !== false)
-		{
-			$resource = $pre;
-		}
-
-		$colour = $this->model_convert($this->colours[$resource], $this->mode, $mode);
-		$results = ($include_original) ? array($resource) : array();
-		$colour2 = $colour3 = $colour4 = $colour;
-		$colour2[0] += 150;
-		$colour3[0] += 180;
-		$colour4[0] += 210;
-
-		$results[] = $this->allocate($colour2, $mode);
-		$results[] = $this->allocate($colour3, $mode);
-		$results[] = $this->allocate($colour4, $mode);
-
-		return $results;
-	}
-
-	/**
-	*/
-	function mono_range($resource, $count = 5, $include_original = true)
-	{
-		if (is_array($resource))
-		{
-			$results = array();
-			for ($i = 0, $size = count($resource); $i < $size; ++$i)
-			{
-				$results = array_merge($results, $this->mono_range($resource[$i], $count, $include_original));
-			}
-			return $results;
-		}
-
-		$mode = (in_array($this->mode, array('hsv', 'ahsv'), true) ? $this->mode : 'ahsv');
-		if (($pre = $this->get_resource($resource)) !== false)
-		{
-			$resource = $pre;
-		}
-
-		$colour = $this->model_convert($this->colours[$resource], $this->mode, $mode);
-
-		$results = array();
-		if ($include_original)
-		{
-			$results[] = $resource;
-			$count--;
-		}
-
-		// This is a hard problem. I chicken out and try to maintain readability at the cost of less randomness.
-
-		while ($count > 0)
-		{
-			$colour[1] = ($colour[1] + mt_rand(40,60)) % 99;
-			$colour[2] = ($colour[2] + mt_rand(40,60));
-			$results[] = $this->allocate($colour, $mode);
-			$count--;
-		}
-		return $results;
-	}
-
-	/**
-	* Convert from one colour model to another
-	*/
-	function model_convert($colour, $from_model, $to_model)
-	{
-		if ($from_model == $to_model)
-		{
-			return $colour;
-		}
-
-		switch ($to_model)
-		{
-			case 'hsv':
-
-				switch ($from_model)
-				{
-					case 'ahsv':
-						return $this->ah2h($colour);
-						break;
-
-					case 'rgb':
-						return $this->rgb2hsv($colour);
-						break;
-				}
-				break;
-
-			case 'ahsv':
-
-				switch ($from_model)
-				{
-					case 'hsv':
-						return $this->h2ah($colour);
-						break;
-
-					case 'rgb':
-						return $this->h2ah($this->rgb2hsv($colour));
-						break;
-				}
-				break;
-
-			case 'rgb':
-				switch ($from_model)
-				{
-					case 'hsv':
-						return $this->hsv2rgb($colour);
-						break;
-
-					case 'ahsv':
-						return $this->hsv2rgb($this->ah2h($colour));
-						break;
-				}
-				break;
-		}
-		return false;
-	}
-
-	/**
-	* Slightly altered from wikipedia's algorithm
-	*/
-	function hsv2rgb($hsv)
-	{
-		$this->normalize_hue($hsv[0]);
-
-		$h = $hsv[0];
-		$s = min(1, max(0, $hsv[1] / 100));
-		$v = min(1, max(0, $hsv[2] / 100));
-
-		// calculate hue sector
-		$hi = floor($hsv[0] / 60);
-
-		// calculate opposite colour
-		$p = $v * (1 - $s);
-
-		// calculate distance between hex vertices
-		$f = ($h / 60) - $hi;
-
-		// coming in or going out?
-		if (!($hi & 1))
-		{
-			$f = 1 - $f;
-		}
-
-		// calculate adjacent colour
-		$q = $v * (1 - ($f * $s));
-
-		switch ($hi)
-		{
-			case 0:
-				$rgb = array($v, $q, $p);
-				break;
-
-			case 1:
-				$rgb = array($q, $v, $p);
-				break;
-
-			case 2:
-				$rgb = array($p, $v, $q);
-				break;
-
-			case 3:
-				$rgb = array($p, $q, $v);
-				break;
-
-			case 4:
-				$rgb = array($q, $p, $v);
-				break;
-
-			case 5:
-				$rgb = array($v, $p, $q);
-				break;
-
-			default:
-				return array(0, 0, 0);
-				break;
-		}
-
-		return array(255 * $rgb[0], 255 * $rgb[1], 255 * $rgb[2]);
-	}
-
-	/**
-	* (more than) Slightly altered from wikipedia's algorithm
-	*/
-	function rgb2hsv($rgb)
-	{
-		$r = min(255, max(0, $rgb[0]));
-		$g = min(255, max(0, $rgb[1]));
-		$b = min(255, max(0, $rgb[2]));
-		$max = max($r, $g, $b);
-		$min = min($r, $g, $b);
-
-		$v = $max / 255;
-		$s = (!$max) ? 0 : 1 - ($min / $max);
-
-		// if max - min is 0, we want hue to be 0 anyway.
-		$h = $max - $min;
-
-		if ($h)
-		{
-			switch ($max)
-			{
-				case $g:
-					$h = 120 + (60 * ($b - $r) / $h);
-					break;
-
-				case $b:
-					$h = 240 + (60 * ($r - $g) / $h);
-					break;
-
-				case $r:
-					$h = 360 + (60 * ($g - $b) / $h);
-					break;
-			}
-		}
-		$this->normalize_hue($h);
-
-		return array($h, $s * 100, $v * 100);
-	}
-
-	/**
-	*/
-	function normalize_hue(&$hue)
-	{
-		$hue %= 360;
-
-		if ($hue < 0)
-		{
-			$hue += 360;
-		}
-	}
-
-	/**
-	* Alternate hue to hue
-	*/
-	function ah2h($ahue)
-	{
-		if (is_array($ahue))
-		{
-			$ahue[0] = $this->ah2h($ahue[0]);
-			return $ahue;
-		}
-		$this->normalize_hue($ahue);
-
-		// blue through red is already ok
-		if ($ahue >= 240)
-		{
-			return $ahue;
-		}
-
-		// ahue green is at 180
-		if ($ahue >= 180)
-		{
-			// return (240 - (2 * (240 - $ahue)));
-			return (2 * $ahue) - 240; // equivalent
-		}
-
-		// ahue yellow is at 120   (RYB rather than RGB)
-		if ($ahue >= 120)
-		{
-			return $ahue - 60;
-		}
-
-		return $ahue / 2;
-	}
-
-	/**
-	* hue to Alternate hue
-	*/
-	function h2ah($hue)
-	{
-		if (is_array($hue))
-		{
-			$hue[0] = $this->h2ah($hue[0]);
-			return $hue;
-		}
-		$this->normalize_hue($hue);
-
-		// blue through red is already ok
-		if ($hue >= 240)
-		{
-			return $hue;
-		}
-		else if ($hue <= 60)
-		{
-			return $hue * 2;
-		}
-		else if ($hue <= 120)
-		{
-			return $hue + 60;
-		}
-		else
-		{
-			return ($hue + 240) / 2;
-		}
-	}
-}
diff --git a/phpBB/phpbb/captcha/factory.php b/phpBB/phpbb/captcha/factory.php
index 2e75ce8667f..fc974569bb5 100644
--- a/phpBB/phpbb/captcha/factory.php
+++ b/phpBB/phpbb/captcha/factory.php
@@ -13,6 +13,9 @@
 
 namespace phpbb\captcha;
 
+use phpbb\captcha\plugins\legacy_wrapper;
+use phpbb\captcha\plugins\plugin_interface;
+
 class factory
 {
 	/**
@@ -41,11 +44,17 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte
 	* Return a new instance of a given plugin
 	*
 	* @param $name
-	* @return object|null
+	* @return plugin_interface
 	*/
-	public function get_instance($name)
+	public function get_instance($name): plugin_interface
 	{
-		return $this->container->get($name);
+		$captcha = $this->container->get($name);
+		if ($captcha instanceof plugin_interface)
+		{
+			return $captcha;
+		}
+
+		return new legacy_wrapper($captcha);
 	}
 
 	/**
@@ -56,7 +65,7 @@ public function get_instance($name)
 	function garbage_collect($name)
 	{
 		$captcha = $this->get_instance($name);
-		$captcha->garbage_collect(0);
+		$captcha->garbage_collect();
 	}
 
 	/**
diff --git a/phpBB/phpbb/captcha/gd.php b/phpBB/phpbb/captcha/gd.php
deleted file mode 100644
index 308bc73e0ba..00000000000
--- a/phpBB/phpbb/captcha/gd.php
+++ /dev/null
@@ -1,1846 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\captcha;
-
-class gd
-{
-	var $width = 360;
-	var $height = 96;
-
-	/**
-	* Create the image containing $code with a seed of $seed
-	*/
-	function execute($code, $seed)
-	{
-		global $config;
-
-		mt_srand($seed);
-
-		// Create image
-		$img = imagecreatetruecolor($this->width, $this->height);
-
-		// Generate colours
-		$colour = new colour_manager($img, array(
-			'random'	=> true,
-			'min_value'	=> 60,
-		), 'hsv');
-
-		$scheme = $colour->colour_scheme('background', false);
-		$scheme = $colour->mono_range($scheme, 10, false);
-		shuffle($scheme);
-
-		$bg_colours = array_splice($scheme, mt_rand(6, 12));
-
-		// Generate code characters
-		$characters = $sizes = $bounding_boxes = $noise = array();
-		$width_avail = $this->width - 15;
-		$code_len = strlen($code);
-		$captcha_bitmaps = $this->captcha_bitmaps();
-
-		for ($i = 0; $i < $code_len; ++$i)
-		{
-			$characters[$i] = new char_cube3d($captcha_bitmaps, $code[$i]);
-
-			list($min, $max) = $characters[$i]->range();
-			$sizes[$i] = mt_rand($min, $max);
-
-			$box = $characters[$i]->dimensions($sizes[$i]);
-			$width_avail -= ($box[2] - $box[0]);
-			$bounding_boxes[$i] = $box;
-		}
-
-		// Redistribute leftover x-space
-		$offset = array();
-		for ($i = 0; $i < $code_len; ++$i)
-		{
-			$denom = ($code_len - $i);
-			$denom = max(1.3, $denom);
-			$offset[$i] = phpbb_mt_rand(0, (int) round((1.5 * $width_avail) / $denom));
-			$width_avail -= $offset[$i];
-		}
-
-		if ($config['captcha_gd_x_grid'])
-		{
-			$grid = (int) $config['captcha_gd_x_grid'];
-			for ($y = 0; $y < $this->height; $y += mt_rand($grid - 2, $grid + 2))
-			{
-				$current_colour = $scheme[array_rand($scheme)];
-				imageline($img, mt_rand(0,4), mt_rand($y - 3, $y), mt_rand($this->width - 5, $this->width), mt_rand($y - 3, $y), $current_colour);
-			}
-		}
-
-		if ($config['captcha_gd_y_grid'])
-		{
-			$grid = (int) $config['captcha_gd_y_grid'];
-			for ($x = 0; $x < $this->width; $x += mt_rand($grid - 2, $grid + 2))
-			{
-				$current_colour = $scheme[array_rand($scheme)];
-				imagedashedline($img, mt_rand($x -3, $x + 3), mt_rand(0, 4), mt_rand($x -3, $x + 3), mt_rand($this->height - 5, $this->height), $current_colour);
-			}
-		}
-
-		if ($config['captcha_gd_wave'] && ($config['captcha_gd_x_grid'] || $config['captcha_gd_y_grid']))
-		{
-			$this->wave($img);
-		}
-
-		if ($config['captcha_gd_3d_noise'])
-		{
-			$noise_bitmaps = $this->captcha_noise_bg_bitmaps();
-			for ($i = 0; $i < $code_len; ++$i)
-			{
-				$noise[$i] = new char_cube3d($noise_bitmaps, mt_rand(1, count($noise_bitmaps['data'])));
-
-				$noise[$i]->range();
-				//$box = $noise[$i]->dimensions($sizes[$i]);
-			}
-			$xoffset = 0;
-			for ($i = 0; $i < $code_len; ++$i)
-			{
-				$dimm = $bounding_boxes[$i];
-				$xoffset += ($offset[$i] - $dimm[0]);
-				$yoffset = mt_rand(-$dimm[1], $this->height - $dimm[3]);
-
-				$noise[$i]->drawchar($sizes[$i], $xoffset, $yoffset, $img, $colour->get_resource('background'), $scheme);
-				$xoffset += $dimm[2];
-			}
-		}
-
-		$xoffset = 5;
-		for ($i = 0; $i < $code_len; ++$i)
-		{
-			$dimm = $bounding_boxes[$i];
-			$xoffset += ($offset[$i] - $dimm[0]);
-			$yoffset = mt_rand(-$dimm[1], $this->height - $dimm[3]);
-
-			$characters[$i]->drawchar($sizes[$i], $xoffset, $yoffset, $img, $colour->get_resource('background'), $scheme);
-			$xoffset += $dimm[2];
-		}
-
-		if ($config['captcha_gd_wave'])
-		{
-			$this->wave($img);
-		}
-
-		if ($config['captcha_gd_foreground_noise'])
-		{
-			$this->noise_line($img, 0, 0, $this->width, $this->height, $colour->get_resource('background'), $scheme, $bg_colours);
-		}
-
-		// Send image
-		header('Content-Type: image/png');
-		header('Cache-control: no-cache, no-store');
-		imagepng($img);
-		imagedestroy($img);
-	}
-
-	/**
-	* Sinus
-	*/
-	function wave($img)
-	{
-		$period_x = mt_rand(12,18);
-		$period_y = mt_rand(7,14);
-		$amp_x = mt_rand(5,10);
-		$amp_y = mt_rand(2,4);
-		$socket = mt_rand(0,100);
-
-		$dampen_x = mt_rand($this->width/5, $this->width/2);
-		$dampen_y = mt_rand($this->height/5, $this->height/2);
-		$direction_x = (mt_rand (0, 1));
-		$direction_y = (mt_rand (0, 1));
-
-		for ($i = 0; $i < $this->width; $i++)
-		{
-			$dir = ($direction_x) ? $i : ($this->width - $i);
-			imagecopy($img, $img, $i-1, sin($socket+ $i/($period_x + $dir/$dampen_x)) * $amp_x, $i, 0, 1, $this->height);
-		}
-		$socket = mt_rand(0,100);
-		for ($i = 0; $i < $this->height; $i++)
-		{
-			$dir = ($direction_y) ? $i : ($this->height - $i);
-			imagecopy($img, $img ,sin($socket + $i/($period_y + ($dir)/$dampen_y)) * $amp_y, $i-1, 0, $i, $this->width, 1);
-		}
-		return $img;
-	}
-
-	/**
-	* Noise line
-	*/
-	function noise_line($img, $min_x, $min_y, $max_x, $max_y, $bg, $font, $non_font)
-	{
-		imagesetthickness($img, 2);
-
-		$x1 = $min_x;
-		$x2 = $max_x;
-		$y1 = $min_y;
-		$y2 = $min_y;
-
-		do
-		{
-			$line = array_merge(
-				array_fill(0, mt_rand(30, 60), $non_font[array_rand($non_font)]),
-				array_fill(0, mt_rand(30, 60), $bg)
-			);
-
-			imagesetstyle($img, $line);
-			imageline($img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED);
-
-			$y1 += mt_rand(12, 35);
-			$y2 += mt_rand(12, 35);
-		}
-		while ($y1 < $max_y && $y2 < $max_y);
-
-		$x1 = $min_x;
-		$x2 = $min_x;
-		$y1 = $min_y;
-		$y2 = $max_y;
-
-		do
-		{
-			$line = array_merge(
-				array_fill(0, mt_rand(30, 60), $non_font[array_rand($non_font)]),
-				array_fill(0, mt_rand(30, 60), $bg)
-			);
-
-			imagesetstyle($img, $line);
-			imageline($img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED);
-
-			$x1 += mt_rand(20, 35);
-			$x2 += mt_rand(20, 35);
-		}
-		while ($x1 < $max_x && $x2 < $max_x);
-		imagesetthickness($img, 1);
-	}
-
-	function captcha_noise_bg_bitmaps()
-	{
-		return array(
-			'width'		=> 15,
-			'height'	=> 5,
-			'data'		=> array(
-
-			1 => array(
-				array(1,0,0,0,1,0,0,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,1,0,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,1,0,0,0,0,0,0,1,0,0),
-				array(1,0,0,0,0,0,1,0,0,0,0,1,0,0,0),
-			),
-			2 => array(
-				array(1,1,mt_rand(0,1),1,0,1,1,1,1,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,1,1,0,1,1,1),
-			),
-			3 => array(
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,1,0,0,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,1),
-			),
-			4 => array(
-				array(1,0,1,0,1,0,0,1,1,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(1,0,1,0,0,0,0,0,0,0,0,0,0,0,0),
-			),
-			5 => array(
-				array(1,1,1,1,0,0,0,1,1,1,0,0,1,0,1),
-				array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(1,0,1,0,0,0,0,0,0,0,0,0,0,0,0),
-			),
-			6 => array(
-				array(mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),0,mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),0,mt_rand(0,1),mt_rand(0,1),mt_rand(0,1)),
-				array(0,0,0,0,0,0,0,mt_rand(0,1),0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(mt_rand(0,1),0,mt_rand(0,1),0,0,0,0,0,0,0,0,0,0,0,0),
-			),
-			7 => array(
-				array(0,0,0,0,0,0,0,0,0,0,1,1,0,1,1),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,1,1,0,0,0,1,0,0,0,0,0,0,0),
-				array(0,1,0,0,0,1,0,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-			),
-		));
-	}
-
-	/**
-	* Return bitmaps
-	*/
-	function captcha_bitmaps()
-	{
-		global $config;
-
-		$chars = array(
-			'A'	=>	array(
-						array(
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,1,1,1,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,1,1,0,1,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,1,1,1,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,1,1),
-							array(0,0,0,0,0,1,1,1,1),
-							array(0,0,0,1,1,1,0,0,1),
-							array(0,1,1,1,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,0,0,0,0,1,1,1),
-							array(0,1,1,1,1,1,1,0,1),
-						),
-					),
-		'B'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-						),
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,1,1,1,1,0,0),
-						),
-					),
-		'C'	=>		array(
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,1),
-							array(0,1,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,1),
-							array(0,0,1,1,1,1,1,0,1),
-						),
-					),
-		'D'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-						),
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,1,1,1,1,1,0,1),
-							array(0,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,1,0,0,0,1,1,1),
-							array(0,0,1,1,1,1,1,0,1),
-						),
-					),
-		'E'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,1,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(0,1,1,1,1,1,1,1,0),
-						),
-					),
-		'F'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-						),
-						array(
-							array(0,1,1,1,1,1,1,1,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,0,0,0),
-						),
-						array(
-							array(0,0,0,1,1,0,0,0,0),
-							array(0,0,1,1,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(1,1,1,1,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-						),
-					),
-		'G'	=>		array(
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,1,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,1),
-							array(0,1,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,1,1,1,1,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,1),
-							array(0,0,1,1,1,1,1,0,1),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,1),
-							array(0,1,1,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,1,0,0,0,0,0,1),
-							array(0,0,1,1,1,1,1,1,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,1,1),
-							array(1,1,1,1,1,1,1,1,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-					),
-		'H'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,1,1,1,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,1,1,1,0,0,0),
-							array(1,1,1,1,0,1,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-						),
-					),
-		'I'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(0,0,0,1,1,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-						),
-					),
-		'J'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,0,1,1,0,0,0,0,0),
-						),
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,1,0,0,1,0,0,0,0),
-							array(1,0,1,1,0,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,0,1,1,0,0,0,0,0),
-						),
-					),
-		'K'	=>		array(
-						array(    // New 'K', supplied by NeoThermic
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,1,0,0,0,0),
-							array(1,0,0,1,0,0,0,0,0),
-							array(1,0,1,0,0,0,0,0,0),
-							array(1,1,0,0,0,0,0,0,0),
-							array(1,0,1,0,0,0,0,0,0),
-							array(1,0,0,1,0,0,0,0,0),
-							array(1,0,0,0,1,0,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,1,0,0),
-							array(0,1,0,0,0,1,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,1,0,1,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,0,1,0,0,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,1,0,0,0,1,0,0,0),
-							array(0,1,0,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,1,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,1,0,1,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,0,1,0,0,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,1,0,0,0,1,0,0,0),
-							array(0,1,0,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-						),
-					),
-		'L'	=>		array(
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,0,1,1,1,0,0,0,0),
-						),
-					),
-		'M'	=>		array(
-						array(
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,1,0,1,0,1,0,1,0),
-							array(0,1,0,1,0,1,0,1,0),
-							array(0,1,0,1,0,1,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,1,1,0,1,1,1,0),
-							array(1,1,0,1,1,1,0,1,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-						),
-					),
-		'N'	=>		array(
-						array(
-							array(1,1,0,0,0,0,0,0,1),
-							array(1,1,0,0,0,0,0,0,1),
-							array(1,0,1,0,0,0,0,0,1),
-							array(1,0,1,0,0,0,0,0,1),
-							array(1,0,0,1,0,0,0,0,1),
-							array(1,0,0,1,0,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,0,1,0,0,1),
-							array(1,0,0,0,0,1,0,0,1),
-							array(1,0,0,0,0,0,1,0,1),
-							array(1,0,0,0,0,0,1,0,1),
-							array(1,0,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,0,1,0),
-							array(0,1,0,1,0,0,0,1,0),
-							array(0,1,0,1,0,0,0,1,0),
-							array(0,1,0,1,0,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,0,1,1,0,1,0),
-							array(0,1,0,0,0,1,0,1,0),
-							array(0,1,0,0,0,1,1,1,0),
-							array(0,1,0,0,0,0,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,0,1,1,1,1,0,0,0),
-							array(1,1,1,0,0,1,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-						),
-					),
-		'O'	=>		array(
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,1,0,0,0),
-							array(1,1,1,0,0,1,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,1,0,0,0,1,1,0,0),
-							array(0,1,1,1,1,1,0,0,0),
-						),
-					),
-		'P'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-						),
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,1,1,0,0,0,0,0),
-							array(1,1,0,1,1,0,0,0,0),
-							array(1,0,0,0,1,0,0,0,0),
-							array(1,0,0,0,1,0,0,0,0),
-							array(1,0,0,1,1,0,0,0,0),
-							array(1,1,1,1,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-						),
-					),
-		'Q'	=>		array(
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,1,0,0,1),
-							array(1,0,0,0,0,0,1,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,1),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,1,0,0,1,1,0,1,1),
-							array(0,1,1,1,1,1,1,1,0),
-							array(0,0,0,0,0,0,1,1,0),
-							array(0,0,0,0,0,0,0,1,1),
-							array(0,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,1,1,1,1),
-							array(0,0,0,0,1,1,0,0,1),
-							array(0,0,0,0,1,0,0,0,1),
-							array(0,0,0,0,1,0,0,0,1),
-							array(0,0,0,0,1,1,0,1,1),
-							array(0,0,0,0,0,1,1,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-						),
-					),
-		'R'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,1,1,0,0,0,0,0,0),
-							array(1,0,0,1,0,0,0,0,0),
-							array(1,0,0,0,1,0,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,1,1,0,0,0,0,0),
-							array(0,1,0,1,1,0,0,0,0),
-							array(0,1,0,0,1,1,0,0,0),
-							array(0,1,0,0,0,1,1,0,0),
-							array(0,1,0,0,0,0,1,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,0,0,0,0),
-							array(1,1,0,0,1,1,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-						),
-					),
-		'S'	=>		array(
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,0,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,1),
-							array(0,1,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,0,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,0,0,0,0,0,1,0),
-							array(1,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,0,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,0,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,1,1,0,0,0),
-							array(0,1,1,1,1,0,0,0,0),
-						),
-					),
-		'T'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-						),
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-						),
-						array(
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,1,1,1,1,1,1,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,1,0,0,0),
-							array(0,0,0,0,0,1,1,1,0),
-						),
-					),
-		'U'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,1,0,0,0,0,0,1),
-							array(0,0,1,0,0,0,0,0,1),
-							array(0,0,1,0,0,0,0,0,1),
-							array(0,0,1,0,0,0,0,0,1),
-							array(0,0,1,0,0,0,0,0,1),
-							array(0,0,1,0,0,0,0,1,1),
-							array(0,0,1,1,0,0,1,1,1),
-							array(0,0,0,1,1,1,1,0,1),
-						),
-					),
-		'V'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-						),
-					),
-		'W'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,1,1,1,0,1,0),
-							array(0,1,0,1,0,1,0,1,0),
-							array(0,1,1,1,0,1,1,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,1,1,1,0,1,0),
-							array(0,1,0,1,0,1,0,1,0),
-							array(0,1,1,1,0,1,1,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-					),
-		'X'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,0,1,1,0,1,1,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-							array(0,0,1,1,0,1,1,0,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-					),
-		'Y'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,1,0,0,0,0,1),
-							array(0,0,0,1,1,0,0,0,1),
-							array(0,0,0,0,1,0,0,1,1),
-							array(0,0,0,0,1,1,0,1,0),
-							array(0,0,0,0,0,1,1,1,0),
-							array(0,0,0,0,0,0,1,0,0),
-							array(0,0,0,0,0,1,1,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,1,1,0,0,0),
-							array(0,0,1,1,1,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-					),
-		'Z'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,1,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,0,0,0,0,0),
-							array(0,0,0,1,0,0,0,0,0),
-							array(0,0,1,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,1,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,0,0,1,0,0,0,0,0),
-							array(0,0,0,1,0,0,0,0,0),
-							array(0,0,1,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,1,1,1,0),
-							array(0,0,0,0,0,1,1,0,0),
-							array(0,0,0,0,1,1,0,0,0),
-							array(0,0,0,1,1,0,0,0,0),
-							array(0,0,1,1,0,0,0,0,0),
-							array(0,0,1,0,0,0,0,0,0),
-							array(0,1,1,1,1,1,1,1,0),
-						),
-					),
-				);
-
-		/** @var 1|2|3 $config['captcha_gd_fonts'] */
-		return array(
-			'width'		=> 9,
-			'height'	=> 15,
-			'data'		=> array(
-
-			'A' =>	$chars['A'][mt_rand(0, min(count($chars['A']), $config['captcha_gd_fonts']) -1)],
-			'B' =>	$chars['B'][mt_rand(0, min(count($chars['B']), $config['captcha_gd_fonts']) -1)],
-			'C' =>	$chars['C'][mt_rand(0, min(count($chars['C']), $config['captcha_gd_fonts']) -1)],
-			'D' =>	$chars['D'][mt_rand(0, min(count($chars['D']), $config['captcha_gd_fonts']) -1)],
-			'E' =>	$chars['E'][mt_rand(0, min(count($chars['E']), $config['captcha_gd_fonts']) -1)],
-			'F' =>	$chars['F'][mt_rand(0, min(count($chars['F']), $config['captcha_gd_fonts']) -1)],
-			'G' =>	$chars['G'][mt_rand(0, min(count($chars['G']), $config['captcha_gd_fonts']) -1)],
-			'H' =>	$chars['H'][mt_rand(0, min(count($chars['H']), $config['captcha_gd_fonts']) -1)],
-			'I' =>	$chars['I'][mt_rand(0, min(count($chars['I']), $config['captcha_gd_fonts']) -1)],
-			'J' =>	$chars['J'][mt_rand(0, min(count($chars['J']), $config['captcha_gd_fonts']) -1)],
-			'K' =>	$chars['K'][mt_rand(0, min(count($chars['K']), $config['captcha_gd_fonts']) -1)],
-			'L' =>	$chars['L'][mt_rand(0, min(count($chars['L']), $config['captcha_gd_fonts']) -1)],
-			'M' =>	$chars['M'][mt_rand(0, min(count($chars['M']), $config['captcha_gd_fonts']) -1)],
-			'N' =>	$chars['N'][mt_rand(0, min(count($chars['N']), $config['captcha_gd_fonts']) -1)],
-			'O' =>	$chars['O'][mt_rand(0, min(count($chars['O']), $config['captcha_gd_fonts']) -1)],
-			'P' =>	$chars['P'][mt_rand(0, min(count($chars['P']), $config['captcha_gd_fonts']) -1)],
-			'Q' =>	$chars['Q'][mt_rand(0, min(count($chars['Q']), $config['captcha_gd_fonts']) -1)],
-			'R' =>	$chars['R'][mt_rand(0, min(count($chars['R']), $config['captcha_gd_fonts']) -1)],
-			'S' =>	$chars['S'][mt_rand(0, min(count($chars['S']), $config['captcha_gd_fonts']) -1)],
-			'T' =>	$chars['T'][mt_rand(0, min(count($chars['T']), $config['captcha_gd_fonts']) -1)],
-			'U' =>	$chars['U'][mt_rand(0, min(count($chars['U']), $config['captcha_gd_fonts']) -1)],
-			'V' =>	$chars['V'][mt_rand(0, min(count($chars['V']), $config['captcha_gd_fonts']) -1)],
-			'W' =>	$chars['W'][mt_rand(0, min(count($chars['W']), $config['captcha_gd_fonts']) -1)],
-			'X' =>	$chars['X'][mt_rand(0, min(count($chars['X']), $config['captcha_gd_fonts']) -1)],
-			'Y' =>	$chars['Y'][mt_rand(0, min(count($chars['Y']), $config['captcha_gd_fonts']) -1)],
-			'Z' =>	$chars['Z'][mt_rand(0, min(count($chars['Z']), $config['captcha_gd_fonts']) -1)],
-
-			'1' => array(
-				array(0,0,0,1,1,0,0,0,0),
-				array(0,0,1,0,1,0,0,0,0),
-				array(0,1,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,1,1,1,1,1,1,1,0),
-			),
-			'2' => array(    // New '2' supplied by Anon
-				array(0,0,0,1,1,1,0,0,0),
-				array(0,0,1,0,0,0,1,0,0),
-				array(0,1,0,0,0,0,1,1,0),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,1,1),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,1,0,0),
-				array(0,0,0,0,0,1,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,1,0,0,0,0,0),
-				array(0,0,1,0,0,0,0,0,0),
-				array(0,1,0,0,0,0,0,0,0),
-				array(1,1,1,1,1,1,1,1,1),
-				array(0,0,0,0,0,0,0,0,0),
-			),
-			'3' => array(
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,1,1,0,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-			),
-			'4' => array(
-				array(0,0,0,0,0,0,1,1,0),
-				array(0,0,0,0,0,1,0,1,0),
-				array(0,0,0,0,1,0,0,1,0),
-				array(0,0,0,1,0,0,0,1,0),
-				array(0,0,1,0,0,0,0,1,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,1,0),
-				array(1,1,1,1,1,1,1,1,1),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-			),
-			'5' => array(
-				array(1,1,1,1,1,1,1,1,1),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(0,1,0,0,0,0,0,0,0),
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-			),
-			'6' => array(
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,1,1,1,1,0,0),
-				array(1,0,1,0,0,0,0,1,0),
-				array(1,1,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-			),
-			'7' => array(
-				array(1,1,1,1,1,1,1,1,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,1,0,0),
-				array(0,0,0,0,0,1,0,0,0),
-				array(0,0,0,0,0,1,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,1,0,0,0,0,0),
-				array(0,0,0,1,0,0,0,0,0),
-				array(0,0,1,0,0,0,0,0,0),
-				array(0,1,0,0,0,0,0,0,0),
-				array(0,1,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-			),
-			'8' => array(
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-			),
-			'9' => array(
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,1,1),
-				array(0,1,0,0,0,0,1,0,1),
-				array(0,0,1,1,1,1,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-			),
-			)
-		);
-	}
-}
diff --git a/phpBB/phpbb/captcha/gd_wave.php b/phpBB/phpbb/captcha/gd_wave.php
deleted file mode 100644
index e0801e7c504..00000000000
--- a/phpBB/phpbb/captcha/gd_wave.php
+++ /dev/null
@@ -1,847 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\captcha;
-
-/**
-* Wave3D CAPTCHA
-*/
-class gd_wave
-{
-	var $width		= 360;
-	var $height		= 96;
-
-	function execute($code, $seed)
-	{
-		// seed the random generator
-		mt_srand($seed);
-
-		// set height and width
-		$img_x = $this->width;
-		$img_y = $this->height;
-
-		// Generate image
-		$img	= imagecreatetruecolor($img_x, $img_y);
-		$x_grid = mt_rand(6, 10);
-		$y_grid = mt_rand(6, 10);
-
-		// Ok, so lets cut to the chase. We could accurately represent this in 3d and
-		// do all the appropriate linear transforms. my questions is... why bother?
-		// The computational overhead is unnecessary when you consider the simple fact:
-		// we're not here to accurately represent a model, but to just show off some random-ish
-		// polygons
-
-		// Conceive of 3 spaces.
-		// 1) planar-space (discrete "pixel" grid)
-		// 2) 3-space. (planar-space with z/height aspect)
-		// 3) image space (pixels on the screen)
-		// resolution of the planar-space we're embedding the text code in
-		$plane_x	= 100;
-		$plane_y	= 30;
-
-		$subdivision_factor = 3;
-
-		// $box is the 4 points in img_space that correspond to the corners of the plane in 3-space
-		$box = array(
-			'upper_left'	=> array(
-				'x' => mt_rand(5, 15),
-				'y' => mt_rand(10, 15)
-			),
-			'upper_right'	=> array(
-				'x' => mt_rand($img_x - 35, $img_x - 19),
-				'y' => mt_rand(10, 17)
-			),
-			'lower_left'	=> array(
-				'x' => mt_rand($img_x - 45, $img_x - 5),
-				'y' => mt_rand($img_y - 15, $img_y - 0),
-			),
-		);
-
-		$box['lower_right'] = array(
-			'x' => $box['lower_left']['x'] + $box['upper_left']['x'] - $box['upper_right']['x'],
-			'y' => $box['lower_left']['y'] + $box['upper_left']['y'] - $box['upper_right']['y'],
-		);
-
-		// TODO
-		$background = imagecolorallocate($img, mt_rand(155, 255), mt_rand(155, 255), mt_rand(155, 255));
-		imagefill($img, 0, 0, $background);
-
-		$random = array();
-		$fontcolors = array();
-
-		for ($i = 0; $i < 15; ++$i)
-		{
-			$random[$i] = imagecolorallocate($img, mt_rand(120, 255), mt_rand(120, 255), mt_rand(120, 255));
-		}
-
-		$fontcolors[0] = imagecolorallocate($img, mt_rand(0, 120), mt_rand(0, 120), mt_rand(0, 120));
-
-		$colors = array();
-
-		$minr = mt_rand(20, 30);
-		$ming = mt_rand(20, 30);
-		$minb = mt_rand(20, 30);
-
-		$maxr = mt_rand(150, 230);
-		$maxg = mt_rand(150, 230);
-		$maxb = mt_rand(150, 230);
-
-		for ($i = -30; $i <= 30; ++$i)
-		{
-			$coeff1 = ($i + 12) / 45;
-			$coeff2 = 1 - $coeff1;
-
-			$red = ($coeff2 * $maxr) + ($coeff1 * $minr);
-			$green = ($coeff2 * $maxg) + ($coeff1 * $ming);
-			$blue = ($coeff2 * $maxb) + ($coeff1 * $minb);
-
-			$colors[$i] = imagecolorallocate($img, min([255, (int) $red]), min([255, (int) $green]), min([255, (int) $blue]));
-		}
-
-		// $img_buffer is the last row of 3-space positions (converted to img-space), cached
-		// (using this means we don't need to recalculate all 4 positions for each new polygon,
-		// merely the newest point that we're adding, which is then cached.
-		$img_buffer = array(array(), array());
-
-		// In image-space, the x- and y-offset necessary to move one unit in the x-direction in planar-space
-		$dxx = ($box['upper_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_x);
-		$dxy = ($box['upper_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_x);
-
-		// In image-space, the x- and y-offset necessary to move one unit in the y-direction in planar-space
-		$dyx = ($box['lower_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_y);
-		$dyy = ($box['lower_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_y);
-
-		// Initial captcha-letter offset in planar-space
-		$plane_offset_x = mt_rand(3, 8);
-		$plane_offset_y = mt_rand( 12, 15);
-
-		// character map
-		$map = $this->captcha_bitmaps();
-
-		// matrix
-		$plane = array();
-
-		// for each character, we'll silkscreen it into our boolean pixel plane
-		for ($c = 0, $code_num = strlen($code); $c < $code_num; ++$c)
-		{
-			$letter = $code[$c];
-
-			for ($x = $map['width'] - 1; $x >= 0; --$x)
-			{
-				for ($y = $map['height'] - 1; $y >= 0; --$y)
-				{
-					if ($map['data'][$letter][$y][$x])
-					{
-						$plane[$y + $plane_offset_y + (($c & 1) ? 1 : -1)][$x + $plane_offset_x] = true;
-					}
-				}
-			}
-			$plane_offset_x += 11;
-		}
-
-		// calculate our first buffer, we can't actually draw polys with these yet
-		// img_pos_prev == screen x,y location to our immediate left.
-		// img_pos_cur == current screen x,y location
-		// we calculate screen position of our
-		// current cell based on the difference from the previous cell
-		// rather than recalculating from absolute coordinates
-		// What we cache into the $img_buffer contains the raised text coordinates.
-		$img_pos_prev	= $img_buffer[0][0] = array($box['upper_left']['x'], $box['upper_left']['y']);
-		$prev_height = $this->wave_height(0, 0, $subdivision_factor);
-		$full_x			= $plane_x * $subdivision_factor;
-		$full_y			= $plane_y * $subdivision_factor;
-
-		for ($x = 1; $x <= $full_x; ++$x)
-		{
-			$cur_height		= $this->wave_height($x, 0, $subdivision_factor);
-			$offset			= $cur_height - $prev_height;
-			$img_pos_cur	= array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset);
-
-			$img_buffer[0][$x]	= $img_pos_cur;
-			$img_pos_prev		= $img_pos_cur;
-			$prev_height		= $cur_height;
-		}
-
-		for ($y = 1; $y <= $full_y; ++$y)
-		{
-			// swap buffers
-			$buffer_cur		= $y & 1;
-			$buffer_prev	= 1 - $buffer_cur;
-
-			$prev_height	= $this->wave_height(0, $y, $subdivision_factor);
-			$offset			= $prev_height - $this->wave_height(0, $y - 1, $subdivision_factor);
-			$img_pos_cur	= array($img_buffer[$buffer_prev][0][0] + $dyx, min($img_buffer[$buffer_prev][0][1] + $dyy + $offset, $img_y - 1));
-
-			// make sure we don't try to write off the page
-			$img_pos_prev	= $img_pos_cur;
-
-			$img_buffer[$buffer_cur][0]	= $img_pos_cur;
-
-			for ($x = 1; $x <= $full_x; ++$x)
-			{
-				$cur_height		= $this->wave_height($x, $y, $subdivision_factor) + $this->grid_height($x, $y, $x_grid, $y_grid, 1);
-
-				// height is a z-factor, not a y-factor
-				$offset			= $cur_height - $prev_height;
-				$img_pos_cur	= array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset);
-
-				// height is float, index it to an int, get closest color
-				$color			= $colors[intval($cur_height)];
-				$img_pos_prev	= $img_pos_cur;
-				$prev_height	= $cur_height;
-
-				$y_index_old = intval(($y - 1) / $subdivision_factor);
-				$y_index_new = intval($y / $subdivision_factor);
-				$x_index_old = intval(($x - 1) / $subdivision_factor);
-				$x_index_new = intval($x / $subdivision_factor);
-
-				if ($plane[$y_index_new][$x_index_new])
-				{
-					$img_pos_cur[1]	+= $this->wave_height($x, $y, $subdivision_factor, 1) - 30 - $cur_height;
-					$color			= $colors[20];
-				}
-				$img_pos_cur[1] = min($img_pos_cur[1], $img_y - 1);
-				$img_buffer[$buffer_cur][$x] = $img_pos_cur;
-
-				// Smooth the edges as much as possible by having not more than one low<->high triangle per square
-				// Otherwise, just
-				$diag_down	= !$plane[$y_index_old][$x_index_old] && !$plane[$y_index_new][$x_index_new];
-				$diag_up	= !$plane[$y_index_old][$x_index_new] && !$plane[$y_index_new][$x_index_old];
-
-				// natural switching
-				$mode = ($x + $y) & 1;
-
-				// override if it requires it
-				if ($diag_down != $diag_up)
-				{
-					$mode = $diag_up;
-				}
-
-				if ($mode)
-				{
-					//		+-/			  /
-					// 1	|/		2	 /|
-					//		/			/-+
-					$poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x]);
-					$poly2 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_cur][$x], $img_buffer[$buffer_prev][$x]);
-				}
-				else
-				{
-					//		\			\-+
-					// 1	|\		2	 \|
-					//		+-\			  \
-					$poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_cur][$x]);
-					$poly2 = array_merge($img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x], $img_buffer[$buffer_cur][$x]);
-				}
-
-				imagefilledpolygon($img, $poly1, 3, $color);
-				imagefilledpolygon($img, $poly2, 3, $color);
-			}
-		}
-
-		// Output image
-		header('Content-Type: image/png');
-		header('Cache-control: no-cache, no-store');
-		//$mtime = explode(' ', microtime());
-		//$totaltime = $mtime[0] + $mtime[1] - $starttime;
-
-		//echo $totaltime . "<br />\n";
-		//echo memory_get_usage() - $tmp;
-		imagepng($img);
-		imagedestroy($img);
-	}
-
-	function wave_height($x, $y, $factor = 1, $tweak = 0.7)
-	{
-		// stretch the wave. TODO: pretty it up
-		$x = $x/5 + 180;
-		$y = $y/4;
-		return ((sin($x / (3 * $factor)) + sin($y / (3 * $factor))) * 10 * $tweak);
-	}
-
-	function grid_height($x, $y, $x_grid, $y_grid, $factor = 1)
-	{
-		return ((!($x % ($x_grid * $factor)) || !($y % ($y_grid * $factor))) ? 3 : 0);
-	}
-
-	function captcha_bitmaps()
-	{
-		return array(
-			'width'		=> 9,
-			'height'	=> 13,
-			'data'		=> array(
-				'A' => array(
-					array(0,0,1,1,1,1,0,0,0),
-					array(0,1,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,1,1,1,1,1,1,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'B' => array(
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'C' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'D' => array(
-					array(1,1,1,1,1,1,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'E' => array(
-					array(0,0,1,1,1,1,1,1,1),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'F' => array(
-					array(0,0,1,1,1,1,1,1,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'G' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'H' => array(
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'I' => array(
-					array(0,1,1,1,1,1,1,1,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,1,1,1,1,1,1,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'J' => array(
-					array(0,0,0,0,0,0,1,1,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'K' => array(
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,1,0,0,0),
-					array(1,0,0,0,1,0,0,0,0),
-					array(1,0,0,1,0,0,0,0,0),
-					array(1,0,1,0,0,0,0,0,0),
-					array(1,1,0,0,0,0,0,0,0),
-					array(1,0,1,0,0,0,0,0,0),
-					array(1,0,0,1,0,0,0,0,0),
-					array(1,0,0,0,1,0,0,0,0),
-					array(1,0,0,0,0,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'L' => array(
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'M' => array(
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,1,0,0,0,1,1,0),
-					array(0,1,0,1,0,1,0,1,0),
-					array(0,1,0,0,1,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'N' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,1,0,0,0,0,0,0,1),
-					array(1,0,1,0,0,0,0,0,1),
-					array(1,0,0,1,0,0,0,0,1),
-					array(1,0,0,0,1,0,0,0,1),
-					array(1,0,0,0,0,1,0,0,1),
-					array(1,0,0,0,0,0,1,0,1),
-					array(1,0,0,0,0,0,0,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'O' => array(
-					array(0,0,0,1,1,1,0,0,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,1,1,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'P' => array(
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'Q' => array(
-					array(0,0,1,1,1,1,0,0,0),
-					array(0,1,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,1,0,0,1,0),
-					array(1,0,0,0,0,1,0,1,0),
-					array(0,1,0,0,0,0,1,0,0),
-					array(0,0,1,1,1,1,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'R' => array(
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,1,0,0,0,0,0,0),
-					array(1,0,0,1,0,0,0,0,0),
-					array(1,0,0,0,1,0,0,0,0),
-					array(1,0,0,0,0,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'S' => array(
-					array(0,0,1,1,1,1,1,1,1),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'T' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'U' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'V' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'W' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,1,0,0,0,1),
-					array(1,0,0,1,0,1,0,0,1),
-					array(1,0,1,0,0,0,1,0,1),
-					array(1,1,0,0,0,0,0,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'X' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'Y' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'Z' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,0,0,0,0,0),
-					array(0,0,1,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'1' => array(
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,1,0,0,0,0),
-					array(0,0,1,0,1,0,0,0,0),
-					array(0,1,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,1,1,1,1,1,1,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'2' => array(
-					array(0,0,0,1,1,1,0,0,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,0,0,0,0,0),
-					array(0,0,1,0,0,0,0,0,0),
-					array(0,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'3' => array(
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,1,1,0,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'4' => array(
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,1,0),
-					array(0,0,0,0,0,1,0,1,0),
-					array(0,0,0,0,1,0,0,1,0),
-					array(0,0,0,1,0,0,0,1,0),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'5' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'6' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,1,1,1,1,0,0),
-					array(1,0,1,0,0,0,0,1,0),
-					array(1,1,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'7' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'8' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'9' => array(
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,1),
-					array(0,0,1,1,1,1,1,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-			)
-		);
-	}
-}
diff --git a/phpBB/phpbb/captcha/non_gd.php b/phpBB/phpbb/captcha/non_gd.php
deleted file mode 100644
index 881701c7d39..00000000000
--- a/phpBB/phpbb/captcha/non_gd.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\captcha;
-
-/**
-* Main non-gd captcha class
-* @ignore
-*/
-class non_gd
-{
-	var $filtered_pngs;
-	var $width = 320;
-	var $height = 50;
-
-	/**
-	* Define filtered pngs on init
-	*/
-	function __construct()
-	{
-		// If we can we will generate a single filtered png, we avoid nastiness via emulation of some Zlib stuff
-		$this->define_filtered_pngs();
-	}
-
-	/**
-	* Create the image containing $code with a seed of $seed
-	*/
-	function execute($code, $seed)
-	{
-		$img_height = $this->height - 10;
-		$img_width = 0;
-
-		mt_srand($seed);
-
-		$char_widths = $hold_chars = array();
-		$code_len = strlen($code);
-
-		for ($i = 0; $i < $code_len; $i++)
-		{
-			$char = $code[$i];
-
-			$width = mt_rand(0, 4);
-			$raw_width = $this->filtered_pngs[$char]['width'];
-			$char_widths[$i] = $width;
-			$img_width += $raw_width - $width;
-
-			// Split the char into chunks of $raw_width + 1 length
-			if (empty($hold_chars[$char]))
-			{
-				$hold_chars[$char] = str_split(base64_decode($this->filtered_pngs[$char]['data']), $raw_width + 1);
-			}
-		}
-
-		$offset_x = mt_rand(0, $this->width - $img_width);
-		$offset_y = mt_rand(0, $this->height - $img_height);
-
-		$image = '';
-		for ($i = 0; $i < $this->height; $i++)
-		{
-			$image .= chr(0);
-
-			if ($i > $offset_y && $i < $offset_y + $img_height)
-			{
-				for ($j = 0; $j < $offset_x; $j++)
-				{
-					$image .= chr(mt_rand(140, 255));
-				}
-
-				for ($j = 0; $j < $code_len; $j++)
-				{
-					/** @psalm-suppress InvalidArrayOffset */
-					$image .= $this->randomise(substr($hold_chars[$code[$j]][$i - $offset_y - 1], 1), $char_widths[$j]);
-				}
-
-				for ($j = $offset_x + $img_width; $j < $this->width; $j++)
-				{
-					$image .= chr(mt_rand(140, 255));
-				}
-			}
-			else
-			{
-				for ($j = 0; $j < $this->width; $j++)
-				{
-					$image .= chr(mt_rand(140, 255));
-				}
-			}
-		}
-		unset($hold_chars);
-
-		$image = $this->create_png($image, $this->width, $this->height);
-
-		// Output image
-		header('Content-Type: image/png');
-		header('Cache-control: no-cache, no-store');
-		echo $image;
-		exit;
-	}
-
-	/**
-	* This is designed to randomise the pixels of the image data within
-	* certain limits so as to keep it readable. It also varies the image
-	* width a little
-	*/
-	function randomise($scanline, $width)
-	{
-		$new_line = '';
-
-		$end = strlen($scanline) - ceil($width/2);
-		for ($i = (int) floor($width / 2); $i < $end; $i++)
-		{
-			$pixel = ord($scanline[$i]);
-
-			if ($pixel < 190)
-			{
-				$new_line .= chr(mt_rand(0, 205));
-			}
-			else if ($pixel > 190)
-			{
-				$new_line .= chr(mt_rand(145, 255));
-			}
-			else
-			{
-				$new_line .= $scanline[$i];
-			}
-		}
-
-		return $new_line;
-	}
-
-	/**
-	* This creates a chunk of the given type, with the given data
-	* of the given length adding the relevant crc
-	*/
-	function png_chunk($length, $type, $data)
-	{
-		$raw = $type . $data;
-
-		return pack('N', $length) . $raw . pack('N', crc32($raw));
-	}
-
-	/**
-	* Creates greyscale 8bit png - The PNG spec can be found at
-	* http://www.libpng.org/pub/png/spec/PNG-Contents.html we use
-	* png because it's a fully recognised open standard and supported
-	* by practically all modern browsers and OSs
-	*/
-	function create_png($raw_image, $width, $height)
-	{
-		// SIG
-		$image = pack('C8', 137, 80, 78, 71, 13, 10, 26, 10);
-
-		// IHDR
-		$raw = pack('N2', $width, $height);
-		$raw .= pack('C5', 8, 0, 0, 0, 0);
-		$image .= $this->png_chunk(13, 'IHDR', $raw);
-
-		// IDAT
-		if (@extension_loaded('zlib'))
-		{
-			$raw_image = gzcompress($raw_image);
-			$length = strlen($raw_image);
-		}
-		else
-		{
-			// The total length of this image, uncompressed, is just a calculation of pixels
-			$length = ($width + 1) * $height;
-
-			// Adler-32 hash generation
-			// Note: The hash is _backwards_ so we must reverse it
-
-			if (@extension_loaded('hash'))
-			{
-				$adler_hash = strrev(hash('adler32', $raw_image, true));
-			}
-			else if (@extension_loaded('mhash'))
-			{
-				$adler_hash = strrev(mhash(MHASH_ADLER32, $raw_image));
-			}
-			else
-			{
-				// Optimized Adler-32 loop ported from the GNU Classpath project
-				$temp_length = $length;
-				$s1 = 1;
-				$s2 = $index = 0;
-
-				while ($temp_length > 0)
-				{
-					// We can defer the modulo operation:
-					// s1 maximally grows from 65521 to 65521 + 255 * 3800
-					// s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31
-					$substract_value = ($temp_length < 3800) ? $temp_length : 3800;
-					$temp_length -= $substract_value;
-
-					while (--$substract_value >= 0)
-					{
-						$s1 += ord($raw_image[$index]);
-						$s2 += $s1;
-
-						$index++;
-					}
-
-					$s1 %= 65521;
-					$s2 %= 65521;
-				}
-				$adler_hash = pack('N', ($s2 << 16) | $s1);
-			}
-
-			// This is the same thing as gzcompress($raw_image, 0) but does not need zlib
-			$raw_image = pack('C3v2', 0x78, 0x01, 0x01, $length, ~$length) . $raw_image . $adler_hash;
-
-			// The Zlib header + Adler hash make us add on 11
-			$length += 11;
-		}
-
-		// IDAT
-		$image .= $this->png_chunk($length, 'IDAT', $raw_image);
-
-		// IEND
-		$image .= $this->png_chunk(0, 'IEND', '');
-
-		return $image;
-	}
-
-	/**
-	* png image data
-	* Each 'data' element is base64_encoded uncompressed IDAT
-	*/
-	function define_filtered_pngs()
-	{
-		$this->filtered_pngs = array(
-			'0' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A///////////////////olFAkBAAAGDyA4P///M31/////////////wD////////////////0dAgAAAAAAAAAAAAEcPipFGHn////////////AP//////////////6DAAAAAAAAAAAAAAAAAALSEAN+T///////////8A//////////////xAAAAAAAAAAAAAAAAAAAAAACPA/////////////wD/////////////oAAAAAAAAAAAAAAAAAAAAAAAev//////////////AP////////////8oAAAAAAAAPNj/zDAAAAAAAABD//////////////8A////////////1AAAAAAAABjw////5BAAAAAAAADo/////////////wD///////////+QAAAAAAAAbP//////QgAAAAAAAKj/////////////AP///////////1wAAAAAAACs/////8AXAAAAAAAAcP////////////8A////////////OAAAAAAAAND////dNwAAAAAAAABI/////////////wD///////////8gAAAAAAAA4P//7koACwAAAAAAACT/////////////AP///////////wgAAAAAAAD///VqAwaPAAAAAAAAEP////////////8A////////////AAAAAAAAAP/8kQYDavUAAAAAAAAA/////////////wD///////////8AAAAAAAAA/6kNAEru/wAAAAAAAAD/////////////AP///////////wAAAAAAAADAIwA33f//AAAAAAAAAP////////////8A////////////FAAAAAAAADYAI8D///8AAAAAAAAQ/////////////wD///////////8kAAAAAAAAAA2p////5AAAAAAAACD/////////////AP///////////0gAAAAAAAAFkfz////UAAAAAAAAQP////////////8A////////////cAAAAAAAAET1/////7AAAAAAAABo/////////////wD///////////+oAAAAAAAAXfX/////sAAAAAAAAGj/////////////AAAAALgAAAAAAAAwAAAAAAAAAAAAAAD////////////oAAAAAAAACOT////oEAAAAAAAAOD/////////////AP////////////8+AAAAAAAAKMz/zDQAAAAAAAA0//////////////8A////////////7jgAAAAAAAAAAAAAAAAAAAAAAKT//////////////wD///////////VqAwIAAAAAAAAAAAAAAAAAAAA8////////////////AP//////////rQcDaVEAAAAAAAAAAAAAAAAAKOj///////////////8A///////////nblnu/IAIAAAAAAAAAAAAAFzw/////////////////wD////////////79////+iITCAAAAAgSITg////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////w==',
-				'width' => 40
-			),
-			'1' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////8BAAAAAAAP//////////////////AP////////////////////////9sAAAAAAAA//////////////////8A////////////////////////pAAAAAAAAAD//////////////////wD//////////////////////6wEAAAAAAAAAP//////////////////AP////////////////////h4AAAAAAAAAAAA//////////////////8A//////////////////ygJAAAAAAAAAAAAAD//////////////////wD//////////////9x8HAAAAAAAAAAAAAAAAP//////////////////AP//////////////AAAAAAAAAAAAAAAAAAAA//////////////////8A//////////////8AAAAAAAAAAAAAAAAAAAD//////////////////wD//////////////wAAAAAAAAR4AAAAAAAAAP//////////////////AP//////////////AAAAAAA4zP8AAAAAAAAA//////////////////8A//////////////8AAAA4sP///wAAAAAAAAD//////////////////wD//////////////yR80P//////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'2' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP/////////////////okFAkCAAABCBIfNT///////////////////8A///////////////8hAgAAAAAAAAAAAAAAFTo/////////////////wD//////////////1QAAAAAAAAAAAAAAAAAACjo////////////////AP////////////+MAAAAAAAAAAAAAAAAAAAAADj///////////////8A////////////9BAAAAAAAAAAAAAAAAAAAAAAALD//////////////wD///////////+gAAAAAAAAAHjs+KwMAAAAAAAAVP//////////////AP///////////1gAAAAAAABM/////6QAAAAAAAAU//////////////8A////////////KAAAAAAAALj/////+AAAAAAAAAD//////////////wD///////////+MfGBMOCAI8P/////wAAAAAAAACP//////////////AP///////////////////////////5wAAAAAAAAw//////////////8A///////////////////////////oFAAAAAAAAHz//////////////wD/////////////////////////6CgAAAAAAAAE3P//////////////AP///////////////////////9ggAAAAAAAAAHT///////////////8A//////////////////////+0DAAAAAAAAAA8+P///////////////wD/////////////////////gAAAAAAAAAAAKOj/////////////////AP//////////////////9FAAAAAAAAAAADzw//////////////////8A/////////////////+g4AAAAAAAAAABk/P///////////////////wD////////////////oKAAAAAAAAAAMqP//////////////////////AP//////////////6CgAAAAAAAAAMNz///////////////////////8A//////////////g4AAAAAAAAAFT0/////////////////////////wD/////////////bAAAAAAAAABU/P//////////////////////////AP///////////8wAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A////////////SAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////9wAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////hAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////9AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////xAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'3' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD////////////////8sGg0FAAAACA4cLz8////////////////////AP//////////////rBgAAAAAAAAAAAAAACTA//////////////////8A/////////////3QAAAAAAAAAAAAAAAAAAASs/////////////////wD///////////+YAAAAAAAAAAAAAAAAAAAAAAjc////////////////AP//////////6AwAAAAAAAAAAAAAAAAAAAAAAGT///////////////8A//////////94AAAAAAAABJDw/8g4AAAAAAAAHP///////////////wD//////////yAAAAAAAACE/////9gAAAAAAAAA////////////////AP///////////NSwiGQ4FOT//////AAAAAAAABD///////////////8A//////////////////////////+YAAAAAAAAVP///////////////wD//////////////////////P/ggAQAAAAAAATM////////////////AP////////////////////9gAAAAAAAAAAAElP////////////////8A/////////////////////0AAAAAAAAAAHLj//////////////////wD/////////////////////OAAAAAAAAAAwkPj/////////////////AP////////////////////8gAAAAAAAAAAAAINj///////////////8A/////////////////////xAAAAAAAAAAAAAAIPD//////////////wD/////////////////////uOz/4HgEAAAAAAAAhP//////////////AP///////////////////////////3wAAAAAAAAw//////////////8A////////////////////////////6AAAAAAAAAj//////////////wD/////////////////////////////AAAAAAAAAP//////////////AP//////////tJh8YEQoDNz//////+AAAAAAAAAY//////////////8A//////////88AAAAAAAAaP//////dAAAAAAAAEz//////////////wD//////////6QAAAAAAAAAdOD/5HQAAAAAAAAApP//////////////AP///////////CgAAAAAAAAAAAAAAAAAAAAAACD4//////////////8A////////////yAQAAAAAAAAAAAAAAAAAAAAEuP///////////////wD/////////////rAQAAAAAAAAAAAAAAAAABJD/////////////////AP//////////////zDQAAAAAAAAAAAAAACTA//////////////////8A/////////////////8BwOCAAAAAUNGi0/P///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'4' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////////////////nAAAAAAAAAD///////////////8A/////////////////////////8AEAAAAAAAAAP///////////////wD////////////////////////gGAAAAAAAAAAA////////////////AP//////////////////////9DAAAAAAAAAAAAD///////////////8A//////////////////////9UAAAAAAAAAAAAAP///////////////wD/////////////////////hAAAAAAAAAAAAAAA////////////////AP///////////////////7QAAAAAAAAAAAAAAAD///////////////8A///////////////////UDAAAAAAUAAAAAAAAAP///////////////wD/////////////////7CQAAAAABMAAAAAAAAAA////////////////AP////////////////xEAAAAAACU/wAAAAAAAAD///////////////8A////////////////cAAAAAAAZP//AAAAAAAAAP///////////////wD//////////////6AAAAAAADz8//8AAAAAAAAA////////////////AP/////////////IBAAAAAAc6P///wAAAAAAAAD///////////////8A////////////5BgAAAAADMz/////AAAAAAAAAP///////////////wD///////////g0AAAAAACk//////8AAAAAAAAA////////////////AP//////////XAAAAAAAfP///////wAAAAAAAAD///////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A////////////////////////////AAAAAAAAAP///////////////wD///////////////////////////8AAAAAAAAA////////////////AP///////////////////////////wAAAAAAAAD///////////////8A////////////////////////////AAAAAAAAAP///////////////wD///////////////////////////8AAAAAAAAA////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'5' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////8AAAAAAAAAAAAAAAAAAAAAAA//////////////8A///////////////MAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////////6wAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////////iAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////////9kAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////////0QAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////////IAAAAAAAYP////////////////////////////8A//////////////wAAAAAAAB8/////////////////////////////wD/////////////3AAAAAAAAIj/////////////////////////////AP////////////+4AAAAAAAAoLRYHAAEKGTE//////////////////8A/////////////5QAAAAAAAAQAAAAAAAAAABY9P///////////////wD/////////////dAAAAAAAAAAAAAAAAAAAAAA89P//////////////AP////////////9QAAAAAAAAAAAAAAAAAAAAAABg//////////////8A/////////////zAAAAAAAAAAAAAAAAAAAAAAAADQ/////////////wD/////////////IAAAAAAAAGjY/+h4BAAAAAAAAGz/////////////AP//////////////9NS0lHSc//////90AAAAAAAALP////////////8A/////////////////////////////9QAAAAAAAAE/////////////wD//////////////////////////////wAAAAAAAAD/////////////AP/////////////////////////////8AAAAAAAAEP////////////8A////////////pIRwWEAgDOD//////8wAAAAAAAA8/////////////wD///////////9EAAAAAAAAaP//////ZAAAAAAAAHz/////////////AP///////////6QAAAAAAAAAaOD/4GQAAAAAAAAE4P////////////8A/////////////CQAAAAAAAAAAAAAAAAAAAAAAGD//////////////wD/////////////yAQAAAAAAAAAAAAAAAAAAAAc7P//////////////AP//////////////rAwAAAAAAAAAAAAAAAAAGNj///////////////8A////////////////0EAAAAAAAAAAAAAAAFTo/////////////////wD//////////////////8h4QCAAAAAcQHzU////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'6' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////////////+0ZCwMAAAUNGjI////////////////////AP/////////////////EMAAAAAAAAAAAAABM6P////////////////8A////////////////lAQAAAAAAAAAAAAAAAAo6P///////////////wD//////////////6wAAAAAAAAAAAAAAAAAAABI////////////////AP/////////////oEAAAAAAAAAAAAAAAAAAAAACw//////////////8A/////////////3AAAAAAAAAoxP/YPAAAAAAAAEj//////////////wD////////////4EAAAAAAACOD////YDCBAVGiAoP//////////////AP///////////7gAAAAAAABY//////////////////////////////8A////////////eAAAAAAAAJT//////////////////////////////wD///////////9MAAAAAAAAvP/IXBgABCx03P//////////////////AP///////////ygAAAAAAADcdAAAAAAAAAAEiP////////////////8A////////////FAAAAAAAAFAAAAAAAAAAAAAAcP///////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAlP//////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAQ8P////////////8A////////////AAAAAAAAAABAyP/kZAAAAAAAAACQ/////////////wD///////////8MAAAAAAAALPj/////WAAAAAAAAET/////////////AP///////////yQAAAAAAACY///////MAAAAAAAAFP////////////8A////////////SAAAAAAAAMD///////wAAAAAAAAA/////////////wD///////////9wAAAAAAAAvP///////wAAAAAAAAD/////////////AP///////////7QAAAAAAACI///////UAAAAAAAAJP////////////8A////////////+AwAAAAAACDw/////2wAAAAAAABY/////////////wD/////////////cAAAAAAAADC8/Ox4AAAAAAAAAKj/////////////AP/////////////oEAAAAAAAAAAAAAAAAAAAAAAk/P////////////8A//////////////+oAAAAAAAAAAAAAAAAAAAABLj//////////////wD///////////////+QAAAAAAAAAAAAAAAAAACQ////////////////AP////////////////+0JAAAAAAAAAAAAAAkuP////////////////8A///////////////////8sGg0FAAADCxgqPz//////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'7' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAABP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAy4/////////////wD//////////////////////////+QUAAAAAAAEuP//////////////AP/////////////////////////8QAAAAAAAAKT///////////////8A/////////////////////////4wAAAAAAAB0/////////////////wD////////////////////////cCAAAAAAANPz/////////////////AP///////////////////////0QAAAAAAATY//////////////////8A//////////////////////+0AAAAAAAAeP///////////////////wD//////////////////////CQAAAAAABTw////////////////////AP////////////////////+gAAAAAAAAkP////////////////////8A/////////////////////ywAAAAAABDw/////////////////////wD///////////////////+4AAAAAAAAbP//////////////////////AP///////////////////1wAAAAAAADQ//////////////////////8A///////////////////4DAAAAAAAMP///////////////////////wD//////////////////7QAAAAAAAB8////////////////////////AP//////////////////aAAAAAAAAMj///////////////////////8A//////////////////8oAAAAAAAM/P///////////////////////wD/////////////////8AAAAAAAAET/////////////////////////AP////////////////+0AAAAAAAAcP////////////////////////8A/////////////////4wAAAAAAACY/////////////////////////wD/////////////////WAAAAAAAAMD/////////////////////////AP////////////////80AAAAAAAA4P////////////////////////8A/////////////////xAAAAAAAAD4/////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'8' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD////////////////////IdDQUAAAEIEiA1P//////////////////AP/////////////////gRAAAAAAAAAAAAAAAROD///////////////8A////////////////0BgAAAAAAAAAAAAAAAAAEMj//////////////wD///////////////AcAAAAAAAAAAAAAAAAAAAAHPD/////////////AP//////////////hAAAAAAAAAAAAAAAAAAAAAAAhP////////////8A//////////////8sAAAAAAAAKMz/zCgAAAAAAAAs/////////////wD//////////////wAAAAAAAADM////zAAAAAAAAAD/////////////AP//////////////BAAAAAAAAP//////AAAAAAAABP////////////8A//////////////8sAAAAAAAAzP///9QAAAAAAAAw/////////////wD//////////////3wAAAAAAAAoyP/YNAAAAAAAAIT/////////////AP//////////////7BgAAAAAAAAAAAAAAAAAAAAc8P////////////8A////////////////xBgAAAAAAAAAAAAAAAAAGNj//////////////wD/////////////////tAQAAAAAAAAAAAAAAACo////////////////AP///////////////HAAAAAAAAAAAAAAAAAAAAB8//////////////8A//////////////9gAAAAAAAAAAAAAAAAAAAAAAB8/////////////wD/////////////wAAAAAAAAABk4P/UWAAAAAAAAATQ////////////AP////////////9UAAAAAAAAaP//////XAAAAAAAAGT///////////8A/////////////xgAAAAAAADg///////cAAAAAAAAJP///////////wD/////////////AAAAAAAAAP////////8AAAAAAAAA////////////AP////////////8AAAAAAAAA4P//////3AAAAAAAAAT///////////8A/////////////ygAAAAAAABg//////9cAAAAAAAALP///////////wD/////////////ZAAAAAAAAABY1P/cXAAAAAAAAABw////////////AP/////////////QAAAAAAAAAAAAAAAAAAAAAAAABNz///////////8A//////////////9gAAAAAAAAAAAAAAAAAAAAAAB0/////////////wD///////////////Q8AAAAAAAAAAAAAAAAAAAAUPz/////////////AP////////////////x4CAAAAAAAAAAAAAAAEIT8//////////////8A///////////////////smFQwGAAAABg0ZKT0/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'9' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////////////ysYCwMAAAUNGiw/P//////////////////AP////////////////+4JAAAAAAAAAAAAAAkuP////////////////8A////////////////lAQAAAAAAAAAAAAAAAAAkP///////////////wD//////////////8AEAAAAAAAAAAAAAAAAAAAAqP//////////////AP/////////////8JAAAAAAAAAAAAAAAAAAAAAAQ7P////////////8A/////////////6wAAAAAAAAAfOz8vCwAAAAAAABw/////////////wD/////////////WAAAAAAAAHD/////7BgAAAAAAAz4////////////AP////////////8kAAAAAAAA1P//////hAAAAAAAALT///////////8A/////////////wAAAAAAAAD///////+4AAAAAAAAcP///////////wD/////////////AAAAAAAAAPz//////8AAAAAAAABI////////////AP////////////8UAAAAAAAAzP//////lAAAAAAAACT///////////8A/////////////0QAAAAAAABY//////gsAAAAAAAADP///////////wD/////////////kAAAAAAAAABw5P/IPAAAAAAAAAAA////////////AP/////////////wEAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A//////////////+UAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD///////////////9wAAAAAAAAAAAAAFAAAAAAAAAU////////////AP////////////////+IBAAAAAAAAABw3AAAAAAAACj///////////8A///////////////////cdCwEABhcxP+8AAAAAAAATP///////////wD//////////////////////////////5AAAAAAAAB4////////////AP//////////////////////////////UAAAAAAAALj///////////8A//////////////+kgGxUQCAM2P///+AIAAAAAAAQ+P///////////wD//////////////0gAAAAAAAA42P/EKAAAAAAAAHD/////////////AP//////////////sAAAAAAAAAAAAAAAAAAAAAAQ6P////////////8A////////////////TAAAAAAAAAAAAAAAAAAAAKz//////////////wD////////////////oKAAAAAAAAAAAAAAAAASU////////////////AP/////////////////sUAAAAAAAAAAAAAAwxP////////////////8A////////////////////yHA0FAAADCxktP///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'A' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////////////////+QAAAAAAAAAAAAAAOT/////////////////AP//////////////////kAAAAAAAAAAAAAAAkP////////////////8A//////////////////88AAAAAAAAAAAAAAA8/////////////////wD/////////////////5AAAAAAAAAAAAAAAAADk////////////////AP////////////////+QAAAAAAAAAAAAAAAAAJD///////////////8A/////////////////zwAAAAAAAAAAAAAAAAAPP///////////////wD////////////////kAAAAAAAAAAgAAAAAAAAA5P//////////////AP///////////////5AAAAAAAAAAgAAAAAAAAACQ//////////////8A////////////////PAAAAAAAAAz8HAAAAAAAADz//////////////wD//////////////+QAAAAAAAAAWP9kAAAAAAAAANz/////////////AP//////////////kAAAAAAAAACk/7wAAAAAAAAAhP////////////8A//////////////88AAAAAAAABOz//BQAAAAAAAAw/////////////wD/////////////4AAAAAAAAAA8////ZAAAAAAAAADc////////////AP////////////+EAAAAAAAAAIj///+8AAAAAAAAAIT///////////8A/////////////zAAAAAAAAAA2P////wQAAAAAAAAMP///////////wD////////////cAAAAAAAAACT//////1wAAAAAAAAA3P//////////AP///////////4QAAAAAAAAAAAAAAAAAAAAAAAAAAACE//////////8A////////////MAAAAAAAAAAAAAAAAAAAAAAAAAAAADD//////////wD//////////9wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANz/////////AP//////////hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhP////////8A//////////8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAw/////////wD/////////3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADc////////AP////////+EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIT///////8A/////////zAAAAAAAAAAhP///////////2QAAAAAAAAAMP///////wD////////cAAAAAAAAAADM////////////vAAAAAAAAAAA3P//////AP///////4QAAAAAAAAAHP/////////////4DAAAAAAAAACE//////8A////////MAAAAAAAAABk//////////////9cAAAAAAAAADD//////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'B' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAEDh83P///////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAEhP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAeP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAABY////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAABT///////////8A//////////8AAAAAAAAAAP/////4zEwAAAAAAAAAAP///////////wD//////////wAAAAAAAAAA////////7AAAAAAAAAAQ////////////AP//////////AAAAAAAAAAD////////sAAAAAAAAAEj///////////8A//////////8AAAAAAAAAAP/////4zEQAAAAAAAAAtP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAFz/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAiA/P////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAIjPj//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAGKz/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAJT///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAABNz//////////wD//////////wAAAAAAAAAA///////sqCAAAAAAAAAAbP//////////AP//////////AAAAAAAAAAD/////////yAAAAAAAAAAs//////////8A//////////8AAAAAAAAAAP//////////AAAAAAAAAAT//////////wD//////////wAAAAAAAAAA/////////7wAAAAAAAAAAP//////////AP//////////AAAAAAAAAAD//////+ikGAAAAAAAAAAY//////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFT//////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsP//////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAADj///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAc6P///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAATOj/////////////AP//////////AAAAAAAAAAAAAAAAAAAEIEBkkNj///////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'C' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////////5JRULBAAAAgkTIDQ//////////////////8A////////////////1FAAAAAAAAAAAAAAAABAyP///////////////wD//////////////4gEAAAAAAAAAAAAAAAAAAAElP//////////////AP////////////9wAAAAAAAAAAAAAAAAAAAAAAAAlP////////////8A////////////kAAAAAAAAAAAAAAAAAAAAAAAAAAEyP///////////wD//////////9wIAAAAAAAAAAAAAAAAAAAAAAAAAAAw////////////AP//////////WAAAAAAAAAAAWMz/8JwQAAAAAAAAAACw//////////8A/////////+wEAAAAAAAAAID//////9QMAAAAAAAAAET//////////wD/////////nAAAAAAAAAAo/P///////3wAAAAABDBspP//////////AP////////9gAAAAAAAAAIz/////////3BxQjMT0//////////////8A/////////zQAAAAAAAAAzP///////////////////////////////wD/////////GAAAAAAAAADo////////////////////////////////AP////////8AAAAAAAAAAP////////////////////////////////8A/////////wAAAAAAAAAA/////////////////////////////////wD/////////AAAAAAAAAAD/////////////////////////////////AP////////8cAAAAAAAAAOj///////////////////////////////8A/////////zgAAAAAAAAA0P/////////kIGio7P///////////////wD/////////bAAAAAAAAACg/////////5wAAAAAMHS49P//////////AP////////+oAAAAAAAAAEz/////////PAAAAAAAAAAc//////////8A//////////QIAAAAAAAAALz//////6QAAAAAAAAAAGT//////////wD//////////3AAAAAAAAAADIzo/+SEBAAAAAAAAAAAyP//////////AP//////////7BAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A////////////rAAAAAAAAAAAAAAAAAAAAAAAAAAE0P///////////wD/////////////fAAAAAAAAAAAAAAAAAAAAAAAAJz/////////////AP//////////////iAQAAAAAAAAAAAAAAAAAAASY//////////////8A////////////////yEAAAAAAAAAAAAAAAAA8yP///////////////wD//////////////////9yIUCwQAAAAIEB4yP//////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'D' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////8AAAAAAAAAAAAAAAAADChQkOT/////////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAABGjw//////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAACDY/////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAABjk////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAKj//////////wD///////////8AAAAAAAAAAP///+isSAAAAAAAAAAANP//////////AP///////////wAAAAAAAAAA////////hAAAAAAAAAAA2P////////8A////////////AAAAAAAAAAD/////////MAAAAAAAAACQ/////////wD///////////8AAAAAAAAAAP////////+MAAAAAAAAAFj/////////AP///////////wAAAAAAAAAA/////////8gAAAAAAAAAMP////////8A////////////AAAAAAAAAAD/////////5AAAAAAAAAAY/////////wD///////////8AAAAAAAAAAP//////////AAAAAAAAAAD/////////AP///////////wAAAAAAAAAA//////////8AAAAAAAAAAP////////8A////////////AAAAAAAAAAD//////////wAAAAAAAAAA/////////wD///////////8AAAAAAAAAAP/////////wAAAAAAAAABD/////////AP///////////wAAAAAAAAAA/////////9QAAAAAAAAAJP////////8A////////////AAAAAAAAAAD/////////qAAAAAAAAABI/////////wD///////////8AAAAAAAAAAP////////9QAAAAAAAAAHj/////////AP///////////wAAAAAAAAAA////////uAAAAAAAAAAAvP////////8A////////////AAAAAAAAAAD////w0HwEAAAAAAAAACT8/////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAADz8//////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAY6P///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAKNz/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAACHT0//////////////8A////////////AAAAAAAAAAAAAAAAABg4bKj0/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'E' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'F' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'G' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////////////////MB8TCgQAAAACCA4YJzs////////////////AP///////////////JQcAAAAAAAAAAAAAAAAAAhw8P////////////8A/////////////9gwAAAAAAAAAAAAAAAAAAAAAAAk2P///////////wD////////////EDAAAAAAAAAAAAAAAAAAAAAAAAAAc7P//////////AP//////////2AwAAAAAAAAAAAAAAAAAAAAAAAAAAABY//////////8A//////////wwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQ/////////wD/////////kAAAAAAAAAAAEHzQ/P/gmCAAAAAAAAAAAFz/////////AP////////wcAAAAAAAAACjg////////8CwAAAAAAAAgWP////////8A////////vAAAAAAAAAAI2P//////////yBRAcJjI8P///////////wD///////94AAAAAAAAAGD/////////////////////////////////AP///////0AAAAAAAAAAsP////////////////////////////////8A////////IAAAAAAAAADc/////////////////////////////////wD///////8AAAAAAAAAAP///////wAAAAAAAAAAAAAAAAD/////////AP///////wAAAAAAAAAA////////AAAAAAAAAAAAAAAAAP////////8A////////AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAA/////////wD///////8gAAAAAAAAAOD//////wAAAAAAAAAAAAAAAAD/////////AP///////0AAAAAAAAAAtP//////AAAAAAAAAAAAAAAAAP////////8A////////cAAAAAAAAABw//////8AAAAAAAAAAAAAAAAA/////////wD///////+8AAAAAAAAABDs////////////AAAAAAAAAAD/////////AP////////wYAAAAAAAAADz0//////////AAAAAAAAAAAP////////8A/////////5AAAAAAAAAAACCY4P//3KhcCAAAAAAAAAAA/////////wD/////////+CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AP//////////xAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIP////////8A////////////rAQAAAAAAAAAAAAAAAAAAAAAAAAAAGTw/////////wD/////////////vBQAAAAAAAAAAAAAAAAAAAAAADjI////////////AP//////////////8HAQAAAAAAAAAAAAAAAAAEiw//////////////8A//////////////////iwcEAgBAAABCA4aKDk/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'H' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'I' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'J' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAj//////////////wD//////////+zMrIxwUDAQ//////wAAAAAAAAAIP//////////////AP//////////DAAAAAAAAADo////2AAAAAAAAAA0//////////////8A//////////8wAAAAAAAAAKj///+YAAAAAAAAAFj//////////////wD//////////2gAAAAAAAAAIND/yBgAAAAAAAAAkP//////////////AP//////////vAAAAAAAAAAAAAAAAAAAAAAAAADc//////////////8A////////////MAAAAAAAAAAAAAAAAAAAAAAAUP///////////////wD////////////EBAAAAAAAAAAAAAAAAAAAABjk////////////////AP////////////+sBAAAAAAAAAAAAAAAAAAY2P////////////////8A///////////////EMAAAAAAAAAAAAAAAVOj//////////////////wD/////////////////vHBAIAAAABg8fNT/////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'K' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////8AAAAAAAAAAP//////////wAQAAAAAAAAAAABw////////AP///////wAAAAAAAAAA/////////9AMAAAAAAAAAAAAcP////////8A////////AAAAAAAAAAD////////cGAAAAAAAAAAAAHD//////////wD///////8AAAAAAAAAAP//////6CgAAAAAAAAAAABs////////////AP///////wAAAAAAAAAA//////Q0AAAAAAAAAAAAVPz///////////8A////////AAAAAAAAAAD////8RAAAAAAAAAAAAFT8/////////////wD///////8AAAAAAAAAAP///1gAAAAAAAAAAABU/P//////////////AP///////wAAAAAAAAAA//9wAAAAAAAAAAAASPz///////////////8A////////AAAAAAAAAAD/jAAAAAAAAAAAADz0/////////////////wD///////8AAAAAAAAAAKQAAAAAAAAAAAA89P//////////////////AP///////wAAAAAAAAAABAAAAAAAAAAAFPT///////////////////8A////////AAAAAAAAAAAAAAAAAAAAAAAApP///////////////////wD///////8AAAAAAAAAAAAAAAAAAAAAAAAU8P//////////////////AP///////wAAAAAAAAAAAAAAAAAAAAAAAABk//////////////////8A////////AAAAAAAAAAAAAAAAAAAAAAAAAADE/////////////////wD///////8AAAAAAAAAAAAAAAAoEAAAAAAAACz8////////////////AP///////wAAAAAAAAAAAAAAGNiAAAAAAAAAAIj///////////////8A////////AAAAAAAAAAAAABjY//gYAAAAAAAACOD//////////////wD///////8AAAAAAAAAAAAY2P///5wAAAAAAAAASP//////////////AP///////wAAAAAAAAAAGNj//////CgAAAAAAAAAqP////////////8A////////AAAAAAAAAADI////////sAAAAAAAAAAc8P///////////wD///////8AAAAAAAAAAP//////////QAAAAAAAAABs////////////AP///////wAAAAAAAAAA///////////IAAAAAAAAAATI//////////8A////////AAAAAAAAAAD///////////9YAAAAAAAAADD8/////////wD///////8AAAAAAAAAAP///////////9wEAAAAAAAAAJD/////////AP///////wAAAAAAAAAA/////////////3AAAAAAAAAADOT///////8A////////AAAAAAAAAAD/////////////7BAAAAAAAAAAUP///////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'L' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'M' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////8AAAAAAAAAAAAAAHz//////3wAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAAAAAATP//////UAAAAAAAAAAAAAAA////////AP//////AAAAAAAAAAAAAAAc//////8cAAAAAAAAAAAAAAD///////8A//////8AAAAAAAAAAAAAAADw////8AAAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAAAAAAALz////AAAAAAAAAAAAAAAAA////////AP//////AAAAAAAAAAAAAAAAkP///5AAAAAAAAAAAAAAAAD///////8A//////8AAAAAAAAAAAAAAABc////ZAAAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAoAAAAADD///8wAAAAACQAAAAAAAAA////////AP//////AAAAAAAAAFwAAAAABPz//AgAAAAAXAAAAAAAAAD///////8A//////8AAAAAAAAAkAAAAAAA0P/UAAAAAACQAAAAAAAAAP///////wD//////wAAAAAAAADMAAAAAACg/6gAAAAAAMQAAAAAAAAA////////AP//////AAAAAAAAAPgEAAAAAHD/dAAAAAAE+AAAAAAAAAD///////8A//////8AAAAAAAAA/zQAAAAAQP9IAAAAADD/AAAAAAAAAP///////wD//////wAAAAAAAAD/bAAAAAAQ/xQAAAAAaP8AAAAAAAAA////////AP//////AAAAAAAAAP+gAAAAAADQAAAAAACc/wAAAAAAAAD///////8A//////8AAAAAAAAA/9QAAAAAAGgAAAAAAND/AAAAAAAAAP///////wD//////wAAAAAAAAD//wwAAAAAFAAAAAAM/P8AAAAAAAAA////////AP//////AAAAAAAAAP//RAAAAAAAAAAAADz//wAAAAAAAAD///////8A//////8AAAAAAAAA//94AAAAAAAAAAAAcP//AAAAAAAAAP///////wD//////wAAAAAAAAD//7AAAAAAAAAAAACo//8AAAAAAAAA////////AP//////AAAAAAAAAP//5AAAAAAAAAAAANz//wAAAAAAAAD///////8A//////8AAAAAAAAA////HAAAAAAAAAAQ////AAAAAAAAAP///////wD//////wAAAAAAAAD///9QAAAAAAAAAEz///8AAAAAAAAA////////AP//////AAAAAAAAAP///4gAAAAAAAAAfP///wAAAAAAAAD///////8A//////8AAAAAAAAA////vAAAAAAAAACw////AAAAAAAAAP///////wD//////wAAAAAAAAD////wAAAAAAAAAOz///8AAAAAAAAA////////AP//////AAAAAAAAAP////8sAAAAAAAc/////wAAAAAAAAD///////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'N' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////AAAAAAAAALD/////////////AAAAAAAAAP//////////AP////////8AAAAAAAAAFOj///////////8AAAAAAAAA//////////8A/////////wAAAAAAAAAASP///////////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAkP//////////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAI1P////////8AAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAw+P///////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAABw////////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAC8//////8AAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAABzs/////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAFD/////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAJz///8AAAAAAAAA//////////8A/////////wAAAAAAAAAUAAAAAAAADNz//wAAAAAAAAD//////////wD/////////AAAAAAAAALQAAAAAAAAANPz/AAAAAAAAAP//////////AP////////8AAAAAAAAA/2wAAAAAAAAAfP8AAAAAAAAA//////////8A/////////wAAAAAAAAD/+CwAAAAAAAAExAAAAAAAAAD//////////wD/////////AAAAAAAAAP//0AQAAAAAAAAgAAAAAAAAAP//////////AP////////8AAAAAAAAA////jAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD/////RAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP/////kFAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAA//////+sAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD///////9kAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP////////QkAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAA/////////8wEAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD//////////4QAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP///////////DwAAAAAAAAAAP//////////AP////////8AAAAAAAAA////////////4BAAAAAAAAAA//////////8A/////////wAAAAAAAAD/////////////qAAAAAAAAAD//////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'O' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A///////////////////0qGw4HAAAABw4aKT0/////////////////wD////////////////wcAwAAAAAAAAAAAAAAAho6P//////////////AP//////////////uBQAAAAAAAAAAAAAAAAAAAAMoP////////////8A/////////////6AEAAAAAAAAAAAAAAAAAAAAAAAAkP///////////wD///////////+4BAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP//////////8BQAAAAAAAAAAAAAAAAAAAAAAAAAAAAM5P////////8A//////////9wAAAAAAAAAAAsrPD/7KQsAAAAAAAAAABg/////////wD/////////+BAAAAAAAAAAUPj///////hQAAAAAAAAAAjs////////AP////////+sAAAAAAAAABDw//////////AYAAAAAAAAAKD///////8A/////////2wAAAAAAAAAdP///////////3wAAAAAAAAAYP///////wD/////////OAAAAAAAAAC4////////////xAAAAAAAAAAw////////AP////////8cAAAAAAAAAOD////////////oAAAAAAAAABT///////8A/////////wAAAAAAAAAA//////////////8AAAAAAAAAAP///////wD/////////AAAAAAAAAAD//////////////wAAAAAAAAAA////////AP////////8AAAAAAAAAAP/////////////8AAAAAAAAAAD///////8A/////////xwAAAAAAAAA5P///////////+AAAAAAAAAAHP///////wD/////////NAAAAAAAAAC8////////////uAAAAAAAAAA4////////AP////////9oAAAAAAAAAHj///////////98AAAAAAAAAGT///////8A/////////6gAAAAAAAAAGPD/////////+BgAAAAAAAAApP///////wD/////////9AwAAAAAAAAAUPz///////xcAAAAAAAAAAjs////////AP//////////cAAAAAAAAAAALKjs//CwOAAAAAAAAAAAYP////////8A///////////wFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzk/////////wD///////////+4BAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP////////////+QAAAAAAAAAAAAAAAAAAAAAAAAAJD///////////8A//////////////+sEAAAAAAAAAAAAAAAAAAAAAyg/////////////wD////////////////oZAgAAAAAAAAAAAAAAARg4P//////////////AP//////////////////9KhsOCAAAAAUMFyc7P////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'P' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////////wAAAAAAAAAAAAAAAAAACCxguP////////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAOOD//////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAGOD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAARP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAABo////////////AP///////////wAAAAAAAAAA////6JwMAAAAAAAAADD///////////8A////////////AAAAAAAAAAD//////6AAAAAAAAAADP///////////wD///////////8AAAAAAAAAAP//////9AAAAAAAAAAA////////////AP///////////wAAAAAAAAAA///////0AAAAAAAAAAD///////////8A////////////AAAAAAAAAAD//////5gAAAAAAAAAHP///////////wD///////////8AAAAAAAAAAP///9iICAAAAAAAAABI////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAJD///////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAI6P///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAIT/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAABU/P////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAIhPz//////////////wD///////////8AAAAAAAAAAAAAAAAABCRMkOz/////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'Q' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////SoaDQcAAAAHDhoqPT///////////////////8A//////////////BwDAAAAAAAAAAAAAAACHDo/////////////////wD///////////+4FAAAAAAAAAAAAAAAAAAAABCo////////////////AP//////////nAQAAAAAAAAAAAAAAAAAAAAAAACQ//////////////8A/////////7gEAAAAAAAAAAAAAAAAAAAAAAAAAACg/////////////wD////////wFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzo////////////AP///////3AAAAAAAAAAACyo8P/sqCwAAAAAAAAAAGT///////////8A///////4EAAAAAAAAABM+P///////FQAAAAAAAAACPT//////////wD//////7AAAAAAAAAAFPD/////////9BgAAAAAAAAApP//////////AP//////bAAAAAAAAAB4////////////fAAAAAAAAABk//////////8A//////84AAAAAAAAALz///////////+8AAAAAAAAADT//////////wD//////xwAAAAAAAAA6P///////////+QAAAAAAAAAHP//////////AP//////AAAAAAAAAAD//////////////wAAAAAAAAAA//////////8A//////8AAAAAAAAAAP//////////////AAAAAAAAAAD//////////wD//////wAAAAAAAAAA/P////////////8AAAAAAAAAAP//////////AP//////GAAAAAAAAADg////////////4AAAAAAAAAAc//////////8A//////84AAAAAAAAALT////MJHTo//+8AAAAAAAAADT//////////wD//////2wAAAAAAAAAdP///2AAABCg/3wAAAAAAAAAZP//////////AP//////rAAAAAAAAAAY9P/sCAAAAABMGAAAAAAAAACk//////////8A///////4EAAAAAAAAABU/P+0OAAAAAAAAAAAAAAACPT//////////wD///////94AAAAAAAAAAA4sPD/gAAAAAAAAAAAAABk////////////AP////////AcAAAAAAAAAAAAAAAAAAAAAAAAAAAADOT///////////8A/////////7wEAAAAAAAAAAAAAAAAAAAAAAAAAACQ/////////////wD//////////6wEAAAAAAAAAAAAAAAAAAAAAAAAABSs////////////AP///////////7gUAAAAAAAAAAAAAAAAAAAAAAAAAABAwP////////8A//////////////BwDAAAAAAAAAAAAAAABAgAAAAAAAA8/////////wD////////////////0qGg0GAAAABgwXJjkxBgAAAAAALD/////////AP//////////////////////////////////5DQAAAAk/P////////8A////////////////////////////////////+GwAAJD//////////wD//////////////////////////////////////8A49P//////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'R' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////wAAAAAAAAAAAAAAAAAAAAQgOGSk+P///////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAcuP//////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAEsP////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ6P///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAADD///////////8A/////////wAAAAAAAAAA///////svDgAAAAAAAAACP///////////wD/////////AAAAAAAAAAD/////////7AAAAAAAAAAA////////////AP////////8AAAAAAAAAAP/////////cAAAAAAAAABD///////////8A/////////wAAAAAAAAAA//////DQoCQAAAAAAAAAQP///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACU////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAIPj///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAzU/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAA02P//////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAxctPz///////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAEDY/////////////////wD/////////AAAAAAAAAAD/9LAsAAAAAAAAAAzc////////////////AP////////8AAAAAAAAAAP///+wkAAAAAAAAADD8//////////////8A/////////wAAAAAAAAAA/////8QAAAAAAAAAAJD//////////////wD/////////AAAAAAAAAAD//////1QAAAAAAAAAFPD/////////////AP////////8AAAAAAAAAAP//////3AQAAAAAAAAAgP////////////8A/////////wAAAAAAAAAA////////aAAAAAAAAAAM6P///////////wD/////////AAAAAAAAAAD////////oCAAAAAAAAABs////////////AP////////8AAAAAAAAAAP////////+AAAAAAAAAAATc//////////8A/////////wAAAAAAAAAA//////////AUAAAAAAAAAFj//////////wD/////////AAAAAAAAAAD//////////5AAAAAAAAAAAND/////////AP////////8AAAAAAAAAAP//////////+CQAAAAAAAAAQP////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'S' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP/////////////////8vHBEIAgAAAQgQHC8/P////////////////8A////////////////pCQAAAAAAAAAAAAAAAAcoP///////////////wD//////////////FwAAAAAAAAAAAAAAAAAAAAAXP//////////////AP////////////9oAAAAAAAAAAAAAAAAAAAAAAAAhP////////////8A////////////zAAAAAAAAAAAAAAAAAAAAAAAAAAI6P///////////wD///////////9cAAAAAAAAAAAAAAAAAAAAAAAAAACA////////////AP///////////xgAAAAAAAAAUOD/8KwkAAAAAAAAADj///////////8A////////////AAAAAAAAAAD0/////8wABCAgICxASP///////////wD///////////8MAAAAAAAAAMz/////////////////////////////AP///////////0AAAAAAAAAACFiQxPT///////////////////////8A////////////oAAAAAAAAAAAAAAAADBwtPT//////////////////wD////////////8QAAAAAAAAAAAAAAAAAAACFTA////////////////AP/////////////oOAAAAAAAAAAAAAAAAAAAAABM6P////////////8A///////////////4fAgAAAAAAAAAAAAAAAAAAAAY2P///////////wD/////////////////7IwwAAAAAAAAAAAAAAAAAAAo+P//////////AP/////////////////////koGw0BAAAAAAAAAAAAACU//////////8A///////////////////////////4uFgAAAAAAAAAADz//////////wD//////////2BgSEA0IBwA6P///////5QAAAAAAAAADP//////////AP//////////JAAAAAAAAACc/////////AAAAAAAAAAA//////////8A//////////9YAAAAAAAAACDo///////AAAAAAAAAABT//////////wD//////////6QAAAAAAAAAACCk7P/snBQAAAAAAAAAUP//////////AP//////////+BAAAAAAAAAAAAAAAAAAAAAAAAAAAACs//////////8A////////////kAAAAAAAAAAAAAAAAAAAAAAAAAAAOP///////////wD////////////8RAAAAAAAAAAAAAAAAAAAAAAAABjc////////////AP/////////////0PAAAAAAAAAAAAAAAAAAAAAAg2P////////////8A///////////////8hBQAAAAAAAAAAAAAAAAMdPT//////////////wD/////////////////+LRwSCAMAAAAHDhoqPT/////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'T' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'U' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////JAAAAAAAAADk/////////+gAAAAAAAAAHP//////////AP////////9MAAAAAAAAAJz/////////nAAAAAAAAABE//////////8A/////////4gAAAAAAAAAHOj//////+ggAAAAAAAAAHz//////////wD/////////0AAAAAAAAAAAIJzs/+ykIAAAAAAAAAAA0P//////////AP//////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A///////////IBAAAAAAAAAAAAAAAAAAAAAAAAAAE0P///////////wD///////////+YAAAAAAAAAAAAAAAAAAAAAAAAAJj/////////////AP////////////+UBAAAAAAAAAAAAAAAAAAAAASU//////////////8A///////////////IPAAAAAAAAAAAAAAAAAAwyP///////////////wD/////////////////0IxYOCAIAAAEIEiAyP//////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'V' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////zAAAAAAAAAAYP//////////////ZAAAAAAAAAAw////////AP//////kAAAAAAAAAAU/P////////////8UAAAAAAAAAJD///////8A///////oBAAAAAAAAADE////////////xAAAAAAAAAAE7P///////wD///////9MAAAAAAAAAHD///////////94AAAAAAAAAEz/////////AP///////6gAAAAAAAAAJP///////////yQAAAAAAAAArP////////8A////////+BAAAAAAAAAA1P/////////YAAAAAAAAABT4/////////wD/////////aAAAAAAAAACE/////////4QAAAAAAAAAbP//////////AP/////////EAAAAAAAAADT/////////OAAAAAAAAADM//////////8A//////////8kAAAAAAAAAOT//////+QAAAAAAAAAKP///////////wD//////////4QAAAAAAAAAmP//////nAAAAAAAAACI////////////AP//////////5AAAAAAAAABE//////9EAAAAAAAABOT///////////8A////////////QAAAAAAAAAT0////9AgAAAAAAABI/////////////wD///////////+gAAAAAAAAAKT///+kAAAAAAAAAKj/////////////AP////////////QIAAAAAAAAXP///1wAAAAAAAAM+P////////////8A/////////////1wAAAAAAAAM+P/8DAAAAAAAAGT//////////////wD/////////////vAAAAAAAAAC8/7wAAAAAAAAAxP//////////////AP//////////////HAAAAAAAAGj/aAAAAAAAACT///////////////8A//////////////94AAAAAAAAHP8cAAAAAAAAhP///////////////wD//////////////9gAAAAAAAAAkAAAAAAAAADk////////////////AP///////////////zgAAAAAAAAQAAAAAAAAQP////////////////8A////////////////lAAAAAAAAAAAAAAAAACg/////////////////wD////////////////sCAAAAAAAAAAAAAAADPT/////////////////AP////////////////9QAAAAAAAAAAAAAABg//////////////////8A/////////////////7AAAAAAAAAAAAAAAMD//////////////////wD//////////////////BQAAAAAAAAAAAAc////////////////////AP//////////////////cAAAAAAAAAAAAHz///////////////////8A///////////////////MAAAAAAAAAAAA3P///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'W' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//8cAAAAAAAAALz/////4AAAAAAAAAAA6P////+8AAAAAAAAABz//wD//1QAAAAAAAAAjP////+gAAAAAAAAAACo/////4wAAAAAAAAAUP//AP//jAAAAAAAAABU/////2AAAAAAAAAAAGj/////VAAAAAAAAACM//8A///EAAAAAAAAACT/////IAAAAAAAAAAAKP////8kAAAAAAAAAMT//wD///gEAAAAAAAAAPD//+AAAAAAAAAAAAAA6P//8AAAAAAAAAAE9P//AP///zAAAAAAAAAAvP//oAAAAAAAAAAAAACo//+8AAAAAAAAADD///8A////bAAAAAAAAACM//9gAAAAAAAAAAAAAGT//4wAAAAAAAAAaP///wD///+kAAAAAAAAAFT//yAAAAAAAAAAAAAAIP//VAAAAAAAAACc////AP///9gAAAAAAAAAJP/gAAAAAAAAAAAAAAAA4P8kAAAAAAAAANT///8A/////xAAAAAAAAAA8KAAAAAAAAAAAAAAAACg8AAAAAAAAAAQ/////wD/////TAAAAAAAAAC8YAAAAAAAAAAAAAAAAGC8AAAAAAAAAET/////AP////+AAAAAAAAAAIwgAAAAAAAAAAAAAAAAIIwAAAAAAAAAfP////8A/////7gAAAAAAAAANAAAAAAAACwwAAAAAAAANAAAAAAAAACw/////wD/////8AAAAAAAAAAAAAAAAAAAdHgAAAAAAAAAAAAAAAAAAOz/////AP//////KAAAAAAAAAAAAAAAAAC4vAAAAAAAAAAAAAAAAAAg//////8A//////9gAAAAAAAAAAAAAAAACPj4CAAAAAAAAAAAAAAAAFj//////wD//////5QAAAAAAAAAAAAAAABE//9IAAAAAAAAAAAAAAAAkP//////AP//////0AAAAAAAAAAAAAAAAIj//4wAAAAAAAAAAAAAAADI//////8A///////8DAAAAAAAAAAAAAAAzP//1AAAAAAAAAAAAAAABPj//////wD///////88AAAAAAAAAAAAABT/////GAAAAAAAAAAAAAA0////////AP///////3QAAAAAAAAAAAAAWP////9gAAAAAAAAAAAAAHD///////8A////////sAAAAAAAAAAAAACg/////6QAAAAAAAAAAAAApP///////wD////////kAAAAAAAAAAAAAOT/////6AAAAAAAAAAAAADc////////AP////////8cAAAAAAAAAAAo////////MAAAAAAAAAAAEP////////8A/////////1QAAAAAAAAAAHD///////94AAAAAAAAAABM/////////wD/////////jAAAAAAAAAAAtP///////7wAAAAAAAAAAID/////////AP/////////EAAAAAAAAAAT0////////+AgAAAAAAAAAuP////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'X' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////9UAAAAAAAAAKz///////////+sAAAAAAAAAFD/////////AP///////+QQAAAAAAAAFOT/////////8BwAAAAAAAAM5P////////8A/////////5gAAAAAAAAATP////////9kAAAAAAAAAJD//////////wD//////////0AAAAAAAAAAoP//////wAAAAAAAAAA0/P//////////AP//////////2AgAAAAAAAAQ4P////gkAAAAAAAABMz///////////8A////////////iAAAAAAAAABA////dAAAAAAAAABw/////////////wD////////////8MAAAAAAAAACU/9AEAAAAAAAAHPD/////////////AP/////////////IBAAAAAAAAAzYMAAAAAAAAACs//////////////8A//////////////90AAAAAAAAABAAAAAAAAAATP///////////////wD///////////////QgAAAAAAAAAAAAAAAAAAzg////////////////AP///////////////7wAAAAAAAAAAAAAAAAAjP////////////////8A/////////////////2AAAAAAAAAAAAAAADD8/////////////////wD/////////////////7BQAAAAAAAAAAAAEyP//////////////////AP/////////////////gDAAAAAAAAAAAAAjY//////////////////8A/////////////////0AAAAAAAAAAAAAAADj8/////////////////wD///////////////+UAAAAAAAAAAAAAAAAAJD/////////////////AP//////////////4AwAAAAAAAAAAAAAAAAADOD///////////////8A//////////////9AAAAAAAAAAAAAAAAAAAAAQP///////////////wD/////////////nAAAAAAAAAAAWAAAAAAAAAAAlP//////////////AP///////////+QQAAAAAAAAAGD/YAAAAAAAAAAM4P////////////8A////////////TAAAAAAAAAAs9P/0LAAAAAAAAABM/////////////wD//////////6AAAAAAAAAADNT////UDAAAAAAAAACg////////////AP/////////kEAAAAAAAAACg//////+gAAAAAAAAABDk//////////8A/////////0wAAAAAAAAAYP////////9gAAAAAAAAAEz//////////wD///////+oAAAAAAAAACz0//////////QsAAAAAAAAAKT/////////AP//////7BQAAAAAAAAM1P///////////9QMAAAAAAAAFOz///////8A//////9UAAAAAAAAAKD//////////////6AAAAAAAAAAVP///////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'Y' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////1QAAAAAAAAAAGj//////////2gAAAAAAAAAAFT///////8A////////5BAAAAAAAAAAAMT////////EAAAAAAAAAAAQ5P///////wD/////////mAAAAAAAAAAAKPj/////+CgAAAAAAAAAAJj/////////AP//////////PAAAAAAAAAAAgP////+AAAAAAAAAAAA8//////////8A///////////YCAAAAAAAAAAE2P//2AQAAAAAAAAACNj//////////wD///////////+AAAAAAAAAAAA4//84AAAAAAAAAACA////////////AP////////////woAAAAAAAAAACUlAAAAAAAAAAAKPz///////////8A/////////////8gAAAAAAAAAABAQAAAAAAAAAADI/////////////wD//////////////2wAAAAAAAAAAAAAAAAAAAAAbP//////////////AP//////////////8BwAAAAAAAAAAAAAAAAAABzw//////////////8A////////////////tAAAAAAAAAAAAAAAAAAAtP///////////////wD/////////////////VAAAAAAAAAAAAAAAAFT/////////////////AP/////////////////oEAAAAAAAAAAAAAAQ6P////////////////8A//////////////////+cAAAAAAAAAAAAAJz//////////////////wD///////////////////9AAAAAAAAAAABA////////////////////AP///////////////////9gAAAAAAAAAANj///////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'Z' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAQ//////////////8A/////////////////////////1AAAAAAAAAABLz//////////////wD///////////////////////98AAAAAAAAAACY////////////////AP//////////////////////pAAAAAAAAAAAaP////////////////8A/////////////////////8QIAAAAAAAAAET8/////////////////wD////////////////////gGAAAAAAAAAAo9P//////////////////AP//////////////////9CwAAAAAAAAAFNz///////////////////8A//////////////////xMAAAAAAAAAATA/////////////////////wD/////////////////eAAAAAAAAAAAnP//////////////////////AP///////////////5wAAAAAAAAAAHT///////////////////////8A///////////////ABAAAAAAAAABM/P///////////////////////wD/////////////3BQAAAAAAAAALPT/////////////////////////AP////////////QoAAAAAAAAABjg//////////////////////////8A///////////8SAAAAAAAAAAExP///////////////////////////wD//////////2wAAAAAAAAAAKD/////////////////////////////AP////////+YAAAAAAAAAAB8//////////////////////////////8A/////////wQAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-		);
-	}
-}
diff --git a/phpBB/phpbb/captcha/plugins/base.php b/phpBB/phpbb/captcha/plugins/base.php
new file mode 100644
index 00000000000..a30e6797313
--- /dev/null
+++ b/phpBB/phpbb/captcha/plugins/base.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\captcha\plugins;
+
+use phpbb\config\config;
+use phpbb\db\driver\driver_interface;
+use phpbb\language\language;
+use phpbb\request\request_interface;
+use phpbb\user;
+
+abstract class base implements plugin_interface
+{
+	/** @var config */
+	protected config $config;
+
+	/** @var driver_interface */
+	protected driver_interface $db;
+
+	/** @var language */
+	protected language $language;
+
+	/** @var request_interface */
+	protected request_interface $request;
+
+	/** @var user */
+	protected user $user;
+
+	/** @var int Attempts at solving the CAPTCHA */
+	protected int $attempts = 0;
+
+	/** @var string Stored random CAPTCHA code */
+	protected string $code = '';
+
+	/** @var bool Resolved state of captcha */
+	protected bool $solved = false;
+
+	/** @var string User supplied confirm code */
+	protected string $confirm_code = '';
+
+	/** @var string Confirm id hash */
+	protected string $confirm_id = '';
+
+	/** @var confirm_type Confirmation type */
+	protected confirm_type $type = confirm_type::UNDEFINED;
+
+	/** @var string Last error message */
+	protected string $last_error = '';
+
+	/**
+	 * Constructor for abstract captcha base class
+	 *
+	 * @param config $config
+	 * @param driver_interface $db
+	 * @param language $language
+	 * @param request_interface $request
+	 * @param user $user
+	 */
+	public function __construct(config $config, driver_interface $db, language $language, request_interface $request, user $user)
+	{
+		$this->config = $config;
+		$this->db = $db;
+		$this->language = $language;
+		$this->request = $request;
+		$this->user = $user;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function init(confirm_type $type): void
+	{
+		$this->confirm_id = $this->request->variable('confirm_id', '');
+		$this->confirm_code = $this->request->variable('confirm_code', '');
+		$this->type = $type;
+
+		if (empty($this->confirm_id) || !$this->load_confirm_data())
+		{
+			// we have no confirm ID, better get ready to display something
+			$this->generate_confirm_data();
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function validate(): bool
+	{
+		if ($this->confirm_id && hash_equals($this->code, $this->confirm_code))
+		{
+			$this->solved = true;
+			return true;
+		}
+
+		$this->increment_attempts();
+		$this->last_error = $this->language->lang('CONFIRM_CODE_WRONG');
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function reset(): void
+	{
+		$sql = 'DELETE FROM ' . CONFIRM_TABLE . "
+			WHERE session_id = '" . $this->db->sql_escape($this->user->session_id) . "'
+				AND confirm_type = " . $this->type->value;
+		$this->db->sql_query($sql);
+
+		$this->generate_confirm_data();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_attempt_count(): int
+	{
+		return $this->attempts;
+	}
+
+	/**
+	 * Look up attempts from confirm table
+	 */
+	protected function load_confirm_data(): bool
+	{
+		$sql = 'SELECT code, attempts
+			FROM ' . CONFIRM_TABLE . "
+			WHERE confirm_id = '" . $this->db->sql_escape($this->confirm_id) . "'
+				AND session_id = '" . $this->db->sql_escape($this->user->session_id) . "'
+				AND confirm_type = " . $this->type->value;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			$this->attempts = $row['attempts'];
+			$this->code = $row['code'];
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Generate confirm data for tracking attempts
+	 *
+	 * @return void
+	 */
+	protected function generate_confirm_data(): void
+	{
+		$this->code = gen_rand_string_friendly(CAPTCHA_MAX_CHARS);
+		$this->confirm_id = md5(unique_id());
+		$this->attempts = 0;
+
+		$sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
+					'confirm_id'	=> $this->confirm_id,
+					'session_id'	=> (string) $this->user->session_id,
+					'confirm_type'	=> $this->type->value,
+					'code'			=> $this->code,
+			));
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	 * Increment number of attempts for confirm ID and session
+	 *
+	 * @return void
+	 */
+	protected function increment_attempts(): void
+	{
+		$sql = 'UPDATE ' . CONFIRM_TABLE . "
+				SET attempts = attempts + 1
+				WHERE confirm_id = '{$this->db->sql_escape($this->confirm_id)}'
+					AND session_id = '{$this->db->sql_escape($this->user->session_id)}'";
+		$this->db->sql_query($sql);
+
+		$this->attempts++;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_hidden_fields(): array
+	{
+		return [
+			'confirm_id'	=> $this->confirm_id,
+			'confirm_code'	=> $this->solved === true ? $this->confirm_code : '',
+		];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function is_solved(): bool
+	{
+		return $this->solved;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_error(): string
+	{
+		return $this->last_error;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function garbage_collect(confirm_type $confirm_type = confirm_type::UNDEFINED): void
+	{
+		$sql = 'SELECT DISTINCT c.session_id
+			FROM ' . CONFIRM_TABLE . ' c
+			LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
+			WHERE s.session_id IS NULL' .
+			((empty($confirm_type)) ? '' : ' AND c.confirm_type = ' . $confirm_type->value);
+		$result = $this->db->sql_query($sql);
+
+		if ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql_in = [];
+			do
+			{
+				$sql_in[] = (string) $row['session_id'];
+			}
+			while ($row = $this->db->sql_fetchrow($result));
+
+			if (count($sql_in))
+			{
+				$sql = 'DELETE FROM ' . CONFIRM_TABLE . '
+					WHERE ' . $this->db->sql_in_set('session_id', $sql_in);
+				$this->db->sql_query($sql);
+			}
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function acp_page(mixed $id, mixed $module): void
+	{
+	}
+}
diff --git a/phpBB/phpbb/captcha/plugins/captcha_abstract.php b/phpBB/phpbb/captcha/plugins/captcha_abstract.php
index 012e28c9872..751663f7281 100644
--- a/phpBB/phpbb/captcha/plugins/captcha_abstract.php
+++ b/phpBB/phpbb/captcha/plugins/captcha_abstract.php
@@ -158,7 +158,7 @@ function garbage_collect($type)
 			LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
 			WHERE s.session_id IS NULL' .
 				((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
-		$result = $db->sql_query($sql);
+		$result = $db->sql_query_limit($sql, 100000); // Prevent possible timeouts
 
 		if ($row = $db->sql_fetchrow($result))
 		{
@@ -179,16 +179,6 @@ function garbage_collect($type)
 		$db->sql_freeresult($result);
 	}
 
-	function uninstall()
-	{
-		$this->garbage_collect(0);
-	}
-
-	function install()
-	{
-		return;
-	}
-
 	function validate()
 	{
 		global $user;
diff --git a/phpBB/phpbb/captcha/plugins/confirm_type.php b/phpBB/phpbb/captcha/plugins/confirm_type.php
new file mode 100644
index 00000000000..e3e11edf77a
--- /dev/null
+++ b/phpBB/phpbb/captcha/plugins/confirm_type.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\captcha\plugins;
+
+/**
+ * Confirmation types for CAPTCHA plugins
+ */
+enum confirm_type: int {
+	case UNDEFINED = 0;
+	case REGISTRATION = 1;
+	case LOGIN = 2;
+	case POST = 3;
+	case REPORT = 4;
+}
diff --git a/phpBB/phpbb/captcha/plugins/gd.php b/phpBB/phpbb/captcha/plugins/gd.php
deleted file mode 100644
index 6d3c9bb3d28..00000000000
--- a/phpBB/phpbb/captcha/plugins/gd.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\captcha\plugins;
-
-class gd extends captcha_abstract
-{
-	var $captcha_vars = array(
-		'captcha_gd_x_grid'				=> 'CAPTCHA_GD_X_GRID',
-		'captcha_gd_y_grid'				=> 'CAPTCHA_GD_Y_GRID',
-		'captcha_gd_foreground_noise'	=> 'CAPTCHA_GD_FOREGROUND_NOISE',
-//		'captcha_gd'					=> 'CAPTCHA_GD_PREVIEWED',
-		'captcha_gd_wave'				=> 'CAPTCHA_GD_WAVE',
-		'captcha_gd_3d_noise'			=> 'CAPTCHA_GD_3D_NOISE',
-		'captcha_gd_fonts'				=> 'CAPTCHA_GD_FONTS',
-	);
-
-	public function is_available()
-	{
-		return @extension_loaded('gd');
-	}
-
-	/**
-	* @return string the name of the class used to generate the captcha
-	*/
-	function get_generator_class()
-	{
-		return '\\phpbb\\captcha\\gd';
-	}
-
-	/**
-	*  API function
-	*/
-	function has_config()
-	{
-		return true;
-	}
-
-	public function get_name()
-	{
-		return 'CAPTCHA_GD';
-	}
-
-	function acp_page($id, $module)
-	{
-		global $user, $template, $phpbb_log, $request;
-		global $config;
-
-		$user->add_lang('acp/board');
-
-		$module->tpl_name = 'captcha_gd_acp';
-		$module->page_title = 'ACP_VC_SETTINGS';
-		$form_key = 'acp_captcha';
-		add_form_key($form_key);
-
-		$submit = $request->variable('submit', '');
-
-		if ($submit && check_form_key($form_key))
-		{
-			$captcha_vars = array_keys($this->captcha_vars);
-			foreach ($captcha_vars as $captcha_var)
-			{
-				$value = $request->variable($captcha_var, 0);
-				if ($value >= 0)
-				{
-					$config->set($captcha_var, $value);
-				}
-			}
-
-			$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_CONFIG_VISUAL');
-			trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action));
-		}
-		else if ($submit)
-		{
-			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
-		}
-		else
-		{
-			foreach ($this->captcha_vars as $captcha_var => $template_var)
-			{
-				$var = (isset($_REQUEST[$captcha_var])) ? $request->variable($captcha_var, 0) : $config[$captcha_var];
-				$template->assign_var($template_var, $var);
-			}
-
-			$template->assign_vars(array(
-				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
-				'CAPTCHA_NAME'		=> $this->get_service_name(),
-				'U_ACTION'			=> $module->u_action,
-			));
-		}
-	}
-
-	function execute_demo()
-	{
-		global $config, $request;
-
-		$config_old = $config;
-
-		$config = new \phpbb\config\config(array());
-		foreach ($config_old as $key => $value)
-		{
-			$config->set($key, $value);
-		}
-
-		foreach ($this->captcha_vars as $captcha_var => $template_var)
-		{
-			$config->set($captcha_var, $request->variable($captcha_var, (int) $config[$captcha_var]));
-		}
-		parent::execute_demo();
-		$config = $config_old;
-	}
-
-}
diff --git a/phpBB/phpbb/captcha/plugins/gd_wave.php b/phpBB/phpbb/captcha/plugins/gd_wave.php
deleted file mode 100644
index 4ac26ed2b72..00000000000
--- a/phpBB/phpbb/captcha/plugins/gd_wave.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\captcha\plugins;
-
-class gd_wave extends captcha_abstract
-{
-	public function is_available()
-	{
-		return @extension_loaded('gd');
-	}
-
-	public function get_name()
-	{
-		return 'CAPTCHA_GD_3D';
-	}
-
-	/**
-	* @return string the name of the class used to generate the captcha
-	*/
-	function get_generator_class()
-	{
-		return '\\phpbb\\captcha\\gd_wave';
-	}
-
-	function acp_page($id, $module)
-	{
-		global $user;
-
-		trigger_error($user->lang['CAPTCHA_NO_OPTIONS'] . adm_back_link($module->u_action));
-	}
-}
diff --git a/phpBB/phpbb/captcha/plugins/incomplete.php b/phpBB/phpbb/captcha/plugins/incomplete.php
new file mode 100644
index 00000000000..07998a71252
--- /dev/null
+++ b/phpBB/phpbb/captcha/plugins/incomplete.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\captcha\plugins;
+
+use phpbb\config\config;
+use phpbb\db\driver\driver_interface;
+use phpbb\language\language;
+use phpbb\request\request_interface;
+use phpbb\template\template;
+use phpbb\user;
+
+class incomplete extends base
+{
+	/**
+	 * Constructor for incomplete captcha
+	 *
+	 * @param config $config
+	 * @param driver_interface $db
+	 * @param language $language
+	 * @param request_interface $request
+	 * @param template $template
+	 * @param user $user
+	 * @param string $phpbb_root_path
+	 * @param string $phpEx
+	 */
+	public function __construct(config $config, driver_interface $db, language $language, request_interface $request,
+								protected template $template, user $user, protected string $phpbb_root_path, protected string $phpEx)
+	{
+		parent::__construct($config, $db, $language, $request, $user);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function is_available(): bool
+	{
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function has_config(): bool
+	{
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_name(): string
+	{
+		return 'CAPTCHA_INCOMPLETE';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function set_name(string $name): void
+	{
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function init(confirm_type $type): void
+	{
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_demo_template(): string
+	{
+		return '';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_template(): string
+	{
+		$contact_link = phpbb_get_board_contact_link($this->config, $this->phpbb_root_path, $this->phpEx);
+
+		$this->template->assign_vars([
+			'CONFIRM_LANG'	=> 'CONFIRM_INCOMPLETE',
+			'CONTACT_LINK'	=> $contact_link,
+		]);
+
+		return 'captcha_incomplete.html';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function validate(): bool
+	{
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_error(): string
+	{
+		return '';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function is_solved(): bool
+	{
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_attempt_count(): int
+	{
+		return 0;
+	}
+}
diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php
new file mode 100644
index 00000000000..aaabddb48bd
--- /dev/null
+++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\captcha\plugins;
+
+class legacy_wrapper implements plugin_interface
+{
+	/** @var object Legacy CAPTCHA instance, should implement functionality as required in phpBB 3.3 */
+	private $legacy_captcha;
+
+	/** @var string Last error */
+	private string $last_error;
+
+	/**
+	 * Constructor for legacy CAPTCHA wrapper
+	 *
+	 * @param object $legacy_captcha
+	 */
+	public function __construct(object $legacy_captcha)
+	{
+		$this->legacy_captcha = $legacy_captcha;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function is_available(): bool
+	{
+		if (method_exists($this->legacy_captcha, 'is_available'))
+		{
+			return $this->legacy_captcha->is_available();
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function has_config(): bool
+	{
+		if (method_exists($this->legacy_captcha, 'has_config'))
+		{
+			return $this->legacy_captcha->has_config();
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_name(): string
+	{
+		if (method_exists($this->legacy_captcha, 'get_name'))
+		{
+			return $this->legacy_captcha->get_name();
+		}
+
+		return '';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function set_name(string $name): void
+	{
+		if (method_exists($this->legacy_captcha, 'set_name'))
+		{
+			$this->legacy_captcha->set_name($name);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function init(confirm_type $type): void
+	{
+		if (method_exists($this->legacy_captcha, 'init'))
+		{
+			$this->legacy_captcha->init($type->value);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_hidden_fields(): array
+	{
+		if (method_exists($this->legacy_captcha, 'get_hidden_fields'))
+		{
+			return $this->legacy_captcha->get_hidden_fields();
+		}
+
+		return [];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function validate(): bool
+	{
+		if (method_exists($this->legacy_captcha, 'validate'))
+		{
+			$error = $this->legacy_captcha->validate();
+			if ($error)
+			{
+				$this->last_error = $error;
+				return false;
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_error(): string
+	{
+		return $this->last_error;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function is_solved(): bool
+	{
+		if (method_exists($this->legacy_captcha, 'is_solved'))
+		{
+			return $this->legacy_captcha->is_solved();
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function reset(): void
+	{
+		if (method_exists($this->legacy_captcha, 'reset'))
+		{
+			$this->legacy_captcha->reset();
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_attempt_count(): int
+	{
+		if (method_exists($this->legacy_captcha, 'get_attempt_count'))
+		{
+			return $this->legacy_captcha->get_attempt_count();
+		}
+
+		// Ensure this is deemed as too many attempts
+		return PHP_INT_MAX;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_template(): string
+	{
+		if (method_exists($this->legacy_captcha, 'get_template'))
+		{
+			return $this->legacy_captcha->get_template();
+		}
+
+		return '';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_demo_template(): string
+	{
+		if (method_exists($this->legacy_captcha, 'get_demo_template'))
+		{
+			return $this->legacy_captcha->get_demo_template(0);
+		}
+
+		return '';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function garbage_collect(confirm_type $confirm_type = confirm_type::UNDEFINED): void
+	{
+		if (method_exists($this->legacy_captcha, 'garbage_collect'))
+		{
+			$this->legacy_captcha->garbage_collect($confirm_type->value);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function acp_page(mixed $id, mixed $module): void
+	{
+		if (method_exists($this->legacy_captcha, 'acp_page'))
+		{
+			$this->legacy_captcha->acp_page($id, $module);
+		}
+	}
+}
diff --git a/phpBB/phpbb/captcha/plugins/nogd.php b/phpBB/phpbb/captcha/plugins/nogd.php
deleted file mode 100644
index da67cd2bf41..00000000000
--- a/phpBB/phpbb/captcha/plugins/nogd.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\captcha\plugins;
-
-class nogd extends captcha_abstract
-{
-	public function is_available()
-	{
-		return true;
-	}
-
-	public function get_name()
-	{
-		return 'CAPTCHA_NO_GD';
-	}
-
-	/**
-	* @return string the name of the class used to generate the captcha
-	*/
-	function get_generator_class()
-	{
-		return '\\phpbb\\captcha\\non_gd';
-	}
-
-	function acp_page($id, $module)
-	{
-		global $user;
-
-		trigger_error($user->lang['CAPTCHA_NO_OPTIONS'] . adm_back_link($module->u_action));
-	}
-}
diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php
new file mode 100644
index 00000000000..41483e45a5b
--- /dev/null
+++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\captcha\plugins;
+
+interface plugin_interface
+{
+	/**
+	 * Check if the plugin is available
+	 *
+	 * @return bool True if the plugin is available, false if not
+	 */
+	public function is_available(): bool;
+
+	/**
+	 * Check if the plugin has a configuration
+	 *
+	 * @return bool True if the plugin has a configuration, false if not
+	 */
+	public function has_config(): bool;
+
+	/**
+	 * Get the name of the plugin, should be language variable
+	 *
+	 * @return string
+	 */
+	public function get_name(): string;
+
+	/**
+	 * Set the service name of the plugin
+	 *
+	 * @param string $name
+	 */
+	public function set_name(string $name): void;
+
+	/**
+	 * Display the captcha for the specified type
+	 *
+	 * @param confirm_type $type Type of captcha, should be one of the CONFIRMATION_* constants
+	 * @return void
+	 */
+	public function init(confirm_type $type): void;
+
+	/**
+	 * Get hidden form fields for this captcha plugin
+	 *
+	 * @return array Hidden form fields
+	 */
+	public function get_hidden_fields(): array;
+
+	/**
+	 * Validate the captcha with the given request data
+	 *
+	 * @return bool True if request data was valid captcha reply, false if not
+	 */
+	public function validate(): bool;
+
+	/**
+	 * Get error string from captcha
+	 *
+	 * @return string Error string, empty string if there is no error
+	 */
+	public function get_error(): string;
+
+	/**
+	 * Return whether captcha was solved
+	 *
+	 * @return bool True if captcha was solved, false if not
+	 */
+	public function is_solved(): bool;
+
+	/**
+	 * Reset captcha state, e.g. after checking if it's valid
+	 *
+	 * @return void
+	 */
+	public function reset(): void;
+
+	/**
+	 * Get attempt count for this captcha and user
+	 *
+	 * @return int Number of attempts
+	 */
+	public function get_attempt_count(): int;
+
+	/**
+	 * Get template filename for captcha
+	 *
+	 * @return string Template file name
+	 */
+	public function get_template(): string;
+
+	/**
+	 * Get template filename for demo
+	 *
+	 * @return string Demo template file name
+	 */
+	public function get_demo_template(): string;
+
+	/**
+	 * Garbage collect captcha plugin
+	 *
+	 * @param confirm_type $confirm_type Confirm type to garbage collect, defaults to all (0)
+	 * @return void
+	 */
+	public function garbage_collect(confirm_type $confirm_type = confirm_type::UNDEFINED): void;
+
+	/**
+	 * Display acp page
+	 *
+	 * @param mixed $id ACP module id
+	 * @param mixed $module ACP module name
+	 * @return void
+	 */
+	public function acp_page(mixed $id, mixed $module): void;
+}
diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php
index b9bfac33f14..526700ec487 100644
--- a/phpBB/phpbb/captcha/plugins/qa.php
+++ b/phpBB/phpbb/captcha/plugins/qa.php
@@ -40,7 +40,7 @@ class qa
 	protected $service_name;
 
 	/** @var int Question ID */
-	protected $question = -1;
+	private $question = -1;
 
 	/**
 	* Constructor
@@ -323,71 +323,6 @@ function garbage_collect($type = 0)
 		$db->sql_freeresult($result);
 	}
 
-	/**
-	*  API function - we don't drop the tables here, as that would cause the loss of all entered questions.
-	*/
-	function uninstall()
-	{
-		$this->garbage_collect(0);
-	}
-
-	/**
-	*  API function - set up shop
-	*/
-	function install()
-	{
-		global $phpbb_container;
-
-		$db_tool = $phpbb_container->get('dbal.tools');
-		$schemas = array(
-				$this->table_captcha_questions		=> array (
-					'COLUMNS' => array(
-						'question_id'	=> array('UINT', null, 'auto_increment'),
-						'strict'		=> array('BOOL', 0),
-						'lang_id'		=> array('UINT', 0),
-						'lang_iso'		=> array('VCHAR:30', ''),
-						'question_text'	=> array('TEXT_UNI', ''),
-					),
-					'PRIMARY_KEY'		=> 'question_id',
-					'KEYS'				=> array(
-						'lang'			=> array('INDEX', 'lang_iso'),
-					),
-				),
-				$this->table_captcha_answers		=> array (
-					'COLUMNS' => array(
-						'question_id'	=> array('UINT', 0),
-						'answer_text'	=> array('STEXT_UNI', ''),
-					),
-					'KEYS'				=> array(
-						'qid'			=> array('INDEX', 'question_id'),
-					),
-				),
-				$this->table_qa_confirm		=> array (
-					'COLUMNS' => array(
-						'session_id'	=> array('CHAR:32', ''),
-						'confirm_id'	=> array('CHAR:32', ''),
-						'lang_iso'		=> array('VCHAR:30', ''),
-						'question_id'	=> array('UINT', 0),
-						'attempts'		=> array('UINT', 0),
-						'confirm_type'	=> array('USINT', 0),
-					),
-					'KEYS'				=> array(
-						'session_id'			=> array('INDEX', 'session_id'),
-						'lookup'				=> array('INDEX', array('confirm_id', 'session_id', 'lang_iso')),
-					),
-					'PRIMARY_KEY'		=> 'confirm_id',
-				),
-		);
-
-		foreach ($schemas as $table => $schema)
-		{
-			if (!$db_tool->sql_table_exists($table))
-			{
-				$db_tool->sql_create_table($table, $schema);
-			}
-		}
-	}
-
 	/**
 	*  API function - see what has to be done to validate
 	*/
@@ -576,6 +511,7 @@ function check_answer()
 		global $db, $request;
 
 		$answer = ($this->question_strict) ? $request->variable('qa_answer', '', true) : utf8_clean_string($request->variable('qa_answer', '', true));
+		$confirm_id = $request->variable('qa_confirm_id', '');
 
 		$sql = 'SELECT answer_text
 			FROM ' . $this->table_captcha_answers . '
@@ -586,7 +522,7 @@ function check_answer()
 		{
 			$solution = ($this->question_strict) ? $row['answer_text'] : utf8_clean_string($row['answer_text']);
 
-			if ($solution === $answer)
+			if ($solution === $answer && $this->confirm_id === $confirm_id)
 			{
 				$this->solved = true;
 
@@ -647,11 +583,6 @@ function acp_page($id, $module)
 		$user->add_lang('acp/board');
 		$user->add_lang('captcha_qa');
 
-		if (!self::is_installed())
-		{
-			$this->install();
-		}
-
 		$module->tpl_name = 'captcha_qa_acp';
 		$module->page_title = 'ACP_VC_SETTINGS';
 		$form_key = 'acp_captcha';
diff --git a/phpBB/phpbb/captcha/plugins/recaptcha.php b/phpBB/phpbb/captcha/plugins/recaptcha.php
index 399eb34b6b9..1c080ba67b1 100644
--- a/phpBB/phpbb/captcha/plugins/recaptcha.php
+++ b/phpBB/phpbb/captcha/plugins/recaptcha.php
@@ -13,6 +13,8 @@
 
 namespace phpbb\captcha\plugins;
 
+use phpbb\exception\runtime_exception;
+
 class recaptcha extends captcha_abstract
 {
 	private $response;
@@ -55,10 +57,11 @@ public static function get_name()
 
 	/**
 	* This function is implemented because required by the upper class, but is never used for reCaptcha.
+	* @throws runtime_exception
 	*/
 	function get_generator_class()
 	{
-		throw new \Exception('No generator class given.');
+		throw new runtime_exception('NO_GENERATOR_CLASS');
 	}
 
 	function acp_page($id, $module)
@@ -176,16 +179,6 @@ function get_hidden_fields()
 		return $hidden_fields;
 	}
 
-	function uninstall()
-	{
-		$this->garbage_collect(0);
-	}
-
-	function install()
-	{
-		return;
-	}
-
 	function validate()
 	{
 		if (!parent::validate())
diff --git a/phpBB/phpbb/captcha/plugins/recaptcha_v3.php b/phpBB/phpbb/captcha/plugins/recaptcha_v3.php
index 02dacb4b51d..b62c561a676 100644
--- a/phpBB/phpbb/captcha/plugins/recaptcha_v3.php
+++ b/phpBB/phpbb/captcha/plugins/recaptcha_v3.php
@@ -13,6 +13,8 @@
 
 namespace phpbb\captcha\plugins;
 
+use phpbb\exception\runtime_exception;
+
 /**
  * Google reCAPTCHA v3 plugin.
  */
@@ -86,12 +88,12 @@ public function execute_demo()
 	 *
 	 * Not needed by this CAPTCHA plugin.
 	 *
-	 * @throws \Exception
+	 * @throws runtime_exception
 	 * @return void
 	 */
 	public function get_generator_class()
 	{
-		throw new \Exception('No generator class given.');
+		throw new runtime_exception('NO_GENERATOR_CLASS');
 	}
 
 	/**
@@ -323,7 +325,7 @@ protected function recaptcha_verify_token()
 		$token		= $request->variable('recaptcha_token', '', true);
 		$action		= $request->variable('recaptcha_action', '', true);
 		$action		= in_array($action, self::$actions) ? $action : reset(self::$actions);
-		$threshold	= (double) $config["recaptcha_v3_threshold_{$action}"] ?? 0.5;
+		$threshold	= (float) $config["recaptcha_v3_threshold_{$action}"] ?? 0.5;
 
 		// No token was provided, discard spam submissions
 		if (empty($token))
@@ -359,6 +361,7 @@ protected function recaptcha_verify_token()
 		if ($result->isSuccess())
 		{
 			$this->solved = true;
+			$this->confirm_code = $this->code;
 
 			return false;
 		}
diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php
new file mode 100644
index 00000000000..9a235edc3be
--- /dev/null
+++ b/phpBB/phpbb/captcha/plugins/turnstile.php
@@ -0,0 +1,287 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\captcha\plugins;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use phpbb\config\config;
+use phpbb\db\driver\driver_interface;
+use phpbb\language\language;
+use phpbb\log\log_interface;
+use phpbb\request\request_interface;
+use phpbb\template\template;
+use phpbb\user;
+
+class turnstile extends base
+{
+	/** @var string URL to cloudflare turnstile API javascript */
+	private const SCRIPT_URL = 'https://challenges.cloudflare.com/turnstile/v0/api.js';
+
+	/** @var string API endpoint for turnstile verification */
+	private const VERIFY_ENDPOINT = 'https://challenges.cloudflare.com/turnstile/v0/siteverify';
+
+	/** @var Client */
+	protected Client $client;
+
+	/** @var language */
+	protected language $language;
+
+	/** @var log_interface */
+	protected log_interface $log;
+
+	/** @var template */
+	protected template $template;
+
+	/** @var string Service name */
+	protected string $service_name = '';
+
+	/** @var array|string[] Supported themes for Turnstile CAPTCHA */
+	protected static array $supported_themes = [
+		'light',
+		'dark',
+		'auto'
+	];
+
+	/**
+	 * Constructor for turnstile captcha plugin
+	 *
+	 * @param config $config
+	 * @param driver_interface $db
+	 * @param language $language
+	 * @param log_interface $log
+	 * @param request_interface $request
+	 * @param template $template
+	 * @param user $user
+	 */
+	public function __construct(config $config, driver_interface $db, language $language, log_interface $log, request_interface $request, template $template, user $user)
+	{
+		parent::__construct($config, $db, $language, $request, $user);
+
+		$this->language = $language;
+		$this->log = $log;
+		$this->template = $template;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function is_available(): bool
+	{
+		$this->init($this->type);
+
+		return !empty($this->config->offsetGet('captcha_turnstile_sitekey'))
+			&& !empty($this->config->offsetGet('captcha_turnstile_secret'));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function has_config(): bool
+	{
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_name(): string
+	{
+		return 'CAPTCHA_TURNSTILE';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function set_name(string $name): void
+	{
+		$this->service_name = $name;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function init(confirm_type $type): void
+	{
+		parent::init($type);
+
+		$this->language->add_lang('captcha_turnstile');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function validate(): bool
+	{
+		if (parent::validate())
+		{
+			return true;
+		}
+
+		$turnstile_response = $this->request->variable('cf-turnstile-response', '');
+		if (!$turnstile_response)
+		{
+			// Return without checking against server without a turnstile response
+			return false;
+		}
+
+		// Retrieve form data for verification
+		$form_data = [
+			'secret'			=> $this->config['captcha_turnstile_secret'],
+			'response'			=> $turnstile_response,
+			'remoteip'			=> $this->user->ip,
+		];
+
+		// Create guzzle client
+		$client = $this->get_client();
+
+		// Check captcha with turnstile API
+		try
+		{
+			$response = $client->request('POST', self::VERIFY_ENDPOINT, [
+				'form_params' => $form_data,
+			]);
+		}
+		catch (GuzzleException)
+		{
+			// Something went wrong during the request to Cloudflare, assume captcha was bad
+			$this->solved = false;
+			return false;
+		}
+
+		// Decode the JSON response
+		$result = json_decode($response->getBody(), true);
+
+		// Check if the response indicates success
+		if (isset($result['success']) && $result['success'] === true)
+		{
+			$this->solved = true;
+			$this->confirm_code = $this->code;
+			return true;
+		}
+		else
+		{
+			$this->last_error = $this->language->lang('CAPTCHA_TURNSTILE_INCORRECT');
+			return false;
+		}
+	}
+
+	/**
+	 * Get Guzzle client
+	 *
+	 * @return Client
+	 */
+	protected function get_client(): Client
+	{
+		if (!isset($this->client))
+		{
+			$this->client = new Client();
+		}
+
+		return $this->client;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_template(): string
+	{
+		if ($this->is_solved())
+		{
+			return '';
+		}
+
+		$this->template->assign_vars([
+			'S_TURNSTILE_AVAILABLE'		=> $this->is_available(),
+			'TURNSTILE_SITEKEY'			=> $this->config->offsetGet('captcha_turnstile_sitekey'),
+			'TURNSTILE_THEME'			=> $this->config->offsetGet('captcha_turnstile_theme'),
+			'U_TURNSTILE_SCRIPT'		=> self::SCRIPT_URL,
+			'CONFIRM_TYPE_REGISTRATION'	=> $this->type->value,
+		]);
+
+		return 'captcha_turnstile.html';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_demo_template(): string
+	{
+		$this->template->assign_vars([
+			'TURNSTILE_THEME'		=> $this->config->offsetGet('captcha_turnstile_theme'),
+			'U_TURNSTILE_SCRIPT'	=> self::SCRIPT_URL,
+		]);
+
+		return 'captcha_turnstile_acp_demo.html';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function acp_page(mixed $id, mixed $module): void
+	{
+		$captcha_vars = [
+			'captcha_turnstile_sitekey'			=> 'CAPTCHA_TURNSTILE_SITEKEY',
+			'captcha_turnstile_secret'			=> 'CAPTCHA_TURNSTILE_SECRET',
+		];
+
+		$module->tpl_name = 'captcha_turnstile_acp';
+		$module->page_title = 'ACP_VC_SETTINGS';
+		$form_key = 'acp_captcha';
+		add_form_key($form_key);
+
+		$submit = $this->request->is_set_post('submit');
+
+		if ($submit && check_form_key($form_key))
+		{
+			$captcha_vars = array_keys($captcha_vars);
+			foreach ($captcha_vars as $captcha_var)
+			{
+				$value = $this->request->variable($captcha_var, '');
+				if ($value)
+				{
+					$this->config->set($captcha_var, $value);
+				}
+			}
+
+			$captcha_theme = $this->request->variable('captcha_turnstile_theme', self::$supported_themes[0]);
+			if (in_array($captcha_theme, self::$supported_themes))
+			{
+				$this->config->set('captcha_turnstile_theme', $captcha_theme);
+			}
+
+			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_CONFIG_VISUAL');
+			trigger_error($this->language->lang('CONFIG_UPDATED') . adm_back_link($module->u_action));
+		}
+		else if ($submit)
+		{
+			trigger_error($this->language->lang('FORM_INVALID') . adm_back_link($module->u_action));
+		}
+		else
+		{
+			foreach ($captcha_vars as $captcha_var => $template_var)
+			{
+				$var = $this->request->is_set($captcha_var) ? $this->request->variable($captcha_var, '') : $this->config->offsetGet($captcha_var);
+				$this->template->assign_var($template_var, $var);
+			}
+
+			$this->template->assign_vars(array(
+				'CAPTCHA_PREVIEW'			=> $this->get_demo_template(),
+				'CAPTCHA_NAME'				=> $this->service_name,
+				'CAPTCHA_TURNSTILE_THEME'	=> $this->config->offsetGet('captcha_turnstile_theme'),
+				'CAPTCHA_TURNSTILE_THEMES'	=> self::$supported_themes,
+				'U_ACTION'					=> $module->u_action,
+			));
+		}
+	}
+}
diff --git a/phpBB/phpbb/class_loader.php b/phpBB/phpbb/class_loader.php
index 19242049aad..9f115a22ed9 100644
--- a/phpBB/phpbb/class_loader.php
+++ b/phpBB/phpbb/class_loader.php
@@ -48,7 +48,7 @@ class class_loader
 	* @param string $php_ext The file extension for PHP files
 	* @param \phpbb\cache\driver\driver_interface|null $cache An implementation of the phpBB cache interface.
 	*/
-	public function __construct($namespace, $path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null)
+	public function __construct($namespace, $path, $php_ext = 'php', \phpbb\cache\driver\driver_interface|null $cache = null)
 	{
 		if ($namespace[0] !== '\\')
 		{
@@ -69,7 +69,7 @@ public function __construct($namespace, $path, $php_ext = 'php', \phpbb\cache\dr
 	*
 	* @param \phpbb\cache\driver\driver_interface|null $cache An implementation of the phpBB cache interface.
 	*/
-	public function set_cache(\phpbb\cache\driver\driver_interface $cache = null)
+	public function set_cache(\phpbb\cache\driver\driver_interface|null $cache = null)
 	{
 		if ($cache)
 		{
diff --git a/phpBB/phpbb/composer.json b/phpBB/phpbb/composer.json
index ab2b9601fa1..dc3d808b418 100644
--- a/phpBB/phpbb/composer.json
+++ b/phpBB/phpbb/composer.json
@@ -4,7 +4,7 @@
 	"type": "library",
 	"keywords": ["phpbb", "forum"],
 	"homepage": "https://www.phpbb.com",
-	"license": "GPL-2.0",
+	"license": "GPL-2.0-only",
 	"authors": [
 		{
 			"name": "phpBB Limited",
@@ -23,11 +23,11 @@
 		"classmap": [""]
 	},
 	"require": {
-		"php": ">=5.4"
+		"php": "^8.2"
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.3.x-dev"
+			"dev-master": "4.0.x-dev"
 		}
 	}
 }
diff --git a/phpBB/phpbb/composer/exception/runtime_exception.php b/phpBB/phpbb/composer/exception/runtime_exception.php
index adbb67994f1..161e203d4b3 100644
--- a/phpBB/phpbb/composer/exception/runtime_exception.php
+++ b/phpBB/phpbb/composer/exception/runtime_exception.php
@@ -29,7 +29,7 @@ class runtime_exception extends base
 	 * @param \Exception|null	$previous	The previous runtime_exception used for the runtime_exception chaining.
 	 * @param integer		$code		The Exception code.
 	 */
-	public function __construct($prefix, $message = '', array $parameters = [], \Exception $previous = null, $code = 0)
+	public function __construct($prefix, $message = '', array $parameters = [], \Exception|null $previous = null, $code = 0)
 	{
 		parent::__construct($prefix . $message, $parameters, $previous, $code);
 	}
diff --git a/phpBB/phpbb/composer/extension_manager.php b/phpBB/phpbb/composer/extension_manager.php
index 1e14a7591d2..144b8d3c89d 100644
--- a/phpBB/phpbb/composer/extension_manager.php
+++ b/phpBB/phpbb/composer/extension_manager.php
@@ -68,7 +68,7 @@ class extension_manager extends manager
 	 * @param string			$root_path			phpBB root path
 	 * @param config|null		$config				Config object
 	 */
-	public function __construct(installer $installer, driver_interface $cache, ext_manager $extension_manager, filesystem $filesystem, $package_type, $exception_prefix, $root_path, config $config = null)
+	public function __construct(installer $installer, driver_interface $cache, ext_manager $extension_manager, filesystem $filesystem, $package_type, $exception_prefix, $root_path, config|null $config = null)
 	{
 		$this->extension_manager = $extension_manager;
 		$this->filesystem = $filesystem;
@@ -86,7 +86,7 @@ public function __construct(installer $installer, driver_interface $cache, ext_m
 	/**
 	 * {@inheritdoc}
 	 */
-	public function pre_install(array $packages, IOInterface $io = null)
+	public function pre_install(array $packages, IOInterface|null $io = null)
 	{
 		$installed_manually = array_intersect(array_keys($this->extension_manager->all_available()), array_keys($packages));
 		if (count($installed_manually) !== 0)
@@ -98,7 +98,7 @@ public function pre_install(array $packages, IOInterface $io = null)
 	/**
 	 * {@inheritdoc}
 	 */
-	public function post_install(array $packages, IOInterface $io = null)
+	public function post_install(array $packages, IOInterface|null $io = null)
 	{
 		if ($this->enable_on_install)
 		{
@@ -127,7 +127,7 @@ public function post_install(array $packages, IOInterface $io = null)
 	/**
 	 * {@inheritdoc}
 	 */
-	protected function pre_update(array $packages, IOInterface $io = null)
+	protected function pre_update(array $packages, IOInterface|null $io = null)
 	{
 		/** @psalm-suppress InvalidArgument */
 		$io->writeError([['DISABLING_EXTENSIONS', [], 1]]);
@@ -158,7 +158,7 @@ protected function pre_update(array $packages, IOInterface $io = null)
 	/**
 	 * {@inheritdoc}
 	 */
-	protected function post_update(array $packages, IOInterface $io = null)
+	protected function post_update(array $packages, IOInterface|null $io = null)
 	{
 		/** @psalm-suppress InvalidArgument */
 		$io->writeError([['ENABLING_EXTENSIONS', [], 1]]);
@@ -184,7 +184,7 @@ protected function post_update(array $packages, IOInterface $io = null)
 	/**
 	 * {@inheritdoc}
 	 */
-	public function remove(array $packages, IOInterface $io = null)
+	public function remove(array $packages, IOInterface|null $io = null)
 	{
 		$packages = $this->normalize_version($packages);
 
@@ -200,7 +200,7 @@ public function remove(array $packages, IOInterface $io = null)
 	/**
 	 * {@inheritdoc}
 	 */
-	public function pre_remove(array $packages, IOInterface $io = null)
+	public function pre_remove(array $packages, IOInterface|null $io = null)
 	{
 		if ($this->purge_on_remove)
 		{
diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php
index 28aaa4171b9..7e8943bee49 100644
--- a/phpBB/phpbb/composer/installer.php
+++ b/phpBB/phpbb/composer/installer.php
@@ -22,10 +22,13 @@
 use Composer\Json\JsonFile;
 use Composer\Json\JsonValidationException;
 use Composer\Package\BasePackage;
+use Composer\Package\CompleteAliasPackage;
 use Composer\Package\CompletePackage;
+use Composer\Package\PackageInterface;
 use Composer\PartialComposer;
 use Composer\Repository\ComposerRepository;
 use Composer\Semver\Constraint\ConstraintInterface;
+use Composer\Semver\VersionParser;
 use Composer\Util\HttpDownloader;
 use phpbb\composer\io\null_io;
 use phpbb\config\config;
@@ -98,7 +101,7 @@ class installer
 	 * @param request		$request	phpBB request object
 	 * @param config|null		$config		Config object
 	 */
-	public function __construct($root_path, filesystem $filesystem, request $request, config $config = null)
+	public function __construct($root_path, filesystem $filesystem, request $request, config|null $config = null)
 	{
 		if ($config)
 		{
@@ -132,7 +135,7 @@ public function __construct($root_path, filesystem $filesystem, request $request
 	 *
 	 * @throws runtime_exception
 	 */
-	public function install(array $packages, $whitelist, IOInterface $io = null)
+	public function install(array $packages, $whitelist, IOInterface|null $io = null)
 	{
 		$this->wrap(function() use ($packages, $whitelist, $io) {
 			$this->do_install($packages, $whitelist, $io);
@@ -152,7 +155,7 @@ public function install(array $packages, $whitelist, IOInterface $io = null)
 	 * @throws runtime_exception
 	 * @throws JsonValidationException
 	 */
-	protected function do_install(array $packages, $whitelist, io\io_interface $io = null)
+	protected function do_install(array $packages, $whitelist, io\io_interface|null $io = null)
 	{
 		if (!$io)
 		{
@@ -229,7 +232,7 @@ public function get_installed_packages($types)
 	 * @return Composer|PartialComposer
 	 * @throws JsonValidationException
 	 */
-	protected function get_composer(?string $config_file): PartialComposer
+	protected function get_composer(string|null $config_file): PartialComposer
 	{
 		static $composer_factory;
 		if (!$composer_factory)
@@ -352,7 +355,7 @@ protected function do_get_available_packages($type)
 							$downloader = new HttpDownloader($io, $composer_config);
 							$json = $downloader->get($url)->getBody();
 
-							/** @var \Composer\Package\PackageInterface $package */
+							/** @var PackageInterface $package */
 							foreach (JsonFile::parseJson($json, $url)['packageNames'] as $package)
 							{
 								$versions            = $repository->findPackages($package);
@@ -364,7 +367,7 @@ protected function do_get_available_packages($type)
 					{
 						// Pre-filter repo packages by their type
 						$packages = [];
-						/** @var \Composer\Package\PackageInterface $package */
+						/** @var PackageInterface $package */
 						foreach ($repository->getPackages() as $package)
 						{
 							if ($package->getType() === $type)
@@ -387,39 +390,49 @@ protected function do_get_available_packages($type)
 				}
 			}
 
-			foreach ($compatible_packages as $name => $versions)
+			foreach ($compatible_packages as $package_name => $package_versions)
 			{
 				// Determine the highest version of the package
-				/** @var CompletePackage $highest_version */
+				/** @var CompletePackage|CompleteAliasPackage $highest_version */
 				$highest_version = null;
 
-				/** @var CompletePackage $version */
-				foreach ($versions as $version)
+				// Sort the versions array in descending order
+				usort($package_versions, function ($a, $b)
 				{
-					if (!$highest_version || version_compare($version->getVersion(), $highest_version->getVersion(), '>'))
+					return version_compare($b->getVersion(), $a->getVersion());
+				});
+
+				// The first element in the sorted array is the highest version
+				if (!empty($package_versions))
+				{
+					$highest_version = $package_versions[0];
+
+					// If highest version is a non-numeric dev branch, it's an instance of CompleteAliasPackage,
+					// so we need to get the package being aliased in order to show the true non-numeric version.
+					if ($highest_version instanceof CompleteAliasPackage)
 					{
-						$highest_version = $version;
+						$highest_version = $highest_version->getAliasOf();
 					}
 				}
 
 				// Generates the entry
-				$available[$name] = [];
-				$available[$name]['name'] = $highest_version->getPrettyName();
-				$available[$name]['display_name'] = $highest_version->getExtra()['display-name'];
-				$available[$name]['composer_name'] = $highest_version->getName();
-				$available[$name]['version'] = $highest_version->getPrettyVersion();
+				$available[$package_name] = [];
+				$available[$package_name]['name'] = $highest_version->getPrettyName();
+				$available[$package_name]['display_name'] = $highest_version->getExtra()['display-name'];
+				$available[$package_name]['composer_name'] = $highest_version->getName();
+				$available[$package_name]['version'] = $highest_version->getPrettyVersion();
 
-				if ($version instanceof CompletePackage)
+				if ($highest_version instanceof CompletePackage)
 				{
-					$available[$name]['description'] = $highest_version->getDescription();
-					$available[$name]['url'] = $highest_version->getHomepage();
-					$available[$name]['authors'] = $highest_version->getAuthors();
+					$available[$package_name]['description'] = $highest_version->getDescription();
+					$available[$package_name]['url'] = $highest_version->getHomepage();
+					$available[$package_name]['authors'] = $highest_version->getAuthors();
 				}
 				else
 				{
-					$available[$name]['description'] = '';
-					$available[$name]['url'] = '';
-					$available[$name]['authors'] = [];
+					$available[$package_name]['description'] = '';
+					$available[$package_name]['url'] = '';
+					$available[$package_name]['authors'] = [];
 				}
 			}
 
@@ -453,39 +466,80 @@ public function check_requirements()
 	/**
 	 * Updates $compatible_packages with the versions of $versions compatibles with the $core_constraint
 	 *
-	 * @param array						$compatible_packages	List of compatibles versions
-	 * @param ConstraintInterface	$core_constraint		Constraint against the phpBB version
+	 * @param array $compatible_packages List of compatibles versions
+	 * @param ConstraintInterface $core_constraint Constraint against the phpBB version
 	 * @param string $core_stability Core stability
-	 * @param string					$package_name			Considered package
-	 * @param array						$versions				List of available versions
+	 * @param string $package_name Considered package
+	 * @param array $versions List of available versions
 	 *
 	 * @return array
 	 */
 	private function get_compatible_versions(array $compatible_packages, ConstraintInterface $core_constraint, $core_stability, $package_name, array $versions)
 	{
+		$version_parser = new VersionParser();
+
 		$core_stability_value = BasePackage::$stabilities[$core_stability];
 
-		/** @var \Composer\Package\PackageInterface $version */
+		/** @var PackageInterface $version */
 		foreach ($versions as $version)
 		{
 			try
 			{
+				// Check stability first to avoid unnecessary operations
 				if (BasePackage::$stabilities[$version->getStability()] > $core_stability_value)
 				{
 					continue;
 				}
 
-				if (array_key_exists('phpbb/phpbb', $version->getRequires()))
+				$requires = $version->getRequires();
+				$extra = $version->getExtra();
+
+				// Check for compatibility with phpBB if 'phpbb/phpbb' exists in 'requires'
+				if (isset($requires['phpbb/phpbb']))
 				{
-					/** @var ConstraintInterface $package_constraint */
-					$package_constraint = $version->getRequires()['phpbb/phpbb']->getConstraint();
+					$package_constraint = $requires['phpbb/phpbb']->getConstraint();
+					if (!$package_constraint->matches($core_constraint))
+					{
+						continue;
+					}
+				}
 
+				// Check for compatibility with phpBB if 'phpbb/phpbb' exists in 'soft-require'
+				if (isset($extra['soft-require']['phpbb/phpbb']))
+				{
+					$package_constraint = $version_parser->parseConstraints($extra['soft-require']['phpbb/phpbb']);
 					if (!$package_constraint->matches($core_constraint))
 					{
 						continue;
 					}
 				}
 
+				// Check for compatibility with php if 'php' exists in 'requires'
+				if (isset($requires['php']))
+				{
+					$php_constraint = $version_parser->parseConstraints(PHP_VERSION);
+					$package_constraint = $requires['php']->getConstraint();
+					if (!$package_constraint->matches($php_constraint))
+					{
+						continue;
+					}
+				}
+
+				// Check for composer/installers requirement - must support version 2.0 or later
+				if (isset($requires['composer/installers']))
+				{
+					$installers_constraint = $requires['composer/installers']->getConstraint();
+					$min_version_constraint = $version_parser->parseConstraints('>=2.0');
+					if (!$min_version_constraint->matches($installers_constraint))
+					{
+						continue;
+					}
+				}
+				else
+				{
+					continue;
+				}
+
 				$compatible_packages[$package_name][] = $version;
 			}
 			catch (\Exception $e)
@@ -506,8 +560,6 @@ private function get_compatible_versions(array $compatible_packages, ConstraintI
 	 */
 	protected function generate_ext_json_file(array $packages)
 	{
-		$io = new NullIO();
-
 		$composer = $this->get_composer(null);
 
 		$core_packages = $this->get_core_packages($composer);
@@ -548,8 +600,148 @@ protected function generate_ext_json_file(array $packages)
 			$lockFile->write([]);
 		}
 
+		// First pass write: base file with requested packages as provided
 		$json_file->write($ext_json_data);
 		$this->ext_json_file_backup = $ext_json_file_backup;
+
+		// Second pass: resolve and pin the highest compatible versions for unconstrained requested packages
+		try
+		{
+			// Build a list of requested packages without explicit constraints
+			$unconstrained = [];
+			foreach ($packages as $name => $constraint)
+			{
+				// The $packages array can be either ['vendor/package' => '^1.2'] or ['vendor/package'] (numeric keys).
+				if (is_int($name))
+				{
+					// Numeric key means just a name
+					$package_name = $constraint;
+					$unconstrained[$package_name] = true;
+				}
+				else
+				{
+					// If constraint is empty or '*' treat as unconstrained
+					if ($constraint === '' || $constraint === '*' || $constraint === null)
+					{
+						$unconstrained[$name] = true;
+					}
+				}
+			}
+
+			if (!empty($unconstrained))
+			{
+				// Load composer on the just-written file so repositories and core constraints are available
+				$ext_composer = $this->get_composer($this->get_composer_ext_json_filename());
+
+				/** @var ConstraintInterface $core_constraint */
+				$core_constraint = $ext_composer->getPackage()->getRequires()['phpbb/phpbb']->getConstraint();
+				$core_stability = $ext_composer->getPackage()->getMinimumStability();
+
+				// Resolve highest compatible versions for each unconstrained package
+				$pins = $this->resolve_highest_versions(array_keys($unconstrained), $ext_composer, $core_constraint, $core_stability);
+
+				if (!empty($pins))
+				{
+					// Merge pins into require section, overwriting unconstrained entries
+					foreach ($pins as $pkg => $version)
+					{
+						$ext_json_data['require'][$pkg] = $version;
+					}
+
+					// Rewrite composer-ext.json with pinned versions
+					$json_file->write($ext_json_data);
+				}
+			}
+		}
+		catch (\Exception $e)
+		{
+			// If resolution fails for any reason, keep the first-pass file intact (Composer will still resolve).
+			// Intentionally swallow to avoid breaking installation flow.
+		}
+	}
+
+	/**
+	 * Resolve the highest compatible versions for the given package names
+	 * based on repositories and phpBB/PHP constraints from the provided Composer instance.
+	 *
+	 * @param array $package_names list of package names to resolve
+	 * @param Composer|PartialComposer $composer Composer instance configured with repositories
+	 * @param ConstraintInterface $core_constraint phpBB version constraint
+	 * @param string $core_stability minimum stability
+	 * @return array [packageName => prettyVersion]
+	 */
+	protected function resolve_highest_versions(array $package_names, $composer, ConstraintInterface $core_constraint, $core_stability): array
+	{
+		$compatible_packages = [];
+		$repositories = $composer->getRepositoryManager()->getRepositories();
+
+		foreach ($repositories as $repository)
+		{
+			try
+			{
+				if ($repository instanceof ComposerRepository)
+				{
+					foreach ($package_names as $name)
+					{
+						$versions = $repository->findPackages($name);
+						if (!empty($versions))
+						{
+							$compatible_packages = $this->get_compatible_versions($compatible_packages, $core_constraint, $core_stability, $name, $versions);
+						}
+					}
+				}
+				else
+				{
+					// Preload and filter by name for non-composer repositories
+					$package_name = [];
+					foreach ($repository->getPackages() as $package)
+					{
+						$name = $package->getName();
+						if (in_array($name, $package_names, true))
+						{
+							$package_name[$name][] = $package;
+						}
+					}
+
+					foreach ($package_name as $name => $versions)
+					{
+						$compatible_packages = $this->get_compatible_versions($compatible_packages, $core_constraint, $core_stability, $name, $versions);
+					}
+				}
+			}
+			catch (\Exception $e)
+			{
+				// If a repo fails, just skip it.
+				continue;
+			}
+		}
+
+		$pins = [];
+		foreach ($package_names as $name)
+		{
+			if (empty($compatible_packages[$name]))
+			{
+				continue;
+			}
+
+			$package_versions = $compatible_packages[$name];
+
+			// Sort descending by normalized version
+			usort($package_versions, function ($a, $b) {
+				return version_compare($b->getVersion(), $a->getVersion());
+			});
+
+			$highest = $package_versions[0];
+			if ($highest instanceof CompleteAliasPackage)
+			{
+				$highest = $highest->getAliasOf();
+			}
+
+			// Pin to the resolved highest compatible version using its pretty version
+			$pins[$name] = $highest->getPrettyVersion();
+		}
+
+		return $pins;
 	}
 
 	/**
diff --git a/phpBB/phpbb/composer/io/html_output_formatter.php b/phpBB/phpbb/composer/io/html_output_formatter.php
index a5e2e8cc4aa..6914709d51a 100644
--- a/phpBB/phpbb/composer/io/html_output_formatter.php
+++ b/phpBB/phpbb/composer/io/html_output_formatter.php
@@ -46,7 +46,7 @@ class html_output_formatter extends \Composer\Console\HtmlOutputFormatter
 	/**
 	 * {@inheritdoc}
 	 */
-	public function format(?string $message): ?string
+	public function format(string|null $message): string|null
 	{
 		$formatted = parent::format($message);
 
diff --git a/phpBB/phpbb/composer/io/web_io.php b/phpBB/phpbb/composer/io/web_io.php
index aac7f060883..b6e9a1b7ffa 100644
--- a/phpBB/phpbb/composer/io/web_io.php
+++ b/phpBB/phpbb/composer/io/web_io.php
@@ -28,7 +28,7 @@ class web_io extends BufferIO implements io_interface
 	 * @param int						$verbosity	Verbosity level
 	 * @param OutputFormatterInterface|null	$formatter	Output formatter
 	 */
-	public function __construct(language $language, $input = '', $verbosity = StreamOutput::VERBOSITY_NORMAL, OutputFormatterInterface $formatter = null)
+	public function __construct(language $language, $input = '', $verbosity = StreamOutput::VERBOSITY_NORMAL, OutputFormatterInterface|null $formatter = null)
 	{
 		$this->language = $language;
 
diff --git a/phpBB/phpbb/composer/manager.php b/phpBB/phpbb/composer/manager.php
index e36a32d1e95..13d3491e9f6 100644
--- a/phpBB/phpbb/composer/manager.php
+++ b/phpBB/phpbb/composer/manager.php
@@ -74,7 +74,7 @@ public function __construct(installer $installer, driver_interface $cache, $pack
 	/**
 	 * {@inheritdoc}
 	 */
-	public function install(array $packages, IOInterface $io = null)
+	public function install(array $packages, IOInterface|null $io = null)
 	{
 		$packages = $this->normalize_version($packages);
 
@@ -103,7 +103,7 @@ public function install(array $packages, IOInterface $io = null)
 	 *                        Each entry may be a name or an array associating a version constraint to a name
 	 * @param IOInterface|null $io IO object used for the output
 	 */
-	protected function pre_install(array $packages, IOInterface $io = null)
+	protected function pre_install(array $packages, IOInterface|null $io = null)
 	{
 	}
 
@@ -114,14 +114,14 @@ protected function pre_install(array $packages, IOInterface $io = null)
 	 *                        Each entry may be a name or an array associating a version constraint to a name
 	 * @param IOInterface|null $io IO object used for the output
 	 */
-	protected function post_install(array $packages, IOInterface $io = null)
+	protected function post_install(array $packages, IOInterface|null $io = null)
 	{
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function update(array $packages, IOInterface $io = null)
+	public function update(array $packages, IOInterface|null $io = null)
 	{
 		$packages = $this->normalize_version($packages);
 
@@ -148,7 +148,7 @@ public function update(array $packages, IOInterface $io = null)
 	 *                        Each entry may be a name or an array associating a version constraint to a name
 	 * @param IOInterface|null $io IO object used for the output
 	 */
-	protected function pre_update(array $packages, IOInterface $io = null)
+	protected function pre_update(array $packages, IOInterface|null $io = null)
 	{
 	}
 
@@ -159,14 +159,14 @@ protected function pre_update(array $packages, IOInterface $io = null)
 	 *                        Each entry may be a name or an array associating a version constraint to a name
 	 * @param IOInterface|null $io IO object used for the output
 	 */
-	protected function post_update(array $packages, IOInterface $io = null)
+	protected function post_update(array $packages, IOInterface|null $io = null)
 	{
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function remove(array $packages, IOInterface $io = null)
+	public function remove(array $packages, IOInterface|null $io = null)
 	{
 		$packages = $this->normalize_version($packages);
 
@@ -195,7 +195,7 @@ public function remove(array $packages, IOInterface $io = null)
 	 *                        Each entry may be a name or an array associating a version constraint to a name
 	 * @param IOInterface|null $io IO object used for the output
 	 */
-	protected function pre_remove(array $packages, IOInterface $io = null)
+	protected function pre_remove(array $packages, IOInterface|null $io = null)
 	{
 	}
 
@@ -206,7 +206,7 @@ protected function pre_remove(array $packages, IOInterface $io = null)
 	 *                        Each entry may be a name or an array associating a version constraint to a name
 	 * @param IOInterface|null $io IO object used for the output
 	 */
-	protected function post_remove(array $packages, IOInterface $io = null)
+	protected function post_remove(array $packages, IOInterface|null $io = null)
 	{
 	}
 
diff --git a/phpBB/phpbb/composer/manager_interface.php b/phpBB/phpbb/composer/manager_interface.php
index d14abee8bc0..9fda2f66eef 100644
--- a/phpBB/phpbb/composer/manager_interface.php
+++ b/phpBB/phpbb/composer/manager_interface.php
@@ -30,7 +30,7 @@ interface manager_interface
 	 *
 	 * @throws runtime_exception
 	 */
-	public function install(array $packages, IOInterface $io = null);
+	public function install(array $packages, IOInterface|null $io = null);
 
 	/**
 	 * Updates or installs a set of packages
@@ -41,7 +41,7 @@ public function install(array $packages, IOInterface $io = null);
 	 *
 	 * @throws runtime_exception
 	 */
-	public function update(array $packages, IOInterface $io = null);
+	public function update(array $packages, IOInterface|null $io = null);
 
 	/**
 	 * Removes a set of packages
@@ -52,7 +52,7 @@ public function update(array $packages, IOInterface $io = null);
 	 *
 	 * @throws runtime_exception
 	 */
-	public function remove(array $packages, IOInterface $io = null);
+	public function remove(array $packages, IOInterface|null $io = null);
 
 	/**
 	 * Tells whether or not a package is managed by Composer.
diff --git a/phpBB/phpbb/console/command/cache/purge.php b/phpBB/phpbb/console/command/cache/purge.php
index 5dfc414454b..a0ace3520c1 100644
--- a/phpBB/phpbb/console/command/cache/purge.php
+++ b/phpBB/phpbb/console/command/cache/purge.php
@@ -81,7 +81,7 @@ protected function configure()
 	*
 	* @return int
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$this->config->increment('assets_version', 1);
 		$this->cache->purge();
diff --git a/phpBB/phpbb/console/command/config/delete.php b/phpBB/phpbb/console/command/config/delete.php
index ce73652ef75..2f77fb168a5 100644
--- a/phpBB/phpbb/console/command/config/delete.php
+++ b/phpBB/phpbb/console/command/config/delete.php
@@ -47,7 +47,7 @@ protected function configure()
 	 * @return int
 	 * @see \phpbb\config\config::delete()
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/config/get.php b/phpBB/phpbb/console/command/config/get.php
index eea5819da1c..80c199bd8a2 100644
--- a/phpBB/phpbb/console/command/config/get.php
+++ b/phpBB/phpbb/console/command/config/get.php
@@ -54,7 +54,7 @@ protected function configure()
 	* @return int
 	* @see \phpbb\config\config::offsetGet()
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/config/increment.php b/phpBB/phpbb/console/command/config/increment.php
index 31078c5ecda..4224b62a85b 100644
--- a/phpBB/phpbb/console/command/config/increment.php
+++ b/phpBB/phpbb/console/command/config/increment.php
@@ -59,7 +59,7 @@ protected function configure()
 	* @return int
 	* @see \phpbb\config\config::increment()
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/config/set.php b/phpBB/phpbb/console/command/config/set.php
index d7e57697d29..5e00c508655 100644
--- a/phpBB/phpbb/console/command/config/set.php
+++ b/phpBB/phpbb/console/command/config/set.php
@@ -59,7 +59,7 @@ protected function configure()
 	* @return int
 	* @see \phpbb\config\config::set()
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/config/set_atomic.php b/phpBB/phpbb/console/command/config/set_atomic.php
index a2b79c05002..0c8eb4f5a7b 100644
--- a/phpBB/phpbb/console/command/config/set_atomic.php
+++ b/phpBB/phpbb/console/command/config/set_atomic.php
@@ -65,7 +65,7 @@ protected function configure()
 	* @return int 0 if the value was changed, 1 otherwise.
 	* @see \phpbb\config\config::set_atomic()
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
index cacc17ff0ee..29ed72ec377 100644
--- a/phpBB/phpbb/console/command/cron/cron_list.php
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -55,7 +55,7 @@ protected function configure()
 	*
 	* @return int
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/cron/run.php b/phpBB/phpbb/console/command/cron/run.php
index d31abb06913..17a2410a74d 100644
--- a/phpBB/phpbb/console/command/cron/run.php
+++ b/phpBB/phpbb/console/command/cron/run.php
@@ -76,7 +76,7 @@ protected function configure()
 	*
 	* @return int 0 if all is ok, 1 if a lock error occurred and 2 if no task matching the argument was found.
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		if ($this->lock_db->acquire())
 		{
diff --git a/phpBB/phpbb/console/command/db/list_command.php b/phpBB/phpbb/console/command/db/list_command.php
index 4e2b298baad..28208c6cc13 100644
--- a/phpBB/phpbb/console/command/db/list_command.php
+++ b/phpBB/phpbb/console/command/db/list_command.php
@@ -47,7 +47,7 @@ protected function configure()
 	 *
 	 * @return int
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php
index cfa506afe21..97bb55c1c62 100644
--- a/phpBB/phpbb/console/command/db/migrate.php
+++ b/phpBB/phpbb/console/command/db/migrate.php
@@ -63,7 +63,7 @@ protected function configure()
 	 *
 	 * @return int
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/db/revert.php b/phpBB/phpbb/console/command/db/revert.php
index 7814f00f94a..21bf4cc16af 100644
--- a/phpBB/phpbb/console/command/db/revert.php
+++ b/phpBB/phpbb/console/command/db/revert.php
@@ -47,7 +47,7 @@ protected function configure()
 	 *
 	 * @return int
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/dev/migration_tips.php b/phpBB/phpbb/console/command/dev/migration_tips.php
index 885103118f7..7c4b0701e82 100644
--- a/phpBB/phpbb/console/command/dev/migration_tips.php
+++ b/phpBB/phpbb/console/command/dev/migration_tips.php
@@ -48,7 +48,7 @@ protected function configure()
 	 *
 	 * @return int
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$migrations = $this->extension_manager->get_finder()
 			->set_extensions(array())
diff --git a/phpBB/phpbb/console/command/extension/disable.php b/phpBB/phpbb/console/command/extension/disable.php
index 9113ef0f331..9f7763acd21 100644
--- a/phpBB/phpbb/console/command/extension/disable.php
+++ b/phpBB/phpbb/console/command/extension/disable.php
@@ -46,7 +46,7 @@ protected function configure()
 	 *
 	 * @return int
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/extension/enable.php b/phpBB/phpbb/console/command/extension/enable.php
index a83d4cf4afb..1b2a63d2e3d 100644
--- a/phpBB/phpbb/console/command/extension/enable.php
+++ b/phpBB/phpbb/console/command/extension/enable.php
@@ -46,7 +46,7 @@ protected function configure()
 	 *
 	 * @return int
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/extension/install.php b/phpBB/phpbb/console/command/extension/install.php
index 1f414e348ee..7b87bb291b4 100644
--- a/phpBB/phpbb/console/command/extension/install.php
+++ b/phpBB/phpbb/console/command/extension/install.php
@@ -75,7 +75,7 @@ protected function configure()
 	* @param OutputInterface $output
 	* @return int
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$output->getFormatter()->setStyle('warning', new OutputFormatterStyle('black', 'yellow'));
 
diff --git a/phpBB/phpbb/console/command/extension/list_available.php b/phpBB/phpbb/console/command/extension/list_available.php
index c53f83c7c78..082f63155fd 100644
--- a/phpBB/phpbb/console/command/extension/list_available.php
+++ b/phpBB/phpbb/console/command/extension/list_available.php
@@ -55,7 +55,7 @@ protected function configure()
 	* @param OutputInterface $output
 	* @return int
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/extension/manage.php b/phpBB/phpbb/console/command/extension/manage.php
index 393488e6afb..ec648333908 100644
--- a/phpBB/phpbb/console/command/extension/manage.php
+++ b/phpBB/phpbb/console/command/extension/manage.php
@@ -69,7 +69,7 @@ protected function configure()
 	* @param OutputInterface $output
 	* @return int
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/extension/purge.php b/phpBB/phpbb/console/command/extension/purge.php
index 0ac47fb0a30..17ca072c65e 100644
--- a/phpBB/phpbb/console/command/extension/purge.php
+++ b/phpBB/phpbb/console/command/extension/purge.php
@@ -46,7 +46,7 @@ protected function configure()
 	 *
 	 * @return int
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/extension/remove.php b/phpBB/phpbb/console/command/extension/remove.php
index 9197caed0b0..118d410c33a 100644
--- a/phpBB/phpbb/console/command/extension/remove.php
+++ b/phpBB/phpbb/console/command/extension/remove.php
@@ -75,7 +75,7 @@ protected function configure()
 	* @param OutputInterface $output
 	* @return integer
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$output->getFormatter()->setStyle('warning', new OutputFormatterStyle('black', 'yellow'));
 
diff --git a/phpBB/phpbb/console/command/extension/show.php b/phpBB/phpbb/console/command/extension/show.php
index e825950a196..fd6c76f4d6b 100644
--- a/phpBB/phpbb/console/command/extension/show.php
+++ b/phpBB/phpbb/console/command/extension/show.php
@@ -40,7 +40,7 @@ protected function configure()
 	 *
 	 * @return int
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/extension/update.php b/phpBB/phpbb/console/command/extension/update.php
index d469d967e42..b9aa14d3b2a 100644
--- a/phpBB/phpbb/console/command/extension/update.php
+++ b/phpBB/phpbb/console/command/extension/update.php
@@ -67,7 +67,7 @@ protected function configure()
 	* @param OutputInterface $output
 	* @return integer
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$output->getFormatter()->setStyle('warning', new OutputFormatterStyle('black', 'yellow'));
 
diff --git a/phpBB/phpbb/console/command/fixup/fix_left_right_ids.php b/phpBB/phpbb/console/command/fixup/fix_left_right_ids.php
index 778c7fe8e7b..942834d196d 100644
--- a/phpBB/phpbb/console/command/fixup/fix_left_right_ids.php
+++ b/phpBB/phpbb/console/command/fixup/fix_left_right_ids.php
@@ -67,7 +67,7 @@ protected function configure()
 	*
 	* @return int
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/fixup/update_hashes.php b/phpBB/phpbb/console/command/fixup/update_hashes.php
index 05bef48c92f..a0e2dc9fc9d 100644
--- a/phpBB/phpbb/console/command/fixup/update_hashes.php
+++ b/phpBB/phpbb/console/command/fixup/update_hashes.php
@@ -77,7 +77,7 @@ protected function configure()
 	/**
 	 * {@inheritdoc}
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		// Get count to be able to display progress
 		$sql = 'SELECT COUNT(user_id) AS count
@@ -101,6 +101,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$old_hash = preg_replace('/^\$CP\$/', '', $row['user_password']);
+
+			// If stored hash type is unknown then it's md5 hash with no prefix
+			// First rehash it using $H$ as hash type identifier (salted_md5)
+			if (!$this->passwords_manager->detect_algorithm($old_hash))
+			{
+				$old_hash = $this->passwords_manager->hash($old_hash, '$H$');
+			}
+
 			$new_hash = $this->passwords_manager->hash($old_hash, [$this->default_type]);
 
 			$sql = 'UPDATE ' . USERS_TABLE . "
diff --git a/phpBB/phpbb/console/command/reparser/list_all.php b/phpBB/phpbb/console/command/reparser/list_all.php
index a062fac75a2..bf06bac88e0 100644
--- a/phpBB/phpbb/console/command/reparser/list_all.php
+++ b/phpBB/phpbb/console/command/reparser/list_all.php
@@ -60,7 +60,7 @@ protected function configure()
 	* @param OutputInterface $output
 	* @return int
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 		$io->section($this->user->lang('CLI_DESCRIPTION_REPARSER_AVAILABLE'));
diff --git a/phpBB/phpbb/console/command/reparser/reparse.php b/phpBB/phpbb/console/command/reparser/reparse.php
index 1e66a22a73e..a59f887a0dd 100644
--- a/phpBB/phpbb/console/command/reparser/reparse.php
+++ b/phpBB/phpbb/console/command/reparser/reparse.php
@@ -93,6 +93,12 @@ protected function configure()
 				InputOption::VALUE_NONE,
 				$this->user->lang('CLI_DESCRIPTION_REPARSER_REPARSE_OPT_DRY_RUN')
 			)
+			->addOption(
+				'force-bbcode-reparsing',
+				null,
+				InputOption::VALUE_NONE,
+				$this->user->lang('CLI_DESCRIPTION_REPARSER_REPARSE_OPT_FORCE_BBCODE')
+			)
 			->addOption(
 				'resume',
 				null,
@@ -129,7 +135,7 @@ protected function configure()
 	* @param OutputInterface $output
 	* @return int
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$this->input = $input;
 		$this->output = $output;
@@ -223,13 +229,15 @@ protected function reparse($name)
 
 		// Start from $max and decrement $current by $size until we reach $min
 		$current = $max;
+
+		$force_bbcode_reparsing = (bool) $this->get_option('force-bbcode-reparsing');
 		while ($current >= $min)
 		{
 			$start = max($min, $current + 1 - $size);
 			$end   = max($min, $current);
 
 			$progress->setMessage($this->user->lang('CLI_REPARSER_REPARSE_REPARSING', $reparser->get_name(), $start, $end));
-			$reparser->reparse_range($start, $end);
+			$reparser->reparse_range($start, $end, $force_bbcode_reparsing);
 
 			$current = $start - 1;
 			$progress->setProgress($max + 1 - $start);
diff --git a/phpBB/phpbb/console/command/thumbnail/delete.php b/phpBB/phpbb/console/command/thumbnail/delete.php
index 21fb843e7db..1db141b1822 100644
--- a/phpBB/phpbb/console/command/thumbnail/delete.php
+++ b/phpBB/phpbb/console/command/thumbnail/delete.php
@@ -12,6 +12,11 @@
 */
 namespace phpbb\console\command\thumbnail;
 
+use phpbb\db\driver\driver_interface;
+use phpbb\language\language;
+use phpbb\storage\exception\storage_exception;
+use phpbb\storage\storage;
+use phpbb\user;
 use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -20,14 +25,19 @@
 class delete extends \phpbb\console\command\command
 {
 	/**
-	* @var \phpbb\config\config
+	* @var driver_interface
 	*/
-	protected $config;
+	protected $db;
 
 	/**
-	* @var \phpbb\db\driver\driver_interface
-	*/
-	protected $db;
+	 * @var language
+	 */
+	protected $language;
+
+	/**
+	 * @var storage
+	 */
+	protected $storage;
 
 	/**
 	* phpBB root path
@@ -38,16 +48,16 @@ class delete extends \phpbb\console\command\command
 	/**
 	* Constructor
 	*
-	* @param \phpbb\config\config $config The config
-	* @param \phpbb\user $user The user object (used to get language information)
-	* @param \phpbb\db\driver\driver_interface $db Database connection
-	* @param string $phpbb_root_path Root path
+	* @param user $user The user object (used to get language information)
+	* @param driver_interface $db Database connection
+	* @param language $language Language
+	* @param storage $storage Storage
 	*/
-	public function __construct(\phpbb\config\config $config, \phpbb\user $user, \phpbb\db\driver\driver_interface $db, $phpbb_root_path)
+	public function __construct(user $user, driver_interface $db, language $language, storage $storage)
 	{
-		$this->config = $config;
 		$this->db = $db;
-		$this->phpbb_root_path = $phpbb_root_path;
+		$this->language = $language;
+		$this->storage = $storage;
 
 		parent::__construct($user);
 	}
@@ -61,7 +71,7 @@ protected function configure()
 	{
 		$this
 			->setName('thumbnail:delete')
-			->setDescription($this->user->lang('CLI_DESCRIPTION_THUMBNAIL_DELETE'))
+			->setDescription($this->language->lang('CLI_DESCRIPTION_THUMBNAIL_DELETE'))
 		;
 	}
 
@@ -75,11 +85,11 @@ protected function configure()
 	*
 	* @return int 0 if all is ok, 1 if a thumbnail couldn't be deleted.
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
-		$io->section($this->user->lang('CLI_THUMBNAIL_DELETING'));
+		$io->section($this->language->lang('CLI_THUMBNAIL_DELETING'));
 
 		$sql = 'SELECT COUNT(*) AS nb_missing_thumbnails
 			FROM ' . ATTACHMENTS_TABLE . '
@@ -90,7 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		if ($nb_missing_thumbnails === 0)
 		{
-			$io->warning($this->user->lang('CLI_THUMBNAIL_NOTHING_TO_DELETE'));
+			$io->warning($this->language->lang('CLI_THUMBNAIL_NOTHING_TO_DELETE'));
 			return symfony_command::SUCCESS;
 		}
 
@@ -101,7 +111,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		$progress = $this->create_progress_bar($nb_missing_thumbnails, $io, $output);
 
-		$progress->setMessage($this->user->lang('CLI_THUMBNAIL_DELETING'));
+		$progress->setMessage($this->language->lang('CLI_THUMBNAIL_DELETING'));
 
 		$progress->start();
 
@@ -109,10 +119,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
 		$return = symfony_command::SUCCESS;
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$thumbnail_path = $this->phpbb_root_path . $this->config['upload_path'] . '/thumb_' . $row['physical_filename'];
-
-			if (@unlink($thumbnail_path))
+			try
 			{
+				$this->storage->delete('thumb_' . $row['physical_filename']);
+
 				$thumbnail_deleted[] = $row['attach_id'];
 
 				if (count($thumbnail_deleted) === 250)
@@ -121,12 +131,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
 					$thumbnail_deleted = array();
 				}
 
-				$progress->setMessage($this->user->lang('CLI_THUMBNAIL_DELETED', $row['real_filename'], $row['physical_filename']));
+				$progress->setMessage($this->language->lang('CLI_THUMBNAIL_DELETED', $row['real_filename'], $row['physical_filename']));
 			}
-			else
+			catch (storage_exception $e)
 			{
 				$return = symfony_command::FAILURE;
-				$progress->setMessage('<error>' . $this->user->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</error>');
+				$progress->setMessage('<error>' . $this->language->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</error>');
+
 			}
 
 			$progress->advance();
@@ -141,7 +152,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 		$progress->finish();
 
 		$io->newLine(2);
-		$io->success($this->user->lang('CLI_THUMBNAIL_DELETING_DONE'));
+		$io->success($this->language->lang('CLI_THUMBNAIL_DELETING_DONE'));
 
 		return $return;
 	}
diff --git a/phpBB/phpbb/console/command/thumbnail/generate.php b/phpBB/phpbb/console/command/thumbnail/generate.php
index 9be4ce5a2e3..0a65d764c58 100644
--- a/phpBB/phpbb/console/command/thumbnail/generate.php
+++ b/phpBB/phpbb/console/command/thumbnail/generate.php
@@ -13,28 +13,52 @@
 
 namespace phpbb\console\command\thumbnail;
 
+use phpbb\attachment\attachment_category;
+use phpbb\cache\service;
+use phpbb\db\driver\driver_interface;
+use phpbb\filesystem\temp;
+use phpbb\language\language;
+use phpbb\storage\storage;
+use phpbb\user;
 use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Filesystem\Filesystem as symfony_filesystem;
 
 class generate extends \phpbb\console\command\command
 {
-	/**
-	* @var \phpbb\config\config
-	*/
-	protected $config;
 
 	/**
-	* @var \phpbb\db\driver\driver_interface
+	* @var driver_interface
 	*/
 	protected $db;
 
 	/**
-	* @var \phpbb\cache\service
+	* @var service
 	*/
 	protected $cache;
 
+	/**
+	 * @var language
+	 */
+	protected $language;
+
+	/**
+	 * @var symfony_filesystem
+	 */
+	protected $symfony_filesystem;
+
+	/**
+	 * @var storage
+	 */
+	protected $storage;
+
+	/**
+	 * @var temp
+	 */
+	protected $temp;
+
 	/**
 	* phpBB root path
 	* @var string
@@ -51,18 +75,23 @@ class generate extends \phpbb\console\command\command
 	/**
 	* Constructor
 	*
-	* @param \phpbb\config\config $config The config
-	* @param \phpbb\user $user The user object (used to get language information)
-	* @param \phpbb\db\driver\driver_interface $db Database connection
-	* @param \phpbb\cache\service $cache The cache service
+	* @param user $user The user object (used to get language information)
+	* @param driver_interface $db Database connection
+	* @param service $cache The cache service
+	* @param language $language Language
+	* @param storage $storage Storage
+	* @param temp $temp Temp
 	* @param string $phpbb_root_path Root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(\phpbb\config\config $config, \phpbb\user $user, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $phpbb_root_path, $php_ext)
+	public function __construct(user $user, driver_interface $db, service $cache, language $language, storage $storage, temp $temp, string $phpbb_root_path, string $php_ext)
 	{
-		$this->config = $config;
 		$this->db = $db;
 		$this->cache = $cache;
+		$this->symfony_filesystem = new symfony_filesystem();
+		$this->language = $language;
+		$this->storage = $storage;
+		$this->temp = $temp;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 
@@ -78,7 +107,7 @@ protected function configure()
 	{
 		$this
 			->setName('thumbnail:generate')
-			->setDescription($this->user->lang('CLI_DESCRIPTION_THUMBNAIL_GENERATE'))
+			->setDescription($this->language->lang('CLI_DESCRIPTION_THUMBNAIL_GENERATE'))
 		;
 	}
 
@@ -92,11 +121,11 @@ protected function configure()
 	*
 	* @return int 0.
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
-		$io->section($this->user->lang('CLI_THUMBNAIL_GENERATING'));
+		$io->section($this->language->lang('CLI_THUMBNAIL_GENERATING'));
 
 		$sql = 'SELECT COUNT(*) AS nb_missing_thumbnails
 			FROM ' . ATTACHMENTS_TABLE . '
@@ -107,7 +136,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		if ($nb_missing_thumbnails === 0)
 		{
-			$io->warning($this->user->lang('CLI_THUMBNAIL_NOTHING_TO_GENERATE'));
+			$io->warning($this->language->lang('CLI_THUMBNAIL_NOTHING_TO_GENERATE'));
 			return symfony_command::SUCCESS;
 		}
 
@@ -125,20 +154,24 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		$progress = $this->create_progress_bar($nb_missing_thumbnails, $io, $output);
 
-		$progress->setMessage($this->user->lang('CLI_THUMBNAIL_GENERATING'));
+		$progress->setMessage($this->language->lang('CLI_THUMBNAIL_GENERATING'));
 
 		$progress->start();
 
 		$thumbnail_created = array();
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			if (isset($extensions[$row['extension']]['display_cat']) && $extensions[$row['extension']]['display_cat'] == \phpbb\attachment\attachment_category::IMAGE)
+			if (isset($extensions[$row['extension']]['display_cat']) && $extensions[$row['extension']]['display_cat'] == attachment_category::IMAGE)
 			{
-				$source = $this->phpbb_root_path . $this->config['upload_path'] . '/' . $row['physical_filename'];
-				$destination = $this->phpbb_root_path . $this->config['upload_path'] . '/thumb_' . $row['physical_filename'];
+				$source = $this->symfony_filesystem->tempnam($this->temp->get_dir(), 'thumbnail_source');
+				$destination = $this->symfony_filesystem->tempnam($this->temp->get_dir(), 'thumbnail_destination');
+
+				file_put_contents($source, $this->storage->read($row['physical_filename']));
 
 				if (create_thumbnail($source, $destination, $row['mimetype']))
 				{
+					$this->storage->write('thumb_' . $row['physical_filename'], fopen($destination, 'rb'));
+
 					$thumbnail_created[] = (int) $row['attach_id'];
 
 					if (count($thumbnail_created) === 250)
@@ -147,12 +180,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
 						$thumbnail_created = array();
 					}
 
-					$progress->setMessage($this->user->lang('CLI_THUMBNAIL_GENERATED', $row['real_filename'], $row['physical_filename']));
+					$progress->setMessage($this->language->lang('CLI_THUMBNAIL_GENERATED', $row['real_filename'], $row['physical_filename']));
 				}
 				else
 				{
-					$progress->setMessage('<info>' . $this->user->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</info>');
+					$progress->setMessage('<info>' . $this->language->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</info>');
 				}
+
+				@unlink($source);
+				@unlink($destination);
 			}
 
 			$progress->advance();
@@ -167,7 +203,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 		$progress->finish();
 
 		$io->newLine(2);
-		$io->success($this->user->lang('CLI_THUMBNAIL_GENERATING_DONE'));
+		$io->success($this->language->lang('CLI_THUMBNAIL_GENERATING_DONE'));
 
 		return symfony_command::SUCCESS;
 	}
diff --git a/phpBB/phpbb/console/command/thumbnail/recreate.php b/phpBB/phpbb/console/command/thumbnail/recreate.php
index cffa2c29dc3..2c4b8cb2d17 100644
--- a/phpBB/phpbb/console/command/thumbnail/recreate.php
+++ b/phpBB/phpbb/console/command/thumbnail/recreate.php
@@ -12,6 +12,8 @@
 */
 namespace phpbb\console\command\thumbnail;
 
+use phpbb\language\language;
+use phpbb\user;
 use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -19,6 +21,24 @@
 
 class recreate extends \phpbb\console\command\command
 {
+	/**
+	 * @var language
+	 */
+	protected $language;
+
+	/**
+	 * Constructor
+	 *
+	 * @param user $user User
+	 * @param language $language Language
+	 */
+	public function __construct(user $user, language $language)
+	{
+		$this->language = $language;
+
+		parent::__construct($user);
+	}
+
 	/**
 	* Sets the command name and description
 	*
@@ -28,7 +48,7 @@ protected function configure()
 	{
 		$this
 			->setName('thumbnail:recreate')
-			->setDescription($this->user->lang('CLI_DESCRIPTION_THUMBNAIL_RECREATE'))
+			->setDescription($this->language->lang('CLI_DESCRIPTION_THUMBNAIL_RECREATE'))
 		;
 	}
 
@@ -42,7 +62,7 @@ protected function configure()
 	*
 	* @return int 0 if all is ok, 1 if a thumbnail couldn't be deleted.
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$command = $this->getApplication()->find('thumbnail:delete');
 
diff --git a/phpBB/phpbb/console/command/update/check.php b/phpBB/phpbb/console/command/update/check.php
index 74220394e2e..ac4fc49ad48 100644
--- a/phpBB/phpbb/console/command/update/check.php
+++ b/phpBB/phpbb/console/command/update/check.php
@@ -82,7 +82,7 @@ protected function configure()
 	* @return int 0 if the board is up to date, 1 if it is not and 2 if an error occurred.
 	* @throws \RuntimeException
 	*/
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/console/command/user/activate.php b/phpBB/phpbb/console/command/user/activate.php
index 1d635b46dc5..81c4cba528c 100644
--- a/phpBB/phpbb/console/command/user/activate.php
+++ b/phpBB/phpbb/console/command/user/activate.php
@@ -17,6 +17,7 @@
 use phpbb\console\command\command;
 use phpbb\language\language;
 use phpbb\log\log_interface;
+use phpbb\messenger\method\email;
 use phpbb\notification\manager;
 use phpbb\user;
 use phpbb\user_loader;
@@ -32,6 +33,9 @@ class activate extends command
 	/** @var config */
 	protected $config;
 
+	/** @var email */
+	protected $email_method;
+
 	/** @var language */
 	protected $language;
 
@@ -65,14 +69,16 @@ class activate extends command
 	 * @param config           $config
 	 * @param language         $language
 	 * @param log_interface    $log
+	 * @param email            $email_method
 	 * @param manager          $notifications
 	 * @param user_loader      $user_loader
 	 * @param string           $phpbb_root_path
 	 * @param string           $php_ext
 	 */
-	public function __construct(user $user, config $config, language $language, log_interface $log, manager $notifications, user_loader $user_loader, $phpbb_root_path, $php_ext)
+	public function __construct(user $user, config $config, language $language, log_interface $log, email $email_method, manager $notifications, user_loader $user_loader, $phpbb_root_path, $php_ext)
 	{
 		$this->config = $config;
+		$this->email_method = $email_method;
 		$this->language = $language;
 		$this->log = $log;
 		$this->notifications = $notifications;
@@ -125,7 +131,7 @@ protected function configure()
 	 *
 	 * @return int 0 if all is well, 1 if any errors occurred
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
@@ -194,20 +200,14 @@ protected function send_notification($user_row, InputInterface $input)
 
 		if ($input->getOption('send-email'))
 		{
-			if (!class_exists('messenger'))
-			{
-				require($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
-			}
-
-			$messenger = new \messenger(false);
-			$messenger->template('admin_welcome_activated', $user_row['user_lang']);
-			$messenger->set_addresses($user_row);
-			$messenger->anti_abuse_headers($this->config, $this->user);
-			$messenger->assign_vars(array(
-					'USERNAME'	=> html_entity_decode($user_row['username'], ENT_COMPAT))
-			);
-
-			$messenger->send(NOTIFY_EMAIL);
+			$this->email_method->set_use_queue(false);
+			$this->email_method->template('admin_welcome_activated', $user_row['user_lang']);
+			$this->email_method->set_addresses($user_row);
+			$this->email_method->anti_abuse_headers($this->config, $this->user);
+			$this->email_method->assign_vars([
+				'USERNAME'	=> html_entity_decode($user_row['username'], ENT_COMPAT),
+			]);
+			$this->email_method->send();
 		}
 	}
 }
diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php
index 30ce1ff1d35..09280a7adef 100644
--- a/phpBB/phpbb/console/command/user/add.php
+++ b/phpBB/phpbb/console/command/user/add.php
@@ -18,6 +18,7 @@
 use phpbb\db\driver\driver_interface;
 use phpbb\exception\runtime_exception;
 use phpbb\language\language;
+use phpbb\messenger\method\email;
 use phpbb\passwords\manager;
 use phpbb\user;
 use Symfony\Component\Console\Command\Command as symfony_command;
@@ -39,6 +40,9 @@ class add extends command
 	/** @var config */
 	protected $config;
 
+	/** @var email */
+	protected $email_method;
+
 	/** @var language */
 	protected $language;
 
@@ -66,14 +70,16 @@ class add extends command
 	 * @param driver_interface $db
 	 * @param config           $config
 	 * @param language         $language
+	 * @param service_collection $messenger
 	 * @param manager          $password_manager
 	 * @param string           $phpbb_root_path
 	 * @param string           $php_ext
 	 */
-	public function __construct(user $user, driver_interface $db, config $config, language $language, manager $password_manager, $phpbb_root_path, $php_ext)
+	public function __construct(user $user, driver_interface $db, config $config, language $language, email $email_method, manager $password_manager, $phpbb_root_path, $php_ext)
 	{
-		$this->db = $db;
 		$this->config = $config;
+		$this->db = $db;
+		$this->email_method = $email_method;
 		$this->language = $language;
 		$this->password_manager = $password_manager;
 		$this->phpbb_root_path = $phpbb_root_path;
@@ -132,7 +138,7 @@ protected function configure()
 	 *
 	 * @return int 0 if all is well, 1 if any errors occurred
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
@@ -296,35 +302,57 @@ protected function send_activation_email($user_id)
 		{
 			case USER_ACTIVATION_SELF:
 				$email_template = 'user_welcome_inactive';
-				$user_actkey = gen_rand_string(mt_rand(6, 10));
 			break;
 			case USER_ACTIVATION_ADMIN:
 				$email_template = 'admin_welcome_inactive';
-				$user_actkey = gen_rand_string(mt_rand(6, 10));
 			break;
 			default:
 				$email_template = 'user_welcome';
-				$user_actkey = '';
 			break;
 		}
 
-		if (!class_exists('messenger'))
-		{
-			require($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
-		}
+		$user_actkey = $this->get_activation_key($user_id);
 
-		$messenger = new \messenger(false);
-		$messenger->template($email_template, $this->user->lang_name);
-		$messenger->to($this->data['email'], $this->data['username']);
-		$messenger->anti_abuse_headers($this->config, $this->user);
-		$messenger->assign_vars(array(
+		$this->email_method->set_use_queue(false);
+		$this->email_method->template($email_template, $this->user->lang_name);
+		$this->email_method->to($this->data['email'], $this->data['username']);
+		$this->email_method->anti_abuse_headers($this->config, $this->user);
+		$this->email_method->assign_vars([
 			'WELCOME_MSG' => html_entity_decode($this->language->lang('WELCOME_SUBJECT', $this->config['sitename']), ENT_COMPAT),
 			'USERNAME'    => html_entity_decode($this->data['username'], ENT_COMPAT),
 			'PASSWORD'    => html_entity_decode($this->data['new_password'], ENT_COMPAT),
-			'U_ACTIVATE'  => generate_board_url() . "/ucp.{$this->php_ext}?mode=activate&u=$user_id&k=$user_actkey")
-		);
+			'U_ACTIVATE'  => generate_board_url() . "/ucp.{$this->php_ext}?mode=activate&u=$user_id&k=$user_actkey",
+		]);
+		$this->email_method->send();
+	}
+
+	/**
+	 * Get user activation key
+	 *
+	 * @param int $user_id User ID
+	 *
+	 * @return string User activation key for user
+	 */
+	protected function get_activation_key(int $user_id): string
+	{
+		$user_actkey = '';
+
+		if ($this->config['require_activation'] == USER_ACTIVATION_SELF || $this->config['require_activation'] == USER_ACTIVATION_ADMIN)
+		{
+			$user_actkey = gen_rand_string(mt_rand(6, 10));
+
+			$sql_ary = [
+				'user_actkey'				=> $user_actkey,
+				'user_actkey_expiration'	=> user::get_token_expiration(),
+			];
+
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+				WHERE user_id = ' . (int) $user_id;
+			$this->db->sql_query($sql);
+		}
 
-		$messenger->send(NOTIFY_EMAIL);
+		return $user_actkey;
 	}
 
 	/**
diff --git a/phpBB/phpbb/console/command/user/delete.php b/phpBB/phpbb/console/command/user/delete.php
index 727de653f8c..203b9db8457 100644
--- a/phpBB/phpbb/console/command/user/delete.php
+++ b/phpBB/phpbb/console/command/user/delete.php
@@ -109,7 +109,7 @@ protected function configure()
 	 *
 	 * @return int 0 if all is well, 1 if any errors occurred
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$name = $input->getArgument('username');
 		$mode = ($input->getOption('delete-posts')) ? 'remove' : 'retain';
diff --git a/phpBB/phpbb/console/command/user/delete_id.php b/phpBB/phpbb/console/command/user/delete_id.php
new file mode 100644
index 00000000000..07d98e76166
--- /dev/null
+++ b/phpBB/phpbb/console/command/user/delete_id.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\console\command\user;
+
+use phpbb\console\command\command;
+use phpbb\db\driver\driver_interface;
+use phpbb\language\language;
+use phpbb\log\log_interface;
+use phpbb\user;
+use phpbb\user_loader;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+class delete_id extends command
+{
+	/** @var driver_interface */
+	protected $db;
+
+	/** @var language */
+	protected $language;
+
+	/** @var log_interface */
+	protected $log;
+
+	/** @var user_loader */
+	protected $user_loader;
+
+	/** @var string Bots table */
+	protected $bots_table;
+
+	/** @var string User group table */
+	protected $user_group_table;
+
+	/** @var string Users table */
+	protected $users_table;
+
+	/** @var string phpBB root path */
+	protected $phpbb_root_path;
+
+	/** @var string PHP extension */
+	protected $php_ext;
+
+	/**
+	 * Construct method
+	 *
+	 * @param driver_interface $db
+	 * @param language         $language
+	 * @param log_interface    $log
+	 * @param user             $user
+	 * @param user_loader      $user_loader
+	 * @param string           $bots_table
+	 * @param string           $user_group_table
+	 * @param string           $users_table
+	 * @param string           $phpbb_root_path
+	 * @param string           $php_ext
+	 */
+	public function __construct(driver_interface $db, language $language, log_interface $log, user $user, user_loader $user_loader,
+								string $bots_table, string $user_group_table, string $users_table, string $phpbb_root_path, string $php_ext)
+	{
+		$this->db = $db;
+		$this->language = $language;
+		$this->log = $log;
+		$this->user_loader = $user_loader;
+		$this->bots_table = $bots_table;
+		$this->user_group_table = $user_group_table;
+		$this->users_table = $users_table;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+
+		$this->language->add_lang('acp/users');
+		parent::__construct($user);
+	}
+
+	/**
+	 * Sets the command name and description
+	 *
+	 * @return void
+	 */
+	protected function configure(): void
+	{
+		$this
+			->setName('user:delete_id')
+			->setDescription($this->language->lang('CLI_DESCRIPTION_USER_DELETE_ID'))
+			->addArgument(
+				'user_ids',
+				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+				$this->language->lang('CLI_DESCRIPTION_USER_DELETE_ID_OPTION_ID')
+			)
+			->addOption(
+				'delete-posts',
+				null,
+				InputOption::VALUE_NONE,
+				$this->language->lang('CLI_DESCRIPTION_USER_DELETE_OPTION_POSTS')
+			)
+		;
+	}
+
+	/**
+	 * Executes the command user:delete_ids
+	 *
+	 * Deletes a list of user ids from the database. An option to delete the users' posts
+	 * is available, by default posts will be retained.
+	 *
+	 * @param InputInterface  $input  The input stream used to get the options
+	 * @param OutputInterface $output The output stream, used to print messages
+	 *
+	 * @return int 0 if all is well, 1 if any errors occurred
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output): int
+	{
+		$user_ids = $input->getArgument('user_ids');
+		$mode = ($input->getOption('delete-posts')) ? 'remove' : 'retain';
+		$deleted_users = 0;
+		$io = new SymfonyStyle($input, $output);
+
+		if (count($user_ids) > 0)
+		{
+			$this->user_loader->load_users($user_ids);
+
+			$progress = $this->create_progress_bar(count($user_ids), $io, $output);
+			$progress->setMessage($this->language->lang('CLI_USER_DELETE_ID_START'));
+			$progress->start();
+
+			foreach ($user_ids as $user_id)
+			{
+				$user_row = $this->user_loader->get_user($user_id);
+
+				// Skip anonymous user
+				if ($user_row['user_id'] == ANONYMOUS)
+				{
+					$progress->advance();
+					continue;
+				}
+				else if ($user_row['user_type'] == USER_IGNORE)
+				{
+					$this->delete_bot_user($user_row);
+				}
+				else
+				{
+					if (!function_exists('user_delete'))
+					{
+						require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+					}
+
+					user_delete($mode, $user_row['user_id'], $user_row['username']);
+
+					$this->log->add('admin', ANONYMOUS, '', 'LOG_USER_DELETED', false, array($user_row['username']));
+				}
+
+				$progress->advance();
+				$deleted_users++;
+			}
+
+			$progress->finish();
+
+			if ($deleted_users > 0)
+			{
+				$io->success($this->language->lang('CLI_USER_DELETE_ID_SUCCESS'));
+			}
+		}
+
+		if (!$deleted_users)
+		{
+			$io->note($this->language->lang('CLI_USER_DELETE_NONE'));
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Interacts with the user.
+	 * Confirm they really want to delete the account...last chance!
+	 *
+	 * @param InputInterface  $input  An InputInterface instance
+	 * @param OutputInterface $output An OutputInterface instance
+	 */
+	protected function interact(InputInterface $input, OutputInterface $output): void
+	{
+		$helper = $this->getHelper('question');
+		if (!$helper instanceof QuestionHelper)
+		{
+			return;
+		}
+
+		$user_ids = $input->getArgument('user_ids');
+		if (count($user_ids) > 0)
+		{
+			$question = new ConfirmationQuestion(
+				$this->language->lang('CLI_USER_DELETE_ID_CONFIRM', implode(',', $user_ids)),
+				false
+			);
+
+			if (!$helper->ask($input, $output, $question))
+			{
+				$input->setArgument('user_ids', []);
+			}
+		}
+	}
+
+	/**
+	 * Deletes a bot user
+	 *
+	 * @param array $user_row
+	 * @return void
+	 */
+	protected function delete_bot_user(array $user_row): void
+	{
+		$delete_tables = [$this->bots_table, $this->user_group_table, $this->users_table];
+		foreach ($delete_tables as $table)
+		{
+			$sql = "DELETE FROM $table
+				WHERE user_id = " . (int) $user_row['user_id'];
+			$this->db->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/phpbb/console/command/user/reclean.php b/phpBB/phpbb/console/command/user/reclean.php
index 96932fcdaac..8634fb35bf1 100644
--- a/phpBB/phpbb/console/command/user/reclean.php
+++ b/phpBB/phpbb/console/command/user/reclean.php
@@ -76,7 +76,7 @@ protected function configure()
 	 *
 	 * @return int 0 if all is well, 1 if any errors occurred
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$io = new SymfonyStyle($input, $output);
 
diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php
index e2d3e2f1930..d4daec7eb2c 100644
--- a/phpBB/phpbb/controller/resolver.php
+++ b/phpBB/phpbb/controller/resolver.php
@@ -53,7 +53,7 @@ class resolver implements ControllerResolverInterface
 	* @param string $phpbb_root_path Relative path to phpBB root
 	* @param \phpbb\template\template|null $template
 	*/
-	public function __construct(ContainerInterface $container, $phpbb_root_path, \phpbb\template\template $template = null)
+	public function __construct(ContainerInterface $container, $phpbb_root_path, \phpbb\template\template|null $template = null)
 	{
 		$this->container = $container;
 		$this->template = $template;
diff --git a/phpBB/phpbb/cron/event/cron_runner_listener.php b/phpBB/phpbb/cron/event/cron_runner_listener.php
index 0c5c6555e6c..b4a8e3538f4 100644
--- a/phpBB/phpbb/cron/event/cron_runner_listener.php
+++ b/phpBB/phpbb/cron/event/cron_runner_listener.php
@@ -85,9 +85,8 @@ public function on_kernel_terminate(TerminateEvent $event)
 				{
 					$task->run();
 				}
-
-				$this->cron_lock->release();
 			}
+			$this->cron_lock->release();
 		}
 	}
 
diff --git a/phpBB/phpbb/cron/task/core/purge_oauth_states.php b/phpBB/phpbb/cron/task/core/purge_oauth_states.php
new file mode 100644
index 00000000000..a14605e896f
--- /dev/null
+++ b/phpBB/phpbb/cron/task/core/purge_oauth_states.php
@@ -0,0 +1,75 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\cron\task\core;
+
+use phpbb\config\config;
+use phpbb\cron\task\base;
+use phpbb\db\driver\driver_interface;
+
+/**
+* Purge oauth_states cron task.
+*/
+class purge_oauth_states extends base
+{
+	/** @var config */
+	protected $config;
+
+	/** @var driver_interface */
+	protected $db;
+
+	/** @var string */
+	protected $oauth_states_table;
+
+	/**
+	* Constructor
+	*
+	* @param config $config The config
+	* @param driver_interface $db The database connection
+	* @param string $oauth_states_table The oauth_states table name
+	*/
+	public function __construct(config $config, driver_interface $db, string $oauth_states_table)
+	{
+		$this->config = $config;
+		$this->db = $db;
+		$this->oauth_states_table = $oauth_states_table;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function run()
+	{
+		$sql = 'DELETE FROM ' . $this->oauth_states_table . '
+			WHERE state_time < ' . (time() - (int) $this->config['session_gc']);
+		$this->db->sql_query($sql);
+
+		$this->config->set('oauth_states_last_gc', time(), true);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function is_runnable(): bool
+	{
+		return (bool) $this->config['session_gc'];
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function should_run(): bool
+	{
+		return isset($this->config['oauth_states_last_gc']) && $this->config['oauth_states_last_gc'] < time() - $this->config['session_gc'];
+	}
+}
diff --git a/phpBB/phpbb/cron/task/core/queue.php b/phpBB/phpbb/cron/task/core/queue.php
index 2f0d91d0464..7e902f53044 100644
--- a/phpBB/phpbb/cron/task/core/queue.php
+++ b/phpBB/phpbb/cron/task/core/queue.php
@@ -13,30 +13,34 @@
 
 namespace phpbb\cron\task\core;
 
+use phpbb\config\config;
+
 /**
-* Queue cron task. Sends email and jabber messages queued by other scripts.
+* Queue cron task. Sends email queued by other scripts.
 */
 class queue extends \phpbb\cron\task\base
 {
-	protected $phpbb_root_path;
-	protected $php_ext;
-	protected $cache_dir;
+	/** var config */
 	protected $config;
 
+	/** var \phpbb\messenger\queue */
+	protected $queue;
+
+	/** var string */
+	protected $queue_cache_file;
+
 	/**
 	 * Constructor.
 	 *
-	 * @param string $phpbb_root_path The root path
-	 * @param string $php_ext PHP file extension
-	 * @param \phpbb\config\config $config The config
-	 * @param string $cache_dir phpBB cache directory
+	 * @param config $config The config
+	 * @param string $queue_cache_file The messenger file queue cache filename
+	 * @param \phpbb\messenger\queue $queue The messenger file queue object
 	 */
-	public function __construct($phpbb_root_path, $php_ext, \phpbb\config\config $config, $cache_dir)
+	public function __construct(config $config, \phpbb\messenger\queue $queue, $queue_cache_file)
 	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
 		$this->config = $config;
-		$this->cache_dir = $cache_dir;
+		$this->queue = $queue;
+		$this->queue_cache_file = $queue_cache_file;
 	}
 
 	/**
@@ -46,12 +50,7 @@ public function __construct($phpbb_root_path, $php_ext, \phpbb\config\config $co
 	*/
 	public function run()
 	{
-		if (!class_exists('queue'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
-		}
-		$queue = new \queue();
-		$queue->process();
+		$this->queue->process();
 	}
 
 	/**
@@ -63,7 +62,7 @@ public function run()
 	*/
 	public function is_runnable()
 	{
-		return file_exists($this->cache_dir . 'queue.' . $this->php_ext);
+		return file_exists($this->queue_cache_file);
 	}
 
 	/**
diff --git a/phpBB/phpbb/cron/task/core/update_hashes.php b/phpBB/phpbb/cron/task/core/update_hashes.php
index 61ed0d05012..78221bb35f3 100644
--- a/phpBB/phpbb/cron/task/core/update_hashes.php
+++ b/phpBB/phpbb/cron/task/core/update_hashes.php
@@ -107,6 +107,14 @@ public function run()
 			while ($row = $this->db->sql_fetchrow($result))
 			{
 				$old_hash = preg_replace('/^\$CP\$/', '', $row['user_password']);
+
+				// If stored hash type is unknown then it's md5 hash with no prefix
+				// First rehash it using $H$ as hash type identifier (salted_md5)
+				if (!$this->passwords_manager->detect_algorithm($old_hash))
+				{
+					$old_hash = $this->passwords_manager->hash($old_hash, '$H$');
+				}
+
 				$new_hash = $this->passwords_manager->hash($old_hash, [$this->default_type]);
 
 				// Increase number so we know that users were selected from the database
diff --git a/phpBB/phpbb/datetime.php b/phpBB/phpbb/datetime.php
index 7b9f9c83ac6..a52148e6096 100644
--- a/phpBB/phpbb/datetime.php
+++ b/phpBB/phpbb/datetime.php
@@ -42,7 +42,7 @@ class datetime extends \DateTime
 	* @param string $time String in a format accepted by strtotime().
 	* @param \DateTimeZone|null $timezone Time zone of the time.
 	*/
-	public function __construct($user, $time = 'now', \DateTimeZone $timezone = null)
+	public function __construct($user, $time = 'now', \DateTimeZone|null $timezone = null)
 	{
 		$this->user	= $user;
 		$timezone	= $timezone ?: $this->user->timezone;
diff --git a/phpBB/phpbb/db/doctrine/case_insensitive_string.php b/phpBB/phpbb/db/doctrine/case_insensitive_string.php
index 484308fc063..e7b62f86491 100644
--- a/phpBB/phpbb/db/doctrine/case_insensitive_string.php
+++ b/phpBB/phpbb/db/doctrine/case_insensitive_string.php
@@ -15,6 +15,8 @@
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
+use phpbb\db\middleware\oracle\platform as oracle_platform;
+use phpbb\db\middleware\postgresql\platform as postgresql_platform;
 
 /**
  * Case-insensitive string type (only supported by Postgres).
diff --git a/phpBB/phpbb/db/doctrine/connection_factory.php b/phpBB/phpbb/db/doctrine/connection_factory.php
index b6923096883..15a0a6416e3 100644
--- a/phpBB/phpbb/db/doctrine/connection_factory.php
+++ b/phpBB/phpbb/db/doctrine/connection_factory.php
@@ -13,12 +13,17 @@
 
 namespace phpbb\db\doctrine;
 
+use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Types\Type;
 use InvalidArgumentException;
 use phpbb\config_php_file;
+use phpbb\db\middleware\mysql\middleware as mysql_middleware;
+use phpbb\db\middleware\oracle\middleware as oracle_middleware;
+use phpbb\db\middleware\postgresql\middleware as postgresql_middleware;
+use phpbb\db\middleware\sqlsrv\middleware as sqlsrv_middleware;
 use phpbb\exception\runtime_exception;
 
 /**
@@ -73,10 +78,10 @@ public static function get_connection(config_php_file $config): Connection
 	public static function get_connection_from_params(
 		string $driver,
 		string $host,
-		?string $user = null,
-		?string $password = null,
-		?string $name = null,
-		?string $port = null): Connection
+		string|null $user = null,
+		string|null $password = null,
+		string|null $name = null,
+		string|null $port = null): Connection
 	{
 		$available_drivers = DriverManager::getAvailableDrivers();
 		if (!in_array($driver, $available_drivers))
@@ -94,9 +99,21 @@ public static function get_connection_from_params(
 			$port
 		);
 
+		$middleware = match($driver)
+		{
+			'pdo_mysql', 'mysqli'	=> [new mysql_middleware()],
+			'pdo_oci', 'oci8'		=> [new oracle_middleware()],
+			'pdo_pgsql', 'pgsql'	=> [new postgresql_middleware()],
+			'pdo_sqlsrv', 'sqlsrv'	=> [new sqlsrv_middleware()],
+			default	=> [],
+		};
+
 		try
 		{
-			$connection = DriverManager::getConnection($params);
+			$connection_config = new Configuration();
+			$connection_config->setMiddlewares($middleware);
+
+			$connection = DriverManager::getConnection($params, $connection_config);
 			if (!Type::hasType(case_insensitive_string::CASE_INSENSITIVE_STRING))
 			{
 				Type::addType(case_insensitive_string::CASE_INSENSITIVE_STRING, case_insensitive_string::class);
diff --git a/phpBB/phpbb/db/doctrine/connection_parameter_factory.php b/phpBB/phpbb/db/doctrine/connection_parameter_factory.php
index 4899f916f48..30ee850138f 100644
--- a/phpBB/phpbb/db/doctrine/connection_parameter_factory.php
+++ b/phpBB/phpbb/db/doctrine/connection_parameter_factory.php
@@ -13,9 +13,6 @@
 
 namespace phpbb\db\doctrine;
 
-use InvalidArgumentException;
-use phpbb\db\doctrine\oci8\driver as oci8_driver;
-
 /**
  * Helper class to generate Doctrine DBAL configuration.
  */
@@ -33,15 +30,15 @@ class connection_parameter_factory
 	 *
 	 * @return array Doctrine DBAL connection parameters.
 	 *
-	 * @throws InvalidArgumentException If a required parameter is empty or null.
+	 * @throws \InvalidArgumentException If a required parameter is empty or null.
 	 */
 	public static function get_configuration(
 		string $driver,
-		?string $host = null,
-		?string $user = null,
-		?string $password = null,
-		?string $name = null,
-		?string $port = null) : array
+		string|null $host = null,
+		string|null $user = null,
+		string|null $password = null,
+		string|null $name = null,
+		string|null $port = null) : array
 	{
 		$params = [
 			'driver' => $driver,
@@ -69,17 +66,17 @@ public static function get_configuration(
 	 *
 	 * @return array Doctrine's DBAL configuration for SQLite.
 	 *
-	 * @throws InvalidArgumentException If a required parameter is empty or null.
+	 * @throws \InvalidArgumentException If a required parameter is empty or null.
 	 */
 	private static function build_connection_parameters(
 		array $params,
-		?string $host = null,
-		?string $user = null,
-		?string $password = null,
-		?string $name = null,
-		?string $port = null) : array
+		string|null $host = null,
+		string|null $user = null,
+		string|null $password = null,
+		string|null $name = null,
+		string|null $port = null) : array
 	{
-		if ($params['driver'] === 'pdo_sqlite')
+		if (in_array($params['driver'], ['pdo_sqlite', 'sqlite3']))
 		{
 			return self::enrich_parameters(
 				self::build_sqlite_parameters($params, $host, $user, $password)
@@ -88,7 +85,7 @@ private static function build_connection_parameters(
 
 		if (empty($user) || empty($name))
 		{
-			throw new InvalidArgumentException('Required database parameter is not set.');
+			throw new \InvalidArgumentException('Required database parameter is not set.');
 		}
 
 		$params = array_merge($params, [
@@ -120,7 +117,7 @@ private static function build_connection_parameters(
 	 *
 	 * @return array Doctrine's DBAL configuration for SQLite.
 	 */
-	private static function build_sqlite_parameters(array $params, string $path, ?string $user, ?string $password) : array
+	private static function build_sqlite_parameters(array $params, string $path, string|null $user, string|null $password) : array
 	{
 		$params['path'] = $path;
 
@@ -146,36 +143,28 @@ private static function build_sqlite_parameters(array $params, string $path, ?st
 	 */
 	private static function enrich_parameters(array $params) : array
 	{
-		$enrichment_tags = [
-			'pdo_mysql' => [
-				'charset' => 'UTF8',
-			],
-			'oci8' => [
-				'charset' => 'UTF8',
-				'platform' => new oracle_platform(),
-				'driverClass' => oci8_driver::class,
-			],
-			'pdo_pgsql' => [
-				'charset' => 'UTF8',
-				'platform' => new postgresql_platform(),
-			],
-			'pdo_sqlsrv' => [
-				'platform' => new sqlsrv_platform(),
-			],
-		];
-
-		if ($params['driver'] === 'pdo_mysql')
+		if (in_array($params['driver'], ['mysqli', 'pdo_mysql', 'pgsql', 'pdo_pgsql', 'oci8', 'pdo_oci']))
 		{
-			$enrichment_tags['pdo_mysql'][\PDO::MYSQL_ATTR_FOUND_ROWS] = true;
+			$params['charset'] = 'UTF8';
 		}
 
-		$driver = $params['driver'];
-		if (!array_key_exists($driver, $enrichment_tags))
+		if ($params['driver'] === 'pdo_mysql' && extension_loaded('pdo_mysql'))
 		{
-			return $params;
+			// Constant PDO::MYSQL_ATTR_FOUND_ROWS is deprecated since 8.5, use Pdo\Mysql::ATTR_FOUND_ROWS instead
+			if (class_exists('\Pdo\Mysql'))
+			{
+				/**
+				 * @psalm-suppress UndefinedClass
+				 */
+				$params[\Pdo\Mysql::ATTR_FOUND_ROWS] = true;
+			}
+			else
+			{
+				$params[\PDO::MYSQL_ATTR_FOUND_ROWS] = true;
+			}
 		}
 
-		return array_merge($params, $enrichment_tags[$driver]);
+		return $params;
 	}
 
 	/*
diff --git a/phpBB/phpbb/db/doctrine/oci8/connection.php b/phpBB/phpbb/db/doctrine/oci8/connection.php
deleted file mode 100644
index 34ed744e9db..00000000000
--- a/phpBB/phpbb/db/doctrine/oci8/connection.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-namespace phpbb\db\doctrine\oci8;
-
-use Doctrine\DBAL\Driver\Connection as DriverConnection;
-use Doctrine\DBAL\Driver\Result as DriverResult;
-use Doctrine\DBAL\Driver\Statement as DriverStatement;
-use Doctrine\DBAL\ParameterType;
-
-class connection implements DriverConnection
-{
-	/**
-	 * @var DriverConnection
-	 */
-	private $wrapped;
-
-	/**
-	 * @param DriverConnection $wrapped
-	 */
-	public function __construct(DriverConnection $wrapped)
-	{
-		$this->wrapped = $wrapped;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function prepare(string $sql): DriverStatement
-	{
-		return new statement($this->wrapped->prepare($sql));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function query(string $sql): DriverResult
-	{
-		return new result($this->wrapped->query($sql));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function quote($value, $type = ParameterType::STRING)
-	{
-		return $this->wrapped->quote($value, $type);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function exec(string $sql): int
-	{
-		return $this->wrapped->exec($sql);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function lastInsertId($name = null)
-	{
-		return $this->wrapped->lastInsertId($name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function beginTransaction(): bool
-	{
-		return $this->wrapped->beginTransaction();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function commit(): bool
-	{
-		return $this->wrapped->commit();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function rollBack(): bool
-	{
-		return $this->wrapped->rollBack();
-	}
-}
diff --git a/phpBB/phpbb/db/doctrine/oci8/driver.php b/phpBB/phpbb/db/doctrine/oci8/driver.php
deleted file mode 100644
index 9a2c67aee05..00000000000
--- a/phpBB/phpbb/db/doctrine/oci8/driver.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-namespace phpbb\db\doctrine\oci8;
-
-use Doctrine\DBAL\Connection as DoctrineConnection;
-use Doctrine\DBAL\Driver\API\ExceptionConverter;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Driver as DoctrineDriver;
-use Doctrine\DBAL\Driver\OCI8\Driver as OCI8Driver;
-
-class driver implements DoctrineDriver
-{
-	/**
-	 * @var DoctrineDriver
-	 */
-	private $wrapped;
-
-	public function __construct()
-	{
-		$this->wrapped = new OCI8Driver();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function connect(array $params)
-	{
-		return new connection($this->wrapped->connect($params));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getDatabasePlatform()
-	{
-		return $this->wrapped->getDatabasePlatform();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getSchemaManager(DoctrineConnection $conn, AbstractPlatform $platform)
-	{
-		return new schema_manager($conn, $platform);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getExceptionConverter(): ExceptionConverter
-	{
-		return $this->wrapped->getExceptionConverter();
-	}
-}
diff --git a/phpBB/phpbb/db/doctrine/oci8/result.php b/phpBB/phpbb/db/doctrine/oci8/result.php
deleted file mode 100644
index 1ab10854279..00000000000
--- a/phpBB/phpbb/db/doctrine/oci8/result.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-namespace phpbb\db\doctrine\oci8;
-
-use Doctrine\DBAL\Driver\Result as DriverResult;
-
-class result implements DriverResult
-{
-	/**
-	 * @var DriverResult
-	 */
-	private $wrapped;
-
-	/**
-	 * @param DriverResult $wrapped
-	 */
-	public function __construct(DriverResult $wrapped)
-	{
-		$this->wrapped = $wrapped;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function fetchNumeric()
-	{
-		return $this->wrapped->fetchNumeric();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function fetchAssociative()
-	{
-		return array_change_key_case($this->wrapped->fetchAssociative(), CASE_LOWER);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function fetchOne()
-	{
-		return $this->wrapped->fetchOne();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function fetchAllNumeric(): array
-	{
-		return $this->wrapped->fetchAllNumeric();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function fetchAllAssociative(): array
-	{
-		$rows = [];
-		foreach ($this->wrapped->fetchAllAssociative() as $row)
-		{
-			$rows[] = array_change_key_case($row, CASE_LOWER);
-		}
-		return $rows;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function fetchFirstColumn(): array
-	{
-		return $this->wrapped->fetchFirstColumn();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function rowCount(): int
-	{
-		return $this->wrapped->rowCount();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function columnCount(): int
-	{
-		return $this->wrapped->columnCount();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function free(): void
-	{
-		$this->wrapped->free();
-	}
-}
diff --git a/phpBB/phpbb/db/doctrine/oci8/statement.php b/phpBB/phpbb/db/doctrine/oci8/statement.php
deleted file mode 100644
index bca22473c4c..00000000000
--- a/phpBB/phpbb/db/doctrine/oci8/statement.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-namespace phpbb\db\doctrine\oci8;
-
-use Doctrine\DBAL\Driver\Result as DriverResult;
-use Doctrine\DBAL\Driver\Statement as DriverStatement;
-use Doctrine\DBAL\ParameterType;
-
-class statement implements DriverStatement
-{
-	/**
-	 * @var DriverStatement
-	 */
-	private $wrapped;
-
-	/**
-	 * @param DriverStatement $wrapped
-	 */
-	public function __construct(DriverStatement $wrapped)
-	{
-		$this->wrapped = $wrapped;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function bindValue($param, $value, $type = ParameterType::STRING): bool
-	{
-		return $this->wrapped->bindValue($param, $value, $type);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function bindParam($param, &$variable, $type = ParameterType::STRING, $length = null): bool
-	{
-		return $this->wrapped->bindParam($param, $variable, $type, $length);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function execute($params = null): DriverResult
-	{
-		return new result($this->wrapped->execute($params));
-	}
-}
diff --git a/phpBB/phpbb/db/doctrine/table_helper.php b/phpBB/phpbb/db/doctrine/table_helper.php
index 935db358381..b163d75ccf5 100644
--- a/phpBB/phpbb/db/doctrine/table_helper.php
+++ b/phpBB/phpbb/db/doctrine/table_helper.php
@@ -13,6 +13,7 @@
 namespace phpbb\db\doctrine;
 
 use InvalidArgumentException;
+use phpbb\db\tools\doctrine as doctrine_dbtools;
 
 class table_helper
 {
@@ -123,6 +124,54 @@ private static function get_default_column_option(array $default_options, string
 		}
 	}
 
+	/**
+	 * Maps table names to their short names for the purpose of prefixing tables' index names.
+	 *
+	 * @param array $table_names	Table names with prefix to add to the map.
+	 * @param string $table_prefix	Tables prefix.
+	 *
+	 * @return array<string, string>	Pairs of table names and their short name representations.
+	 * @psalm-return array{string, string}
+	 */
+	public static function map_short_table_names(array $table_names = [], string $table_prefix = ''): array
+	{
+		$short_table_names_map = [];
+		foreach ($table_names as $table_name)
+		{
+			$short_table_names_map[$table_name] = self::generate_shortname(doctrine_dbtools::remove_prefix($table_name, $table_prefix));
+		}
+
+		return $short_table_names_map;
+	}
+
+	/**
+	 * Generates short table names for the purpose of prefixing tables' index names.
+	 *
+	 * @param string $table_name	Table name without prefix to generate its short name.
+	 *
+	 * @return string	Short table name.
+	 */
+	public static function generate_shortname(string $table_name = ''): string
+	{
+		// Only shorten actually long names
+		if (strlen($table_name) > 4)
+		{
+			// Remove vowels
+			$table_name = preg_replace('/([^aeiou_])([aeiou]+)/i', '$1', $table_name);
+
+			// Remove underscores
+			$table_name = str_replace('_', '', $table_name);
+
+			// Remove repeated consonants and their combinations (like 'ss', 'flfl' and similar)
+			$table_name = preg_replace('/(.+)\\1+/i', '$1', $table_name);
+
+			// Restrict short name length to 10 chars
+			$table_name = substr($table_name, 0, 10);
+		}
+
+		return $table_name;
+	}
+
 	/**
 	 * Private constructor. Call methods of table_helper statically.
 	 */
diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index 9a90a4594c1..402764104e4 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -37,7 +37,7 @@ function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = fals
 		// Test for driver support, to avoid suppressed fatal error
 		if (!function_exists('sqlsrv_connect'))
 		{
-			$this->connect_error = 'Native MS SQL Server driver for PHP is missing or needs to be updated. Version 1.1 or later is required to install phpBB3. You can download the driver from: http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx';
+			$this->connect_error = 'Native MS SQL Server driver for PHP is missing or needs to be updated. Version 1.1 or later is required to install phpBB. You can download the driver from: http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx';
 			return $this->sql_error('');
 		}
 
diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index 485bb4dd74b..457e6d8ac8a 100644
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@@ -59,14 +59,17 @@ function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = fals
 			}
 		}
 
-		$this->db_connect_id = mysqli_init();
+		if (!$this->db_connect_id = mysqli_init())
+		{
+			$this->connect_error = 'Failed to initialize MySQLi object.';
 
-		if (!@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS))
+		}
+		else if (!@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS))
 		{
-			$this->db_connect_id = '';
+			$this->connect_error = 'Failed to establish a connection to the MySQL database engine. Please ensure MySQL server is running and the database configuration parameters are correct.';
 		}
 
-		if ($this->db_connect_id && $this->dbname != '')
+		if (!$this->connect_error && $this->db_connect_id && $this->dbname != '')
 		{
 			// Disable loading local files on client side
 			@mysqli_options($this->db_connect_id, MYSQLI_OPT_LOCAL_INFILE, 0);
@@ -154,7 +157,9 @@ protected function _sql_transaction(string $status = 'begin'): bool
 		switch ($status)
 		{
 			case 'begin':
-				return @mysqli_autocommit($this->db_connect_id, false);
+				@mysqli_autocommit($this->db_connect_id, false);
+				$result = @mysqli_begin_transaction($this->db_connect_id);
+				return $result;
 
 			case 'commit':
 				$result = @mysqli_commit($this->db_connect_id);
@@ -342,15 +347,8 @@ protected function _sql_error(): array
 		if ($this->db_connect_id)
 		{
 			$error = [
-				'message'	=> $this->db_connect_id->error,
-				'code'		=> $this->db_connect_id->errno,
-			];
-		}
-		else if (function_exists('mysqli_connect_error'))
-		{
-			$error = [
-				'message'	=> $this->db_connect_id->connect_error,
-				'code'		=> $this->db_connect_id->connect_errno,
+				'message'	=> $this->db_connect_id->connect_error ?: $this->db_connect_id->error,
+				'code'		=> $this->db_connect_id->connect_errno ?: $this->db_connect_id->errno,
 			];
 		}
 		else
diff --git a/phpBB/phpbb/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php
index 9e2f1c9d2c1..7210a4e862a 100644
--- a/phpBB/phpbb/db/driver/oracle.php
+++ b/phpBB/phpbb/db/driver/oracle.php
@@ -105,7 +105,7 @@ function sql_server_info($raw = false, $use_cache = true)
 */
 		$this->sql_server_version = @oci_server_version($this->db_connect_id);
 
-		return $this->sql_server_version;
+		return $this->sql_server_version ?: '';
 	}
 
 	/**
diff --git a/phpBB/phpbb/db/driver/sqlite3.php b/phpBB/phpbb/db/driver/sqlite3.php
index b2db70852bf..2c74666d268 100644
--- a/phpBB/phpbb/db/driver/sqlite3.php
+++ b/phpBB/phpbb/db/driver/sqlite3.php
@@ -15,7 +15,7 @@
 
 /**
 * SQLite3 Database Abstraction Layer
-* Minimum Requirement: 3.6.15+
+* Minimum Requirement: 3.8.3+
 */
 class sqlite3 extends \phpbb\db\driver\driver
 {
diff --git a/phpBB/phpbb/db/middleware/mysql/driver.php b/phpBB/phpbb/db/middleware/mysql/driver.php
new file mode 100644
index 00000000000..306cadb72de
--- /dev/null
+++ b/phpBB/phpbb/db/middleware/mysql/driver.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\middleware\mysql;
+
+use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware;
+
+/**
+ * MySQL Doctrine driver middleware.
+ * Makes use of phpBB's MySQL specific platform.
+ */
+class driver extends AbstractDriverMiddleware
+{
+	/**
+	 * {@inheritDoc}
+	 */
+	public function createDatabasePlatformForVersion($version)
+	{
+		return new platform();
+	}
+}
diff --git a/phpBB/phpbb/db/middleware/mysql/middleware.php b/phpBB/phpbb/db/middleware/mysql/middleware.php
new file mode 100644
index 00000000000..793512cfffe
--- /dev/null
+++ b/phpBB/phpbb/db/middleware/mysql/middleware.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\middleware\mysql;
+
+use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\mysql\driver as mysql_driver;
+
+/**
+ * MySQL Doctrine middleware.
+ * Makes use of phpBB's MySQL specific platform.
+ */
+class middleware implements Driver\Middleware
+{
+	public function wrap(Driver $driver): Driver
+	{
+		return new mysql_driver($driver);
+	}
+}
diff --git a/phpBB/phpbb/db/middleware/mysql/platform.php b/phpBB/phpbb/db/middleware/mysql/platform.php
new file mode 100644
index 00000000000..ed4cbdb1bbf
--- /dev/null
+++ b/phpBB/phpbb/db/middleware/mysql/platform.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\middleware\mysql;
+
+use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
+use Doctrine\DBAL\Schema\TableDiff;
+
+/**
+ * MySQL specific schema handling.
+ *
+ * While adding auto_increment column to MySQL, it must be indexed.
+ * If it's indexed as primary key, it should be declared as NOT NULL
+ * because MySQL primary key columns cannot be NULL.
+ */
+class platform extends AbstractMySQLPlatform
+{
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getAlterTableSQL(TableDiff $diff)
+	{
+		$sql = parent::getAlterTableSQL($diff);
+		$table = $diff->getOldTable();
+		$columns = $diff->getAddedColumns();
+
+		foreach ($columns as $column)
+		{
+			$column_name = $column->getName();
+			if (!empty($column->getAutoincrement()) && $table)
+			{
+				foreach ($sql as $i => $query)
+				{
+					if (stripos($query, "add $column_name"))
+					{
+						if (!$table->getPrimaryKey())
+						{
+							$sql[$i] = str_replace(' DEFAULT NULL', '', $sql[$i]);
+							$sql[$i] .= ' PRIMARY KEY';
+						}
+						else
+						{
+							$sql[$i] .= ", ADD KEY ($column_name)";
+						}
+					}
+				}
+			}
+		}
+
+		return $sql;
+	}
+}
diff --git a/phpBB/phpbb/db/middleware/oracle/driver.php b/phpBB/phpbb/db/middleware/oracle/driver.php
new file mode 100644
index 00000000000..bb4172bfe05
--- /dev/null
+++ b/phpBB/phpbb/db/middleware/oracle/driver.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\middleware\oracle;
+
+use Doctrine\DBAL\Connection as DoctrineConnection;
+use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+
+/**
+ * Oracle Doctrine driver middleware.
+ * Makes use of phpBB's Oracle specific platform.
+ */
+class driver extends AbstractDriverMiddleware
+{
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getSchemaManager(DoctrineConnection $conn, AbstractPlatform $platform)
+	{
+		return new schema_manager($conn, $platform);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function createDatabasePlatformForVersion($version)
+	{
+		return new platform();
+	}
+}
diff --git a/phpBB/phpbb/db/middleware/oracle/middleware.php b/phpBB/phpbb/db/middleware/oracle/middleware.php
new file mode 100644
index 00000000000..c54ca4d81d7
--- /dev/null
+++ b/phpBB/phpbb/db/middleware/oracle/middleware.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\middleware\oracle;
+
+use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\oracle\driver as oracle_driver;
+
+/**
+ * Oracle Doctrine middleware.
+ * Makes use of phpBB's Oracle specific platform.
+ */
+class middleware implements Driver\Middleware
+{
+	public function wrap(Driver $driver): Driver
+	{
+		return new oracle_driver($driver);
+	}
+}
diff --git a/phpBB/phpbb/db/doctrine/oracle_platform.php b/phpBB/phpbb/db/middleware/oracle/platform.php
similarity index 98%
rename from phpBB/phpbb/db/doctrine/oracle_platform.php
rename to phpBB/phpbb/db/middleware/oracle/platform.php
index 7c011e6e775..8604f50fb19 100644
--- a/phpBB/phpbb/db/doctrine/oracle_platform.php
+++ b/phpBB/phpbb/db/middleware/oracle/platform.php
@@ -11,7 +11,7 @@
  *
  */
 
-namespace phpbb\db\doctrine;
+namespace phpbb\db\middleware\oracle;
 
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Schema\Identifier;
@@ -21,7 +21,7 @@
 /**
  * Oracle specific schema restrictions for BC.
  */
-class oracle_platform extends OraclePlatform
+class platform extends OraclePlatform
 {
 	/**
 	 * {@inheritDoc}
diff --git a/phpBB/phpbb/db/doctrine/oci8/schema_manager.php b/phpBB/phpbb/db/middleware/oracle/schema_manager.php
similarity index 96%
rename from phpBB/phpbb/db/doctrine/oci8/schema_manager.php
rename to phpBB/phpbb/db/middleware/oracle/schema_manager.php
index c0b2caea1d8..2ec1c08df0f 100644
--- a/phpBB/phpbb/db/doctrine/oci8/schema_manager.php
+++ b/phpBB/phpbb/db/middleware/oracle/schema_manager.php
@@ -11,7 +11,7 @@
  *
  */
 
-namespace phpbb\db\doctrine\oci8;
+namespace phpbb\db\middleware\oracle;
 
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
diff --git a/phpBB/phpbb/db/middleware/postgresql/driver.php b/phpBB/phpbb/db/middleware/postgresql/driver.php
new file mode 100644
index 00000000000..35a2de28be5
--- /dev/null
+++ b/phpBB/phpbb/db/middleware/postgresql/driver.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\middleware\postgresql;
+
+use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware;
+
+/**
+ * PostgreSQL Doctrine driver middleware.
+ * Makes use of phpBB's PostgreSQL specific platform.
+ */
+class driver extends AbstractDriverMiddleware
+{
+	/**
+	 * {@inheritDoc}
+	 */
+	public function createDatabasePlatformForVersion($version)
+	{
+		return new platform();
+	}
+}
diff --git a/phpBB/phpbb/db/middleware/postgresql/middleware.php b/phpBB/phpbb/db/middleware/postgresql/middleware.php
new file mode 100644
index 00000000000..defdcea6eb5
--- /dev/null
+++ b/phpBB/phpbb/db/middleware/postgresql/middleware.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\middleware\postgresql;
+
+use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\postgresql\driver as postgresql_driver;
+
+/**
+ * PostgreSQL Doctrine middleware.
+ * Makes use of phpBB's PostgreSQL specific platform.
+ */
+class middleware implements Driver\Middleware
+{
+	public function wrap(Driver $driver): Driver
+	{
+		return new postgresql_driver($driver);
+	}
+}
diff --git a/phpBB/phpbb/db/doctrine/postgresql_platform.php b/phpBB/phpbb/db/middleware/postgresql/platform.php
similarity index 73%
rename from phpBB/phpbb/db/doctrine/postgresql_platform.php
rename to phpBB/phpbb/db/middleware/postgresql/platform.php
index ea637b42037..e5e7a9a1c6f 100644
--- a/phpBB/phpbb/db/doctrine/postgresql_platform.php
+++ b/phpBB/phpbb/db/middleware/postgresql/platform.php
@@ -11,13 +11,13 @@
  *
  */
 
-namespace phpbb\db\doctrine;
+namespace phpbb\db\middleware\postgresql;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
-use Doctrine\DBAL\Schema\Index;
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\Sequence;
 use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\Types\BigIntType;
 use Doctrine\DBAL\Types\IntegerType;
 use Doctrine\DBAL\Types\SmallIntType;
@@ -31,7 +31,7 @@
  * to stay compatible with the existing DB we have to change its
  * naming and not ours.
  */
-class postgresql_platform extends PostgreSQL94Platform
+class platform extends PostgreSQLPlatform
 {
 	/**
 	 * {@inheritdoc}
@@ -78,6 +78,36 @@ public function getDefaultValueDeclarationSQL($column): string
 		return AbstractPlatform::getDefaultValueDeclarationSQL($column);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getAlterTableSQL(TableDiff $diff)
+	{
+		$sql = parent::getAlterTableSQL($diff);
+		$table_name = $diff->getOldTable()->getName();
+		$columns = $diff->getAddedColumns();
+		$post_sql = $sequence_sql = [];
+
+		foreach ($columns as $column)
+		{
+			$column_name = $column->getName();
+			if (!empty($column->getAutoincrement()))
+			{
+				$sequence = new Sequence($this->getIdentitySequenceName($table_name, $column_name));
+				$sequence_sql[] = $this->getCreateSequenceSQL($sequence);
+				$post_sql[] = 'ALTER SEQUENCE ' . $sequence->getName() . ' OWNED BY ' . $table_name . '.' . $column_name;
+			}
+		}
+		$sql = array_merge($sequence_sql, $sql, $post_sql);
+
+		foreach ($sql as $i => $query)
+		{
+			$sql[$i] = str_replace('{{placeholder_sequence}}', "nextval('{$table_name}_seq')", $query);
+		}
+
+		return $sql;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -157,31 +187,19 @@ public function getDropIndexSQL($index, $table = null): string
 	{
 		// If we have a primary or a unique index, we need to drop the constraint
 		// instead of the index itself or postgreSQL will reject the query.
-		if ($index instanceof Index)
-		{
-			if ($index->isPrimary())
-			{
-				if ($table instanceof Table)
-				{
-					$table = $table->getQuotedName($this);
-				}
-				else if (!is_string($table))
-				{
-					throw new \InvalidArgumentException(
-						__METHOD__ . '() expects $table parameter to be string or ' . Table::class . '.'
-					);
-				}
-
-				return 'ALTER TABLE '.$table.' DROP CONSTRAINT '.$index->getQuotedName($this);
-			}
-		}
-		else if (! is_string($index))
+		if (is_string($index) && $table !== null && $index === $this->tableName($table) . '_pkey')
 		{
-			throw new \InvalidArgumentException(
-				__METHOD__ . '() expects $index parameter to be string or ' . Index::class . '.'
-			);
+			return $this->getDropConstraintSQL($index, $this->tableName($table));
 		}
 
 		return parent::getDropIndexSQL($index, $table);
 	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	private function tableName($table)
+	{
+		return $table instanceof Table ? $table->getName() : (string) $table;
+	}
 }
diff --git a/phpBB/phpbb/db/middleware/sqlsrv/driver.php b/phpBB/phpbb/db/middleware/sqlsrv/driver.php
new file mode 100644
index 00000000000..4fbd9e33f0b
--- /dev/null
+++ b/phpBB/phpbb/db/middleware/sqlsrv/driver.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\middleware\sqlsrv;
+
+use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware;
+
+/**
+ * Microsoft SQL server Doctrine driver middleware.
+ * Makes use of phpBB's SQL Server specific platform.
+ */
+class driver extends AbstractDriverMiddleware
+{
+	/**
+	 * {@inheritDoc}
+	 */
+	public function createDatabasePlatformForVersion($version)
+	{
+		return new platform();
+	}
+}
diff --git a/phpBB/phpbb/db/middleware/sqlsrv/middleware.php b/phpBB/phpbb/db/middleware/sqlsrv/middleware.php
new file mode 100644
index 00000000000..03814e8cfa0
--- /dev/null
+++ b/phpBB/phpbb/db/middleware/sqlsrv/middleware.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\middleware\sqlsrv;
+
+use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\sqlsrv\driver as sqlsrv_driver;
+
+/**
+ * Microsoft SQL server Doctrine middleware.
+ * Makes use of phpBB's SQL Server specific platform.
+ */
+class middleware implements Driver\Middleware
+{
+	public function wrap(Driver $driver): Driver
+	{
+		return new sqlsrv_driver($driver);
+	}
+}
diff --git a/phpBB/phpbb/db/doctrine/sqlsrv_platform.php b/phpBB/phpbb/db/middleware/sqlsrv/platform.php
similarity index 98%
rename from phpBB/phpbb/db/doctrine/sqlsrv_platform.php
rename to phpBB/phpbb/db/middleware/sqlsrv/platform.php
index ca2a9dd7e64..a7a58e3dda6 100644
--- a/phpBB/phpbb/db/doctrine/sqlsrv_platform.php
+++ b/phpBB/phpbb/db/middleware/sqlsrv/platform.php
@@ -11,7 +11,7 @@
  *
  */
 
-namespace phpbb\db\doctrine;
+namespace phpbb\db\middleware\sqlsrv;
 
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use Doctrine\DBAL\Schema\Identifier;
@@ -20,7 +20,7 @@
 /**
  * SQLServer specific schema restrictions for BC.
  */
-class sqlsrv_platform extends SQLServerPlatform
+class platform extends SQLServerPlatform
 {
 	/**
 	 * {@inheritDoc}
diff --git a/phpBB/phpbb/db/migration/container_aware_migration.php b/phpBB/phpbb/db/migration/container_aware_migration.php
index 3b4b49b04b8..c1f90eecd04 100644
--- a/phpBB/phpbb/db/migration/container_aware_migration.php
+++ b/phpBB/phpbb/db/migration/container_aware_migration.php
@@ -13,13 +13,12 @@
 
 namespace phpbb\db\migration;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
 * Abstract base class for container aware database migrations.
 */
-abstract class container_aware_migration extends migration implements ContainerAwareInterface
+abstract class container_aware_migration extends migration
 {
 	/**
 	 * @var ContainerInterface
@@ -29,7 +28,7 @@ abstract class container_aware_migration extends migration implements ContainerA
 	/**
 	 * {@inheritdoc}
 	 */
-	public function setContainer(ContainerInterface $container = null)
+	public function setContainer(ContainerInterface|null $container = null)
 	{
 		$this->container = $container;
 	}
diff --git a/phpBB/phpbb/db/migration/data/v310/bot_update.php b/phpBB/phpbb/db/migration/data/v310/bot_update.php
index b42e77be7db..26557141d1b 100644
--- a/phpBB/phpbb/db/migration/data/v310/bot_update.php
+++ b/phpBB/phpbb/db/migration/data/v310/bot_update.php
@@ -17,7 +17,10 @@ class bot_update extends \phpbb\db\migration\migration
 {
 	public static function depends_on()
 	{
-		return array('\phpbb\db\migration\data\v310\rc6');
+		return array(
+			'\phpbb\db\migration\data\v310\rc6',
+			'\phpbb\db\migration\data\v310\avatars',
+		);
 	}
 
 	public function update_data()
diff --git a/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php
index 7c03eef3475..c0b02bc496d 100644
--- a/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php
+++ b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php
@@ -15,6 +15,10 @@
 
 class notification_options_reconvert extends \phpbb\db\migration\migration
 {
+	protected const NOTIFY_EMAIL = 0;
+	protected const NOTIFY_IM = 1;
+	protected const NOTIFY_BOTH = 2;
+
 	public static function depends_on()
 	{
 		return array('\phpbb\db\migration\data\v310\notifications_schema_fix');
@@ -67,12 +71,12 @@ public function perform_conversion(\phpbb\db\sql_insert_buffer $insert_buffer, $
 			// In-board notification
 			$notification_methods[] = '';
 
-			if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
+			if ($row['user_notify_type'] == self::NOTIFY_EMAIL || $row['user_notify_type'] == self::NOTIFY_BOTH)
 			{
 				$notification_methods[] = 'email';
 			}
 
-			if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
+			if ($row['user_notify_type'] == self::NOTIFY_IM || $row['user_notify_type'] == self::NOTIFY_BOTH)
 			{
 				$notification_methods[] = 'jabber';
 			}
diff --git a/phpBB/phpbb/db/migration/data/v33x/add_oauth_state_time.php b/phpBB/phpbb/db/migration/data/v33x/add_oauth_state_time.php
new file mode 100644
index 00000000000..13c41d04e89
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/add_oauth_state_time.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+use phpbb\db\migration\migration;
+
+class add_oauth_state_time extends migration
+{
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3316',
+		];
+	}
+
+	public function update_schema(): array
+	{
+		return [
+			'add_columns' => [
+				$this->table_prefix . 'oauth_states' => [
+					'state_time'	=> ['TIMESTAMP', 0],
+				],
+			],
+			'add_index' => [
+				$this->table_prefix . 'oauth_states' => [
+					'state_time' => ['state_time'],
+				],
+			],
+		];
+	}
+
+	public function update_data(): array
+	{
+		return [
+			['config.add', ['oauth_states_last_gc', 0]],
+		];
+	}
+
+	public function revert_data(): array
+	{
+		return [
+			['config.remove', ['oauth_states_last_gc']],
+		];
+	}
+
+	public function revert_schema(): array
+	{
+		return [
+			'drop_keys' => [
+				$this->table_prefix . 'oauth_states' => [
+					'state_time',
+				],
+			],
+			'drop_columns' => [
+				$this->table_prefix . 'oauth_states' => [
+					'state_time',
+				],
+			],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/add_resend_activation_expiration.php b/phpBB/phpbb/db/migration/data/v33x/add_resend_activation_expiration.php
new file mode 100644
index 00000000000..9ebbe9811a2
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/add_resend_activation_expiration.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+use phpbb\db\migration\migration;
+
+class add_resend_activation_expiration extends migration
+{
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3311',
+		];
+	}
+
+	public function update_schema(): array
+	{
+		return [
+			'add_columns' => [
+				$this->table_prefix . 'users' => [
+					'user_actkey_expiration'	=> ['TIMESTAMP', 0, 'after' => 'user_actkey'],
+				],
+			],
+		];
+	}
+
+	public function revert_schema(): array
+	{
+		return [
+			'drop_columns' => [
+				$this->table_prefix . 'users' => [
+					'user_actkey_expiration',
+				],
+			],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php b/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php
new file mode 100644
index 00000000000..d4506eea392
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+use phpbb\db\migration\migration;
+
+class add_user_last_active extends migration
+{
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3311',
+		];
+	}
+
+	public function update_schema()
+	{
+		return [
+			'add_columns'	=> [
+				$this->table_prefix . 'users'	=> [
+					'user_last_active'		=> ['TIMESTAMP', 0, 'after' => 'user_lastvisit'],
+				],
+			],
+		];
+	}
+
+	public function revert_schema()
+	{
+		return [
+			'drop_columns'	=> [
+				$this->table_prefix . 'users'	=> ['user_last_active'],
+			],
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['custom', [[$this, 'set_user_last_active']]],
+		];
+	}
+
+	public function set_user_last_active($start = 0)
+	{
+		// Get maximum user id from database
+		$sql = "SELECT MAX(user_id) AS max_user_id
+			FROM {$this->table_prefix}users";
+		$result = $this->db->sql_query($sql);
+		$max_id = (int) $this->db->sql_fetchfield('max_user_id');
+		$this->db->sql_freeresult($result);
+
+		if ($start > $max_id)
+		{
+			return;
+		}
+
+		// Keep setting user_last_active time
+		$next_start = $start + 10000;
+
+		$sql = 'UPDATE ' . $this->table_prefix . 'users
+			SET user_last_active = user_lastvisit
+			WHERE user_id > ' . (int) $start . '
+				AND user_id <= ' . (int) ($next_start);
+		$this->db->sql_query($sql);
+
+		return $next_start;
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/jquery_update_v3.php b/phpBB/phpbb/db/migration/data/v33x/jquery_update_v3.php
new file mode 100644
index 00000000000..f1f96071268
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/jquery_update_v3.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+use phpbb\db\migration\migration;
+
+class jquery_update_v3 extends migration
+{
+	public function effectively_installed()
+	{
+		return $this->config['load_jquery_url'] === '//ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js';
+	}
+
+	public static function depends_on()
+	{
+		return ['\phpbb\db\migration\data\v33x\v3311'];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/profilefields_update.php b/phpBB/phpbb/db/migration/data/v33x/profilefields_update.php
index 02fc8858f46..b3fbb2415ff 100644
--- a/phpBB/phpbb/db/migration/data/v33x/profilefields_update.php
+++ b/phpBB/phpbb/db/migration/data/v33x/profilefields_update.php
@@ -107,8 +107,8 @@ public function update_youtube_profile_field(): bool
 			{
 				$this->db->sql_query(
 					"UPDATE $profile_fields_data
-					SET $yt_profile_field = '$updated_youtube_url_part'
-					WHERE user_id = {$row['user_id']}"
+					SET $yt_profile_field = '{$this->db->sql_escape($updated_youtube_url_part)}'
+					WHERE user_id = " . (int) $row['user_id']
 				);
 			}
 
@@ -202,6 +202,6 @@ public function revert_other_profile_fields(): void
 
 	protected function get_youtube_url_part(string $profile_field_string): string
 	{
-		return preg_replace('#^https://(?:www\.)?youtube\.com/(.+)$#iu', '$1', $profile_field_string);
+		return preg_replace('#^https://(?:www\.)?youtube\.com/(.+)$#iu', '$1', $profile_field_string) ?: '';
 	}
 }
diff --git a/phpBB/phpbb/db/migration/data/v33x/topic_views_update.php b/phpBB/phpbb/db/migration/data/v33x/topic_views_update.php
new file mode 100644
index 00000000000..8402d548c45
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/topic_views_update.php
@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v33x;
+
+class topic_views_update extends \phpbb\db\migration\migration
+{
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3314',
+		];
+	}
+
+	public function update_schema(): array
+	{
+		// This extends the topic view count field so we can support much larger values.
+		return [
+			'change_columns' => [
+				$this->table_prefix . 'topics' => [
+					'topic_views'  => ['ULINT', 0],
+				],
+			]
+		];
+	}
+
+	public function revert_schema(): array
+	{
+		return [
+			'change_columns' => [
+				$this->table_prefix . 'topics' => [
+					'topic_views'  => ['UINT', 0],
+				],
+			]
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/v3312.php b/phpBB/phpbb/db/migration/data/v33x/v3312.php
new file mode 100644
index 00000000000..36e78b95ef5
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v3312.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v3312 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.12', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\add_resend_activation_expiration',
+			'\phpbb\db\migration\data\v33x\add_user_last_active',
+			'\phpbb\db\migration\data\v33x\v3312rc1',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.12']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/v3312rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3312rc1.php
new file mode 100644
index 00000000000..77247b96f25
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v3312rc1.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v3312rc1 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.12-RC1', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\jquery_update_v3',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.12-RC1']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/v3313.php b/phpBB/phpbb/db/migration/data/v33x/v3313.php
new file mode 100644
index 00000000000..a133213c814
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v3313.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v3313 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.13', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3313rc1',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.13']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/v3313rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3313rc1.php
new file mode 100644
index 00000000000..4481a538212
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v3313rc1.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v3313rc1 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.13-RC1', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3312',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.13-RC1']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/v3314.php b/phpBB/phpbb/db/migration/data/v33x/v3314.php
new file mode 100644
index 00000000000..ce333dbf5a1
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v3314.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v3314 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.14', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3314rc1',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.14']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/v3314rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3314rc1.php
new file mode 100644
index 00000000000..1632a65ddad
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v3314rc1.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v3314rc1 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.14-RC1', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3313',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.14-RC1']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/v3315.php b/phpBB/phpbb/db/migration/data/v33x/v3315.php
new file mode 100644
index 00000000000..23028602f65
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v3315.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v3315 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.15', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3315rc1',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.15']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/v3315rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3315rc1.php
new file mode 100644
index 00000000000..71ab26c908b
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v3315rc1.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v3315rc1 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.15-RC1', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\topic_views_update',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.15-RC1']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/v3316.php b/phpBB/phpbb/db/migration/data/v33x/v3316.php
new file mode 100644
index 00000000000..854de1fa44e
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v3316.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v3316 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.16', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3316rc1',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.16']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/v3316rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3316rc1.php
new file mode 100644
index 00000000000..1f9a83e7ea2
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v3316rc1.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v3316rc1 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.16-RC1', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3315',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.16-RC1']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v33x/v3317.php b/phpBB/phpbb/db/migration/data/v33x/v3317.php
new file mode 100644
index 00000000000..2fab238057d
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v3317.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v3317 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.17', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3316',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.17']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php b/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php
new file mode 100644
index 00000000000..183b5d91db9
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v400;
+
+class add_bbcode_font_icon extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_column_exists($this->table_prefix . 'bbcodes', 'bbcode_font_icon');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v400\dev'
+		];
+	}
+
+	public function update_schema()
+	{
+		return [
+			'add_columns'	=> [
+				$this->table_prefix . 'bbcodes'	=> [
+					'bbcode_font_icon'	=> ['VCHAR:64', ''],
+				],
+			],
+		];
+	}
+
+	public function revert_schema()
+	{
+		return [
+			'drop_columns'	=> [
+				$this->table_prefix . 'bbcodes'	=> [
+					'bbcode_font_icon',
+				],
+			],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush.php b/phpBB/phpbb/db/migration/data/v400/add_webpush.php
new file mode 100644
index 00000000000..c0fabf722aa
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/add_webpush.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class add_webpush extends migration
+{
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v400\dev',
+		];
+	}
+
+	public function effectively_installed(): bool
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'notification_push');
+	}
+
+	public function update_schema(): array
+	{
+		return [
+			'add_tables'	=> [
+				$this->table_prefix . 'notification_push' => [
+					'COLUMNS'	=> [
+						'notification_type_id'	=> ['USINT', 0],
+						'item_id'				=> ['ULINT', 0],
+						'item_parent_id'		=> ['ULINT', 0],
+						'user_id'				=> ['ULINT', 0],
+						'push_data'				=> ['MTEXT', ''],
+						'notification_time'		=> ['TIMESTAMP', 0]
+					],
+					'PRIMARY_KEY' => ['notification_type_id', 'item_id', 'item_parent_id', 'user_id'],
+				],
+				$this->table_prefix . 'push_subscriptions' => [
+					'COLUMNS'	=> [
+						'subscription_id'	=> ['ULINT', null, 'auto_increment'],
+						'user_id'			=> ['ULINT', 0],
+						'endpoint'			=> ['TEXT', ''],
+						'expiration_time'	=> ['TIMESTAMP', 0],
+						'p256dh'			=> ['VCHAR', ''],
+						'auth'				=> ['VCHAR', ''],
+					],
+					'PRIMARY_KEY' => ['subscription_id', 'user_id'],
+				]
+			],
+		];
+	}
+
+	public function revert_schema(): array
+	{
+		return [
+			'drop_tables' => [
+				$this->table_prefix . 'notification_push',
+				$this->table_prefix . 'push_subscriptions',
+			],
+		];
+	}
+
+	public function update_data(): array
+	{
+		return [
+			['config.add', ['webpush_enable', false]],
+			['config.add', ['webpush_vapid_public', '']],
+			['config.add', ['webpush_vapid_private', '']],
+			['module.add', [
+				'acp',
+				'ACP_CLIENT_COMMUNICATION',
+				[
+					'module_basename'	=> 'acp_board',
+					'module_langname'	=> 'ACP_WEBPUSH_SETTINGS',
+					'module_mode'		=> 'webpush',
+					'module_auth'		=> 'acl_a_board',
+					'after'				=> ['settings', 'ACP_JABBER_SETTINGS'],
+				],
+			]],
+		];
+	}
+
+	public function revert_data(): array
+	{
+		return [
+			['config.remove', ['webpush_enable']],
+			['config.remove', ['webpush_vapid_public']],
+			['config.remove', ['webpush_vapid_private']],
+			['module.remove', ['acp', 'ACP_CLIENT_COMMUNICATION', 'ACP_WEBPUSH_SETTINGS']]
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php b/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php
new file mode 100644
index 00000000000..751ab9e5f41
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class add_webpush_options extends migration
+{
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v400\add_webpush',
+		];
+	}
+
+	public function effectively_installed(): bool
+	{
+		return $this->config->offsetExists('webpush_method_default_enable') || $this->config->offsetExists('webpush_dropdown_subscribe');
+	}
+
+	public function update_data(): array
+	{
+		return [
+			['config.add', ['webpush_method_default_enable', true]],
+			['config.add', ['webpush_dropdown_subscribe', true]],
+		];
+	}
+
+	public function revert_data(): array
+	{
+		return [
+			['config.remove', ['webpush_method_default_enable']],
+			['config.remove', ['webpush_dropdown_subscribe']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush_token.php b/phpBB/phpbb/db/migration/data/v400/add_webpush_token.php
new file mode 100644
index 00000000000..f87dadf9e79
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/add_webpush_token.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class add_webpush_token extends migration
+{
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v400\add_webpush',
+		];
+	}
+
+	public function effectively_installed(): bool
+	{
+		return $this->db_tools->sql_column_exists($this->table_prefix . 'notification_push', 'push_token');
+	}
+
+	public function update_schema(): array
+	{
+		return [
+			'add_columns'	=> [
+				$this->table_prefix . 'notification_push' => [
+					'push_token'	=> ['VCHAR', ''],
+				],
+			],
+		];
+	}
+
+	public function revert_schema(): array
+	{
+		return [
+			'drop_columns' => [
+				$this->table_prefix . 'notification_push' => [
+					'push_token',
+				],
+			],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/disable_extensions.php b/phpBB/phpbb/db/migration/data/v400/disable_extensions.php
new file mode 100644
index 00000000000..377f72fbd80
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/disable_extensions.php
@@ -0,0 +1,57 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\container_aware_migration;
+
+class disable_extensions extends container_aware_migration
+{
+	/**
+	 * @var array List of extensions included with phpBB
+	 */
+	public static array $default_extensions = [
+		'phpbb/viglink',
+	];
+
+	public static function depends_on(): array
+	{
+		return ['\phpbb\db\migration\data\v400\v400a1'];
+	}
+
+	public function update_data(): array
+	{
+		return [
+			['custom', [[$this, 'disable_enabled_extensions']]],
+		];
+	}
+
+	/**
+	 * Disable all enabled extensions except those included with phpBB.
+	 * This is a safety measure to prevent possible PHP fatal errors
+	 * caused by extensions that are not compatible with the changes
+	 * introduced with phpBB 4.0.0-a2.
+	 */
+	public function disable_enabled_extensions(): void
+	{
+		$ext_manager = $this->container->get('ext.manager');
+
+		$enabled_extensions = array_keys($ext_manager->all_enabled());
+		$enabled_extensions = array_diff($enabled_extensions, self::$default_extensions);
+
+		foreach ($enabled_extensions as $extension)
+		{
+			$ext_manager->disable($extension);
+		}
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/extensions_composer_2.php b/phpBB/phpbb/db/migration/data/v400/extensions_composer_2.php
index fe4b9f4cefb..9c2500949ca 100644
--- a/phpBB/phpbb/db/migration/data/v400/extensions_composer_2.php
+++ b/phpBB/phpbb/db/migration/data/v400/extensions_composer_2.php
@@ -24,7 +24,7 @@ public function effectively_installed()
 
 	public function update_data()
 	{
-		$repositories = json_decode($this->config['exts_composer_repositories'], true);
+		$repositories = json_decode($this->config['exts_composer_repositories'], true) ?: [];
 		$repositories[] = 'https://satis.phpbb.com';
 		$repositories = array_unique($repositories);
 
diff --git a/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php b/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php
new file mode 100644
index 00000000000..9f1167f8eb6
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php
@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class extensions_composer_4 extends migration
+{
+	public function effectively_installed()
+	{
+		return str_contains($this->config['exts_composer_repositories'], 'https://www.phpbb.com/customise/db/composer/40/');
+	}
+
+	public function update_data()
+	{
+		$repositories = json_decode($this->config['exts_composer_repositories'], true) ?: [];
+		$repositories = array_map(function($repo) {
+			return $repo === 'https://www.phpbb.com/customise/db/composer/'
+				? 'https://www.phpbb.com/customise/db/composer/40/'
+				: $repo;
+		}, $repositories);
+
+		return [
+			['config.update', ['exts_composer_repositories', json_encode($repositories, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)]],
+		];
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v400\extensions_composer',
+			'\phpbb\db\migration\data\v400\extensions_composer_2',
+			'\phpbb\db\migration\data\v400\extensions_composer_3'
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/hidpi_icons.php b/phpBB/phpbb/db/migration/data/v400/hidpi_icons.php
new file mode 100644
index 00000000000..6e91b15ca53
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/hidpi_icons.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class hidpi_icons extends migration
+{
+	private array $default_icons = [
+		'misc/fire',
+		'misc/heart',
+		'misc/radioactive',
+		'misc/star',
+		'misc/thinking',
+		'smile/alert',
+		'smile/info',
+		'smile/mrgreen',
+		'smile/question',
+		'smile/redface',
+	];
+
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v400\dev'
+		];
+	}
+
+	public function update_data(): array
+	{
+		return [
+			['custom', [[$this, 'gif_to_svg_icons']]],
+		];
+	}
+
+	public function revert_data(): array
+	{
+		return [
+			['custom', [[$this, 'svg_to_gif_icons']]],
+		];
+	}
+
+	public function gif_to_svg_icons(): void
+	{
+		foreach ($this->default_icons as $smiley)
+		{
+			$sql = 'UPDATE ' . $this->tables['icons'] . "
+				SET icons_url = '" . $this->db->sql_escape($smiley) . ".svg'
+				WHERE icons_url = '" . $this->db->sql_escape($smiley) . ".gif'";
+			$this->db->sql_query($sql);
+		}
+	}
+
+	public function svg_to_gif_icons(): void
+	{
+		foreach ($this->default_icons as $smiley)
+		{
+			$sql = 'UPDATE ' . $this->tables['icons'] . "
+				SET icons_url = '" . $this->db->sql_escape($smiley) . ".gif'
+				WHERE icons_url = '" . $this->db->sql_escape($smiley) . ".svg'";
+			$this->db->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php b/phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php
new file mode 100644
index 00000000000..f51810f0954
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class hidpi_smilies extends migration
+{
+	private array $default_smilies = [
+		'icon_arrow',
+		'icon_cool',
+		'icon_cry',
+		'icon_e_biggrin',
+		'icon_e_confused',
+		'icon_e_geek',
+		'icon_e_sad',
+		'icon_e_smile',
+		'icon_e_surprised',
+		'icon_e_ugeek',
+		'icon_e_wink',
+		'icon_eek',
+		'icon_evil',
+		'icon_exclaim',
+		'icon_idea',
+		'icon_lol',
+		'icon_mad',
+		'icon_mrgreen',
+		'icon_neutral',
+		'icon_question',
+		'icon_razz',
+		'icon_redface',
+		'icon_rolleyes',
+		'icon_twisted',
+	];
+
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v400\dev'
+		];
+	}
+
+	public function update_data(): array
+	{
+		return [
+			['custom', [[$this, 'gif_to_svg_smilies']]],
+		];
+	}
+
+	public function revert_data(): array
+	{
+		return [
+			['custom', [[$this, 'svg_to_gif_smilies']]],
+		];
+	}
+
+	public function gif_to_svg_smilies(): void
+	{
+		foreach ($this->default_smilies as $smiley)
+		{
+			$sql = 'UPDATE ' . $this->tables['smilies'] . "
+				SET smiley_url = '" . $this->db->sql_escape($smiley) . ".svg'
+				WHERE smiley_url = '" . $this->db->sql_escape($smiley) . ".gif'";
+			$this->db->sql_query($sql);
+		}
+	}
+
+	public function svg_to_gif_smilies(): void
+	{
+		foreach ($this->default_smilies as $smiley)
+		{
+			$sql = 'UPDATE ' . $this->tables['smilies'] . "
+				SET smiley_url = '" . $this->db->sql_escape($smiley) . ".gif'
+				WHERE smiley_url = '" . $this->db->sql_escape($smiley) . ".svg'";
+			$this->db->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/qa_captcha.php b/phpBB/phpbb/db/migration/data/v400/qa_captcha.php
new file mode 100644
index 00000000000..69cca2dc15d
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/qa_captcha.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class qa_captcha extends migration
+{
+	public function effectively_installed(): bool
+	{
+		return $this->db_tools->sql_table_exists($this->tables['captcha_qa_questions'])
+			&& $this->db_tools->sql_table_exists($this->tables['captcha_qa_answers'])
+			&& $this->db_tools->sql_table_exists($this->tables['captcha_qa_confirm']);
+	}
+
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v400\dev',
+		];
+	}
+
+	public function update_schema(): array
+	{
+		return [
+			'add_tables'	=> [
+				$this->tables['captcha_qa_questions'] => [
+					'COLUMNS' => [
+						'question_id'	=> ['UINT', null, 'auto_increment'],
+						'strict'		=> ['BOOL', 0],
+						'lang_id'		=> ['UINT', 0],
+						'lang_iso'		=> ['VCHAR:30', ''],
+						'question_text'	=> ['TEXT_UNI', ''],
+					],
+					'PRIMARY_KEY'		=> 'question_id',
+					'KEYS'				=> [
+						'lang'			=> ['INDEX', 'lang_iso'],
+					],
+				],
+				$this->tables['captcha_qa_answers'] => [
+					'COLUMNS' => [
+						'question_id'	=> ['UINT', 0],
+						'answer_text'	=> ['STEXT_UNI', ''],
+					],
+					'KEYS'				=> [
+						'qid'			=> ['INDEX', 'question_id'],
+					],
+				],
+				$this->tables['captcha_qa_confirm'] => [
+					'COLUMNS' => [
+						'session_id'	=> ['CHAR:32', ''],
+						'confirm_id'	=> ['CHAR:32', ''],
+						'lang_iso'		=> ['VCHAR:30', ''],
+						'question_id'	=> ['UINT', 0],
+						'attempts'		=> ['UINT', 0],
+						'confirm_type'	=> ['USINT', 0],
+					],
+					'KEYS'				=> [
+						'session_id'			=> ['INDEX', 'session_id'],
+						'lookup'				=> ['INDEX', ['confirm_id', 'session_id', 'lang_iso']],
+					],
+					'PRIMARY_KEY'		=> 'confirm_id',
+				],
+			],
+		];
+	}
+
+	public function revert_schema(): array
+	{
+		return [
+			'drop_tables' => [
+				$this->tables['captcha_qa_questions'],
+				$this->tables['captcha_qa_answers'],
+				$this->tables['captcha_qa_confirm']
+			],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php b/phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php
new file mode 100644
index 00000000000..1fb79f8f4b7
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class remove_broken_captcha extends migration
+{
+	/** @var array List of broken captcha that have been removed  */
+	private array $removed_captchas = [
+		'core.captcha.plugins.gd',
+		'core.captcha.plugins.gd_wave',
+		'core.captcha.plugins.nogd'
+	];
+
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v400\dev',
+		];
+	}
+
+	public function update_data(): array
+	{
+		return [
+			['config.remove', ['captcha_gd']],
+			['config.remove', ['captcha_gd_3d_noise']],
+			['config.remove', ['captcha_gd_fonts']],
+			['config.remove', ['captcha_gd_foreground_noise']],
+			['config.remove', ['captcha_gd_wave']],
+			['config.remove', ['captcha_gd_x_grid']],
+			['config.remove', ['captcha_gd_y_grid']],
+			['custom', [[$this, 'replace_broken_captcha']]],
+		];
+	}
+
+	public function revert_data(): array
+	{
+		return [
+			['config.add', ['captcha_gd', 0]],
+			['config.add', ['captcha_gd_3d_noise', 1]],
+			['config.add', ['captcha_gd_fonts', 1]],
+			['config.add', ['captcha_gd_foreground_noise', 1]],
+			['config.add', ['captcha_gd_wave', 0]],
+			['config.add', ['captcha_gd_x_grid', 25]],
+			['config.add', ['captcha_gd_y_grid', 25]],
+		];
+	}
+
+	public function replace_broken_captcha(): void
+	{
+		if (in_array($this->config['captcha_plugin'], $this->removed_captchas))
+		{
+			$this->config->set('captcha_plugin', 'core.captcha.plugins.incomplete');
+		}
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/remove_img_link.php b/phpBB/phpbb/db/migration/data/v400/remove_img_link.php
new file mode 100644
index 00000000000..172bea5e1d0
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/remove_img_link.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class remove_img_link extends migration
+{
+	public function effectively_installed()
+	{
+		return !$this->config->offsetExists('img_link_width')
+			&& !$this->config->offsetExists('img_link_height');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v400\dev'
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.remove', ['img_link_width']],
+			['config.remove', ['img_link_height']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php
new file mode 100644
index 00000000000..a933653f633
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class remove_jabber extends migration
+{
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v310\notifications_use_full_name',
+			'\phpbb\db\migration\data\v31x\add_jabber_ssl_context_config_options',
+			'\phpbb\db\migration\data\v400\dev',
+			'\phpbb\db\migration\data\v400\add_webpush',
+		];
+	}
+
+	public function update_schema(): array
+	{
+		return [
+			'drop_columns' => [
+				$this->table_prefix . 'users' => [
+					'user_jabber',
+				],
+			],
+			'add_columns' => [
+				$this->table_prefix . 'user_notifications' => [
+					'id' => ['ULINT', null, 'auto_increment'],
+				],
+			],
+			'add_primary_keys' => [
+				$this->table_prefix . 'user_notifications' => ['id'],
+			],
+		];
+	}
+
+	public function revert_schema(): array
+	{
+		return [
+			'add_columns' => [
+				$this->table_prefix . 'users' => [
+					'user_jabber' => ['VCHAR_UNI', ''],
+				],
+			],
+			'drop_columns' => [
+				$this->table_prefix . 'user_notifications' => [
+					'id',
+				],
+			],
+		];
+	}
+
+	public function update_data(): array
+	{
+		return [
+			['config.remove', ['jab_enable']],
+			['config.remove', ['jab_host']],
+			['config.remove', ['jab_package_size']],
+			['config.remove', ['jab_password']],
+			['config.remove', ['jab_port']],
+			['config.remove', ['jab_use_ssl']],
+			['config.remove', ['jab_username']],
+			['config.remove', ['jab_verify_peer']],
+			['config.remove', ['jab_verify_peer_name']],
+			['config.remove', ['jab_allow_self_signed']],
+			['module.remove', [
+				'acp',
+				'ACP_CLIENT_COMMUNICATION',
+				'ACP_JABBER_SETTINGS',
+			]],
+			['permission.remove', ['a_jabber']],
+			['permission.remove', ['u_sendim']],
+			['custom', [[$this, 'move_jabber_to_email_notifications']]],
+		];
+	}
+
+	public function move_jabber_to_email_notifications()
+	{
+		$sql = 'DELETE FROM ' . $this->tables['user_notifications'] . "
+			WHERE method = 'notification.method.jabber'";
+		$this->db->sql_query($sql);
+
+		return true;
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/remove_max_img_size.php b/phpBB/phpbb/db/migration/data/v400/remove_max_img_size.php
new file mode 100644
index 00000000000..8a5338a454b
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/remove_max_img_size.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class remove_max_img_size extends migration
+{
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v400\dev',
+		];
+	}
+
+	public function update_data(): array
+	{
+		return [
+			['config.remove', ['max_sig_img_width']],
+			['config.remove', ['max_sig_img_height']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/remove_notify_type.php b/phpBB/phpbb/db/migration/data/v400/remove_notify_type.php
new file mode 100644
index 00000000000..7ed606cd804
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/remove_notify_type.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class remove_notify_type extends migration
+{
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v400\remove_jabber',
+			'\phpbb\db\migration\data\v400\dev',
+			'\phpbb\db\migration\data\v30x\release_3_0_0',
+		];
+	}
+
+	public function update_schema(): array
+	{
+		return [
+			'drop_columns' => [
+				$this->table_prefix . 'users' => [
+					'user_notify_type',
+				],
+			]
+		];
+	}
+
+	public function revert_schema(): array
+	{
+		return [
+			'add_columns' => [
+				$this->table_prefix . 'users' => [
+					'user_notify_type' => ['TINT:4', 0],
+				],
+			]
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/remove_smtp_auth_method.php b/phpBB/phpbb/db/migration/data/v400/remove_smtp_auth_method.php
new file mode 100644
index 00000000000..830307c1e8e
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/remove_smtp_auth_method.php
@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class remove_smtp_auth_method extends migration
+{
+	public function effectively_installed()
+	{
+		return !$this->config->offsetExists('smtp_auth_method');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v400\dev',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.remove', ['smtp_auth_method']],
+		];
+	}
+
+	public function revert_data()
+	{
+		return [
+			['config.add', ['smtp_auth_method', 'PLAIN']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php b/phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php
new file mode 100644
index 00000000000..3df6feee19e
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+use phpbb\db\doctrine\table_helper;
+use phpbb\db\tools\doctrine as doctrine_dbtools;
+
+class rename_duplicated_index_names extends migration
+{
+	/**
+	 * @var array
+	 */
+	protected static $table_keys;
+
+	/**
+	 * @var array
+	 */
+	protected static $rename_index;
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v400\storage_track_index',
+		];
+	}
+
+	public function update_schema()
+	{
+		if (!isset(self::$rename_index))
+		{
+			if (!isset(self::$table_keys))
+			{
+				$this->get_tables_index_names();
+			}
+			$short_table_names = table_helper::map_short_table_names(array_keys(self::$table_keys), $this->table_prefix);
+
+			foreach (self::$table_keys as $table_name => $key_names)
+			{
+				$prefixless_table_name = doctrine_dbtools::remove_prefix($table_name, $this->table_prefix);
+				foreach ($key_names as $key_name)
+				{
+					// If 'old' key name is already new format, do not rename it
+					if (str_starts_with($key_name, $short_table_names[$table_name]))
+					{
+						continue;
+					}
+
+					// If 'old' key name is prefixed by its table name with and/or without table name common prefix
+					// (f.e. 'phpbb_log_log_time'), remove it to prefix with the relevant table's short name
+					$cleaned_key_name = $key_name;
+					foreach ([$table_name, $prefixless_table_name] as $prefix)
+					{
+						$cleaned_key_name = doctrine_dbtools::remove_prefix($cleaned_key_name, $prefix);
+					}
+					$key_name_new = $short_table_names[$table_name] . '_' . $cleaned_key_name;
+
+					self::$rename_index[$table_name][$key_name] = $key_name_new;
+				}
+			}
+		}
+
+		return [
+			'rename_index' => self::$rename_index ?? [],
+		];
+	}
+
+	public function revert_schema()
+	{
+		$schema = $this->update_schema();
+		array_walk($schema['rename_index'], function (&$index_data, $table_name) {
+		  $index_data = array_flip($index_data);
+		});
+
+		return $schema;
+	}
+
+	protected function get_schema()
+	{
+		$self_classname = '\\' . str_replace('/', '\\', self::class);
+		$finder_factory = new \phpbb\finder\factory(null, false, $this->phpbb_root_path, $this->php_ext);
+		$finder = $finder_factory->get();
+		$migrator_classes = $finder->core_path('phpbb/db/migration/data/')->get_classes();
+		$self_class_index = array_search($self_classname, $migrator_classes);
+		unset($migrator_classes[$self_class_index]);
+
+		$schema_generator = new \phpbb\db\migration\schema_generator(
+			$migrator_classes,
+			$this->config,
+			$this->db,
+			$this->db_tools,
+			$this->phpbb_root_path,
+			$this->php_ext,
+			$this->table_prefix,
+			$this->tables
+		);
+
+		return $schema_generator->get_schema();
+	}
+
+	public function get_tables_index_names()
+	{
+		$schema_manager = $this->db_tools->get_connection()->createSchemaManager();
+		$table_names = $schema_manager->listTableNames();
+
+		if (!empty($table_names))
+		{
+			foreach ($table_names as $table_name)
+			{
+				$indices = $schema_manager->listTableIndexes($table_name);
+				$indices = array_keys(array_filter($indices,
+					function (\Doctrine\DBAL\Schema\Index $index)
+					{
+						return !$index->isPrimary();
+					})
+				);
+
+				if (!empty($indices))
+				{
+					self::$table_keys[$table_name] = $indices;
+				}
+			}
+		}
+		else
+		{
+			foreach ($this->get_schema() as $table_name => $table_data)
+			{
+				if (isset($table_data['KEYS']))
+				{
+					self::$table_keys[$table_name] = array_keys($table_data['KEYS']);
+				}
+			}
+		}
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/storage_attachment.php b/phpBB/phpbb/db/migration/data/v400/storage_attachment.php
index d9f60ccdace..9e1919f3f3e 100644
--- a/phpBB/phpbb/db/migration/data/v400/storage_attachment.php
+++ b/phpBB/phpbb/db/migration/data/v400/storage_attachment.php
@@ -38,4 +38,13 @@ public function update_data()
 			['config.remove', ['upload_path']],
 		];
 	}
+
+	public function revert_data()
+	{
+		return [
+			['config.remove', ['storage\\attachment\\provider']],
+			['config.remove', ['storage\\attachment\\config\\path']],
+			['config.add', ['upload_path', 'files']],
+		];
+	}
 }
diff --git a/phpBB/phpbb/db/migration/data/v400/storage_avatar.php b/phpBB/phpbb/db/migration/data/v400/storage_avatar.php
index 5afed251d75..f9de7cd8a53 100644
--- a/phpBB/phpbb/db/migration/data/v400/storage_avatar.php
+++ b/phpBB/phpbb/db/migration/data/v400/storage_avatar.php
@@ -38,4 +38,13 @@ public function update_data()
 			['config.remove', ['avatar_path']],
 		];
 	}
+
+	public function revert_data()
+	{
+		return [
+			['config.remove', ['storage\\avatar\\provider']],
+			['config.remove', ['storage\\avatar\\config\\path']],
+			['config.add', ['avatar_path', 'images/avatars/upload']],
+		];
+	}
 }
diff --git a/phpBB/phpbb/db/migration/data/v400/storage_backup.php b/phpBB/phpbb/db/migration/data/v400/storage_backup.php
index f764f5636ec..d9f19c42f03 100644
--- a/phpBB/phpbb/db/migration/data/v400/storage_backup.php
+++ b/phpBB/phpbb/db/migration/data/v400/storage_backup.php
@@ -45,6 +45,15 @@ public function update_schema()
 		];
 	}
 
+	public function revert_schema()
+	{
+		return [
+			'drop_tables'	=> [
+				$this->table_prefix . 'backups',
+			],
+		];
+	}
+
 	public function update_data()
 	{
 		return [
@@ -52,4 +61,12 @@ public function update_data()
 			['config.add', ['storage\\backup\\config\\path', 'store']],
 		];
 	}
+
+	public function revert_data()
+	{
+		return [
+			['config.remove', ['storage\\backup\\provider']],
+			['config.remove', ['storage\\backup\\config\\path']],
+		];
+	}
 }
diff --git a/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php b/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php
new file mode 100644
index 00000000000..190445a04fa
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php
@@ -0,0 +1,64 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class storage_backup_data extends migration
+{
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v400\storage_backup',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['custom', [[$this, 'update_backup_data']]],
+		];
+	}
+
+	public function update_backup_data()
+	{
+		$methods = ['sql', 'sql.gz', 'sql.bz2'];
+
+		$dir = $this->phpbb_root_path . 'store/';
+		$handle = @opendir($dir);
+
+		if ($handle)
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('#^backup_(\d{10,})_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches))
+				{
+					if (in_array($matches[2], $methods))
+					{
+						$insert_ary = [
+							'filename'	=> $file,
+						];
+
+						$sql = 'INSERT INTO ' . $this->table_prefix . 'backups ' . $this->db->sql_build_array('INSERT', $insert_ary);
+
+						$this->db->sql_query($sql);
+					}
+				}
+
+			}
+
+			closedir($handle);
+		}
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/storage_track.php b/phpBB/phpbb/db/migration/data/v400/storage_track.php
index 767eee5c0d3..35ebda12395 100644
--- a/phpBB/phpbb/db/migration/data/v400/storage_track.php
+++ b/phpBB/phpbb/db/migration/data/v400/storage_track.php
@@ -14,11 +14,12 @@
 namespace phpbb\db\migration\data\v400;
 
 use phpbb\db\migration\container_aware_migration;
-use phpbb\storage\exception\exception;
-use phpbb\storage\storage;
+use phpbb\storage\file_tracker;
 
 class storage_track extends container_aware_migration
 {
+	private const BATCH_SIZE = 100;
+
 	public function effectively_installed()
 	{
 		return $this->db_tools->sql_table_exists($this->tables['storage']);
@@ -30,6 +31,7 @@ public static function depends_on()
 			'\phpbb\db\migration\data\v400\storage_attachment',
 			'\phpbb\db\migration\data\v400\storage_avatar',
 			'\phpbb\db\migration\data\v400\storage_backup',
+			'\phpbb\db\migration\data\v400\storage_backup_data',
 		];
 	}
 
@@ -70,15 +72,15 @@ public function update_data()
 
 	public function track_avatars()
 	{
-		/** @var storage $storage */
-		$storage = $this->container->get('storage.avatar');
+		/** @var file_tracker $file_tracker */
+		$file_tracker = $this->container->get('storage.file_tracker');
 
-		$sql = 'SELECT user_avatar
+		$sql = 'SELECT DISTINCT user_avatar
 			FROM ' . USERS_TABLE . "
 			WHERE user_avatar_type = 'avatar.driver.upload'";
-
 		$result = $this->db->sql_query($sql);
 
+		$files = [];
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$avatar_group = false;
@@ -93,76 +95,96 @@ public function track_avatars()
 			$ext		= substr(strrchr($filename, '.'), 1);
 			$filename	= (int) $filename;
 
-			try
-			{
-				$storage->track_file($this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $filename . '.' . $ext);
-			}
-			catch (exception $e)
+			$filename = $this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $filename . '.' . $ext;
+			$files[] = [
+				'file_path' => $filename,
+				'filesize' => @filesize($this->phpbb_root_path . $this->config['storage\\avatar\\config\\path'] . '/' . $filename),
+			];
+
+			if (count($files) >= self::BATCH_SIZE)
 			{
-				// If file doesn't exist, don't track it
+				$file_tracker->track_files('avatar', $files);
+				$files = [];
 			}
 		}
+
+		if (!empty($files))
+		{
+			$file_tracker->track_files('avatar', $files);
+		}
+
 		$this->db->sql_freeresult($result);
 	}
 
 	public function track_attachments()
 	{
-		/** @var storage $storage */
-		$storage = $this->container->get('storage.attachment');
+		/** @var file_tracker $file_tracker */
+		$file_tracker = $this->container->get('storage.file_tracker');
 
-		$sql = 'SELECT physical_filename, thumbnail
+		$sql = 'SELECT DISTINCT physical_filename, thumbnail
 			FROM ' . ATTACHMENTS_TABLE;
-
 		$result = $this->db->sql_query($sql);
 
+		$files = [];
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			try
-			{
-				$storage->track_file($row['physical_filename']);
-			}
-			catch (exception $e)
+			$files[] = [
+				'file_path' => $row['physical_filename'],
+				'filesize' => @filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/' . $row['physical_filename']),
+			];
+
+			if ($row['thumbnail'] == 1)
 			{
-				// If file doesn't exist, don't track it
+				$files[] = [
+					'file_path' => 'thumb_' . $row['physical_filename'],
+					'filesize' => @filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/thumb_' . $row['physical_filename']),
+				];
 			}
 
-			if ($row['thumbnail'] == 1)
+			if (count($files) >= self::BATCH_SIZE)
 			{
-				try
-				{
-					$storage->track_file('thumb_' . $row['physical_filename']);
-				}
-				catch (exception $e)
-				{
-					// If file doesn't exist, don't track it
-				}
+				$file_tracker->track_files('attachment', $files);
+				$files = [];
 			}
 		}
+
+		if (!empty($files))
+		{
+			$file_tracker->track_files('attachment', $files);
+		}
+
 		$this->db->sql_freeresult($result);
 	}
 
 	public function track_backups()
 	{
-		/** @var storage $storage */
-		$storage = $this->container->get('storage.backup');
+		/** @var file_tracker $file_tracker */
+		$file_tracker = $this->container->get('storage.file_tracker');
 
-		$sql = 'SELECT filename
+		$sql = 'SELECT DISTINCT filename
 			FROM ' . BACKUPS_TABLE;
-
 		$result = $this->db->sql_query($sql);
 
+		$files = [];
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			try
-			{
-				$storage->track_file($row['filename']);
-			}
-			catch (exception $e)
+			$files[] = [
+				'file_path' => $row['filename'],
+				'filesize' => @filesize($this->phpbb_root_path . $this->config['storage\\backup\\config\\path'] . '/' . $row['filename']),
+			];
+
+			if (count($files) >= self::BATCH_SIZE)
 			{
-				// If file doesn't exist, don't track it
+				$file_tracker->track_files('backup', $files);
+				$files = [];
 			}
 		}
 
+		if (!empty($files))
+		{
+			$file_tracker->track_files('backup', $files);
+		}
+
 		$this->db->sql_freeresult($result);
 	}
 }
diff --git a/phpBB/phpbb/db/migration/data/v400/storage_track_index.php b/phpBB/phpbb/db/migration/data/v400/storage_track_index.php
new file mode 100644
index 00000000000..63f57f5e00f
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/storage_track_index.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\container_aware_migration;
+
+class storage_track_index extends container_aware_migration
+{
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v400\storage_track',
+		];
+	}
+
+	public function update_schema()
+	{
+		return [
+			'add_unique_index'	=> [
+				$this->table_prefix . 'storage'		=> [
+					'uidx_storage'	=> ['file_path', 'storage'],
+				],
+			]
+		];
+	}
+
+	public function revert_schema()
+	{
+		return [
+			'drop_keys' => [
+				$this->table_prefix . 'storage' => [
+					'uidx_storage',
+				],
+			],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/turnstile_captcha.php b/phpBB/phpbb/db/migration/data/v400/turnstile_captcha.php
new file mode 100644
index 00000000000..77e921c090f
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/turnstile_captcha.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class turnstile_captcha extends migration
+{
+	public function effectively_installed(): bool
+	{
+		return $this->config->offsetExists('captcha_turnstile_sitekey')
+			&& $this->config->offsetExists('captcha_turnstile_secret')
+			&& $this->config->offsetExists('captcha_turnstile_theme');
+	}
+
+	public static function depends_on(): array
+	{
+		return [
+			'\phpbb\db\migration\data\v400\dev',
+		];
+	}
+
+	public function update_data(): array
+	{
+		return [
+			['config.add', ['captcha_turnstile_sitekey', '']],
+			['config.add', ['captcha_turnstile_secret', '']],
+			['config.add', ['captcha_turnstile_theme', 'light']],
+		];
+	}
+
+	public function revert_data(): array
+	{
+		return [
+			['config.remove', ['captcha_turnstile_sitekey']],
+			['config.remove', ['captcha_turnstile_secret']],
+			['config.remove', ['captcha_turnstile_theme']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/v400a1.php b/phpBB/phpbb/db/migration/data/v400/v400a1.php
new file mode 100644
index 00000000000..8897d6f279d
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/v400a1.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+class v400a1 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '4.0.0-a1', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3315',
+			'\phpbb\db\migration\data\v400\add_mention_settings',
+			'\phpbb\db\migration\data\v400\remove_remote_avatar',
+			'\phpbb\db\migration\data\v400\increase_avatar_size',
+			'\phpbb\db\migration\data\v400\remove_img_link',
+			'\phpbb\db\migration\data\v400\add_bbcode_font_icon',
+			'\phpbb\db\migration\data\v400\font_awesome_6_upgrade',
+			'\phpbb\db\migration\data\v400\remove_broken_captcha',
+			'\phpbb\db\migration\data\v400\turnstile_captcha',
+			'\phpbb\db\migration\data\v400\add_audio_files_attachment_group',
+			'\phpbb\db\migration\data\v400\add_webpush_token',
+			'\phpbb\db\migration\data\v400\remove_remote_upload',
+			'\phpbb\db\migration\data\v400\remove_notify_type',
+			'\phpbb\db\migration\data\v400\remove_template_php',
+			'\phpbb\db\migration\data\v400\storage_adapter_local_subfolders_remove',
+			'\phpbb\db\migration\data\v400\add_webpush_options',
+			'\phpbb\db\migration\data\v400\remove_max_img_size',
+			'\phpbb\db\migration\data\v400\hidpi_smilies',
+			'\phpbb\db\migration\data\v400\extensions_composer_2',
+			'\phpbb\db\migration\data\v400\add_storage_permission',
+			'\phpbb\db\migration\data\v400\hidpi_icons',
+			'\phpbb\db\migration\data\v400\qa_captcha',
+			'\phpbb\db\migration\data\v400\search_backend_update',
+			'\phpbb\db\migration\data\v400\remove_flash_v2',
+			'\phpbb\db\migration\data\v400\add_disable_board_access_config',
+			'\phpbb\db\migration\data\v400\remove_dbms_version_config',
+			'\phpbb\db\migration\data\v400\ban_table_p2',
+			'\phpbb\db\migration\data\v400\extensions_composer_3',
+			'\phpbb\db\migration\data\v400\acp_storage_module',
+			'\phpbb\db\migration\data\v400\add_video_files_attachment_group',
+			'\phpbb\db\migration\data\v400\remove_attachment_download_mode',
+			'\phpbb\db\migration\data\v400\remove_smtp_auth_method',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '4.0.0-a1']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v400/v400a2.php b/phpBB/phpbb/db/migration/data/v400/v400a2.php
new file mode 100644
index 00000000000..296e6112ad6
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/v400a2.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+class v400a2 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '4.0.0-a2', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v3316',
+			'\phpbb\db\migration\data\v400\disable_extensions',
+			'\phpbb\db\migration\data\v400\extensions_composer_4',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '4.0.0-a2']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/db/migration/helper.php b/phpBB/phpbb/db/migration/helper.php
index bce2efff510..44cd23462a8 100644
--- a/phpBB/phpbb/db/migration/helper.php
+++ b/phpBB/phpbb/db/migration/helper.php
@@ -42,6 +42,7 @@ public function get_schema_steps($schema_changes)
 			'add_primary_keys'	=> 2, // perform_schema_changes only uses one level, but second is in the function
 			'add_unique_index'	=> 2,
 			'add_index'			=> 2,
+			'rename_index'		=> 1,
 		);
 
 		foreach ($nested_level as $change_type => $data_depth)
diff --git a/phpBB/phpbb/db/migration/migration.php b/phpBB/phpbb/db/migration/migration.php
index 6bfc395e4dd..e0ea38ff801 100644
--- a/phpBB/phpbb/db/migration/migration.php
+++ b/phpBB/phpbb/db/migration/migration.php
@@ -72,6 +72,8 @@ public function __construct(\phpbb\config\config $config, \phpbb\db\driver\drive
 		$this->php_ext = $php_ext;
 
 		$this->errors = array();
+
+		$this->db_tools->set_table_prefix($this->table_prefix);
 	}
 
 	/**
diff --git a/phpBB/phpbb/db/migration/schema_generator.php b/phpBB/phpbb/db/migration/schema_generator.php
index dfbbf3ccbbc..1153f4c67e7 100644
--- a/phpBB/phpbb/db/migration/schema_generator.php
+++ b/phpBB/phpbb/db/migration/schema_generator.php
@@ -14,21 +14,17 @@
 namespace phpbb\db\migration;
 
 use Closure;
-use LogicException;
 use phpbb\config\config;
 use phpbb\db\driver\driver_interface;
 use phpbb\db\migrator;
 use phpbb\db\tools\tools_interface;
 use UnexpectedValueException;
-use CHItA\TopologicalSort\TopologicalSort;
 
 /**
 * The schema generator generates the schema based on the existing migrations
 */
 class schema_generator
 {
-	use TopologicalSort;
-
 	/** @var config */
 	protected $config;
 
@@ -103,24 +99,56 @@ public function get_schema() : array
 			return $this->tables;
 		}
 
-		$migrations = $this->class_names;
-		$filter = function($class_name) {
-			return !migrator::is_migration($class_name);
-		};
+		$dependency_counts = [];
+		$dependencies = [];
+		$applicable_migrations = [];
+		$migration_count = 0;
+		foreach ($this->class_names as $class_name)
+		{
+			if (!migrator::is_migration($class_name))
+			{
+				continue;
+			}
 
-		$edges = function($class_name) {
-			return $class_name::depends_on();
-		};
+			$migration_count++;
+			$migration_dependencies = $class_name::depends_on();
+			if (empty($migration_dependencies))
+			{
+				$applicable_migrations[] = $class_name;
+				continue;
+			}
 
-		$apply_for_each = function($class_name) {
-			$this->apply_migration_to_schema($class_name);
-		};
+			$dependency_counts[$class_name] = count($migration_dependencies);
+			foreach ($migration_dependencies as $migration_dependency)
+			{
+				$dependencies[$migration_dependency][] = $class_name;
+			}
+		}
 
-		try
+		$applied_migrations = 0;
+		while (!empty($applicable_migrations))
 		{
-			$this->topologicalSort($migrations, $edges, true, $apply_for_each, $filter);
+			$migration = array_pop($applicable_migrations);
+			$this->apply_migration_to_schema($migration);
+			++$applied_migrations;
+
+			if (!array_key_exists($migration, $dependencies))
+			{
+				continue;
+			}
+
+			$dependents = $dependencies[$migration];
+			foreach ($dependents as $dependent)
+			{
+				$dependency_counts[$dependent]--;
+				if ($dependency_counts[$dependent] === 0)
+				{
+					$applicable_migrations[] = $dependent;
+				}
+			}
 		}
-		catch (LogicException $e)
+
+		if ($migration_count !== $applied_migrations)
 		{
 			throw new UnexpectedValueException(
 				"Migrations either have circular dependencies or unsatisfiable dependencies."
@@ -157,8 +185,10 @@ private function apply_migration_to_schema(string $migration_class)
 			'drop_columns'		=> 'COLUMNS',
 			'change_columns'	=> 'COLUMNS',
 			'add_index'			=> 'KEYS',
+			'add_primary_keys'	=> 'PRIMARY_KEY',
 			'add_unique_index'	=> 'KEYS',
 			'drop_keys'			=> 'KEYS',
+			'rename_index'		=> 'KEYS',
 		];
 
 		$schema_changes = $migration->update_schema();
@@ -178,6 +208,7 @@ private function apply_migration_to_schema(string $migration_class)
 			{
 				case 'add':
 				case 'change':
+				case 'rename':
 					$action = function(&$value, $changes, $value_transform = null) {
 						self::set_all($value, $changes, $value_transform);
 					};
@@ -240,7 +271,7 @@ private function for_each_table(array $data, callable $callback, $column = null,
 	 * @param mixed			$data				Array of values to be set.
 	 * @param callable|null	$value_transform	Callback to transform the value being set.
 	 */
-	private static function set_all(&$schema, $data, ?callable $value_transform = null)
+	private static function set_all(&$schema, $data, callable|null $value_transform = null)
 	{
 		$data = (!is_array($data)) ? [$data] : $data;
 		foreach ($data as $key => $change)
@@ -317,9 +348,9 @@ private static function handle_add_column(array &$value, string $key, array $cha
 	 *
 	 * @return Closure|null The value transformation callback or null if it is not needed.
 	 */
-	private static function get_value_transform(string $change_type, string $schema_type) : ?Closure
+	private static function get_value_transform(string $change_type, string $schema_type) : Closure|null
 	{
-		if ($change_type !== 'add')
+		if (!in_array($change_type, ['add', 'rename']))
 		{
 			return null;
 		}
@@ -327,6 +358,23 @@ private static function get_value_transform(string $change_type, string $schema_
 		switch ($schema_type)
 		{
 			case 'index':
+				if ($change_type == 'rename')
+				{
+					return function(&$value, $key, $change) {
+						if (isset($value[$key]))
+						{
+							$data_backup = $value[$key];
+							unset($value[$key]);
+							$value[$change] = $data_backup;
+							unset($data_backup);
+						}
+						else
+						{
+							return null;
+						}
+					};
+				}
+
 				return function(&$value, $key, $change) {
 					$value[$key] = ['INDEX', $change];
 				};
diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php
index 69f32fcb4ca..94193629bf9 100644
--- a/phpBB/phpbb/db/migration/tool/permission.php
+++ b/phpBB/phpbb/db/migration/tool/permission.php
@@ -444,15 +444,14 @@ public function permission_set($name, $auth_option, $type = 'role', $has_permiss
 		}
 		$this->db->sql_freeresult($result);
 
-		if (empty($new_auth))
+		$type = (string) $type; // Prevent PHP bug.
+		if (empty($new_auth) || !in_array($type, ['role','group']))
 		{
 			return;
 		}
 
 		$current_auth = array();
 
-		$type = (string) $type; // Prevent PHP bug.
-
 		switch ($type)
 		{
 			case 'role':
@@ -535,40 +534,32 @@ function ($option) use ($role_type)
 			break;
 		}
 
-		$sql_ary = array();
-		switch ($type)
+		$sql_ary = $auth_update_list = [];
+		$table = $type == 'role' ? ACL_ROLES_DATA_TABLE : ACL_GROUPS_TABLE;
+		foreach ($new_auth as $auth_option_id)
 		{
-			case 'role':
-				foreach ($new_auth as $auth_option_id)
-				{
-					if (!isset($current_auth[$auth_option_id]))
-					{
-						$sql_ary[] = array(
-							'role_id'			=> $role_id,
-							'auth_option_id'	=> $auth_option_id,
-							'auth_setting'		=> $has_permission,
-						);
-					}
-				}
-
-				$this->db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary);
-			break;
-
-			case 'group':
-				foreach ($new_auth as $auth_option_id)
-				{
-					if (!isset($current_auth[$auth_option_id]))
-					{
-						$sql_ary[] = array(
-							'group_id'			=> $group_id,
-							'auth_option_id'	=> $auth_option_id,
-							'auth_setting'		=> $has_permission,
-						);
-					}
-				}
+			if (!isset($current_auth[$auth_option_id]))
+			{
+				$sql_ary[] = [
+					$type . '_id'		=> ${$type . '_id'},
+					'auth_option_id'	=> $auth_option_id,
+					'auth_setting'		=> (int) $has_permission,
+				];
+			}
+			else
+			{
+				$auth_update_list[] = $auth_option_id;
+			}
+		}
+		$this->db->sql_multi_insert($table, $sql_ary);
 
-				$this->db->sql_multi_insert(ACL_GROUPS_TABLE, $sql_ary);
-			break;
+		if (count($auth_update_list))
+		{
+			$sql = 'UPDATE ' . $table . '
+				SET auth_setting = ' . (int) $has_permission . '
+				WHERE ' . $this->db->sql_in_set('auth_option_id', $auth_update_list) . '
+					AND ' . $type . '_id = ' .  (int) ${$type . '_id'};
+			$this->db->sql_query($sql);
 		}
 
 		$this->auth->acl_clear_prefetch();
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 0df548ca908..ea14f654c05 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -15,12 +15,12 @@
 
 use phpbb\config\config;
 use phpbb\db\driver\driver_interface;
+use phpbb\db\migration\container_aware_migration;
 use phpbb\db\migration\exception;
 use phpbb\db\migration\helper;
 use phpbb\db\output_handler\migrator_output_handler_interface;
 use phpbb\db\output_handler\null_migrator_output_handler;
 use phpbb\db\tools\tools_interface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -575,7 +575,9 @@ protected function try_revert($name)
 				$state['migration_data_state']['_total_time'] : 0.0;
 			$elapsed_time = microtime(true);
 
-			$steps = array_merge($this->helper->reverse_update_data($migration->update_data()), $migration->revert_data());
+			$update_data = $migration->update_data() ?? [];
+			$revert_data = $migration->revert_data() ?? [];
+			$steps = array_merge($this->helper->reverse_update_data($update_data), $revert_data);
 			$result = $this->process_data_step($steps, $state['migration_data_state']);
 
 			$elapsed_time = microtime(true) - $elapsed_time;
@@ -980,7 +982,7 @@ public function get_migration($name)
 	{
 		$migration = new $name($this->config, $this->db, $this->db_tools, $this->phpbb_root_path, $this->php_ext, $this->table_prefix, $this->tables);
 
-		if ($migration instanceof ContainerAwareInterface)
+		if ($migration instanceof container_aware_migration)
 		{
 			$migration->setContainer($this->container);
 		}
diff --git a/phpBB/phpbb/db/tools/doctrine.php b/phpBB/phpbb/db/tools/doctrine.php
index bd3f71f83ad..f26bcf92089 100644
--- a/phpBB/phpbb/db/tools/doctrine.php
+++ b/phpBB/phpbb/db/tools/doctrine.php
@@ -49,6 +49,11 @@ class doctrine implements tools_interface
 	 */
 	private $return_statements;
 
+	/**
+	 * @var string
+	 */
+	private $table_prefix;
+
 	/**
 	 * Database tools constructors.
 	 *
@@ -61,6 +66,14 @@ public function __construct(Connection $connection, bool $return_statements = fa
 		$this->connection = $connection;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_connection(): Connection
+	{
+		return $this->connection;
+	}
+
 	/**
 	 * @return AbstractSchemaManager
 	 *
@@ -83,7 +96,15 @@ protected function get_schema_manager(): AbstractSchemaManager
 	 */
 	protected function get_schema(): Schema
 	{
-		return $this->get_schema_manager()->createSchema();
+		return $this->get_schema_manager()->introspectSchema();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function set_table_prefix($table_prefix): void
+	{
+		$this->table_prefix = $table_prefix;
 	}
 
 	/**
@@ -279,30 +300,6 @@ function (Schema $schema) use ($table_name, $column_name, $column_data, $column_
 	 */
 	public function sql_column_remove(string $table_name, string $column_name)
 	{
-		// Check if this column is part of a primary key. If yes, remove the primary key.
-		$primary_key_indexes = $this->get_filtered_index_list($table_name, false);
-
-		$primary_key_indexes = array_filter($primary_key_indexes, function($index) use ($column_name) {
-			$index_columns = array_map('strtolower', $index->getUnquotedColumns());
-			return in_array($column_name, $index_columns, true) && $index->isPrimary();
-		});
-
-		if (count($primary_key_indexes))
-		{
-			$ret = $this->alter_schema(
-				function (Schema $schema) use ($table_name, $column_name): void
-				{
-					$table = $schema->getTable($table_name);
-					$table->dropPrimaryKey();
-				}
-			);
-
-			if ($ret !== true)
-			{
-				return $ret;
-			}
-		}
-
 		return $this->alter_schema(
 			function (Schema $schema) use ($table_name, $column_name): void
 			{
@@ -324,6 +321,19 @@ function (Schema $schema) use ($table_name, $index_name, $column): void
 		);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function sql_rename_index(string $table_name, string $index_name_old, string $index_name_new)
+	{
+		return $this->alter_schema(
+			function (Schema $schema) use ($table_name, $index_name_old, $index_name_new): void
+			{
+				$this->schema_rename_index($schema, $table_name, $index_name_old, $index_name_new);
+			}
+		);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -358,7 +368,7 @@ public function sql_create_primary_key(string $table_name, $column)
 		return $this->alter_schema(
 			function (Schema $schema) use ($table_name, $column): void
 			{
-				$this->schema_create_primary_key($schema, $column, $table_name);
+				$this->schema_create_primary_key($schema, $table_name, $column);
 			}
 		);
 	}
@@ -370,7 +380,7 @@ public function sql_truncate_table(string $table_name): void
 	{
 		try
 		{
-			$this->connection->executeQuery($this->get_schema_manager()->getDatabasePlatform()->getTruncateTableSQL($table_name));
+			$this->connection->executeQuery($this->connection->getDatabasePlatform()->getTruncateTableSQL($table_name));
 		}
 		catch (Exception $e)
 		{
@@ -378,6 +388,59 @@ public function sql_truncate_table(string $table_name): void
 		}
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public static function add_prefix(string $name, string $prefix): string
+	{
+		return str_ends_with($prefix, '_') ? $prefix . $name : $prefix . '_' . $name;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public static function remove_prefix(string $name, string $prefix = ''): string
+	{
+		$prefix = str_ends_with($prefix, '_') ? $prefix : $prefix . '_';
+		return $prefix && str_starts_with($name, $prefix) ? substr($name, strlen($prefix)) : $name;
+	}
+
+	/**
+	 * Returns an array of the table index names and relevant data in format
+	 * [
+	 *		[$index_name] = [
+	 *			'columns'	=> (array) $index_columns,
+	 *			'flags'		=> (array) $index_flags,
+	 *			'options'	=> (array) $index_options,
+	 *			'is_primary'=> (bool) $isPrimary,
+	 *			'is_unique'	=> (bool) $isUnique,
+	 *			'is_simple'	=> (bool) $isSimple,
+	 *		]
+	 *
+	 * @param string $table_name
+	 *
+	 * @return array
+	 */
+	public function sql_get_table_index_data(string $table_name): array
+	{
+		$schema = $this->get_schema();
+		$table = $schema->getTable($table_name);
+		$indexes = [];
+		foreach ($table->getIndexes() as $index)
+		{
+			$indexes[$index->getName()] = [
+				'columns'	=> array_map('strtolower', $index->getUnquotedColumns()),
+				'flags'		=> $index->getFlags(),
+				'options'	=> $index->getOptions(),
+				'is_primary'=> $index->isPrimary(),
+				'is_unique'	=> $index->isUnique(),
+				'is_simple'	=> $index->isSimpleIndex(),
+			];
+		}
+
+		return $indexes;
+	}
+
 	/**
 	 * Returns an array of indices for either unique and primary keys, or simple indices.
 	 *
@@ -452,34 +515,25 @@ protected function asset_exists(string $needle, array $assets): bool
 	 */
 	protected function alter_schema(callable $callback)
 	{
-		try
-		{
-			$current_schema = $this->get_schema();
-			$new_schema = clone $current_schema;
-			call_user_func($callback, $new_schema);
-
-			$comparator = new comparator();
-			$schemaDiff = $comparator->compareSchemas($current_schema, $new_schema);
-			$queries = $schemaDiff->toSql($this->get_schema_manager()->getDatabasePlatform());
+		$current_schema = $this->get_schema();
+		$new_schema = clone $current_schema;
+		call_user_func($callback, $new_schema);
 
-			if ($this->return_statements)
-			{
-				return $queries;
-			}
+		$comparator = new comparator();
+		$schemaDiff = $comparator->compareSchemas($current_schema, $new_schema);
+		$queries = $schemaDiff->toSql($this->connection->getDatabasePlatform());
 
-			foreach ($queries as $query)
-			{
-				// executeQuery() must be used here because $query might return a result set, for instance REPAIR does
-				$this->connection->executeQuery($query);
-			}
-
-			return true;
+		if ($this->return_statements)
+		{
+			return $queries;
 		}
-		catch (Exception $e)
+
+		foreach ($queries as $query)
 		{
-			// @todo: check if it makes sense to properly handle the exception
-			return false;
+			// executeQuery() must be used here because $query might return a result set, for instance REPAIR does
+			$this->connection->executeQuery($query);
 		}
+		return true;
 	}
 
 	/**
@@ -547,6 +601,11 @@ protected function schema_perform_changes(Schema $schema, array $schema_changes)
 				'use_key' => true,
 				'per_table' => true,
 			],
+			'rename_index' => [
+				'method' => 'schema_rename_index',
+				'use_key' => true,
+				'per_table' => true,
+			],
 		];
 
 		foreach ($mapping as $action => $params)
@@ -604,7 +663,8 @@ protected function schema_create_table(Schema $schema, string $table_name, array
 		}
 
 		$table = $schema->createTable($table_name);
-		$dbms_name = $this->get_schema_manager()->getDatabasePlatform()->getName();
+		$short_table_name = table_helper::generate_shortname(self::remove_prefix($table_name, $this->table_prefix));
+		$dbms_name = $this->connection->getDatabasePlatform()->getName();
 
 		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
 		{
@@ -629,25 +689,18 @@ protected function schema_create_table(Schema $schema, string $table_name, array
 			foreach ($table_data['KEYS'] as $key_name => $key_data)
 			{
 				$columns = (is_array($key_data[1])) ? $key_data[1] : [$key_data[1]];
+				$key_name = !str_starts_with($key_name, $short_table_name) ? self::add_prefix($key_name, $short_table_name) : $key_name;
 
-				// Supports key columns defined with there length
-				$columns = array_map(function (string $column)
-				{
-					if (strpos($column, ':') !== false)
-					{
-						$parts = explode(':', $column, 2);
-						return $parts[0];
-					}
-					return $column;
-				}, $columns);
+				$options = [];
+				$this->schema_get_index_key_data($columns, $options);
 
 				if ($key_data[0] === 'UNIQUE')
 				{
-					$table->addUniqueIndex($columns, $key_name);
+					$table->addUniqueIndex($columns, $key_name, $options);
 				}
 				else
 				{
-					$table->addIndex($columns, $key_name);
+					$table->addIndex($columns, $key_name, [], $options);
 				}
 			}
 		}
@@ -661,6 +714,8 @@ protected function schema_create_table(Schema $schema, string $table_name, array
 	}
 
 	/**
+	 * Removes a table
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param bool   $safe_check
@@ -678,6 +733,8 @@ protected function schema_drop_table(Schema $schema, string $table_name, bool $s
 	}
 
 	/**
+	 * Adds column to a table
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $column_name
@@ -698,7 +755,7 @@ function (Table $table) use ($column_name, $column_data, $safe_check)
 					return false;
 				}
 
-				$dbms_name = $this->get_schema_manager()->getDatabasePlatform()->getName();
+				$dbms_name = $this->connection->getDatabasePlatform()->getName();
 
 				list($type, $options) = table_helper::convert_column_data($column_data, $dbms_name);
 				$table->addColumn($column_name, $type, $options);
@@ -708,6 +765,8 @@ function (Table $table) use ($column_name, $column_data, $safe_check)
 	}
 
 	/**
+	 * Alters column properties
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $column_name
@@ -728,7 +787,7 @@ function (Table $table) use ($column_name, $column_data, $safe_check): void
 					return;
 				}
 
-				$dbms_name = $this->get_schema_manager()->getDatabasePlatform()->getName();
+				$dbms_name = $this->connection->getDatabasePlatform()->getName();
 
 				list($type, $options) = table_helper::convert_column_data($column_data, $dbms_name);
 				$options['type'] = Type::getType($type);
@@ -738,6 +797,8 @@ function (Table $table) use ($column_name, $column_data, $safe_check): void
 	}
 
 	/**
+	 * Alters column properties or adds a column
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $column_name
@@ -760,6 +821,8 @@ protected function schema_column_change_add(Schema $schema, string $table_name,
 	}
 
 	/**
+	 * Removes a column in a table
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $column_name
@@ -812,6 +875,8 @@ function (Table $table) use ($schema, $table_name, $column_name, $safe_check): v
 	}
 
 	/**
+	 * Creates non-unique index for a table
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $index_name
@@ -824,16 +889,53 @@ protected function schema_create_index(Schema $schema, string $table_name, strin
 	{
 		$columns = (is_array($column)) ? $column : [$column];
 		$table = $schema->getTable($table_name);
+		$short_table_name = table_helper::generate_shortname(self::remove_prefix($table_name, $this->table_prefix));
+		$index_name = !str_starts_with($index_name, $short_table_name) ? self::add_prefix($index_name, $short_table_name) : $index_name;
 
 		if ($safe_check && $table->hasIndex($index_name))
 		{
 			return;
 		}
 
-		$table->addIndex($columns, $index_name);
+		$options = [];
+		$this->schema_get_index_key_data($columns, $options);
+
+		$table->addIndex($columns, $index_name, [], $options);
 	}
 
 	/**
+	 * Renames table index
+	 *
+	 * @param Schema $schema
+	 * @param string $table_name
+	 * @param string $index_name_old
+	 * @param string $index_name_new
+	 * @param bool   $safe_check
+	 *
+	 * @throws SchemaException
+	 */
+	protected function schema_rename_index(Schema $schema, string $table_name, string $index_name_old, string $index_name_new, bool $safe_check = false): void
+	{
+		$table = $schema->getTable($table_name);
+		$short_table_name = table_helper::generate_shortname(self::remove_prefix($table_name, $this->table_prefix));
+
+		if (!$table->hasIndex($index_name_old))
+		{
+			$index_name_old = !str_starts_with($index_name_old, $short_table_name) ? self::add_prefix($index_name_old, $short_table_name) : self::remove_prefix($index_name_old, $short_table_name);
+		}
+		$index_name_new = !str_starts_with($index_name_new, $short_table_name) ? self::add_prefix($index_name_new, $short_table_name) : $index_name_new;
+
+		if ($safe_check && !$table->hasIndex($index_name_old))
+		{
+			return;
+		}
+
+		$table->renameIndex($index_name_old, $index_name_new);
+	}
+
+	/**
+	 * Creates unique (non-primary) index for a table
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $index_name
@@ -846,16 +948,23 @@ protected function schema_create_unique_index(Schema $schema, string $table_name
 	{
 		$columns = (is_array($column)) ? $column : [$column];
 		$table = $schema->getTable($table_name);
+		$short_table_name = table_helper::generate_shortname(self::remove_prefix($table_name, $this->table_prefix));
+		$index_name = !str_starts_with($index_name, $short_table_name) ? self::add_prefix($index_name, $short_table_name) : $index_name;
 
 		if ($safe_check && $table->hasIndex($index_name))
 		{
 			return;
 		}
 
-		$table->addUniqueIndex($columns, $index_name);
+		$options = [];
+		$this->schema_get_index_key_data($columns, $options);
+
+		$table->addUniqueIndex($columns, $index_name, $options);
 	}
 
 	/**
+	 * Removes table index
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $index_name
@@ -866,6 +975,12 @@ protected function schema_create_unique_index(Schema $schema, string $table_name
 	protected function schema_index_drop(Schema $schema, string $table_name, string $index_name, bool $safe_check = false): void
 	{
 		$table = $schema->getTable($table_name);
+		$short_table_name = table_helper::generate_shortname(self::remove_prefix($table_name, $this->table_prefix));
+
+		if (!$table->hasIndex($index_name))
+		{
+			$index_name = !str_starts_with($index_name, $short_table_name) ? self::add_prefix($index_name, $short_table_name) : self::remove_prefix($index_name, $short_table_name);
+		}
 
 		if ($safe_check && !$table->hasIndex($index_name))
 		{
@@ -876,21 +991,47 @@ protected function schema_index_drop(Schema $schema, string $table_name, string
 	}
 
 	/**
-	 * @param        $column
+	 * Creates primary key for a table
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
+	 * @param array|string $column_name
 	 * @param bool   $safe_check
 	 *
 	 * @throws SchemaException
 	 */
-	protected function schema_create_primary_key(Schema $schema, $column, string $table_name, bool $safe_check = false): void
+	protected function schema_create_primary_key(Schema $schema, string $table_name, array|string $column_name, bool $safe_check = false): void
 	{
-		$columns = (is_array($column)) ? $column : [$column];
+		$columns = (is_array($column_name)) ? $column_name : [$column_name];
 		$table = $schema->getTable($table_name);
 		$table->dropPrimaryKey();
 		$table->setPrimaryKey($columns);
 	}
 
+	/**
+	 * Checks if index data contains key length
+	 * and put it into $options['lengths'] array.
+	 * Handles key length in formats of 'keyname:123' or 'keyname(123)'
+	 *
+	 * @param array  $columns
+	 * @param array  $options
+	 */
+	protected function schema_get_index_key_data(array &$columns, array &$options): void
+	{
+		if (!empty($columns))
+		{
+			$columns = array_map(function (string $column) use (&$options)
+			{
+				if (preg_match('/^([a-zA-Z0-9_]+)(?:(?:\:|\()([0-9]{1,3})\)?)?$/', $column, $parts))
+				{
+					$options['lengths'][] = $parts[2] ?? null;
+					return $parts[1];
+				}
+				return $column;
+			}, $columns);
+		}
+	}
+
 	/**
 	 * Recreate an index of a table
 	 *
diff --git a/phpBB/phpbb/db/tools/tools_interface.php b/phpBB/phpbb/db/tools/tools_interface.php
index 0b8cefd8ddf..ceb1bb384d6 100644
--- a/phpBB/phpbb/db/tools/tools_interface.php
+++ b/phpBB/phpbb/db/tools/tools_interface.php
@@ -165,6 +165,17 @@ public function sql_index_exists(string $table_name, string $index_name): bool;
 	 */
 	public function sql_create_index(string $table_name, string $index_name, $column);
 
+	/**
+	 * Rename index
+	 *
+	 * @param string $table_name     Table to modify
+	 * @param string $index_name_old Name of the index to rename
+	 * @param string $index_name_new New name of the index being renamed
+	 *
+	 * @return bool|string[]    True if the statements have been executed
+	 */
+	public function sql_rename_index(string $table_name, string $index_name_old, string $index_name_new);
+
 	/**
 	 * Drop Index
 	 *
@@ -215,4 +226,41 @@ public function sql_create_primary_key(string $table_name, $column);
 	 * @return void
 	 */
 	public function sql_truncate_table(string $table_name): void;
+
+	/**
+	 * Gets current Doctrine DBAL connection
+	 *
+	 * @return \Doctrine\DBAL\Connection
+	 */
+	public function get_connection(): \Doctrine\DBAL\Connection;
+
+	/**
+	 * Adds prefix to a string if needed
+	 *
+	 * @param string	$name		Table name with tables prefix
+	 * @param string	$prefix		Prefix to add
+	 *
+	 * @return string	Prefixed name
+	 */
+	public static function add_prefix(string $name, string $prefix): string;
+
+	/**
+	 * Removes prefix from string if exists. If prefix is empty,
+	 * the first part of the string ending with underscore will be removed.
+	 *
+	 * @param string	$name		String to remove the prefix from
+	 * @param string	$prefix		Prefix to remove
+	 *
+	 * @return string	Prefixless string
+	 */
+	public static function remove_prefix(string $name, string $prefix = ''): string;
+
+	/**
+	 * Sets table prefix
+	 *
+	 * @param string	$table_prefix	String to test vs prefix
+	 *
+	 * @return void
+	 */
+	public function set_table_prefix(string $table_prefix): void;
 }
diff --git a/phpBB/phpbb/debug/error_handler.php b/phpBB/phpbb/debug/error_handler.php
index f0a1efa3e36..159d0d36b14 100644
--- a/phpBB/phpbb/debug/error_handler.php
+++ b/phpBB/phpbb/debug/error_handler.php
@@ -24,7 +24,7 @@ class error_handler extends ErrorHandler
 	/**
 	 * @psalm-suppress MethodSignatureMismatch
 	 */
-	public function __construct(BufferingLogger $bootstrappingLogger = null, private readonly bool $debug = false) // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+	public function __construct(BufferingLogger|null $bootstrappingLogger = null, private readonly bool $debug = false) // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
 	{
 		parent::__construct($bootstrappingLogger, $debug);
 	}
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index 46e7edffd28..6a1ad68e922 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -13,11 +13,11 @@
 
 namespace phpbb\di;
 
-use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\LazyServiceDumper;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
@@ -458,6 +458,7 @@ protected function load_extensions()
 			}
 
 			$extensions = $ext_container->get('ext.manager')->all_enabled();
+			$resources = [];
 
 			// Load each extension found
 			$autoloaders = '<?php
@@ -480,6 +481,11 @@ protected function load_extensions()
 
 				$this->container_extensions[] = new $extension_class($ext_name, $path);
 
+				if (is_dir($path))
+				{
+					$resources[] = new \Symfony\Component\Config\Resource\DirectoryResource($path);
+				}
+
 				// Load extension autoloader
 				$filename = $path . 'vendor/autoload.php';
 				if (file_exists($filename))
@@ -489,7 +495,7 @@ protected function load_extensions()
 			}
 
 			$configCache = new ConfigCache($this->get_autoload_filename(), false);
-			$configCache->write($autoloaders);
+			$configCache->write($autoloaders, $resources);
 
 			require($this->get_autoload_filename());
 		}
@@ -511,7 +517,7 @@ protected function dump_container($cache)
 		try
 		{
 			$dumper = new PhpDumper($this->container);
-			$proxy_dumper = new ProxyDumper();
+			$proxy_dumper = new LazyServiceDumper();
 			$dumper->setProxyDumper($proxy_dumper);
 
 			$cached_container_dump = $dumper->dump(array(
@@ -536,7 +542,6 @@ protected function dump_container($cache)
 	protected function create_container(array $extensions)
 	{
 		$container = new ContainerBuilder(new ParameterBag($this->get_core_parameters()));
-		$container->setProxyInstantiator(new proxy_instantiator($this->get_cache_dir()));
 
 		$extensions_alias = array();
 
@@ -573,7 +578,7 @@ protected function inject_dbal_driver()
 		}
 
 		$config_data = $this->config_php_file->get_all();
-		if (!empty($config_data))
+		if (!empty($config_data) && !empty($config_data['dbms']))
 		{
 			if ($this->dbal_connection === null)
 			{
@@ -592,6 +597,10 @@ protected function inject_dbal_driver()
 			}
 			$this->container->set('dbal.conn.driver', $this->dbal_connection);
 		}
+		else
+		{
+			return;
+		}
 	}
 
 	/**
diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php
index 6d68a5170a0..99b34b2ca50 100644
--- a/phpBB/phpbb/di/extension/container_configuration.php
+++ b/phpBB/phpbb/di/extension/container_configuration.php
@@ -24,7 +24,7 @@ class container_configuration implements ConfigurationInterface
 	 *
 	 * @return TreeBuilder The tree builder
 	 */
-	public function getConfigTreeBuilder()
+	public function getConfigTreeBuilder(): TreeBuilder
 	{
 		$treeBuilder = new TreeBuilder('core');
 		$rootNode = $treeBuilder->getRootNode();
diff --git a/phpBB/phpbb/di/proxy_instantiator.php b/phpBB/phpbb/di/proxy_instantiator.php
deleted file mode 100644
index 70295a3dece..00000000000
--- a/phpBB/phpbb/di/proxy_instantiator.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-namespace phpbb\di;
-
-use ProxyManager\Configuration;
-use ProxyManager\Factory\LazyLoadingValueHolderFactory;
-use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\InstantiatorInterface;
-
-/**
- * Runtime lazy loading proxy generator extended for allowing use while using
- * open_basedir restrictions
- *
- * Original author: Marco Pivetta <ocramius@gmail.com>
- */
-class proxy_instantiator implements InstantiatorInterface
-{
-	/**
-	 * @var LazyLoadingValueHolderFactory
-	 */
-	private $factory;
-
-	/**
-	 * proxy_instantiator constructor
-	 * @param string $cache_dir Cache dir for fall back when using open_basedir
-	 */
-	public function __construct($cache_dir)
-	{
-		$config = new Configuration();
-
-		// Prevent trying to write to system temp dir in case of open_basedir
-		// restrictions being in effect
-		$tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : '';
-		if (empty($tmp_dir) || !@file_exists($tmp_dir) || !@is_writable($tmp_dir))
-		{
-			$config->setProxiesTargetDir($cache_dir);
-		}
-		$config->setGeneratorStrategy(new EvaluatingGeneratorStrategy());
-
-		$this->factory = new LazyLoadingValueHolderFactory($config);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator)
-	{
-		return $this->factory->createProxy(
-			$definition->getClass(),
-			function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($realInstantiator) {
-				$wrappedInstance = call_user_func($realInstantiator);
-
-				$proxy->setProxyInitializer(null);
-
-				return true;
-			}
-		);
-	}
-}
diff --git a/phpBB/phpbb/event/dispatcher.php b/phpBB/phpbb/event/dispatcher.php
index 7b85edf6008..472b1dff96a 100644
--- a/phpBB/phpbb/event/dispatcher.php
+++ b/phpBB/phpbb/event/dispatcher.php
@@ -52,7 +52,7 @@ public function trigger_event($eventName, $data = [])
 	/**
 	 * {@inheritdoc}
 	 */
-	public function dispatch(object $event, string $eventName = null) : object
+	public function dispatch(object $event, string|null $eventName = null) : object
 	{
 		if ($this->disabled)
 		{
diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php
index 9de9d94bd6d..953bc5b5ecf 100644
--- a/phpBB/phpbb/event/kernel_exception_subscriber.php
+++ b/phpBB/phpbb/event/kernel_exception_subscriber.php
@@ -90,12 +90,15 @@ public function on_kernel_exception(ExceptionEvent $event)
 		}
 		else if (!$this->debug && $exception instanceof NotFoundHttpException)
 		{
-			// Do not update user session page if it does not exist
-			$this->user->update_session_page = false;
-
 			$message = $this->language->lang('PAGE_NOT_FOUND');
 		}
 
+		// Do not update user session page if it does not exist
+		if ($exception instanceof NotFoundHttpException)
+		{
+			$this->user->update_session_page = false;
+		}
+
 		// Show <strong> text in bold
 		$message = preg_replace('#&lt;(/?strong)&gt;#i', '<$1>', $message);
 
diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php
index 04e5f91ca27..d89ac512f91 100644
--- a/phpBB/phpbb/event/md_exporter.php
+++ b/phpBB/phpbb/event/md_exporter.php
@@ -169,7 +169,7 @@ public function crawl_eventsmd($md_file, $filter)
 
 			list($file_details, $details) = explode("\n* Since: ", $details, 2);
 
-			$changed_versions = array();
+			$changed_versions = [];
 			if (strpos($details, "\n* Changed: ") !== false)
 			{
 				list($since, $details) = explode("\n* Changed: ", $details, 2);
@@ -184,7 +184,11 @@ public function crawl_eventsmd($md_file, $filter)
 			else
 			{
 				list($since, $description) = explode("\n* Purpose: ", $details, 2);
-				$changed_versions = array();
+			}
+
+			if (str_contains($since, "\n* Deprecated: "))
+			{
+				list($since, $deprecated) = explode("\n* Deprecated: ", $since, 2);
 			}
 
 			$files = $this->validate_file_list($file_details);
@@ -225,6 +229,7 @@ public function crawl_eventsmd($md_file, $filter)
 				'event'			=> $this->current_event,
 				'files'			=> $files,
 				'since'			=> $since,
+				'deprecated'	=> $deprecated ?? '',
 				'changed'		=> $changes,
 				'description'	=> $description,
 			);
@@ -451,7 +456,7 @@ public function validate_since($since)
 	{
 		if (!$this->validate_version($since))
 		{
-			throw new \LogicException("Invalid since information found for event '{$this->current_event}'");
+			throw new \LogicException("Invalid since information found for event '{$this->current_event}': {$since}");
 		}
 
 		return $since;
diff --git a/phpBB/phpbb/event/recursive_event_filter_iterator.php b/phpBB/phpbb/event/recursive_event_filter_iterator.php
index f671c474d96..c8734cd6de4 100644
--- a/phpBB/phpbb/event/recursive_event_filter_iterator.php
+++ b/phpBB/phpbb/event/recursive_event_filter_iterator.php
@@ -39,7 +39,7 @@ public function __construct(\RecursiveIterator $iterator, $root_path)
 	*
 	* @return recursive_event_filter_iterator
 	*/
-	public function getChildren(): ?\RecursiveFilterIterator
+	public function getChildren(): \RecursiveFilterIterator|null
 	{
 		$inner_iterator = $this->getInnerIterator();
 		assert($inner_iterator instanceof \RecursiveIterator);
diff --git a/phpBB/phpbb/exception/http_exception.php b/phpBB/phpbb/exception/http_exception.php
index f22c90128ef..f92606cc7ce 100644
--- a/phpBB/phpbb/exception/http_exception.php
+++ b/phpBB/phpbb/exception/http_exception.php
@@ -44,7 +44,7 @@ class http_exception extends runtime_exception implements HttpExceptionInterface
 	 * @param array			$headers		Additional headers to set in the response.
 	 * @param integer		$code			The Exception code.
 	 */
-	public function __construct($status_code, $message = "", array $parameters = array(), \Exception $previous = null, array $headers = array(), $code = 0)
+	public function __construct($status_code, $message = "", array $parameters = array(), \Exception|null $previous = null, array $headers = array(), $code = 0)
 	{
 		$this->status_code = $status_code;
 		$this->headers = $headers;
diff --git a/phpBB/phpbb/exception/runtime_exception.php b/phpBB/phpbb/exception/runtime_exception.php
index ccf0d84f32f..632e26dec4c 100644
--- a/phpBB/phpbb/exception/runtime_exception.php
+++ b/phpBB/phpbb/exception/runtime_exception.php
@@ -35,7 +35,7 @@ class runtime_exception extends \RuntimeException implements exception_interface
 	 * @param \Exception|null	$previous	The previous runtime_exception used for the runtime_exception chaining.
 	 * @param integer		$code		The Exception code.
 	 */
-	public function __construct($message = "", array $parameters = array(), \Exception $previous = null, $code = 0)
+	public function __construct($message = "", array $parameters = array(), \Exception|null $previous = null, $code = 0)
 	{
 		$this->parameters = $parameters;
 
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php
index adb6d884d1d..29b7cc213dd 100644
--- a/phpBB/phpbb/extension/manager.php
+++ b/phpBB/phpbb/extension/manager.php
@@ -47,7 +47,7 @@ class manager
 	* @param \phpbb\cache\service|null $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(ContainerInterface $container, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, finder_factory $finder_factory, $extension_table, $phpbb_root_path, \phpbb\cache\service $cache = null, $cache_name = '_ext')
+	public function __construct(ContainerInterface $container, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, finder_factory $finder_factory, $extension_table, $phpbb_root_path, \phpbb\cache\service|null $cache = null, $cache_name = '_ext')
 	{
 		$this->cache = $cache;
 		$this->cache_name = $cache_name;
@@ -258,9 +258,7 @@ public function enable_step($name)
 	*/
 	public function enable($name)
 	{
-		// @codingStandardsIgnoreStart
 		while ($this->enable_step($name));
-		// @codingStandardsIgnoreEnd
 	}
 
 	/**
@@ -306,9 +304,7 @@ public function disable_step($name)
 	*/
 	public function disable($name)
 	{
-		// @codingStandardsIgnoreStart
 		while ($this->disable_step($name));
-		// @codingStandardsIgnoreEnd
 	}
 
 	/**
@@ -361,9 +357,7 @@ public function purge_step($name)
 	*/
 	public function purge($name)
 	{
-		// @codingStandardsIgnoreStart
 		while ($this->purge_step($name));
-		// @codingStandardsIgnoreEnd
 	}
 
 	/**
diff --git a/phpBB/phpbb/feed/controller/feed.php b/phpBB/phpbb/feed/controller/feed.php
index a7eb61ba6e3..9df56bba0c1 100644
--- a/phpBB/phpbb/feed/controller/feed.php
+++ b/phpBB/phpbb/feed/controller/feed.php
@@ -134,6 +134,8 @@ public function __construct(Environment $twig, symfony_request $request, control
 	 */
 	public function forums()
 	{
+		$this->check_enabled();
+
 		if (!$this->config['feed_overall_forums'])
 		{
 			$this->send_unavailable();
@@ -151,6 +153,8 @@ public function forums()
 	 */
 	public function news()
 	{
+		$this->check_enabled();
+
 		// Get at least one news forum
 		$sql = 'SELECT forum_id
 					FROM ' . FORUMS_TABLE . '
@@ -176,6 +180,8 @@ public function news()
 	 */
 	public function topics()
 	{
+		$this->check_enabled();
+
 		if (!$this->config['feed_topics_new'])
 		{
 			$this->send_unavailable();
@@ -193,6 +199,8 @@ public function topics()
 	 */
 	public function topics_new()
 	{
+		$this->check_enabled();
+
 		return $this->topics();
 	}
 
@@ -205,6 +213,8 @@ public function topics_new()
 	 */
 	public function topics_active()
 	{
+		$this->check_enabled();
+
 		if (!$this->config['feed_topics_active'])
 		{
 			$this->send_unavailable();
@@ -224,6 +234,8 @@ public function topics_active()
 	 */
 	public function forum($forum_id)
 	{
+		$this->check_enabled();
+
 		if (!$this->config['feed_forum'])
 		{
 			$this->send_unavailable();
@@ -243,6 +255,8 @@ public function forum($forum_id)
 	 */
 	public function topic($topic_id)
 	{
+		$this->check_enabled();
+
 		if (!$this->config['feed_topic'])
 		{
 			$this->send_unavailable();
@@ -260,6 +274,8 @@ public function topic($topic_id)
 	 */
 	public function overall()
 	{
+		$this->check_enabled();
+
 		if (!$this->config['feed_overall'])
 		{
 			$this->send_unavailable();
@@ -407,6 +423,22 @@ protected function send_feed_do(feed_interface $feed)
 		return $response;
 	}
 
+	/**
+	 * Check if feeds are enabled in the configuration.
+	 *
+	 * @throws http_exception If feeds are disabled.
+	 *
+	 * @return void
+	 */
+	protected function check_enabled()
+	{
+		// Feeds are disabled, no need to continue
+		if (!$this->config['feed_enable'])
+		{
+			throw new http_exception(404, 'NO_FEED_ENABLED');
+		}
+	}
+
 	/**
 	 * Throw and exception saying that the feed isn't available
 	 *
diff --git a/phpBB/phpbb/feed/event/http_auth_subscriber.php b/phpBB/phpbb/feed/event/http_auth_subscriber.php
new file mode 100644
index 00000000000..901164814c3
--- /dev/null
+++ b/phpBB/phpbb/feed/event/http_auth_subscriber.php
@@ -0,0 +1,211 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\feed\event;
+
+use phpbb\auth\auth;
+use phpbb\config\config;
+use phpbb\language\language;
+use phpbb\request\request_interface;
+use phpbb\user;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Event subscriber for HTTP authentication on feed routes
+ */
+class http_auth_subscriber implements EventSubscriberInterface
+{
+	/** @var auth */
+	protected $auth;
+
+	/** @var config */
+	protected $config;
+
+	/** @var language */
+	protected $language;
+
+	/** @var request_interface */
+	protected $request;
+
+	/** @var user */
+	protected $user;
+
+	/**
+	 * Constructor
+	 *
+	 * @param auth				$auth		Auth object
+	 * @param config			$config		Config object
+	 * @param language	$language	Language object
+	 * @param request_interface	$request	Request object
+	 * @param user				$user		User object
+	 */
+	public function __construct(auth $auth, config $config, language $language, request_interface $request, user $user)
+	{
+		$this->auth = $auth;
+		$this->config = $config;
+		$this->language = $language;
+		$this->request = $request;
+		$this->user = $user;
+	}
+
+	/**
+	 * Handle HTTP authentication for feed routes
+	 *
+	 * @param RequestEvent $event
+	 * @return void
+	 */
+	public function on_kernel_request(RequestEvent $event)
+	{
+		// Check if HTTP authentication is enabled
+		if (!$this->config['feed_http_auth'])
+		{
+			return;
+		}
+
+		$request = $event->getRequest();
+		$route = $request->attributes->get('_route');
+
+		// Only apply to feed routes
+		if (strpos($route, 'phpbb_feed_') !== 0)
+		{
+			return;
+		}
+
+		// Only allow HTTP authentication in secure context (HTTPS)
+		if (!$request->isSecure())
+		{
+			return;
+		}
+
+		// User is already logged in, no need to authenticate
+		if (!empty($this->user->data['is_registered']))
+		{
+			return;
+		}
+
+		// Get HTTP authentication credentials
+		[$username, $password] = $this->get_credentials();
+
+		// If no credentials provided, send authentication challenge
+		if ($username === null || $password === null)
+		{
+			$this->send_auth_challenge($event);
+			return;
+		}
+
+		// Attempt to login with the provided credentials
+		$auth_result = $this->auth->login($username, $password, false, true, false);
+
+		if ($auth_result['status'] == LOGIN_SUCCESS)
+		{
+			// Reload ACL for the newly logged-in user
+			$this->auth->acl($this->user->data);
+			return;
+		}
+		else if ($auth_result['status'] == LOGIN_ERROR_ATTEMPTS)
+		{
+			// Too many login attempts
+			$response = new Response($this->language->lang('LOGIN_ERROR_ATTEMPTS'), Response::HTTP_UNAUTHORIZED);
+			$event->setResponse($response);
+			return;
+		}
+
+		// Authentication failed, send challenge
+		$this->send_auth_challenge($event);
+	}
+
+	/**
+	 * Retrieve HTTP authentication credentials from server variables
+	 *
+	 * @return array [username, password] Array containing the username and password, or null if not found
+	 */
+	protected function get_credentials(): array
+	{
+		$username_keys = [
+			'PHP_AUTH_USER',
+			'Authorization',
+			'REMOTE_USER',
+			'REDIRECT_REMOTE_USER',
+			'HTTP_AUTHORIZATION',
+			'REDIRECT_HTTP_AUTHORIZATION',
+			'REMOTE_AUTHORIZATION',
+			'REDIRECT_REMOTE_AUTHORIZATION',
+			'AUTH_USER',
+		];
+
+		$password_keys = [
+			'PHP_AUTH_PW',
+			'REMOTE_PASSWORD',
+			'AUTH_PASSWORD',
+		];
+
+		$username = null;
+		foreach ($username_keys as $key)
+		{
+			if ($this->request->is_set($key, request_interface::SERVER))
+			{
+				$username = htmlspecialchars_decode($this->request->server($key));
+				break;
+			}
+		}
+
+		$password = null;
+		foreach ($password_keys as $key)
+		{
+			if ($this->request->is_set($key, request_interface::SERVER))
+			{
+				$password =  htmlspecialchars_decode($this->request->server($key));
+				break;
+			}
+		}
+
+		// Decode Basic authentication header if needed
+		if (!is_null($username) && is_null($password) && strpos($username, 'Basic ') === 0)
+		{
+			[$username, $password] = explode(':', base64_decode(substr($username, 6)), 2);
+		}
+
+		return [$username, $password];
+	}
+
+	/**
+	 * Send HTTP authentication challenge
+	 *
+	 * @param RequestEvent $event
+	 * @return void
+	 */
+	protected function send_auth_challenge(RequestEvent $event)
+	{
+		$realm = $this->config['sitename'];
+
+		// Filter out non-ASCII characters per RFC2616
+		$realm = preg_replace('/[\x80-\xFF]/', '?', $realm);
+
+		$response = new Response($this->language->lang('NOT_AUTHORISED'), Response::HTTP_UNAUTHORIZED);
+		$response->headers->set('WWW-Authenticate', 'Basic realm="' . $realm . ' - Feed"');
+		$event->setResponse($response);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public static function getSubscribedEvents(): array
+	{
+		return [
+			KernelEvents::REQUEST => ['on_kernel_request', 5],
+		];
+	}
+}
diff --git a/phpBB/phpbb/feed/exception/no_feed_exception.php b/phpBB/phpbb/feed/exception/no_feed_exception.php
index af6357b74cb..42a9d6b81ad 100644
--- a/phpBB/phpbb/feed/exception/no_feed_exception.php
+++ b/phpBB/phpbb/feed/exception/no_feed_exception.php
@@ -15,7 +15,7 @@
 
 class no_feed_exception extends feed_unavailable_exception
 {
-	public function __construct(\Exception $previous = null, $code = 0)
+	public function __construct(\Exception|null $previous = null, $code = 0)
 	{
 		parent::__construct('NO_FEED', array(), $previous, $code);
 	}
diff --git a/phpBB/phpbb/feed/exception/no_forum_exception.php b/phpBB/phpbb/feed/exception/no_forum_exception.php
index a60832957af..0d2be5fe95c 100644
--- a/phpBB/phpbb/feed/exception/no_forum_exception.php
+++ b/phpBB/phpbb/feed/exception/no_forum_exception.php
@@ -15,7 +15,7 @@
 
 class no_forum_exception extends feed_unavailable_exception
 {
-	public function __construct($forum_id, \Exception $previous = null, $code = 0)
+	public function __construct($forum_id, \Exception|null $previous = null, $code = 0)
 	{
 		parent::__construct('NO_FORUM', array($forum_id), $previous, $code);
 	}
diff --git a/phpBB/phpbb/feed/exception/no_topic_exception.php b/phpBB/phpbb/feed/exception/no_topic_exception.php
index b961a65d1c5..a97186d8a0e 100644
--- a/phpBB/phpbb/feed/exception/no_topic_exception.php
+++ b/phpBB/phpbb/feed/exception/no_topic_exception.php
@@ -15,7 +15,7 @@
 
 class no_topic_exception extends feed_unavailable_exception
 {
-	public function __construct($topic_id, \Exception $previous = null, $code = 0)
+	public function __construct($topic_id, \Exception|null $previous = null, $code = 0)
 	{
 		parent::__construct('NO_TOPIC', array($topic_id), $previous, $code);
 	}
diff --git a/phpBB/phpbb/feed/exception/unauthorized_forum_exception.php b/phpBB/phpbb/feed/exception/unauthorized_forum_exception.php
index 4384c7b39ba..eb80dd2497a 100644
--- a/phpBB/phpbb/feed/exception/unauthorized_forum_exception.php
+++ b/phpBB/phpbb/feed/exception/unauthorized_forum_exception.php
@@ -15,7 +15,7 @@
 
 class unauthorized_forum_exception extends unauthorized_exception
 {
-	public function __construct($forum_id, \Exception $previous = null, $code = 0)
+	public function __construct($forum_id, \Exception|null $previous = null, $code = 0)
 	{
 		parent::__construct('SORRY_AUTH_READ', array($forum_id), $previous, $code);
 	}
diff --git a/phpBB/phpbb/feed/exception/unauthorized_topic_exception.php b/phpBB/phpbb/feed/exception/unauthorized_topic_exception.php
index f49f0a04760..2a758b1b65d 100644
--- a/phpBB/phpbb/feed/exception/unauthorized_topic_exception.php
+++ b/phpBB/phpbb/feed/exception/unauthorized_topic_exception.php
@@ -15,7 +15,7 @@
 
 class unauthorized_topic_exception extends unauthorized_exception
 {
-	public function __construct($topic_id, \Exception $previous = null, $code = 0)
+	public function __construct($topic_id, \Exception|null $previous = null, $code = 0)
 	{
 		parent::__construct('SORRY_AUTH_READ_TOPIC', array($topic_id), $previous, $code);
 	}
diff --git a/phpBB/phpbb/feed/helper.php b/phpBB/phpbb/feed/helper.php
index 8e50f5135f7..2275e02ee36 100644
--- a/phpBB/phpbb/feed/helper.php
+++ b/phpBB/phpbb/feed/helper.php
@@ -126,7 +126,7 @@ public function generate_content($content, $uid, $bitfield, $options, $forum_id,
 
 		$this->renderer->set_smilies_path($this->get_board_url() . '/' . $this->config['smilies_path']);
 
-		$this->renderer->configure_user($this->user, $this->config, $this->auth);
+		$this->renderer->configure_user($this->auth, $this->config, $this->user);
 
 		$content = generate_text_for_display($content, $uid, $bitfield, $options);
 
@@ -167,7 +167,7 @@ public function generate_content($content, $uid, $bitfield, $options, $forum_id,
 			$content .= implode('<br />', $post_attachments);
 
 			// Convert attachments' relative path to absolute path
-			$pattern = '#(/app.php)?/download/attachment/#';
+			$pattern = '#(/index.php)?/download/attachment/#';
 			$replacement = $this->get_board_url() . '\1/download/attachment/';
 			$content = preg_replace($pattern, $replacement, $content);
 		}
@@ -191,6 +191,6 @@ public function generate_content($content, $uid, $bitfield, $options, $forum_id,
 		// Other control characters
 		$content = preg_replace('#(?:[\x00-\x1F\x7F]+|(?:\xC2[\x80-\x9F])+)#', '', $content);
 
-		return $content;
+		return $content ?: '';
 	}
 }
diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php
index 873bccc9e89..88378d3a3a9 100644
--- a/phpBB/phpbb/file_downloader.php
+++ b/phpBB/phpbb/file_downloader.php
@@ -13,91 +13,127 @@
 
 namespace phpbb;
 
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\RequestException;
+use phpbb\exception\runtime_exception;
+
 class file_downloader
 {
+	const OK = 200;
+	const NOT_FOUND = 404;
+	const REQUEST_TIMEOUT = 408;
+
 	/** @var string Error string */
-	protected $error_string = '';
+	protected string $error_string = '';
 
 	/** @var int Error number */
-	protected $error_number = 0;
+	protected int $error_number = 0;
+
+	/**
+	 * Create new guzzle client
+	 *
+	 * @param string $host
+	 * @param int $port
+	 * @param int $timeout
+	 *
+	 * @return Client
+	 */
+	protected function create_client(string $host, int $port = 443, int $timeout = 6): Client
+	{
+		// Only set URL scheme if not specified in URL
+		$url_parts = parse_url($host);
+		if (!isset($url_parts['scheme']))
+		{
+			$host = (($port === 443) ? 'https://' : 'http://') . $host;
+		}
+
+		// Initialize Guzzle client
+		return new Client([
+			'base_uri' => $host,
+			'timeout'  => $timeout,
+			'headers' => [
+				'user-agent' => 'phpBB/' . PHPBB_VERSION,
+				'accept' => '*/*',
+			  ],
+		]);
+	}
 
 	/**
 	 * Retrieve contents from remotely stored file
 	 *
-	 * @param string	$host			File host
-	 * @param string	$directory		Directory file is in
-	 * @param string	$filename		Filename of file to retrieve
-	 * @param int		$port			Port to connect to; default: 80
-	 * @param int		$timeout		Connection timeout in seconds; default: 6
+	 * @param string    $host            File host
+	 * @param string    $directory       Directory file is in
+	 * @param string    $filename        Filename of file to retrieve
+	 * @param int       $port            Port to connect to; default: 443
+	 * @param int       $timeout         Connection timeout in seconds; default: 6
 	 *
 	 * @return false|string File data as string if file can be read and there is no
-	 *			timeout, false if there were errors or the connection timed out
+	 *         timeout, false if there were errors or the connection timed out
 	 *
-	 * @throws \phpbb\exception\runtime_exception If data can't be retrieved and no error
-	 *		message is returned
+	 * @throws runtime_exception If data can't be retrieved and no error
+	 *         message is returned
 	 */
-	public function get($host, $directory, $filename, $port = 80, $timeout = 6)
+	public function get(string $host, string $directory, string $filename, int $port = 443, int $timeout = 6): bool|string
 	{
+		try
+		{
+			// Initialize Guzzle client
+			$client = $this->create_client($host, $port, $timeout);
+		}
+		catch (\RuntimeException $exception)
+		{
+			throw new runtime_exception('HTTP_HANDLER_NOT_FOUND');
+		}
+
 		// Set default values for error variables
 		$this->error_number = 0;
 		$this->error_string = '';
 
-		if (function_exists('fsockopen') &&
-			$socket = @fsockopen(($port == 443 ? 'ssl://' : '') . $host, $port, $this->error_number, $this->error_string, $timeout)
-		)
+		try
 		{
-			@fputs($socket, "GET $directory/$filename HTTP/1.0\r\n");
-			@fputs($socket, "HOST: $host\r\n");
-			@fputs($socket, "Connection: close\r\n\r\n");
-
-			$timer_stop = time() + $timeout;
-			stream_set_timeout($socket, $timeout);
+			$response = $client->request('GET', "$directory/$filename");
 
-			$file_info = '';
-			$get_info = false;
-
-			while (!@feof($socket))
+			// Check if the response status code is 200 (OK)
+			if ($response->getStatusCode() == self::OK)
 			{
-				if ($get_info)
-				{
-					$file_info .= @fread($socket, 1024);
-				}
-				else
-				{
-					$line = @fgets($socket, 1024);
-					if ($line == "\r\n")
-					{
-						$get_info = true;
-					}
-					else if (stripos($line, '404 not found') !== false)
-					{
-						throw new \phpbb\exception\runtime_exception('FILE_NOT_FOUND', array($filename));
-					}
-				}
-
-				$stream_meta_data = stream_get_meta_data($socket);
-
-				if ($stream_meta_data['timed_out'] || time() >= $timer_stop)
-				{
-					throw new \phpbb\exception\runtime_exception('FSOCK_TIMEOUT');
-				}
+				return $response->getBody()->getContents();
+			}
+			else
+			{
+				$this->error_number = $response->getStatusCode();
+				throw new runtime_exception('FILE_NOT_FOUND', [$filename]);
 			}
-			@fclose($socket);
 		}
-		else
+		catch (RequestException $exception)
 		{
-			if ($this->error_string)
+			if ($exception->hasResponse())
 			{
-				$this->error_string = utf8_convert_message($this->error_string);
-				return false;
+				$this->error_number = $exception->getResponse()->getStatusCode();
+
+				if ($this->error_number == self::NOT_FOUND)
+				{
+					throw new runtime_exception('FILE_NOT_FOUND', [$filename]);
+				}
 			}
 			else
 			{
-				throw new \phpbb\exception\runtime_exception('FSOCK_DISABLED');
+				$this->error_number = self::REQUEST_TIMEOUT;
+				throw new runtime_exception('FSOCK_TIMEOUT');
 			}
-		}
 
-		return $file_info;
+			$this->error_string = utf8_convert_message($exception->getMessage());
+			return false;
+		}
+		catch (runtime_exception $exception)
+		{
+			// Rethrow runtime_exceptions, only handle unknown cases below
+			throw $exception;
+		}
+		catch (\Throwable $exception)
+		{
+			$this->error_string = utf8_convert_message($exception->getMessage());
+			throw new runtime_exception('FSOCK_DISABLED');
+		}
 	}
 
 	/**
@@ -105,7 +141,7 @@ public function get($host, $directory, $filename, $port = 80, $timeout = 6)
 	 *
 	 * @return string Error string
 	 */
-	public function get_error_string()
+	public function get_error_string(): string
 	{
 		return $this->error_string;
 	}
@@ -115,7 +151,7 @@ public function get_error_string()
 	 *
 	 * @return int Error number
 	 */
-	public function get_error_number()
+	public function get_error_number(): int
 	{
 		return $this->error_number;
 	}
diff --git a/phpBB/phpbb/files/filespec.php b/phpBB/phpbb/files/filespec.php
index 6e4c224e392..5157f673ed1 100644
--- a/phpBB/phpbb/files/filespec.php
+++ b/phpBB/phpbb/files/filespec.php
@@ -103,7 +103,7 @@ class filespec
 	 * @param \phpbb\mimetype\guesser|null	$mimetype_guesser Mime type guesser
 	 * @param \phpbb\plupload\plupload|null	$plupload Plupload
 	 */
-	public function __construct(\phpbb\filesystem\filesystem_interface $phpbb_filesystem, language $language, \bantu\IniGetWrapper\IniGetWrapper $php_ini, \FastImageSize\FastImageSize $imagesize, $phpbb_root_path, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
+	public function __construct(\phpbb\filesystem\filesystem_interface $phpbb_filesystem, language $language, \bantu\IniGetWrapper\IniGetWrapper $php_ini, \FastImageSize\FastImageSize $imagesize, $phpbb_root_path, \phpbb\mimetype\guesser|null $mimetype_guesser = null, \phpbb\plupload\plupload|null $plupload = null)
 	{
 		$this->filesystem = $phpbb_filesystem;
 		$this->language = $language;
@@ -355,7 +355,7 @@ public function get_mimetype($filename)
 	 */
 	public function get_filesize($filename)
 	{
-		return @filesize($filename);
+		return @filesize($filename) ?: 0;
 	}
 
 
@@ -398,7 +398,7 @@ public function check_content($disallowed_content)
 	 * @param bool $overwrite If set to true, an already existing file will be overwritten
 	 * @param bool $skip_image_check If set to true, the check for the file to be a valid image is skipped
 	 * @param string|bool $chmod Permission mask for chmodding the file after a successful move.
-	 *				The mode entered here reflects the mode defined by {@link phpbb_chmod()}
+	 *				The mode entered here reflects the mode defined by {@link \phpbb\filesystem\filesystem::phpbb_chmod()}
 	 *
 	 * @return bool True if file was moved, false if not
 	 * @access public
diff --git a/phpBB/phpbb/files/filespec_storage.php b/phpBB/phpbb/files/filespec_storage.php
index e7759357562..4a2fd43dd42 100644
--- a/phpBB/phpbb/files/filespec_storage.php
+++ b/phpBB/phpbb/files/filespec_storage.php
@@ -86,7 +86,7 @@ class filespec_storage
 	 * @param \phpbb\mimetype\guesser|null	$mimetype_guesser Mime type guesser
 	 * @param \phpbb\plupload\plupload|null	$plupload Plupload
 	 */
-	public function __construct(language $language, \FastImageSize\FastImageSize $imagesize, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
+	public function __construct(language $language, \FastImageSize\FastImageSize $imagesize, \phpbb\mimetype\guesser|null $mimetype_guesser = null, \phpbb\plupload\plupload|null $plupload = null)
 	{
 		$this->language = $language;
 		$this->imagesize = $imagesize;
@@ -339,7 +339,7 @@ public function get_mimetype($filename)
 	 */
 	public function get_filesize($filename)
 	{
-		return @filesize($filename);
+		return @filesize($filename) ?: 0;
 	}
 
 
@@ -446,14 +446,10 @@ public function move_file($storage, $overwrite = false, $skip_image_check = fals
 		{
 			$fp = fopen($this->filename, 'rb');
 
-			$storage->write_stream($this->destination_file, $fp);
-
-			if (is_resource($fp))
-			{
-				fclose($fp);
-			}
+			$storage->write($this->destination_file, $fp);
+			$this->file_moved = true;
 		}
-		catch (\phpbb\storage\exception\exception $e)
+		catch (\phpbb\storage\exception\storage_exception $e)
 		{
 			$this->error[] = $this->language->lang($this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR', $this->destination_file);
 			$this->file_moved = false;
diff --git a/phpBB/phpbb/filesystem.php b/phpBB/phpbb/filesystem.php
deleted file mode 100644
index 6ac94593313..00000000000
--- a/phpBB/phpbb/filesystem.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb;
-
-/**
- * @deprecated	3.2.0-dev	(To be removed 4.0.0) use \phpbb\filesystem\filesystem instead
- */
-class filesystem extends \phpbb\filesystem\filesystem
-{
-}
diff --git a/phpBB/phpbb/filesystem/exception/filesystem_exception.php b/phpBB/phpbb/filesystem/exception/filesystem_exception.php
index 55ea3625a5a..6d533705a25 100644
--- a/phpBB/phpbb/filesystem/exception/filesystem_exception.php
+++ b/phpBB/phpbb/filesystem/exception/filesystem_exception.php
@@ -26,7 +26,7 @@ class filesystem_exception extends runtime_exception
 	 * @param \Exception|null	$previous	The previous runtime_exception used for the runtime_exception chaining.
 	 * @param integer			$code		The Exception code.
 	 */
-	public function __construct($message = '', $filename = '', $parameters = array(), \Exception $previous = null, $code = 0)
+	public function __construct($message = '', $filename = '', $parameters = array(), \Exception|null $previous = null, $code = 0)
 	{
 		parent::__construct($message, array_merge(array('filename' => $filename), $parameters), $previous, $code);
 	}
diff --git a/phpBB/phpbb/filesystem/filesystem.php b/phpBB/phpbb/filesystem/filesystem.php
index 6324c5c209d..a84c458bb94 100644
--- a/phpBB/phpbb/filesystem/filesystem.php
+++ b/phpBB/phpbb/filesystem/filesystem.php
@@ -293,7 +293,7 @@ public function make_path_relative($end_path, $start_path)
 	/**
 	 * {@inheritdoc}
 	 */
-	public function mirror($origin_dir, $target_dir, \Traversable $iterator = null, $options = array())
+	public function mirror($origin_dir, $target_dir, \Traversable|null $iterator = null, $options = array())
 	{
 		try
 		{
diff --git a/phpBB/phpbb/filesystem/filesystem_interface.php b/phpBB/phpbb/filesystem/filesystem_interface.php
index 0e7967dcfbd..11c4141d0d3 100644
--- a/phpBB/phpbb/filesystem/filesystem_interface.php
+++ b/phpBB/phpbb/filesystem/filesystem_interface.php
@@ -190,7 +190,7 @@ public function make_path_relative($end_path, $start_path);
 	 * 															The filename which triggered the error can be
 	 * 															retrieved by filesystem_exception::get_filename()
 	 */
-	public function mirror($origin_dir, $target_dir, \Traversable $iterator = null, $options = array());
+	public function mirror($origin_dir, $target_dir, \Traversable|null $iterator = null, $options = array());
 
 	/**
 	 * Creates a directory recursively.
diff --git a/phpBB/phpbb/filesystem/helper.php b/phpBB/phpbb/filesystem/helper.php
index d7efc3d19b8..a3836c381b7 100644
--- a/phpBB/phpbb/filesystem/helper.php
+++ b/phpBB/phpbb/filesystem/helper.php
@@ -303,7 +303,7 @@ public static function resolve_path($path, $prefix = '', $absolute = false, $ret
 					{
 						if (defined('PHP_WINDOWS_VERSION_MAJOR'))
 						{
-							$prefix = $link[0] . ':';
+							$prefix = substr($link, 0, 1) . ':';
 							$link = substr($link, 2);
 						}
 						else
diff --git a/phpBB/phpbb/filesystem/temp.php b/phpBB/phpbb/filesystem/temp.php
index 649221d8022..4c8a71d6008 100644
--- a/phpBB/phpbb/filesystem/temp.php
+++ b/phpBB/phpbb/filesystem/temp.php
@@ -13,8 +13,20 @@
 
 namespace phpbb\filesystem;
 
+use phpbb\filesystem\exception\filesystem_exception;
+
 class temp
 {
+	/**
+	 * @var filesystem
+	 */
+	protected $filesystem;
+
+	/**
+	 * @var string
+	 */
+	protected $cache_temp_dir;
+
 	/**
 	* @var string	Temporary directory path
 	*/
@@ -23,23 +35,10 @@ class temp
 	/**
 	 * Constructor
 	 */
-	public function __construct($filesystem, $cache_temp_dir)
+	public function __construct(filesystem $filesystem, string $cache_temp_dir)
 	{
-		$tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : '';
-
-		// Prevent trying to write to system temp dir in case of open_basedir
-		// restrictions being in effect
-		if (empty($tmp_dir) || !@file_exists($tmp_dir) || !@is_writable($tmp_dir))
-		{
-			$tmp_dir = $cache_temp_dir;
-
-			if (!is_dir($tmp_dir))
-			{
-				$filesystem->mkdir($tmp_dir, 0777);
-			}
-		}
-
-		$this->temp_dir = helper::realpath($tmp_dir);
+		$this->filesystem = $filesystem;
+		$this->cache_temp_dir = $cache_temp_dir;
 	}
 
 	/**
@@ -49,6 +48,30 @@ public function __construct($filesystem, $cache_temp_dir)
 	 */
 	public function get_dir()
 	{
+		if ($this->temp_dir === null)
+		{
+			$tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : '';
+
+			// Prevent trying to write to system temp dir in case of open_basedir
+			// restrictions being in effect
+			if (empty($tmp_dir) || !@file_exists($tmp_dir) || !@is_writable($tmp_dir))
+			{
+				$tmp_dir = $this->cache_temp_dir;
+
+				if (!is_dir($tmp_dir))
+				{
+					$this->filesystem->mkdir($tmp_dir, 0777);
+				}
+			}
+
+			$this->temp_dir = helper::realpath($tmp_dir);
+
+			if ($this->temp_dir === false)
+			{
+				throw new filesystem_exception('FILESYSTEM_CANNOT_CREATE_DIRECTORY', $tmp_dir);
+			}
+		}
+
 		return $this->temp_dir;
 	}
 }
diff --git a/phpBB/phpbb/finder/factory.php b/phpBB/phpbb/finder/factory.php
index 0ce087b061f..81b60bcd8bd 100644
--- a/phpBB/phpbb/finder/factory.php
+++ b/phpBB/phpbb/finder/factory.php
@@ -33,7 +33,7 @@ class factory
 	* @param string $phpbb_root_path	Path to the phpbb root directory
 	* @param string $php_ext			php file extension
 	*/
-	public function __construct(?service $cache, bool $use_cache, string $phpbb_root_path, string $php_ext)
+	public function __construct(service|null $cache, bool $use_cache, string $phpbb_root_path, string $php_ext)
 	{
 		$this->cache = $cache;
 		$this->use_cache = $use_cache;
diff --git a/phpBB/phpbb/finder/finder.php b/phpBB/phpbb/finder/finder.php
index 7bad84e36d0..1bb197a37c8 100644
--- a/phpBB/phpbb/finder/finder.php
+++ b/phpBB/phpbb/finder/finder.php
@@ -58,7 +58,7 @@ class finder
 	* @param string $cache_name The name of the cache variable, defaults to
 	*							_ext_finder
 	*/
-	public function __construct(?service $cache, bool $use_cache, string $phpbb_root_path, string $php_ext, string $cache_name = '_ext_finder')
+	public function __construct(service|null $cache, bool $use_cache, string $phpbb_root_path, string $php_ext, string $cache_name = '_ext_finder')
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->cache = $cache;
diff --git a/phpBB/phpbb/form/form_helper.php b/phpBB/phpbb/form/form_helper.php
new file mode 100644
index 00000000000..d489150a11b
--- /dev/null
+++ b/phpBB/phpbb/form/form_helper.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\form;
+
+use phpbb\config\config;
+use phpbb\request\request_interface;
+use phpbb\user;
+
+class form_helper
+{
+	/** @var config */
+	protected $config;
+
+	/** @var request_interface  */
+	protected $request;
+
+	/** @var user */
+	protected $user;
+
+	/**
+	 * Constructor for form_helper
+	 *
+	 * @param config $config
+	 * @param request_interface $request
+	 * @param user $user
+	 */
+	public function __construct(config $config, request_interface $request, user $user)
+	{
+		$this->config = $config;
+		$this->request = $request;
+		$this->user = $user;
+	}
+
+	/**
+	 * Get form tokens for form
+	 *
+	 * @param string $form_name Name of form
+	 * @param int|null $now Token generation time
+	 * @param string|null $token_sid SID used for form token
+	 * @param string|null $token Generated token
+	 *
+	 * @return array Array containing form_token and creation_time of form token
+	 */
+	public function get_form_tokens(string $form_name, int|null &$now = 0, string|null &$token_sid = '', string|null &$token = ''): array
+	{
+		$now = time();
+		$token_sid = ($this->user->data['user_id'] == ANONYMOUS && !empty($this->config['form_token_sid_guests'])) ? $this->user->session_id : '';
+		$token = sha1($now . $this->user->data['user_form_salt'] . $form_name . $token_sid);
+
+		return [
+			'creation_time' => $now,
+			'form_token'	=> $token,
+		];
+	}
+
+	/**
+	 * Check form token for form
+	 *
+	 * @param string $form_name Name of form
+	 * @param int|null $timespan Lifetime of token or null if default value should be used
+	 * @return bool True if form token is valid, false if not
+	 */
+	public function check_form_tokens(string $form_name, int|null $timespan = null): bool
+	{
+		if ($timespan === null)
+		{
+			// we enforce a minimum value of half a minute here.
+			$timespan = ($this->config['form_token_lifetime'] == -1) ? -1 : max(30, $this->config['form_token_lifetime']);
+		}
+
+		if ($this->request->is_set_post('creation_time') && $this->request->is_set_post('form_token'))
+		{
+			$creation_time	= abs($this->request->variable('creation_time', 0));
+			$token = $this->request->variable('form_token', '');
+
+			$diff = time() - $creation_time;
+
+			// If creation_time and the time() now is zero we can assume it was not a human doing this (the check for if ($diff)...
+			if (defined('DEBUG_TEST') || $diff && ($diff <= $timespan || $timespan === -1))
+			{
+				$token_sid = ($this->user->data['user_id'] == ANONYMOUS && !empty($this->config['form_token_sid_guests'])) ? $this->user->session_id : '';
+				$key = sha1($creation_time . $this->user->data['user_form_salt'] . $form_name . $token_sid);
+
+				if (hash_equals($key, $token))
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/phpBB/phpbb/forum/birthday_helper.php b/phpBB/phpbb/forum/birthday_helper.php
new file mode 100644
index 00000000000..4c93f387bc1
--- /dev/null
+++ b/phpBB/phpbb/forum/birthday_helper.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\forum;
+
+use phpbb\auth\auth;
+use phpbb\config\config;
+use phpbb\db\driver\driver_interface;
+use phpbb\event\dispatcher;
+use phpbb\language\language;
+use phpbb\template\template;
+use phpbb\user;
+
+class birthday_helper
+{
+	/** @var auth */
+	protected $auth;
+
+	/** @var config */
+	protected $config;
+
+	/** @var driver_interface */
+	protected $db;
+
+	/** @var dispatcher */
+	protected $dispatcher;
+
+	/** @var language */
+	protected $language;
+
+	/** @var template */
+	protected $template;
+
+	/** @var user */
+	protected $user;
+
+	/**
+	 * Constructor
+	 *
+	 * @param auth $auth
+	 * @param config $config
+	 * @param driver_interface $db
+	 * @param dispatcher $dispatcher
+	 * @param language $language
+	 * @param template $template
+	 * @param user $user
+	 */
+	public function __construct(auth $auth, config $config, driver_interface $db, dispatcher $dispatcher, language $language, template $template, user $user)
+	{
+		$this->auth = $auth;
+		$this->config = $config;
+		$this->db = $db;
+		$this->dispatcher = $dispatcher;
+		$this->language = $language;
+		$this->template = $template;
+		$this->user = $user;
+	}
+
+	/**
+	 * Display birthdays in index page
+	 *
+	 * @return void
+	 *
+	 * @psalm-suppress InvalidArgument
+	 */
+	public function display_birthdays(): void
+	{
+		$show_birthdays = ($this->config['load_birthdays'] && $this->config['allow_birthdays'] && $this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'));
+
+		$birthdays = array();
+		if ($show_birthdays)
+		{
+			$time = $this->user->create_datetime();
+			$now = phpbb_gmgetdate($time->getTimestamp() + $time->getOffset());
+
+			// Display birthdays of 29th february on 28th february in non-leap-years
+			$leap_year_birthdays = '';
+			if ($now['mday'] == 28 && $now['mon'] == 2 && !$time->format('L'))
+			{
+				$leap_year_birthdays = " OR u.user_birthday LIKE '" . $this->db->sql_escape(sprintf('%2d-%2d-', 29, 2)) . "%'";
+			}
+
+			$sql_ary = array(
+				'SELECT' => 'u.user_id, u.username, u.user_colour, u.user_birthday',
+				'FROM' => array(
+					USERS_TABLE => 'u',
+				),
+				'LEFT_JOIN' => array(
+					array(
+						'FROM' => array(BANS_TABLE => 'b'),
+						'ON' => 'u.user_id = b.ban_userid',
+					),
+				),
+				'WHERE' => 'b.ban_id IS NULL
+			AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ")
+			AND (u.user_birthday LIKE '" . $this->db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' $leap_year_birthdays)",
+			);
+
+			/**
+			 * Event to modify the SQL query to get birthdays data
+			 *
+			 * @event core.index_modify_birthdays_sql
+			 * @var	array	now			The assoc array with the 'now' local timestamp data
+			 * @var	array	sql_ary		The SQL array to get the birthdays data
+			 * @var	object	time		The user related Datetime object
+			 * @since 3.1.7-RC1
+			 */
+			$vars = array('now', 'sql_ary', 'time');
+			extract($this->dispatcher->trigger_event('core.index_modify_birthdays_sql', compact($vars)));
+
+			$sql = $this->db->sql_build_query('SELECT', $sql_ary);
+			$result = $this->db->sql_query($sql);
+			$rows = $this->db->sql_fetchrowset($result);
+			$this->db->sql_freeresult($result);
+
+			foreach ($rows as $row)
+			{
+				$birthday_username	= get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
+				$birthday_year		= (int) substr($row['user_birthday'], -4);
+				$birthday_age		= ($birthday_year) ? max(0, $now['year'] - $birthday_year) : '';
+
+				$birthdays[] = array(
+					'USERNAME'	=> $birthday_username,
+					'AGE'		=> $birthday_age,
+				);
+			}
+
+			/**
+			 * Event to modify the birthdays list
+			 *
+			 * @event core.index_modify_birthdays_list
+			 * @var	array	birthdays		Array with the users birthdays data
+			 * @var	array	rows			Array with the birthdays SQL query result
+			 * @since 3.1.7-RC1
+			 */
+			$vars = array('birthdays', 'rows');
+			extract($this->dispatcher->trigger_event('core.index_modify_birthdays_list', compact($vars)));
+
+			$this->template->assign_block_vars_array('birthdays', $birthdays);
+		}
+
+		$this->template->assign_vars([
+			'S_DISPLAY_BIRTHDAY_LIST' => $show_birthdays,
+		]);
+	}
+}
diff --git a/phpBB/phpbb/forum/controller/index.php b/phpBB/phpbb/forum/controller/index.php
new file mode 100644
index 00000000000..a074c609fb6
--- /dev/null
+++ b/phpBB/phpbb/forum/controller/index.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\forum\controller;
+
+use phpbb\auth\auth;
+use phpbb\config\config;
+use phpbb\controller\helper as controller_helper;
+use phpbb\event\dispatcher;
+use phpbb\forum\birthday_helper;
+use phpbb\group\helper as group_helper;
+use phpbb\language\language;
+use phpbb\template\template;
+use phpbb\user;
+use Symfony\Component\HttpFoundation\Response;
+
+class index
+{
+	/** @var auth */
+	protected $auth;
+
+	/** @var birthday_helper */
+	protected $birthday_helper;
+
+	/** @var config */
+	protected $config;
+
+	/** @var controller_helper */
+	protected $controller_helper;
+
+	/** @var dispatcher */
+	protected $dispatcher;
+
+	/** @var group_helper */
+	protected $group_helper;
+
+	/** @var language */
+	protected $language;
+
+	/** @var user */
+	protected $user;
+
+	/** @var template */
+	protected $template;
+
+	/** @var string */
+	protected $phpbb_root_path;
+
+	/** @var string */
+	protected $phpEx;
+
+	/**
+	 * Constructor
+	 *
+	 * @param auth $auth
+	 * @param birthday_helper $birthday_helper
+	 * @param config $config
+	 * @param controller_helper $controller_helper
+	 * @param dispatcher $dispatcher
+	 * @param group_helper $group_helper
+	 * @param language $language
+	 * @param user $user
+	 * @param template $template
+	 * @param string $phpbb_root_path
+	 * @param string $phpEx
+	 */
+	public function __construct(auth $auth, birthday_helper $birthday_helper, config $config, controller_helper $controller_helper, dispatcher $dispatcher, group_helper $group_helper, language $language, user $user, template $template, string $phpbb_root_path, string $phpEx)
+	{
+		$this->auth = $auth;
+		$this->birthday_helper = $birthday_helper;
+		$this->config = $config;
+		$this->controller_helper = $controller_helper;
+		$this->dispatcher = $dispatcher;
+		$this->group_helper = $group_helper;
+		$this->language = $language;
+		$this->user = $user;
+		$this->template = $template;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->phpEx = $phpEx;
+	}
+
+	/**
+	 * Display the index page
+	 *
+	 * @return Response
+	 */
+	public function handle(): Response
+	{
+		if (!function_exists('display_forums'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_display.' . $this->phpEx);
+		}
+
+		if (!function_exists('get_username_string'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_content.' . $this->phpEx);
+		}
+
+		$this->language->add_lang('viewforum');
+
+		display_forums('', $this->config['load_moderators']);
+
+		// This is shown only if display_online_list is true
+		$this->group_helper->display_legend();
+
+		$this->birthday_helper->display_birthdays();
+
+		$this->template->assign_vars(array(
+			'TOTAL_POSTS'	=> $this->language->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']),
+			'TOTAL_TOPICS'	=> $this->language->lang('TOTAL_TOPICS', (int) $this->config['num_topics']),
+			'TOTAL_USERS'	=> $this->language->lang('TOTAL_USERS', (int) $this->config['num_users']),
+			'NEWEST_USER'	=> $this->language->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour'])),
+
+			'S_LOGIN_ACTION'			=> append_sid("{$this->phpbb_root_path}ucp.$this->phpEx", 'mode=login'),
+			'U_SEND_PASSWORD'			=> ($this->config['email_enable'] && $this->config['allow_password_reset']) ? $this->controller_helper->route('phpbb_ucp_forgot_password_controller') : '',
+			'S_INDEX'					=> true,
+
+			'U_CANONICAL'		=> generate_board_url() . '/',
+			'U_MARK_FORUMS'		=> ($this->user->data['is_registered'] || $this->config['load_anon_lastread']) ? $this->controller_helper->route('phpbb_index_controller', ['hash' => generate_link_hash('global'), 'mark' => 'forums', 'mark_time' => time()]) : '',
+			'U_MCP'				=> ($this->auth->acl_get('m_') || $this->auth->acl_getf_global('m_')) ? append_sid("{$this->phpbb_root_path}mcp.$this->phpEx", 'i=main&amp;mode=front') : '')
+		);
+
+		$page_title = ($this->config['board_index_text'] !== '') ? $this->config['board_index_text'] : $this->language->lang('INDEX');
+
+		/**
+		 * You can use this event to modify the page title and load data for the index
+		 *
+		 * @event core.index_modify_page_title
+		 * @var	string	page_title		Title of the index page
+		 * @since 3.1.0-a1
+		 */
+		$vars = array('page_title');
+		extract($this->dispatcher->trigger_event('core.index_modify_page_title', compact($vars)));
+
+		return $this->controller_helper->render('index_body.html', $page_title, 200, true);
+	}
+}
diff --git a/phpBB/phpbb/group/helper.php b/phpBB/phpbb/group/helper.php
index 4098846709e..5e1aaa1dc48 100644
--- a/phpBB/phpbb/group/helper.php
+++ b/phpBB/phpbb/group/helper.php
@@ -32,6 +32,9 @@ class helper
 	/** @var avatar_helper */
 	protected $avatar_helper;
 
+	/** @var driver_interface */
+	protected $db;
+
 	/** @var cache */
 	protected $cache;
 
@@ -47,6 +50,9 @@ class helper
 	/** @var path_helper */
 	protected $path_helper;
 
+	/** @var template */
+	protected $template;
+
 	/** @var user */
 	protected $user;
 
@@ -61,22 +67,26 @@ class helper
 	 *
 	 * @param auth					$auth			Authentication object
 	 * @param avatar_helper			$avatar_helper	Avatar helper object
+	 * @param driver_interface 		$db 			Database connection
 	 * @param cache					$cache			Cache service object
 	 * @param config				$config			Configuration object
 	 * @param language				$language		Language object
 	 * @param dispatcher_interface	$dispatcher		Event dispatcher object
 	 * @param path_helper			$path_helper	Path helper object
+	 * @param template 				$template 		Template service
 	 * @param user					$user			User object
 	 */
-	public function __construct(auth $auth, avatar_helper $avatar_helper, cache $cache, config $config, language $language, dispatcher_interface $dispatcher, path_helper $path_helper, user $user)
+	public function __construct(auth $auth, avatar_helper $avatar_helper, driver_interface $db, cache $cache, config $config, language $language, dispatcher_interface $dispatcher, path_helper $path_helper, template $template, user $user)
 	{
 		$this->auth = $auth;
 		$this->avatar_helper = $avatar_helper;
+		$this->db = $db;
 		$this->cache = $cache;
 		$this->config = $config;
 		$this->language = $language;
 		$this->dispatcher = $dispatcher;
 		$this->path_helper = $path_helper;
+		$this->template = $template;
 		$this->user = $user;
 
 		$this->phpbb_root_path = $path_helper->get_phpbb_root_path();
@@ -304,11 +314,9 @@ public function get_avatar($group_row, $alt = 'GROUP_AVATAR', $ignore_config = f
 	/**
 	 * Display groups legend
 	 *
-	 * @param driver_interface $db
-	 * @param template $template
 	 * @return void
 	 */
-	public function display_legend(driver_interface $db, template $template): void
+	public function display_legend(): void
 	{
 		$order_legend = $this->config['legend_sort_groupname'] ? 'group_name' : 'group_legend';
 
@@ -334,18 +342,18 @@ public function display_legend(driver_interface $db, template $template): void
 					AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $this->user->data['user_id'] . ')
 				ORDER BY g.' . $order_legend . ' ASC';
 		}
-		$result = $db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$show_group_url = $row['group_name'] != 'BOTS' && $this->auth->acl_get('u_viewprofile');
 
-			$template->assign_block_vars('LEGEND', [
+			$this->template->assign_block_vars('LEGEND', [
 				'GROUP_COLOR'		=> $row['group_colour'] ?: '',
 				'GROUP_NAME'		=> $this->get_name($row['group_name']),
 				'GROUP_URL'			=> $show_group_url ? append_sid("{$this->path_helper->get_phpbb_root_path()}memberlist.{$this->path_helper->get_php_ext()}", 'mode=group&amp;g=' . $row['group_id']) : '',
 			]);
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 	}
 }
diff --git a/phpBB/phpbb/help/controller/faq.php b/phpBB/phpbb/help/controller/faq.php
index 0f63be5b564..62a82a3efe5 100644
--- a/phpBB/phpbb/help/controller/faq.php
+++ b/phpBB/phpbb/help/controller/faq.php
@@ -146,6 +146,17 @@ public function display()
 				'HELP_FAQ_BOOKMARKS_REMOVE_QUESTION' => 'HELP_FAQ_BOOKMARKS_REMOVE_ANSWER',
 			)
 		);
+		$this->manager->add_block(
+			'HELP_FAQ_BLOCK_WEBPUSH',
+			false,
+			array(
+				'HELP_FAQ_WEBPUSH_WHAT_QUESTION'    => 'HELP_FAQ_WEBPUSH_WHAT_ANSWER',
+				'HELP_FAQ_WEBPUSH_HOW_QUESTION'     => 'HELP_FAQ_WEBPUSH_HOW_ANSWER',
+				'HELP_FAQ_WEBPUSH_SESSION_QUESTION' => 'HELP_FAQ_WEBPUSH_SESSION_ANSWER',
+				'HELP_FAQ_WEBPUSH_SUBBING_QUESTION' => 'HELP_FAQ_WEBPUSH_SUBBING_ANSWER',
+				'HELP_FAQ_WEBPUSH_GENERAL_QUESTION' => 'HELP_FAQ_WEBPUSH_GENERAL_ANSWER',
+			)
+		);
 		$this->manager->add_block(
 			'HELP_FAQ_BLOCK_ATTACHMENTS',
 			false,
diff --git a/phpBB/phpbb/install/console/command/install/config/show.php b/phpBB/phpbb/install/console/command/install/config/show.php
index 138f74e74ff..4f89087f04e 100644
--- a/phpBB/phpbb/install/console/command/install/config/show.php
+++ b/phpBB/phpbb/install/console/command/install/config/show.php
@@ -76,7 +76,7 @@ protected function configure()
 	 *
 	 * @return int 0 if everything went fine, or a non-zero exit code
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$this->iohandler_factory->set_environment('cli');
 
@@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		try
 		{
-			$config = Yaml::parse(file_get_contents($config_file), true);
+			$config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
 		}
 		catch (ParseException $e)
 		{
diff --git a/phpBB/phpbb/install/console/command/install/config/validate.php b/phpBB/phpbb/install/console/command/install/config/validate.php
index 2682756c13f..2521fce7516 100644
--- a/phpBB/phpbb/install/console/command/install/config/validate.php
+++ b/phpBB/phpbb/install/console/command/install/config/validate.php
@@ -76,7 +76,7 @@ protected function configure()
 	 *
 	 * @return int 0 if everything went fine, or a non-zero exit code
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$this->iohandler_factory->set_environment('cli');
 
@@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		try
 		{
-			$config = Yaml::parse(file_get_contents($config_file), true);
+			$config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
 		}
 		catch (ParseException $e)
 		{
diff --git a/phpBB/phpbb/install/console/command/install/install.php b/phpBB/phpbb/install/console/command/install/install.php
index 84c8aa688af..8461c7a7189 100644
--- a/phpBB/phpbb/install/console/command/install/install.php
+++ b/phpBB/phpbb/install/console/command/install/install.php
@@ -97,7 +97,7 @@ protected function configure()
 	 * @return int 0 if everything went fine, or a non-zero exit code
 	 * @throws iohandler_not_implemented_exception
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$this->iohandler_factory->set_environment('cli');
 
@@ -126,7 +126,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		try
 		{
-			$config = Yaml::parse(file_get_contents($config_file), true);
+			$config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
 		}
 		catch (ParseException $e)
 		{
@@ -195,7 +195,6 @@ private function register_configuration(cli_iohandler $iohandler, $config)
 		$iohandler->set_input('smtp_delivery', $config['email']['smtp_delivery']);
 		$iohandler->set_input('smtp_host', $config['email']['smtp_host']);
 		$iohandler->set_input('smtp_port', $config['email']['smtp_port']);
-		$iohandler->set_input('smtp_auth', $config['email']['smtp_auth']);
 		$iohandler->set_input('smtp_user', $config['email']['smtp_user']);
 		$iohandler->set_input('smtp_pass', $config['email']['smtp_pass']);
 		$iohandler->set_input('submit_email', 'submit');
diff --git a/phpBB/phpbb/install/console/command/update/config/show.php b/phpBB/phpbb/install/console/command/update/config/show.php
index 85f90e14aa7..f35b55ba87c 100644
--- a/phpBB/phpbb/install/console/command/update/config/show.php
+++ b/phpBB/phpbb/install/console/command/update/config/show.php
@@ -76,7 +76,7 @@ protected function configure()
 	 *
 	 * @return int 0 if everything went fine, or a non-zero exit code
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$this->iohandler_factory->set_environment('cli');
 
@@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		try
 		{
-			$config = Yaml::parse(file_get_contents($config_file), true);
+			$config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
 		}
 		catch (ParseException $e)
 		{
diff --git a/phpBB/phpbb/install/console/command/update/config/validate.php b/phpBB/phpbb/install/console/command/update/config/validate.php
index 69fba0f7a83..ba36f06fb24 100644
--- a/phpBB/phpbb/install/console/command/update/config/validate.php
+++ b/phpBB/phpbb/install/console/command/update/config/validate.php
@@ -76,7 +76,7 @@ protected function configure()
 	 *
 	 * @return int 0 if everything went fine, or a non-zero exit code
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$this->iohandler_factory->set_environment('cli');
 
@@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		try
 		{
-			$config = Yaml::parse(file_get_contents($config_file), true);
+			$config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
 		}
 		catch (ParseException $e)
 		{
diff --git a/phpBB/phpbb/install/console/command/update/update.php b/phpBB/phpbb/install/console/command/update/update.php
index 3c70231c203..036bf6f766d 100644
--- a/phpBB/phpbb/install/console/command/update/update.php
+++ b/phpBB/phpbb/install/console/command/update/update.php
@@ -95,7 +95,7 @@ protected function configure()
 	 *
 	 * @return int
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$this->iohandler_factory->set_environment('cli');
 
@@ -124,7 +124,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		try
 		{
-			$config = Yaml::parse(file_get_contents($config_file), true);
+			$config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
 		}
 		catch (ParseException $e)
 		{
diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php
index c6f49784bf8..785dff3f6a4 100644
--- a/phpBB/phpbb/install/controller/helper.php
+++ b/phpBB/phpbb/install/controller/helper.php
@@ -204,6 +204,23 @@ public function handle_language_select()
 		}
 	}
 
+	/**
+	 * Handle installer restart
+	 */
+	public function handle_installer_restart(): void
+	{
+		$restart = $this->phpbb_request->variable('install_restart', false);
+		if ($restart)
+		{
+			// Clean up config file to restart installer
+			$this->installer_config->clean_up_config_file();
+		}
+		else if ($this->installer_config->exists())
+		{
+			$this->template->assign_var('SHOW_RESTART_BUTTON', true);
+		}
+	}
+
 	/**
 	 * Process navigation data to reflect active/completed stages
 	 *
@@ -266,7 +283,7 @@ protected function page_header($page_title, $selected_language = false)
 			'L_SELECT_LANG'			=> $this->language->lang('SELECT_LANG'),
 			'L_SKIP'				=> $this->language->lang('SKIP'),
 			'PAGE_TITLE'			=> $this->language->lang($page_title),
-			'T_JQUERY_LINK'			=> $this->path_helper->get_web_root_path() . $path . '../assets/javascript/jquery-3.6.0.min.js',
+			'T_JQUERY_LINK'			=> $this->path_helper->get_web_root_path() . $path . '../assets/javascript/jquery-3.7.1.min.js',
 			'T_FONT_AWESOME_LINK'	=> $this->path_helper->get_web_root_path() . $path . '../assets/css/font-awesome.min.css',
 			'T_TEMPLATE_PATH'		=> $this->path_helper->get_web_root_path() . $path . 'style',
 			'T_ASSETS_PATH'			=> $this->path_helper->get_web_root_path() . $path . '../assets',
@@ -339,6 +356,14 @@ protected function render_navigation()
 	protected function render_language_select($selected_language = null)
 	{
 		$langs = $this->lang_helper->get_available_languages();
+
+		// The first language will be selected by default. Unless a user has consciously included
+		// other languages in the installation process, it will be British English anyway.
+		if ($selected_language === null && count($langs))
+		{
+			$selected_language = $langs[0]['iso'];
+		}
+
 		foreach ($langs as $lang)
 		{
 			$this->template->assign_block_vars('language_select_item', array(
diff --git a/phpBB/phpbb/install/controller/install.php b/phpBB/phpbb/install/controller/install.php
index df6da1e3db1..c52bff55ad3 100644
--- a/phpBB/phpbb/install/controller/install.php
+++ b/phpBB/phpbb/install/controller/install.php
@@ -126,6 +126,7 @@ public function handle()
 		// Set the appropriate input-output handler
 		$this->installer->set_iohandler($this->iohandler_factory->get());
 		$this->controller_helper->handle_language_select();
+		$this->controller_helper->handle_installer_restart();
 
 		if ($this->request->is_ajax())
 		{
diff --git a/phpBB/phpbb/install/database_task.php b/phpBB/phpbb/install/database_task.php
index 758e511c1ae..83bfe8fbfe9 100644
--- a/phpBB/phpbb/install/database_task.php
+++ b/phpBB/phpbb/install/database_task.php
@@ -74,7 +74,7 @@ protected function exec_sql(string $sql)
 	 *
 	 * @return Result|null Result of the query.
 	 */
-	protected function query(string $sql) : ?Result
+	protected function query(string $sql) : Result|null
 	{
 		try
 		{
@@ -95,7 +95,7 @@ protected function query(string $sql) : ?Result
 	 *
 	 * @return Statement|null The prepared statement object or null if preparing failed
 	 */
-	protected function create_prepared_stmt(string $sql): ?Statement
+	protected function create_prepared_stmt(string $sql): Statement|null
 	{
 		try
 		{
@@ -155,7 +155,7 @@ protected function exec_prepared_stmt($stmt, array $params)
 	 *
 	 * @return int|null The last insert ID.
 	 */
-	protected function get_last_insert_id() : ?int
+	protected function get_last_insert_id() : int|null
 	{
 		try
 		{
diff --git a/phpBB/phpbb/install/helper/config.php b/phpBB/phpbb/install/helper/config.php
index 7eb0ae3b052..1e73be145a7 100644
--- a/phpBB/phpbb/install/helper/config.php
+++ b/phpBB/phpbb/install/helper/config.php
@@ -217,12 +217,22 @@ public function get_progress_data()
 		return $this->progress_data;
 	}
 
+	/**
+	 * Checks whether install config exists, i.e. whether an installation is in progress
+	 *
+	 * @return bool
+	 */
+	public function exists(): bool
+	{
+		return $this->filesystem->exists($this->install_config_file);
+	}
+
 	/**
 	 * Recovers install configuration from file
 	 */
 	public function load_config()
 	{
-		if (!$this->filesystem->exists($this->install_config_file))
+		if (!$this->exists())
 		{
 			return;
 		}
diff --git a/phpBB/phpbb/install/helper/database.php b/phpBB/phpbb/install/helper/database.php
index 55a938de9ee..792ef0ef6b7 100644
--- a/phpBB/phpbb/install/helper/database.php
+++ b/phpBB/phpbb/install/helper/database.php
@@ -39,7 +39,7 @@ class database
 		// Note: php 5.5 alpha 2 deprecated mysql.
 		// Keep mysqli before mysql in this list.
 		'mysqli'	=> array(
-			'LABEL'			=> 'MySQL with MySQLi Extension',
+			'LABEL'			=> 'MySQL',
 			'SCHEMA'		=> 'mysql_41',
 			'MODULE'		=> 'mysqli',
 			'DOCTRINE'		=> ['pdo_mysql'],
@@ -59,7 +59,7 @@ class database
 			'2.0.x'			=> true,
 		),
 		'mssqlnative'	=> array(
-			'LABEL'			=> 'MS SQL Server 2005+ [ Native ]',
+			'LABEL'			=> 'MS SQL Server [ Native ]',
 			'SCHEMA'		=> 'mssql',
 			'MODULE'		=> 'sqlsrv',
 			'DOCTRINE'		=> ['pdo_sqlsrv'],
@@ -78,7 +78,7 @@ class database
 			'2.0.x'			=> false,
 		),
 		'postgres' => array(
-			'LABEL'			=> 'PostgreSQL 8.3+',
+			'LABEL'			=> 'PostgreSQL',
 			'SCHEMA'		=> 'postgres',
 			'MODULE'		=> 'pgsql',
 			'DOCTRINE'		=> ['pdo_pgsql'],
@@ -225,7 +225,7 @@ public function remove_comments($sql_query)
 		// Remove # style comments
 		$sql_query = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql_query));
 
-		return $sql_query;
+		return $sql_query ?: '';
 	}
 
 	/**
@@ -393,6 +393,7 @@ public function check_database_connection($dbms, $dbhost, $dbport, $dbuser, $dbp
 			$doctrine_db = connection_factory::get_connection_from_params($dbms, $dbhost, $dbuser, $dbpass, $dbname, $dbport);
 			$db_tools_factory = new \phpbb\db\tools\factory();
 			$db_tools = $db_tools_factory->get($doctrine_db);
+			$db_tools->set_table_prefix($table_prefix);
 			$tables = $db_tools->sql_list_tables();
 			$tables = array_map('strtolower', $tables);
 			$table_intersect = array_intersect($tables, $table_ary);
@@ -405,10 +406,29 @@ public function check_database_connection($dbms, $dbhost, $dbport, $dbuser, $dbp
 			}
 
 			// Check if database version is supported
+			/** @psalm-suppress UndefinedInterfaceMethod */
+			$db_server_version = $doctrine_db->getWrappedConnection()->getServerVersion();
 			switch ($dbms)
 			{
+				case 'mysqli':
+					if (stripos($db->sql_server_info(), 'mariadb') !== false && version_compare($db_server_version, '10.2.7', '<'))
+					{
+						$errors[] = array(
+							'title' => 'INST_ERR_DB_NO_MARIADB',
+						);
+					}
+					else
+					{
+						if (version_compare($db_server_version, '5.6', '<'))
+						{
+							$errors[] = array(
+								'title' => 'INST_ERR_DB_NO_MYSQLI',
+							);
+						}
+					}
+				break;
 				case 'sqlite3':
-					if (version_compare($db->sql_server_info(true), '3.6.15', '<'))
+					if (version_compare($db_server_version, '3.8.3', '<'))
 					{
 						$errors[] = array(
 							'title' => 'INST_ERR_DB_NO_SQLITE3',
@@ -416,20 +436,7 @@ public function check_database_connection($dbms, $dbhost, $dbport, $dbuser, $dbp
 					}
 				break;
 				case 'oracle':
-					$sql = "SELECT *
-						FROM NLS_DATABASE_PARAMETERS
-						WHERE PARAMETER = 'NLS_RDBMS_VERSION'
-							OR PARAMETER = 'NLS_CHARACTERSET'";
-					$result = $db->sql_query($sql);
-
-					$stats = [];
-					while ($row = $db->sql_fetchrow($result))
-					{
-						$stats[$row['parameter']] = $row['value'];
-					}
-					$db->sql_freeresult($result);
-
-					if (version_compare($stats['NLS_RDBMS_VERSION'], '9.2', '<') && $stats['NLS_CHARACTERSET'] !== 'UTF8')
+					if (version_compare($db_server_version, '12.1.0.2', '<'))
 					{
 						$errors[] = array(
 							'title' => 'INST_ERR_DB_NO_ORACLE',
@@ -437,17 +444,35 @@ public function check_database_connection($dbms, $dbhost, $dbport, $dbuser, $dbp
 					}
 				break;
 				case 'postgres':
-					$sql = "SHOW server_encoding;";
-					$result = $db->sql_query($sql);
-					$row = $db->sql_fetchrow($result);
-					$db->sql_freeresult($result);
-
-					if ($row['server_encoding'] !== 'UNICODE' && $row['server_encoding'] !== 'UTF8')
+					if (version_compare($db_server_version, '9.4', '<'))
 					{
 						$errors[] = array(
 							'title' => 'INST_ERR_DB_NO_POSTGRES',
 						);
 					}
+					else
+					{
+						$sql = "SHOW server_encoding;";
+						$result = $db->sql_query($sql);
+						$row = $db->sql_fetchrow($result);
+						$db->sql_freeresult($result);
+
+						if ($row['server_encoding'] !== 'UNICODE' && $row['server_encoding'] !== 'UTF8')
+						{
+							$errors[] = array(
+								'title' => 'INST_ERR_DB_NO_POSTGRES_UTF8',
+							);
+						}
+					}
+				break;
+				case 'mssqlnative':
+				case 'mssql_odbc':
+					if (version_compare($db_server_version, '11.0.2100.60', '<'))
+					{
+						$errors[] = array(
+							'title' => 'INST_ERR_DB_NO_MSSQL',
+						);
+					}
 				break;
 			}
 		}
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php
index 23ab5df919b..3664b39f2da 100644
--- a/phpBB/phpbb/install/installer.php
+++ b/phpBB/phpbb/install/installer.php
@@ -280,7 +280,9 @@ public function run()
 		}
 		catch (\Exception $e)
 		{
-			$this->iohandler->add_error_message($e->getMessage());
+			$stack_trace = phpbb_filter_root_path(str_replace("\n", '<br>', $e->getTraceAsString()));
+			$message = $e->getMessage();
+			$this->iohandler->add_error_message($message, $stack_trace);
 			$this->iohandler->send_response(true);
 			$fail_cleanup = true;
 		}
diff --git a/phpBB/phpbb/install/installer_configuration.php b/phpBB/phpbb/install/installer_configuration.php
index 974080dc55e..2550f24acb0 100644
--- a/phpBB/phpbb/install/installer_configuration.php
+++ b/phpBB/phpbb/install/installer_configuration.php
@@ -24,7 +24,7 @@ class installer_configuration implements ConfigurationInterface
 	 *
 	 * @return TreeBuilder The tree builder
 	 */
-	public function getConfigTreeBuilder()
+	public function getConfigTreeBuilder(): TreeBuilder
 	{
 		$treeBuilder = new TreeBuilder('installer');
 		$rootNode = $treeBuilder->getRootNode();
@@ -97,9 +97,6 @@ public function getConfigTreeBuilder()
 						->scalarNode('smtp_port')
 							->defaultValue(null)
 							->end()
-						->scalarNode('smtp_auth')
-							->defaultValue(null)
-							->end()
 						->scalarNode('smtp_user')
 							->defaultValue(null)
 							->end()
diff --git a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
index 5d5b7043256..9e3c8d38dba 100644
--- a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
+++ b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
@@ -132,6 +132,7 @@ public function run()
 
 		$updates = [
 			'board_startdate' => (string) $current_time,
+			'board_timezone' => $this->install_config->get('admin_timezone'),
 			'default_lang' => $this->install_config->get('default_lang'),
 
 			'server_name' => $this->install_config->get('server_name'),
@@ -149,7 +150,6 @@ public function run()
 			'smtp_delivery'		=> $this->install_config->get('smtp_delivery'),
 			'smtp_host'			=> $this->install_config->get('smtp_host'),
 			'smtp_port'			=> $this->install_config->get('smtp_port'),
-			'smtp_auth_method'	=> $this->install_config->get('smtp_auth'),
 			'smtp_username'		=> $this->install_config->get('smtp_user'),
 			'smtp_password'		=> $this->install_config->get('smtp_pass'),
 
@@ -166,12 +166,6 @@ public function run()
 			'site_desc'	=> $this->install_config->get('board_description'),
 		];
 
-		if (@extension_loaded('gd'))
-		{
-			$updates['captcha_plugin'] = 'core.captcha.plugins.gd';
-			$updates['captcha_gd'] = '1';
-		}
-
 		$ref = substr($referer, strpos($referer, '://') + 3);
 		if (!(stripos($ref, $server_name) === 0))
 		{
@@ -179,7 +173,7 @@ public function run()
 		}
 
 		// We set a (semi-)unique cookie name to bypass login issues related to the cookie name.
-		$cookie_name = 'phpbb3_';
+		$cookie_name = 'phpbb_';
 		$rand_str = md5(mt_rand());
 		$rand_str = str_replace('0', 'z', base_convert($rand_str, 16, 35));
 		$rand_str = substr($rand_str, 0, 5);
diff --git a/phpBB/phpbb/install/module/install_database/task/add_default_data.php b/phpBB/phpbb/install/module/install_database/task/add_default_data.php
index bda01a79e85..d69a5925875 100644
--- a/phpBB/phpbb/install/module/install_database/task/add_default_data.php
+++ b/phpBB/phpbb/install/module/install_database/task/add_default_data.php
@@ -147,7 +147,7 @@ protected function replace_dbms_specific_sql(string $query) : string
 			break;
 		}
 
-		return $query;
+		return $query ?: '';
 	}
 
 	/**
diff --git a/phpBB/phpbb/install/module/install_database/task/add_tables.php b/phpBB/phpbb/install/module/install_database/task/add_tables.php
index 0d7e81b9e87..dfe276b6c9e 100644
--- a/phpBB/phpbb/install/module/install_database/task/add_tables.php
+++ b/phpBB/phpbb/install/module/install_database/task/add_tables.php
@@ -98,6 +98,7 @@ public function __construct(config $config,
 		$this->schema_file_path	= $phpbb_root_path . 'store/schema.json';
 		$this->table_prefix		= $this->config->get('table_prefix');
 		$this->change_prefix	= $this->config->get('change_table_prefix', true);
+		$this->db_tools->set_table_prefix($this->table_prefix);
 
 		parent::__construct(true);
 	}
diff --git a/phpBB/phpbb/install/module/install_database/task/create_schema_file.php b/phpBB/phpbb/install/module/install_database/task/create_schema_file.php
index e75bca65dca..250b19f46b5 100644
--- a/phpBB/phpbb/install/module/install_database/task/create_schema_file.php
+++ b/phpBB/phpbb/install/module/install_database/task/create_schema_file.php
@@ -15,6 +15,7 @@
 
 use phpbb\db\doctrine\connection_factory;
 use phpbb\install\exception\resource_limit_reached_exception;
+use Symfony\Component\Yaml\Yaml;
 
 /**
  * Create database schema
@@ -145,7 +146,8 @@ public function run()
 			$migrator_classes = $finder->core_path('phpbb/db/migration/data/')->get_classes();
 			$factory = new \phpbb\db\tools\factory();
 			$db_tools = $factory->get($this->db_doctrine, true);
-			$tables_data = \Symfony\Component\Yaml\Yaml::parseFile($this->phpbb_root_path . '/config/default/container/tables.yml');
+			$db_tools->set_table_prefix($table_prefix);
+			$tables_data = Yaml::parseFile($this->phpbb_root_path . '/config/default/container/tables.yml', Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
 			$tables = [];
 			foreach ($tables_data['parameters'] as $parameter => $table)
 			{
diff --git a/phpBB/phpbb/install/module/install_database/task/update_user_and_post_data.php b/phpBB/phpbb/install/module/install_database/task/update_user_and_post_data.php
index ba178135b94..7cc5fd4f49f 100644
--- a/phpBB/phpbb/install/module/install_database/task/update_user_and_post_data.php
+++ b/phpBB/phpbb/install/module/install_database/task/update_user_and_post_data.php
@@ -114,7 +114,8 @@ public function run()
 			. '		user_lang = :lang,'
 			. '		user_email = :email,'
 			. '		user_dateformat = :dateformat,'
-			. '		username_clean = :clean_username'
+			. '		username_clean = :clean_username,'
+			. '		user_timezone = :timezone'
 			. ' WHERE username = \'Admin\'';
 
 		$this->create_and_execute_prepared_stmt($sql, [
@@ -125,6 +126,7 @@ public function run()
 			'email'				=> $this->install_config->get('board_email'),
 			'dateformat'		=> $this->language->lang('default_dateformat'),
 			'clean_username'	=> utf8_clean_string($this->install_config->get('admin_name')),
+			'timezone'			=> $this->install_config->get('admin_timezone'),
 		]);
 		$this->exec_sql('UPDATE ' . $this->user_table . ' SET user_regdate = ' . $current_time);
 
diff --git a/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php b/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php
index 8913b6a9235..3a0aeb60d9a 100644
--- a/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php
+++ b/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php
@@ -165,7 +165,7 @@ public function run()
 	protected function get_config_data($debug = false, $debug_container = false, $environment = null)
 	{
 		$config_content = "<?php\n";
-		$config_content .= "// phpBB 3.3.x auto-generated configuration file\n// Do not change anything in this file!\n";
+		$config_content .= "// phpBB auto-generated configuration file\n// Do not change anything in this file!\n";
 
 		$dbms = $this->install_config->get('dbms');
 		$db_driver = $this->db_helper->get_available_dbms($dbms);
diff --git a/phpBB/phpbb/install/module/install_finish/task/install_extensions.php b/phpBB/phpbb/install/module/install_finish/task/install_extensions.php
index 019553053fb..049694babab 100644
--- a/phpBB/phpbb/install/module/install_finish/task/install_extensions.php
+++ b/phpBB/phpbb/install/module/install_finish/task/install_extensions.php
@@ -157,7 +157,7 @@ protected function execute_step($key, $value) : void
 			if (isset($extensions[$key]) && $extensions[$key]['ext_active'])
 			{
 				// Create log
-				$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($key));
+				$this->log->add('admin', ANONYMOUS, $this->user->ip, 'LOG_EXT_ENABLE', time(), array($key));
 				$this->iohandler->add_success_message(array('CLI_EXTENSION_ENABLE_SUCCESS', $key));
 			}
 			else
diff --git a/phpBB/phpbb/install/module/install_finish/task/notify_user.php b/phpBB/phpbb/install/module/install_finish/task/notify_user.php
index 6fb7bc2743f..ff575130a4d 100644
--- a/phpBB/phpbb/install/module/install_finish/task/notify_user.php
+++ b/phpBB/phpbb/install/module/install_finish/task/notify_user.php
@@ -14,62 +14,52 @@
 namespace phpbb\install\module\install_finish\task;
 
 use phpbb\config\db;
+use phpbb\install\helper\config;
+use phpbb\install\helper\iohandler\iohandler_interface;
+use phpbb\auth\auth;
+use phpbb\log\log_interface;
+use phpbb\user;
+use phpbb\install\helper\container_factory;
+use phpbb\messenger\method\email;
 
 /**
  * Logs installation and sends an email to the admin
  */
 class notify_user extends \phpbb\install\task_base
 {
-	/**
-	 * @var \phpbb\install\helper\config
-	 */
+	/** @var config */
 	protected $install_config;
 
-	/**
-	 * @var \phpbb\install\helper\iohandler\iohandler_interface
-	 */
+	/** @var iohandler_interface */
 	protected $iohandler;
 
-	/**
-	 * @var \phpbb\auth\auth
-	 */
+	/** @var auth */
 	protected $auth;
 
-	/**
-	 * @var db
-	 */
+	/** @var db */
 	protected $config;
 
-	/**
-	 * @var \phpbb\log\log_interface
-	 */
-	protected $log;
+	/** @var email */
+	protected $email_method;
 
-	/**
-	 * @var \phpbb\user
-	 */
-	protected $user;
+	/** @var log_interface */
+	protected $log;
 
-	/**
-	 * @var string
-	 */
+	/** @var string */
 	protected $phpbb_root_path;
 
-	/**
-	 * @var string
-	 */
-	protected $php_ext;
+	/** @var user */
+	protected $user;
 
 	/**
 	 * Constructor
 	 *
-	 * @param \phpbb\install\helper\container_factory				$container
-	 * @param \phpbb\install\helper\config							$install_config
-	 * @param \phpbb\install\helper\iohandler\iohandler_interface	$iohandler
-	 * @param string												$phpbb_root_path
-	 * @param string												$php_ext
+	 * @param container_factory		$container
+	 * @param config				$install_config
+	 * @param iohandler_interface	$iohandler
+	 * @param string				$phpbb_root_path
 	 */
-	public function __construct(\phpbb\install\helper\container_factory $container, \phpbb\install\helper\config $install_config, \phpbb\install\helper\iohandler\iohandler_interface $iohandler, $phpbb_root_path, $php_ext)
+	public function __construct(container_factory $container, config $install_config, iohandler_interface $iohandler, $phpbb_root_path)
 	{
 		$this->install_config	= $install_config;
 		$this->iohandler		= $iohandler;
@@ -77,8 +67,8 @@ public function __construct(\phpbb\install\helper\container_factory $container,
 		$this->auth				= $container->get('auth');
 		$this->log				= $container->get('log');
 		$this->user				= $container->get('user');
+		$this->email_method		= $container->get('messenger.method.email');
 		$this->phpbb_root_path	= $phpbb_root_path;
-		$this->php_ext			= $php_ext;
 
 		// We need to reload config for cases when it doesn't have all values
 		/** @var \phpbb\cache\driver\driver_interface $cache */
@@ -107,17 +97,15 @@ public function run()
 
 		if ($this->config['email_enable'])
 		{
-			include ($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
-
-			$messenger = new \messenger(false);
-			$messenger->template('installed', $this->install_config->get('user_language', 'en'));
-			$messenger->to($this->config['board_email'], $this->install_config->get('admin_name'));
-			$messenger->anti_abuse_headers($this->config, $this->user);
-			$messenger->assign_vars(array(
-					'USERNAME'		=> html_entity_decode($this->install_config->get('admin_name'), ENT_COMPAT),
-					'PASSWORD'		=> html_entity_decode($this->install_config->get('admin_passwd'), ENT_COMPAT))
-			);
-			$messenger->send(NOTIFY_EMAIL);
+			$this->email_method->set_use_queue(false);
+			$this->email_method->template('installed', $this->install_config->get('user_language', 'en'));
+			$this->email_method->to($this->config['board_email'], $this->install_config->get('admin_name'));
+			$this->email_method->anti_abuse_headers($this->config, $this->user);
+			$this->email_method->assign_vars([
+				'USERNAME' => html_entity_decode($this->install_config->get('admin_name'), ENT_COMPAT),
+				'PASSWORD' => html_entity_decode($this->install_config->get('admin_passwd'), ENT_COMPAT),
+			]);
+			$this->email_method->send();
 		}
 
 		// Login admin
@@ -141,7 +129,7 @@ public function run()
 			$this->user->ip,
 			'LOG_INSTALL_INSTALLED',
 			false,
-			array($this->config['version'])
+			[$this->config['version']]
 		);
 
 		// Remove install_lock
diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php
index 0560f2d46d8..1175ab86260 100644
--- a/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php
+++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php
@@ -71,6 +71,7 @@ protected function process_form()
 		$admin_pass1	= $this->io_handler->get_input('admin_pass1', '', true);
 		$admin_pass2	= $this->io_handler->get_input('admin_pass2', '', true);
 		$board_email	= $this->io_handler->get_input('board_email', '', true);
+		$admin_timezone	= $this->io_handler->get_input('admin_timezone', 'UTC', true);
 
 		$admin_data_valid = $this->check_admin_data($admin_name, $admin_pass1, $admin_pass2, $board_email);
 
@@ -79,6 +80,7 @@ protected function process_form()
 			$this->install_config->set('admin_name', $admin_name);
 			$this->install_config->set('admin_passwd', $admin_pass1);
 			$this->install_config->set('board_email', $board_email);
+			$this->install_config->set('admin_timezone', $admin_timezone);
 		}
 		else
 		{
diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php
index 93c0eb385e2..3c6508f6a7b 100644
--- a/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php
+++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php
@@ -52,12 +52,9 @@ public function run()
 		$smtp_delivery	= $this->io_handler->get_input('smtp_delivery', '');
 		$smtp_host		= $this->io_handler->get_input('smtp_host', '', true);
 		$smtp_port		= $this->io_handler->get_input('smtp_port', '');
-		$smtp_auth		= $this->io_handler->get_input('smtp_auth', '');
 		$smtp_user		= $this->io_handler->get_input('smtp_user', '', true);
 		$smtp_passwd	= $this->io_handler->get_input('smtp_pass', '', true);
 
-		$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP');
-
 		// Check if data is sent
 		if ($this->io_handler->get_input('submit_email', false))
 		{
@@ -65,22 +62,11 @@ public function run()
 			$this->install_config->set('smtp_delivery', $smtp_delivery);
 			$this->install_config->set('smtp_host', $smtp_host);
 			$this->install_config->set('smtp_port', $smtp_port);
-			$this->install_config->set('smtp_auth', $smtp_auth);
 			$this->install_config->set('smtp_user', $smtp_user);
 			$this->install_config->set('smtp_pass', $smtp_passwd);
 		}
 		else
 		{
-			$auth_options = array();
-			foreach ($auth_methods as $method)
-			{
-				$auth_options[] = array(
-					'value'		=> $method,
-					'label'		=> 'SMTP_' . str_replace('-', '_', $method),
-					'selected'	=> false,
-				);
-			}
-
 			$email_form = array(
 				'email_enable' => array(
 					'label'			=> 'ENABLE_EMAIL',
@@ -126,12 +112,6 @@ public function run()
 					'type'			=> 'text',
 					'default'		=> $smtp_port,
 				),
-				'smtp_auth' => array(
-					'label'			=> 'SMTP_AUTH_METHOD',
-					'description'	=> 'SMTP_AUTH_METHOD_EXPLAIN',
-					'type'			=> 'select',
-					'options'		=> $auth_options,
-				),
 				'smtp_user' => array(
 					'label'			=> 'SMTP_USERNAME',
 					'description'	=> 'SMTP_USERNAME_EXPLAIN',
diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php
index 5f600764396..f16cd065fca 100644
--- a/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php
+++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php
@@ -73,7 +73,7 @@ public function run()
 		}
 
 		$script_path = str_replace(array('\\', '//'), '/', $script_path);
-		$script_path = trim(dirname(dirname(dirname($script_path)))); // Because we are in install/app.php/route_name
+		$script_path = trim(dirname(dirname(dirname($script_path)))); // Because we are in install/index.php/route_name
 
 		// Server data
 		$cookie_secure		= $this->io_handler->get_input('cookie_secure', $cookie_secure);
diff --git a/phpBB/phpbb/install/module/requirements/task/check_filesystem.php b/phpBB/phpbb/install/module/requirements/task/check_filesystem.php
index f08b7b960dd..32c14d59c93 100644
--- a/phpBB/phpbb/install/module/requirements/task/check_filesystem.php
+++ b/phpBB/phpbb/install/module/requirements/task/check_filesystem.php
@@ -145,31 +145,29 @@ protected function check_file($file, $failable = false)
 		// Try to create file if it does not exists
 		if (!file_exists($path))
 		{
-			$fp = @fopen($path, 'w');
-			@fclose($fp);
-			try
+			if (!is_resource($fp = @fopen($path, 'w')))
 			{
-				$this->filesystem->phpbb_chmod($path,
-					\phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE
-				);
-				$exists = true;
+				$exists = $writable = false;
 			}
-			catch (\phpbb\filesystem\exception\filesystem_exception $e)
-			{
-				// Do nothing
-			}
-		}
-
-		if (file_exists($path))
-		{
-			if (!$this->filesystem->is_writable($path))
+			else
 			{
-				$writable = false;
+				@fclose($fp);
+				try
+				{
+					$this->filesystem->phpbb_chmod($path,
+						\phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE
+					);
+					$exists = true;
+				}
+				catch (\phpbb\filesystem\exception\filesystem_exception $e)
+				{
+					$writable = false;
+				}
 			}
 		}
-		else
+		else if (!$this->filesystem->is_writable($path))
 		{
-			$exists = $writable = false;
+			$writable = false;
 		}
 
 		$this->set_test_passed(($exists && $writable) || $failable);
diff --git a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
index be48cf19678..ccff406d145 100644
--- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
+++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
@@ -68,9 +68,6 @@ public function run()
 		// Check for PCRE support
 		$this->check_pcre();
 
-		// Check for JSON support
-		$this->check_json();
-
 		// Check for mbstring support
 		$this->check_mbstring();
 
@@ -99,7 +96,7 @@ protected function set_test_passed($is_passed)
 	 */
 	protected function check_php_version()
 	{
-		if (version_compare(PHP_VERSION, '7.2.0', '<'))
+		if (version_compare(PHP_VERSION, '8.2.0', '<'))
 		{
 			$this->response_helper->add_error_message('PHP_VERSION_REQD', 'PHP_VERSION_REQD_EXPLAIN');
 
@@ -142,22 +139,6 @@ protected function check_pcre()
 		$this->set_test_passed(false);
 	}
 
-	/**
-	 * Checks whether PHP's JSON extension is available or not
-	 */
-	protected function check_json()
-	{
-		if (@extension_loaded('json'))
-		{
-			$this->set_test_passed(true);
-			return;
-		}
-
-		$this->response_helper->add_error_message('PHP_JSON_SUPPORT', 'PHP_JSON_SUPPORT_EXPLAIN');
-
-		$this->set_test_passed(false);
-	}
-
 	/**
 	 * Checks whether PHP's mbstring extension is available or not
 	 */
diff --git a/phpBB/phpbb/install/module/update_database/task/update_extensions.php b/phpBB/phpbb/install/module/update_database/task/update_extensions.php
index e47d23d0522..6ea3a517bf4 100644
--- a/phpBB/phpbb/install/module/update_database/task/update_extensions.php
+++ b/phpBB/phpbb/install/module/update_database/task/update_extensions.php
@@ -174,7 +174,7 @@ public function run()
 						if (isset($extensions[$ext_name]) && $extensions[$ext_name]['ext_active'])
 						{
 							// Create log
-							$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_UPDATE', time(), array($ext_name));
+							$this->log->add('admin', ANONYMOUS, $this->user->ip, 'LOG_EXT_UPDATE', time(), array($ext_name));
 							$this->iohandler->add_success_message(array('CLI_EXTENSION_UPDATE_SUCCESS', $ext_name));
 						}
 						else
diff --git a/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php b/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php
index e4ed6a77140..45caa0d3cfa 100644
--- a/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php
+++ b/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php
@@ -187,8 +187,8 @@ public function run()
 
 					if (!$empty && in_array($filename, $merge_conflicts))
 					{
-					$merge_conflicts[] = $filename;
-				}
+						$merge_conflicts[] = $filename;
+					}
 					else
 					{
 						$file_is_merged = true;
diff --git a/phpBB/phpbb/install/sequential_task.php b/phpBB/phpbb/install/sequential_task.php
index bc389c272d9..60af336039c 100644
--- a/phpBB/phpbb/install/sequential_task.php
+++ b/phpBB/phpbb/install/sequential_task.php
@@ -38,7 +38,7 @@ abstract protected function execute_step($key, $value) : void;
 	 *
 	 * @throws resource_limit_reached_exception When resources are exhausted.
 	 */
-	protected function execute(config $config, array $data, ?string $counter_name = null) : void
+	protected function execute(config $config, array $data, string|null $counter_name = null) : void
 	{
 		if ($counter_name === null)
 		{
diff --git a/phpBB/phpbb/install/updater_configuration.php b/phpBB/phpbb/install/updater_configuration.php
index 519de3bd2bd..9322a5fe7f0 100644
--- a/phpBB/phpbb/install/updater_configuration.php
+++ b/phpBB/phpbb/install/updater_configuration.php
@@ -24,7 +24,7 @@ class updater_configuration implements ConfigurationInterface
 	 *
 	 * @return TreeBuilder The tree builder
 	 */
-	public function getConfigTreeBuilder()
+	public function getConfigTreeBuilder(): TreeBuilder
 	{
 		$treeBuilder = new TreeBuilder('updater');
 		$rootNode = $treeBuilder->getRootNode();
diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index dee8b584861..4336c8f9f2f 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -230,10 +230,10 @@ public function is_set($key)
 	 * Params are the language key and the parameters to be substituted.
 	 * This function/functionality is inspired by SHS` and Ashe.
 	 *
-	 * Example call: <samp>$user->lang('NUM_POSTS_IN_QUEUE', 1);</samp>
+	 * Example call: <samp>$language->lang('NUM_POSTS_IN_QUEUE', 1);</samp>
 	 *
 	 * If the first parameter is an array, the elements are used as keys and subkeys to get the language entry:
-	 * Example: <samp>$user->lang(array('datetime', 'AGO'), 1)</samp> uses $user->lang['datetime']['AGO'] as language entry.
+	 * Example: <samp>$language->lang(array('datetime', 'AGO'), 1)</samp> uses $language->lang['datetime']['AGO'] as language entry.
 	 *
 	 * @return string	Return localized string or the language key if the translation is not available
 	 */
@@ -403,6 +403,7 @@ protected function inject_default_variables(): void
 		$this->lang['USER_LANG'] = $lang_values['user_lang'] ?? 'en-gb';
 		$this->lang['PLURAL_RULE'] = $lang_values['plural_rule'] ?? 1;
 		$this->lang['RECAPTCHA_LANG'] = $lang_values['recaptcha_lang'] ?? 'en-GB';
+		$this->lang['TURNSTILE_LANG'] = $lang_values['turnstile_lang'] ?? 'auto'; // default to auto mode
 	}
 
 	/**
diff --git a/phpBB/phpbb/language/language_file_helper.php b/phpBB/phpbb/language/language_file_helper.php
index 995c7b47125..9b1029f4bd5 100644
--- a/phpBB/phpbb/language/language_file_helper.php
+++ b/phpBB/phpbb/language/language_file_helper.php
@@ -65,6 +65,8 @@ public function get_available_languages() : array
 			$available_languages[] = $this->get_language_data_from_json($data);
 		}
 
+		usort($available_languages, [$this, 'sort_by_local_name']);
+
 		return $available_languages;
 	}
 
@@ -110,16 +112,29 @@ protected function get_language_data_from_json(array $data) : array
 		}
 
 		return [
-			'iso'			=> $data['extra']['language-iso'],
-			'name'			=> $data['extra']['english-name'],
-			'local_name'	=> $data['extra']['local-name'],
-			'author'		=> implode(', ', $authors),
-			'version'		=> $data['version'],
-			'phpbb_version'	=> $data['extra']['phpbb-version'],
-			'direction'		=> $data['extra']['direction'],
-			'user_lang'		=> $data['extra']['user-lang'],
-			'plural_rule'	=> $data['extra']['plural-rule'],
-			'recaptcha_lang'=> $data['extra']['recaptcha-lang'],
+			'iso'				=> $data['extra']['language-iso'],
+			'name'				=> $data['extra']['english-name'],
+			'local_name'		=> $data['extra']['local-name'],
+			'author'			=> implode(', ', $authors),
+			'version'			=> $data['version'],
+			'phpbb_version'		=> $data['extra']['phpbb-version'],
+			'direction'			=> $data['extra']['direction'],
+			'user_lang'			=> $data['extra']['user-lang'],
+			'plural_rule'		=> $data['extra']['plural-rule'],
+			'recaptcha_lang'	=> $data['extra']['recaptcha-lang'],
+			'turnstile_lang'	=> $data['extra']['turnstile-lang'] ?? '',
 		];
 	}
+
+	/**
+	 * Sorts the languages by their name instead of iso code
+	 *
+	 * @param mixed $a First language data
+	 * @param mixed $b Second language data
+	 * @return int
+	 */
+	private static function sort_by_local_name(mixed $a, mixed $b): int
+	{
+		return $a['local_name'] <=> $b['local_name'];
+	}
 }
diff --git a/phpBB/phpbb/lock/posting.php b/phpBB/phpbb/lock/posting.php
new file mode 100644
index 00000000000..569cad9971b
--- /dev/null
+++ b/phpBB/phpbb/lock/posting.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\lock;
+
+use phpbb\cache\driver\driver_interface as cache_interface;
+use phpbb\config\config;
+
+class posting
+{
+	/** @var cache_interface */
+	private $cache;
+
+	/** @var config */
+	private $config;
+
+	/** @var string */
+	private $lock_name = '';
+
+	/**
+	 * Constructor for posting lock
+	 *
+	 * @param cache_interface $cache
+	 * @param config $config
+	 */
+	public function __construct(cache_interface $cache, config $config)
+	{
+		$this->cache = $cache;
+		$this->config = $config;
+	}
+
+	/**
+	 * Set lock name
+	 *
+	 * @param int $creation_time Creation time of form, must be checked already
+	 * @param string $form_token Form token used for form, must be checked already
+	 *
+	 * @return void
+	 */
+	private function set_lock_name(int $creation_time, string $form_token): void
+	{
+		$this->lock_name = sha1(((string) $creation_time) . $form_token) . '_posting_lock';
+	}
+
+	/**
+	 * Acquire lock for current posting form submission
+	 *
+	 * @param int $creation_time Creation time of form, must be checked already
+	 * @param string $form_token Form token used for form, must be checked already
+	 *
+	 * @return bool True if lock could be acquired, false if not
+	 */
+	public function acquire(int $creation_time, string $form_token): bool
+	{
+		$this->set_lock_name($creation_time, $form_token);
+
+		// Lock is held for session, cannot acquire it unless special flag for testing is set
+		if ($this->cache->_exists($this->lock_name) && !$this->config->offsetExists('ci_tests_no_lock_posting'))
+		{
+			return false;
+		}
+
+		$this->cache->put($this->lock_name, true, $this->config['flood_interval']);
+
+		return true;
+	}
+}
diff --git a/phpBB/phpbb/manifest.php b/phpBB/phpbb/manifest.php
new file mode 100644
index 00000000000..a9ef60f7f7e
--- /dev/null
+++ b/phpBB/phpbb/manifest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb;
+
+use phpbb\config\config;
+use phpbb\event\dispatcher_interface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+class manifest
+{
+	/** @var config */
+	protected $config;
+
+	/** @var dispatcher_interface */
+	protected $phpbb_dispatcher;
+
+	/** @var user */
+	protected $user;
+
+	/**
+	 * Constructor for manifest controller
+	 *
+	 * @param config $config
+	 * @param dispatcher_interface $phpbb_dispatcher
+	 * @param user $user
+	 */
+	public function __construct(config $config, dispatcher_interface $phpbb_dispatcher, user $user)
+	{
+		$this->config = $config;
+		$this->phpbb_dispatcher = $phpbb_dispatcher;
+		$this->user = $user;
+	}
+
+	/**
+	 * Handle creation of a manifest json file for progressive web-app support
+	 *
+	 * @return JsonResponse
+	 */
+	public function handle(): JsonResponse
+	{
+		// Get the board URL and extract the path component
+		$board_path = $this->config['force_server_vars'] ? $this->config['script_path'] : (parse_url(generate_board_url(), PHP_URL_PATH) ?? '');
+
+		// Ensure path ends with '/' for PWA scope
+		$scope = rtrim($board_path, '/\\') . '/';
+		$start_url = $scope;
+
+		$sitename = html_entity_decode($this->config['sitename'], ENT_QUOTES, 'UTF-8');
+		$sitename_short = html_entity_decode($this->config['sitename_short'], ENT_QUOTES, 'UTF-8');
+
+		$manifest = [
+			'name'			=> $sitename,
+			'short_name'	=> $sitename_short ?: utf8_substr($sitename, 0, 12),
+			'display'		=> 'standalone',
+			'orientation'	=> 'portrait',
+			'start_url'		=> $start_url,
+			'scope'			=> $scope,
+		];
+
+		/**
+		 * Event to modify manifest data before it is outputted
+		 *
+		 * @event core.modify_manifest
+		 * @var	array	manifest	    Array of manifest members
+		 * @var string  scope           PWA scope path
+		 * @var string  start_url       PWA start URL
+		 * @var	string	sitename	    Full name of the board
+		 * @var	string	sitename_short	Shortened name of the board
+		 * @since 4.0.0-a1
+		 */
+		$vars = ['manifest', 'scope', 'start_url', 'sitename', 'sitename_short'];
+		extract($this->phpbb_dispatcher->trigger_event('core.modify_manifest', compact($vars)));
+
+		$response = new JsonResponse($manifest);
+		$response->setPublic();
+		$response->setMaxAge(3600);
+		$response->headers->addCacheControlDirective('must-revalidate', true);
+
+		if (!empty($this->user->data['is_bot']))
+		{
+			// Let reverse proxies know we detected a bot.
+			$response->headers->set('X-PHPBB-IS-BOT', 'yes');
+		}
+
+		return $response;
+	}
+}
diff --git a/phpBB/phpbb/members/controller/online.php b/phpBB/phpbb/members/controller/online.php
new file mode 100644
index 00000000000..eb680a332ad
--- /dev/null
+++ b/phpBB/phpbb/members/controller/online.php
@@ -0,0 +1,311 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\members\controller;
+
+use phpbb\auth\auth;
+use phpbb\config\config;
+use phpbb\event\dispatcher;
+use phpbb\exception\http_exception;
+use phpbb\group\helper as group_helper;
+use phpbb\controller\helper;
+use phpbb\language\language;
+use phpbb\members\viewonline_helper;
+use phpbb\pagination;
+use phpbb\request\request;
+use phpbb\template\template;
+use phpbb\user;
+use Symfony\Component\HttpFoundation\Response;
+
+class online
+{
+	/** @var auth */
+	protected $auth;
+
+	/** @var config */
+	protected $config;
+
+	/** @var dispatcher */
+	protected $dispatcher;
+
+	/** @var group_helper */
+	protected $group_helper;
+
+	/** @var viewonline_helper */
+	protected $viewonline_helper;
+
+	/** @var helper */
+	protected $helper;
+
+	/** @var language */
+	protected $language;
+
+	/** @var pagination */
+	protected $pagination;
+
+	/** @var request */
+	protected $request;
+
+	/** @var template */
+	protected $template;
+
+	/** @var user */
+	protected $user;
+
+	/** @var string */
+	protected $phpbb_root_path;
+
+	/** @var string */
+	protected $php_ex;
+
+	/**
+	 * online constructor.
+	 * @param auth $auth
+	 * @param config $config
+	 * @param dispatcher $dispatcher
+	 * @param group_helper $group_helper
+	 * @param viewonline_helper $viewonline_helper
+	 * @param helper $helper
+	 * @param language $language
+	 * @param pagination $pagination
+	 * @param request $request
+	 * @param template $template
+	 * @param user $user
+	 * @param string $phpbb_root_path
+	 * @param string $php_ex
+	 */
+	public function __construct(auth $auth, config $config, dispatcher $dispatcher, group_helper $group_helper, viewonline_helper $viewonline_helper, helper $helper, language $language, pagination $pagination, request $request, template $template, user $user, string $phpbb_root_path, string $php_ex)
+	{
+		$this->auth					= $auth;
+		$this->config				= $config;
+		$this->dispatcher			= $dispatcher;
+		$this->group_helper			= $group_helper;
+		$this->viewonline_helper	= $viewonline_helper;
+		$this->helper				= $helper;
+		$this->language				= $language;
+		$this->pagination			= $pagination;
+		$this->request				= $request;
+		$this->template				= $template;
+		$this->user					= $user;
+		$this->phpbb_root_path		= $phpbb_root_path;
+		$this->php_ex				= $php_ex;
+	}
+
+	/**
+	 * Controller for /online route
+	 *
+	 * @return Response a Symfony response object
+	 */
+	public function handle(): Response
+	{
+		// Display a listing of board admins, moderators
+		if (!function_exists('display_user_activity'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ex);
+		}
+
+		// Load language strings
+		$this->language->add_lang('memberlist');
+
+		// Can this user view profiles/memberlist?
+		if (!$this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'))
+		{
+			if ($this->user->data['user_id'] != ANONYMOUS)
+			{
+				throw new http_exception(403, 'NO_VIEW_USERS');
+			}
+
+			login_box('', $this->language->lang('LOGIN_EXPLAIN_VIEWONLINE'));
+		}
+
+		// Get and set some variables
+		$mode			= $this->request->variable('mode', '');
+		$session_id		= $this->request->variable('s', '');
+		$start			= $this->request->variable('start', 0);
+		$sort_key		= $this->request->variable('sk', 'b');
+		$sort_dir		= $this->request->variable('sd', 'd');
+		$show_guests	= ($this->config['load_online_guests']) ? $this->request->variable('sg', 0) : 0;
+
+		$sort_key_text = ['a' => $this->language->lang('SORT_USERNAME'), 'b' => $this->language->lang('SORT_JOINED'), 'c' => $this->language->lang('SORT_LOCATION')];
+		$sort_key_sql = ['a' => 'u.username_clean', 'b' => 's.session_time', 'c' => 's.session_page'];
+
+		// Sorting and order
+		if (!isset($sort_key_text[$sort_key]))
+		{
+			$sort_key = 'b';
+		}
+
+		$order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
+
+		$this->user->update_session_infos();
+
+		// Get number of online guests (if we do not display them)
+		$guest_counter = (!$show_guests) ? $this->viewonline_helper->get_number_guests() : 0;
+
+		// Get user list (moved into viewonline_helper)
+		$session_data_rowset = $this->viewonline_helper->get_session_data_rowset($show_guests, $order_by, $guest_counter);
+
+		$prev_id = $prev_ip = $user_list = [];
+		$logged_visible_online = $logged_hidden_online = $counter = 0;
+
+		// Get forum IDs for session pages which have only 't' parameter
+		$this->viewonline_helper->get_forum_ids($session_data_rowset);
+
+		foreach ($session_data_rowset as $row)
+		{
+			if ($row['user_id'] != ANONYMOUS && !isset($prev_id[$row['user_id']]))
+			{
+				$view_online = $s_user_hidden = false;
+				$user_colour = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : '';
+
+				$username_full = ($row['user_type'] != USER_IGNORE) ? get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) : '<span' . $user_colour . '>' . $row['username'] . '</span>';
+
+				if (!$row['session_viewonline'])
+				{
+					$view_online = ($this->auth->acl_get('u_viewonline') || $row['user_id'] === $this->user->data['user_id']) ? true : false;
+					$logged_hidden_online++;
+
+					$username_full = '<em>' . $username_full . '</em>';
+					$s_user_hidden = true;
+				}
+				else
+				{
+					$view_online = true;
+					$logged_visible_online++;
+				}
+
+				$prev_id[$row['user_id']] = 1;
+
+				if ($view_online)
+				{
+					$counter++;
+				}
+
+				if (!$view_online || $counter > $start + $this->config['topics_per_page'] || $counter <= $start)
+				{
+					continue;
+				}
+			}
+			else if ($show_guests && $row['user_id'] == ANONYMOUS && !isset($prev_ip[$row['session_ip']]))
+			{
+				$prev_ip[$row['session_ip']] = 1;
+				$guest_counter++;
+				$counter++;
+
+				if ($counter > $start + $this->config['topics_per_page'] || $counter <= $start)
+				{
+					continue;
+				}
+
+				$s_user_hidden = false;
+				$username_full = get_username_string('full', $row['user_id'], $this->language->lang('GUEST'));
+			}
+			else
+			{
+				continue;
+			}
+
+			list($location, $location_url) = $this->viewonline_helper->get_location($row['session_page'], $row['session_forum_id']);
+
+			$session_page = parse_url($row['session_page'], PHP_URL_PATH);
+			$session_page = preg_replace('/^\/index\.php\//', '/', $session_page);
+			$on_page = $this->viewonline_helper->get_user_page($session_page);
+
+			$forum_data = $this->viewonline_helper->get_forum_data();
+
+			/**
+			* Overwrite the location's name and URL, which are displayed in the list
+			*
+			* @event core.viewonline_overwrite_location
+			* @var	array	on_page			File name and query string
+			* @var	array	row				Array with the users sql row
+			* @var	string	location		Page name to displayed in the list
+			* @var	string	location_url	Page url to displayed in the list
+			* @var	array	forum_data		Array with forum data
+			* @since 3.1.0-a1
+			* @changed 3.1.0-a2 Added var forum_data
+			*/
+			$vars = ['on_page', 'row', 'location', 'location_url', 'forum_data'];
+			extract($this->dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars)));
+
+			$template_row = [
+				'USERNAME' 			=> $row['username'],
+				'USERNAME_COLOUR'	=> $row['user_colour'],
+				'USERNAME_FULL'		=> $username_full,
+				'LASTUPDATE'		=> $this->user->format_date($row['session_time']),
+				'FORUM_LOCATION'	=> $location,
+				'USER_IP'			=> ($this->auth->acl_get('a_')) ? (($mode == 'lookup' && $session_id == $row['session_id']) ? phpbb_get_host_for_ip($row['session_ip']) : $row['session_ip']) : '',
+				'USER_BROWSER'		=> ($this->auth->acl_get('a_user')) ? utf8_htmlspecialchars($row['session_browser']) : '',
+
+				'U_USER_PROFILE'	=> ($row['user_type'] != USER_IGNORE) ? get_username_string('profile', $row['user_id'], '') : '',
+				'U_USER_IP'			=> append_sid($this->phpbb_root_path . "viewonline." . $this->php_ex, 'mode=lookup' . (($mode != 'lookup' || $row['session_id'] != $session_id) ? '&amp;s=' . $row['session_id'] : '') . "&amp;sg=$show_guests&amp;start=$start&amp;sk=$sort_key&amp;sd=$sort_dir"),
+				'U_WHOIS'			=> $this->helper->route('phpbb_members_online_whois', ['session_id' => $row['session_id']]),
+				'U_FORUM_LOCATION'	=> $location_url,
+
+				'S_USER_HIDDEN'		=> $s_user_hidden,
+				'S_GUEST'			=> ($row['user_id'] == ANONYMOUS) ? true : false,
+				'S_USER_TYPE'		=> $row['user_type'],
+			];
+
+			/**
+			* Modify viewonline template data before it is displayed in the list
+			*
+			* @event core.viewonline_modify_user_row
+			* @var	array	on_page			File name and query string
+			* @var	array	row				Array with the users sql row
+			* @var	array	forum_data		Array with forum data
+			* @var	array	template_row	Array with template variables for the user row
+			* @since 3.1.0-RC4
+			*/
+			$vars = ['on_page', 'row', 'forum_data', 'template_row'];
+			extract($this->dispatcher->trigger_event('core.viewonline_modify_user_row', compact($vars)));
+
+			$this->template->assign_block_vars('user_row', $template_row);
+		}
+
+		$this->group_helper->display_legend();
+
+		// Refreshing the page every 60 seconds...
+		meta_refresh(60, $this->helper->route('phpbb_members_online', ['sg' => $show_guests, 'sk' => $sort_key, 'sd' => $sort_dir, 'start' => $start]));
+
+		$start = $this->pagination->validate_start($start, $this->config['topics_per_page'], $counter);
+		$base_url = $this->helper->route('phpbb_members_online', ['sg' => $show_guests, 'sk' => $sort_key, 'sd' => $sort_dir]);
+		$this->pagination->generate_template_pagination($base_url, 'pagination', 'start', $counter, $this->config['topics_per_page'], $start);
+
+		// Send data to template
+		$this->template->assign_vars([
+			'TOTAL_REGISTERED_USERS_ONLINE'	=> $this->language->lang('REG_USERS_ONLINE', (int) $logged_visible_online, $this->language->lang('HIDDEN_USERS_ONLINE', (int) $logged_hidden_online)),
+			'TOTAL_GUEST_USERS_ONLINE'		=> $this->language->lang('GUEST_USERS_ONLINE', (int) $guest_counter),
+
+			'U_SORT_USERNAME'		=> $this->helper->route('phpbb_members_online', ['sg' => (int) $show_guests, 'sk' => 'a', 'sd' => (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a')]),
+			'U_SORT_UPDATED'		=> $this->helper->route('phpbb_members_online', ['sg' => (int) $show_guests, 'sk' => 'b', 'sd' => (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a')]),
+			'U_SORT_LOCATION'		=> $this->helper->route('phpbb_members_online', ['sg' => (int) $show_guests, 'sk' => 'c', 'sd' => (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a')]),
+
+			'U_SWITCH_GUEST_DISPLAY'	=> $this->helper->route('phpbb_members_online', ['sg' => (int) !$show_guests]),
+			'L_SWITCH_GUEST_DISPLAY'	=> ($show_guests) ? $this->language->lang('HIDE_GUESTS') : $this->language->lang('DISPLAY_GUESTS'),
+			'S_SWITCH_GUEST_DISPLAY'	=> ($this->config['load_online_guests']) ? true : false,
+			'S_VIEWONLINE'				=> true,
+		]);
+
+		$this->template->assign_block_vars('navlinks', [
+			'BREADCRUMB_NAME'	=> $this->language->lang('WHO_IS_ONLINE'),
+			'U_BREADCRUMB'		=> $this->helper->route('phpbb_members_online'),
+		]);
+
+		make_jumpbox(append_sid($this->phpbb_root_path . "viewforum." . $this->php_ex));
+
+		// Render
+		return $this->helper->render('viewonline_body.html', $this->language->lang('WHO_IS_ONLINE'));
+	}
+
+}
diff --git a/phpBB/phpbb/members/controller/online_whois.php b/phpBB/phpbb/members/controller/online_whois.php
new file mode 100644
index 00000000000..479582501a0
--- /dev/null
+++ b/phpBB/phpbb/members/controller/online_whois.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\members\controller;
+
+use phpbb\auth\auth;
+use phpbb\db\driver\driver_interface;
+use phpbb\controller\helper;
+use phpbb\exception\http_exception;
+use phpbb\language\language;
+use phpbb\template\template;
+use phpbb\user;
+use Symfony\Component\HttpFoundation\Response;
+
+class online_whois
+{
+	/** @var auth */
+	protected $auth;
+
+	/** @var driver_interface */
+	protected $db;
+
+	/** @var helper */
+	protected $helper;
+
+	/** @var language */
+	protected $language;
+
+	/** @var template */
+	protected $template;
+
+	/** @var user */
+	protected $user;
+
+	/** @var string */
+	private $users_table;
+
+	/** @var string */
+	private $sessions_table;
+
+	/** @var string */
+	private $phpbb_root_path;
+
+	/** @var string */
+	private $php_ex;
+
+	/**
+	 * online_whois constructor.
+	 * @param auth $auth
+	 * @param driver_interface $db
+	 * @param helper $helper
+	 * @param language $language
+	 * @param template $template
+	 * @param user $user
+	 * @param string $users_table
+	 * @param string $sessions_table
+	 * @param string $phpbb_root_path
+	 * @param string $php_ex
+	 */
+	public function __construct(auth $auth, driver_interface $db, helper $helper, language $language, template $template, user $user, string $users_table, string $sessions_table, string $phpbb_root_path, string $php_ex)
+	{
+		$this->auth				= $auth;
+		$this->db				= $db;
+		$this->helper			= $helper;
+		$this->language			= $language;
+		$this->template			= $template;
+		$this->user				= $user;
+		$this->users_table		= $users_table;
+		$this->sessions_table	= $sessions_table;
+		$this->phpbb_root_path	= $phpbb_root_path;
+		$this->php_ex			= $php_ex;
+	}
+
+	/**
+	 * Controller for /online/whois/{session_id} route
+	 *
+	 * @param $session_id
+	 * @return Response a Symfony response object
+	 */
+	public function handle($session_id): Response
+	{
+		if (!function_exists('user_ipwhois'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ex);
+		}
+
+		// Load language strings
+		$this->language->add_lang('memberlist');
+
+		if (!$this->auth->acl_get('a_'))
+		{
+			$this->language->add_lang('acp/common');
+
+			throw new http_exception(403, 'NO_ADMIN');
+		}
+
+		$sql = 'SELECT u.user_id, u.username, u.user_type, s.session_ip
+			FROM ' . $this->users_table . ' u, ' . $this->sessions_table . " s
+			WHERE s.session_id = '" . $this->db->sql_escape($session_id) . "'
+				AND	u.user_id = s.session_user_id";
+		$result = $this->db->sql_query($sql);
+
+		if ($row = $this->db->sql_fetchrow($result))
+		{
+			$this->template->assign_var('WHOIS', user_ipwhois($row['session_ip']));
+		}
+		$this->db->sql_freeresult($result);
+
+		// Render
+		return $this->helper->render('viewonline_whois.html', $this->language->lang('WHO_IS_ONLINE'));
+	}
+}
diff --git a/phpBB/phpbb/members/controller/team.php b/phpBB/phpbb/members/controller/team.php
new file mode 100644
index 00000000000..1aac91d70cf
--- /dev/null
+++ b/phpBB/phpbb/members/controller/team.php
@@ -0,0 +1,439 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\members\controller;
+
+use phpbb\auth\auth;
+use phpbb\config\config;
+use phpbb\db\driver\driver_interface;
+use phpbb\event\dispatcher;
+use phpbb\exception\http_exception;
+use phpbb\group\helper as group_helper;
+use phpbb\controller\helper;
+use phpbb\language\language;
+use phpbb\template\template;
+use phpbb\user;
+use Symfony\Component\HttpFoundation\Response;
+
+class team
+{
+	/**
+	 * @var auth
+	 */
+	protected $auth;
+
+	/**
+	 * @var config
+	 */
+	protected $config;
+
+	/**
+	 * @var driver_interface
+	 */
+	protected $db;
+
+	/**
+	 * @var dispatcher
+	 */
+	protected $dispatcher;
+
+	/**
+	 * @var group_helper
+	 */
+	protected $group_helper;
+
+	/**
+	 * @var helper
+	 */
+	protected $helper;
+
+	/**
+	 * @var language
+	 */
+	protected $language;
+
+	/**
+	 * @var template
+	 */
+	protected $template;
+
+	/**
+	 * @var user
+	 */
+	protected $user;
+
+	/**
+	 * @var string
+	 */
+	protected $phpbb_root_path;
+
+	/**
+	 * @var string
+	 */
+	protected $php_ext;
+
+	/**
+	 * @var string
+	 */
+	protected $forums_table;
+
+	/**
+	 * @var string
+	 */
+	protected $groups_table;
+
+	/**
+	 * @var string
+	 */
+	protected $teampage_table;
+
+	/**
+	 * @var string
+	 */
+	protected $user_group_table;
+
+	/**
+	 * @var string
+	 */
+	protected $users_table;
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param auth             $auth           Authentication service
+	 * @param config           $config         Configuration
+	 * @param driver_interface $db             Database driver
+	 * @param dispatcher       $dispatcher     Event dispatcher
+	 * @param group_helper     $group_helper   Group helper
+	 * @param helper           $helper         Controller helper
+	 * @param language         $language       Language service
+	 * @param template         $template       Template service
+	 * @param user             $user           User object
+	 * @param string           $phpbb_root_path Path to phpBB root
+	 * @param string           $phpEx          PHP file extension
+	 * @param string           $forums_table   Table name for forums
+	 * @param string           $groups_table   Table name for groups
+	 * @param string           $teampage_table Table name for teampage
+	 * @param string           $user_group_table Table name for user_group
+	 * @param string           $users_table    Table name for users
+	 */
+	public function __construct(auth $auth, config $config, driver_interface $db, dispatcher $dispatcher, group_helper $group_helper, helper $helper, language $language, template $template, user $user, string $phpbb_root_path, string $phpEx, string $forums_table, string $groups_table, string $teampage_table, string $user_group_table, string $users_table)
+	{
+		$this->auth				= $auth;
+		$this->config			= $config;
+		$this->db				= $db;
+		$this->dispatcher		= $dispatcher;
+		$this->group_helper		= $group_helper;
+		$this->helper			= $helper;
+		$this->language			= $language;
+		$this->template			= $template;
+		$this->user				= $user;
+		$this->phpbb_root_path	= $phpbb_root_path;
+		$this->php_ext			= $phpEx;
+		$this->forums_table	= $forums_table;
+		$this->groups_table	= $groups_table;
+		$this->teampage_table	= $teampage_table;
+		$this->user_group_table	= $user_group_table;
+		$this->users_table	= $users_table;
+	}
+
+	/**
+	 * Controller for /team route
+	 *
+	 * @return Response a Symfony response object
+	 */
+	public function handle() : Response
+	{
+		// Display a listing of board admins, moderators
+		if (!function_exists('user_get_id_name'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		}
+		if (!function_exists('phpbb_get_user_rank'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+		}
+
+		// Load language strings
+		$this->language->add_lang('memberlist');
+
+		// Can this user view profiles/memberlist?
+		if (!$this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'))
+		{
+			if ($this->user->data['user_id'] != ANONYMOUS)
+			{
+				throw new http_exception(403, 'NO_VIEW_USERS');
+			}
+
+			login_box('', $this->language->lang('LOGIN_EXPLAIN_TEAM'));
+		}
+
+		$sql = 'SELECT *
+			FROM ' . $this->teampage_table . '
+			ORDER BY teampage_position ASC';
+		$result = $this->db->sql_query($sql, 3600);
+		$teampage_data = $this->db->sql_fetchrowset($result);
+		$this->db->sql_freeresult($result);
+
+		$sql_ary = [
+			'SELECT'	=> 'g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id as ug_user_id, t.teampage_id',
+
+			'FROM'		=> [$this->groups_table => 'g'],
+
+			'LEFT_JOIN'	=> [
+				[
+					'FROM'	=> [$this->teampage_table => 't'],
+					'ON'	=> 't.group_id = g.group_id',
+				],
+				[
+					'FROM'	=> [$this->user_group_table => 'ug'],
+					'ON'	=> 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . (int) $this->user->data['user_id'],
+				],
+			],
+		];
+
+		$result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary));
+
+		$group_ids = $groups_ary = [];
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if ($row['group_type'] == GROUP_HIDDEN && !$this->auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $this->user->data['user_id'])
+			{
+				$row['group_name'] = $this->language->lang('GROUP_UNDISCLOSED');
+				$row['u_group'] = '';
+			}
+			else
+			{
+				$row['group_name'] = $this->group_helper->get_name($row['group_name']);
+				$row['u_group'] = append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=group&amp;g=' . $row['group_id']);
+			}
+
+			if ($row['teampage_id'])
+			{
+				// Only put groups into the array we want to display.
+				// We are fetching all groups, to ensure we got all data for default groups.
+				$group_ids[] = (int) $row['group_id'];
+			}
+			$groups_ary[(int) $row['group_id']] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		$sql_ary = [
+			'SELECT'	=> 'u.user_id, u.group_id as default_group, u.username, u.username_clean, u.user_colour, u.user_type, u.user_rank, u.user_posts, u.user_allow_pm, g.group_id',
+
+			'FROM'		=> [
+				$this->user_group_table => 'ug',
+			],
+
+			'LEFT_JOIN'	=> [
+				[
+					'FROM'	=> [$this->users_table => 'u'],
+					'ON'	=> 'ug.user_id = u.user_id',
+				],
+				[
+					'FROM'	=> [$this->groups_table => 'g'],
+					'ON'	=> 'ug.group_id = g.group_id',
+				],
+			],
+
+			'WHERE'		=> $this->db->sql_in_set('g.group_id', $group_ids, false, true) . ' AND ug.user_pending = 0',
+
+			'ORDER_BY'	=> 'u.username_clean ASC',
+		];
+
+		/**
+		 * Modify the query used to get the users for the team page
+		 *
+		 * @event core.memberlist_team_modify_query
+		 * @var array	sql_ary			Array containing the query
+		 * @var array	group_ids		Array of group ids
+		 * @var array	teampage_data	The teampage data
+		 * @since 3.1.3-RC1
+		 */
+		$vars = ['sql_ary', 'group_ids', 'teampage_data'];
+		extract($this->dispatcher->trigger_event('core.memberlist_team_modify_query', compact($vars)));
+
+		$result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary));
+
+		$user_ary = $user_ids = $group_users = [];
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$row['forums'] = '';
+			$row['forums_ary'] = [];
+			$user_ary[(int) $row['user_id']] = $row;
+			$user_ids[] = (int) $row['user_id'];
+			$group_users[(int) $row['group_id']][] = (int) $row['user_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		$user_ids = array_unique($user_ids);
+
+		if (!empty($user_ids) && $this->config['teampage_forums'])
+		{
+			$this->template->assign_var('S_DISPLAY_MODERATOR_FORUMS', true);
+			// Get all moderators
+			$perm_ary = $this->auth->acl_get_list($user_ids, ['m_'], false);
+
+			foreach ($perm_ary as $forum_id => $forum_ary)
+			{
+				foreach ($forum_ary as $id_ary)
+				{
+					foreach ($id_ary as $id)
+					{
+						if (!$forum_id)
+						{
+							$user_ary[$id]['forums'] = $this->language->lang('ALL_FORUMS');
+						}
+						else
+						{
+							$user_ary[$id]['forums_ary'][] = $forum_id;
+						}
+					}
+				}
+			}
+
+			$sql = 'SELECT forum_id, forum_name
+				FROM ' . $this->forums_table;
+			$result = $this->db->sql_query($sql);
+
+			$forums = [];
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$forums[$row['forum_id']] = $row['forum_name'];
+			}
+			$this->db->sql_freeresult($result);
+
+			foreach ($user_ary as $user_id => $user_data)
+			{
+				if (!$user_data['forums'])
+				{
+					foreach ($user_data['forums_ary'] as $forum_id)
+					{
+						$user_ary[$user_id]['forums_options'] = true;
+						if (isset($forums[$forum_id]))
+						{
+							if ($this->auth->acl_get('f_list', $forum_id))
+							{
+								$user_ary[$user_id]['forums'] .= '<option value="">' . $forums[$forum_id] . '</option>';
+							}
+						}
+					}
+				}
+			}
+		}
+
+		foreach ($teampage_data as $team_data)
+		{
+			// If this team entry has no group, it's a category
+			if (!$team_data['group_id'])
+			{
+				$this->template->assign_block_vars('group', [
+					'GROUP_NAME'  => $team_data['teampage_name'],
+				]);
+
+				continue;
+			}
+
+			$group_data = $groups_ary[(int) $team_data['group_id']];
+			$group_id = (int) $team_data['group_id'];
+
+			if (!$team_data['teampage_parent'])
+			{
+				// If the group does not have a parent category, we display the groupname as category
+				$this->template->assign_block_vars('group', [
+					'GROUP_NAME'	=> $group_data['group_name'],
+					'GROUP_COLOR'	=> $group_data['group_colour'],
+					'U_GROUP'		=> $group_data['u_group'],
+				]);
+			}
+
+			// Display group members.
+			if (!empty($group_users[$group_id]))
+			{
+				foreach ($group_users[$group_id] as $user_id)
+				{
+					if (isset($user_ary[$user_id]))
+					{
+						$row = $user_ary[$user_id];
+						if ($this->config['teampage_memberships'] == 1 && ($group_id != $groups_ary[$row['default_group']]['group_id']) && $groups_ary[$row['default_group']]['teampage_id'])
+						{
+							// Display users in their primary group, instead of the first group, when it is displayed on the teampage.
+							continue;
+						}
+
+						$user_rank_data = phpbb_get_user_rank($row, (($row['user_id'] == ANONYMOUS) ? false : $row['user_posts']));
+
+						$template_vars = [
+							'USER_ID'		=> $row['user_id'],
+							'FORUMS'		=> $row['forums'],
+							'FORUM_OPTIONS'	=> (isset($row['forums_options'])) ? true : false,
+							'RANK_TITLE'	=> $user_rank_data['title'],
+
+							'GROUP_NAME'	=> $groups_ary[$row['default_group']]['group_name'],
+							'GROUP_COLOR'	=> $groups_ary[$row['default_group']]['group_colour'],
+							'U_GROUP'		=> $groups_ary[$row['default_group']]['u_group'],
+
+							'RANK_IMG'		=> $user_rank_data['img'],
+							'RANK_IMG_SRC'	=> $user_rank_data['img_src'],
+
+							'S_INACTIVE'	=> $row['user_type'] == USER_INACTIVE,
+
+							'U_PM'			=> ($this->config['allow_privmsg'] && $this->auth->acl_get('u_sendpm') && ($row['user_allow_pm'] || $this->auth->acl_gets('a_', 'm_') || $this->auth->acl_getf_global('m_'))) ? append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'i=pm&amp;mode=compose&amp;u=' . $row['user_id']) : '',
+
+							'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
+							'USERNAME'			=> get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
+							'USER_COLOR'		=> get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
+							'U_VIEW_PROFILE'	=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
+						];
+
+						/**
+						 * Modify the template vars for displaying the user in the groups on the teampage
+						 *
+						 * @event core.memberlist_team_modify_template_vars
+						 * @var array	template_vars		Array containing the query
+						 * @var array	row					Array containing the action user row
+						 * @var array	groups_ary			Array of groups with all users that should be displayed
+						 * @since 3.1.3-RC1
+						 */
+						$vars = ['template_vars', 'row', 'groups_ary'];
+						extract($this->dispatcher->trigger_event('core.memberlist_team_modify_template_vars', compact($vars)));
+
+						$this->template->assign_block_vars('group.user', $template_vars);
+
+						if ($this->config['teampage_memberships'] != 2)
+						{
+							unset($user_ary[$user_id]);
+						}
+					}
+				}
+			}
+		}
+
+		$this->template->assign_vars([
+			'PM_IMG' => $this->user->img('icon_contact_pm', $this->language->lang('SEND_PRIVATE_MESSAGE')),
+		]);
+
+		// Breadcrumbs
+		$this->template->assign_block_vars('navlinks', [
+			'BREADCRUMB_NAME' => $this->language->lang('THE_TEAM'),
+			'U_BREADCRUMB' => $this->helper->route('phpbb_members_team'),
+		]);
+
+		make_jumpbox(append_sid("{$this->phpbb_root_path}viewforum.{$this->php_ext}"));
+
+		// Render
+		return $this->helper->render('memberlist_team.html', $this->language->lang('THE_TEAM'));
+	}
+
+}
diff --git a/phpBB/phpbb/members/viewonline_helper.php b/phpBB/phpbb/members/viewonline_helper.php
new file mode 100644
index 00000000000..8ead6c0e42d
--- /dev/null
+++ b/phpBB/phpbb/members/viewonline_helper.php
@@ -0,0 +1,469 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\members;
+
+use phpbb\filesystem\helper as filesystem_helper;
+
+/**
+ * Class to handle viewonline related tasks
+ */
+class viewonline_helper
+{
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\event\dispatcher_interface */
+	protected $dispatcher;
+
+	/** @var \phpbb\routing\router */
+	protected $router;
+
+	/** @var \phpbb\controller\helper */
+	protected $helper;
+
+	/** @var \phpbb\language\language */
+	protected $language;
+
+	/** @var \phpbb\auth\auth */
+	protected $auth;
+
+	/** @var string */
+	protected $phpbb_root_path;
+
+	/** @var string */
+	protected $php_ex;
+
+	/** @var string */
+	protected $phpbb_adm_relative_path;
+
+	/** @var string */
+	protected $forums_table;
+
+	/** @var string */
+	protected $topics_table;
+
+	/** @var string */
+	protected $users_table;
+
+	/** @var string */
+	protected $sessions_table;
+
+	/**
+	 * @param \phpbb\db\driver\driver_interface $db
+	 * @param \phpbb\config\config $config
+	 * @param \phpbb\event\dispatcher_interface $dispatcher
+	 * @param \phpbb\routing\router $router
+	 * @param \phpbb\controller\helper $helper
+	 * @param \phpbb\language\language $language
+	 * @param \phpbb\auth\auth $auth
+	 * @param string $phpbb_root_path
+	 * @param string $php_ex
+	 * @param string $phpbb_adm_relative_path
+	 * @param string $users_table
+	 * @param string $sessions_table
+	 * @param string $topics_table
+	 * @param string $forums_table
+	 */
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\routing\router $router, \phpbb\controller\helper $helper, \phpbb\language\language $language, \phpbb\auth\auth $auth, string $phpbb_root_path, string $php_ex, string $phpbb_adm_relative_path, string $users_table, string $sessions_table, string $topics_table, string $forums_table)
+	{
+		$this->db = $db;
+		$this->config = $config;
+		$this->dispatcher = $dispatcher;
+
+		$this->router = $router;
+		$this->helper = $helper;
+		$this->language = $language;
+		$this->auth = $auth;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ex = $php_ex;
+		$this->phpbb_adm_relative_path = $phpbb_adm_relative_path;
+
+		$this->users_table = $users_table;
+		$this->sessions_table = $sessions_table;
+		$this->topics_table = $topics_table;
+		$this->forums_table = $forums_table;
+	}
+
+	/**
+	 * Get forum IDs for topics
+	 *
+	 * Retrieve forum IDs and add the data into the session data array
+	 * Array structure matches sql_fethrowset() result array
+	 *
+	 * @param array $session_data_rowset Users' session data array
+	 * @return void
+	 */
+	public function get_forum_ids(array &$session_data_rowset): void
+	{
+		$topic_ids = $match = [];
+		foreach ($session_data_rowset as $number => $row)
+		{
+			if ($row['session_forum_id'] == 0 && preg_match('#t=([0-9]+)#', $row['session_page'], $match))
+			{
+				$topic_ids[$number] = (int) $match[1];
+			}
+		}
+
+		if (count($topic_ids = array_unique($topic_ids)))
+		{
+			$sql_ary = [
+				'SELECT'	=> 't.topic_id, t.forum_id',
+				'FROM'		=> [
+					$this->topics_table => 't',
+				],
+				'WHERE'		=> $this->db->sql_in_set('t.topic_id', $topic_ids),
+				'ORDER_BY'	=> 't.topic_id',
+			];
+			$result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary));
+			$forum_ids_rowset = $this->db->sql_fetchrowset($result);
+			$this->db->sql_freeresult($result);
+
+			foreach ($forum_ids_rowset as $forum_ids_row)
+			{
+				$session_data_row_number = array_search((int) $forum_ids_row['topic_id'], $topic_ids);
+				$session_data_rowset[$session_data_row_number]['session_forum_id'] = (int) $forum_ids_row['forum_id'];
+			}
+		}
+	}
+
+	/**
+	 * Get user page
+	 *
+	 * @param string $session_page User's session page
+	 * @return array Match array filled by preg_match()
+	 */
+	public function get_user_page($session_page): array
+	{
+		$session_page = filesystem_helper::clean_path($session_page);
+
+		if (str_starts_with($session_page, './'))
+		{
+			$session_page = substr($session_page, 2);
+		}
+
+		preg_match('#^((\.\./)*([a-z0-9/_-]+))#i', $session_page, $on_page);
+		if (empty($on_page))
+		{
+			$on_page[1] = '';
+		}
+
+		return $on_page;
+	}
+
+	/**
+	 * Given a certain page, it returns the title of the page and a link to it.
+	 * There are 2 strategies to detect the page the user is in:
+	 *  - Try to get the controller route from the router service
+	 *  - And second, if is not possible to get the controller route, the
+	 * page is analyzed by path, analyzing the file that is accessed. This
+	 * is mostly for legacy pages, and should be removed in the future.
+	 *
+	 * @param string $session_page
+	 * @param int $forum_id
+	 * @return array
+	 */
+	public function get_location(string $session_page, int $forum_id): array
+	{
+		try
+		{
+			$match = $this->router->match($session_page);
+
+			switch ($match['_route'])
+			{
+				case 'phpbb_index_controller':
+					$location = $this->language->lang('INDEX');
+					$location_url = $this->helper->route('phpbb_index_controller');
+					break;
+
+				case 'phpbb_help_bbcode_controller':
+				case 'phpbb_help_faq_controller':
+					$location = $this->language->lang('VIEWING_FAQ');
+					$location_url = $this->helper->route('phpbb_help_faq_controller');
+					break;
+
+				case 'phpbb_members_online':
+				case 'phpbb_members_online_whois':
+					$location = $this->language->lang('VIEWING_ONLINE');
+					$location_url = $this->helper->route('phpbb_members_online');
+					break;
+
+				case 'phpbb_members_team':
+					$location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex);
+					$location = $this->language->lang('VIEWING_MEMBERS');
+					break;
+
+				case 'phpbb_report_pm_controller':
+				case 'phpbb_report_post_controller':
+					$location = $this->language->lang('REPORTING_POST');
+					$location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex);
+					break;
+
+				default:
+					// Is a route, but not in the switch
+					$location = $this->language->lang('INDEX');
+					$location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex);
+			}
+		}
+		catch (\RuntimeException $e) // Urls without route
+		{
+			$on_page = $this->get_user_page($session_page);
+
+			switch ($on_page[1])
+			{
+				case $this->phpbb_adm_relative_path . 'index':
+					$location = $this->language->lang('ACP');
+					$location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex);
+					break;
+
+				case 'posting':
+				case 'viewforum':
+				case 'viewtopic':
+
+					$forum_data = $this->get_forum_data();
+
+					if ($forum_id && $this->auth->acl_get('f_list', $forum_id))
+					{
+						$location = '';
+						$location_url = append_sid($this->phpbb_root_path . "viewforum." . $this->php_ex, 'f=' . $forum_id);
+
+						if ($forum_data[$forum_id]['forum_type'] == FORUM_LINK)
+						{
+							$location = $this->language->lang('READING_LINK', $forum_data[$forum_id]['forum_name']);
+							break;
+						}
+
+						switch ($on_page[1])
+						{
+							case 'posting':
+								preg_match('#mode=([a-z]+)#', $session_page, $on_page);
+								$posting_mode = (!empty($on_page[1])) ? $on_page[1] : '';
+
+								switch ($posting_mode)
+								{
+									case 'reply':
+									case 'quote':
+										$location = $this->language->lang('REPLYING_MESSAGE', $forum_data[$forum_id]['forum_name']);
+										break;
+
+									default:
+										$location = $this->language->lang('POSTING_MESSAGE', $forum_data[$forum_id]['forum_name']);
+										break;
+								}
+								break;
+
+							case 'viewtopic':
+								$location = $this->language->lang('READING_TOPIC', $forum_data[$forum_id]['forum_name']);
+								break;
+
+							case 'viewforum':
+								$location = $this->language->lang('READING_FORUM', $forum_data[$forum_id]['forum_name']);
+								break;
+						}
+					}
+					else
+					{
+						$location = $this->language->lang('INDEX');
+						$location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex);
+					}
+					break;
+
+				case 'search':
+					$location = $this->language->lang('SEARCHING_FORUMS');
+					$location_url = append_sid($this->phpbb_root_path . "search." . $this->php_ex);
+					break;
+
+				case 'memberlist':
+					$location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex);
+
+					if (str_contains($session_page, 'mode=viewprofile'))
+					{
+						$location = $this->language->lang('VIEWING_MEMBER_PROFILE');
+					}
+					else if (str_contains($session_page, 'mode=contactadmin'))
+					{
+						$location = $this->language->lang('VIEWING_CONTACT_ADMIN');
+						$location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex, 'mode=contactadmin');
+					}
+					else
+					{
+						$location = $this->language->lang('VIEWING_MEMBERS');
+					}
+					break;
+
+				case 'mcp':
+					$location = $this->language->lang('VIEWING_MCP');
+					$location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex);
+					break;
+
+				case 'ucp':
+					$location = $this->language->lang('VIEWING_UCP');
+
+					// Grab some common modules
+					$url_params = [
+						'mode=register'		=> 'VIEWING_REGISTER',
+						'i=pm&mode=compose'	=> 'POSTING_PRIVATE_MESSAGE',
+						'i=pm&'				=> 'VIEWING_PRIVATE_MESSAGES',
+						'i=profile&'		=> 'CHANGING_PROFILE',
+						'i=prefs&'			=> 'CHANGING_PREFERENCES',
+					];
+
+					foreach ($url_params as $param => $lang)
+					{
+						if (strpos($session_page, $param) !== false)
+						{
+							$location = $this->language->lang($lang);
+							break;
+						}
+					}
+
+					$location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex);
+					break;
+
+				default:
+					$location = $this->language->lang('INDEX');
+					$location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex);
+					break;
+			}
+		}
+
+		return [$location, $location_url];
+	}
+
+	/**
+	 * Get number of guests online
+	 *
+	 * @return int
+	 */
+	public function get_number_guests(): int
+	{
+		switch ($this->db->get_sql_layer())
+		{
+			case 'sqlite3':
+				$sql = 'SELECT COUNT(session_ip) as num_guests
+					FROM (
+						SELECT DISTINCT session_ip
+							FROM ' . $this->sessions_table . '
+							WHERE session_user_id = ' . ANONYMOUS . '
+								AND session_time >= ' . (time() - ($this->config['load_online_time'] * 60)) .
+					')';
+				break;
+
+			default:
+				$sql = 'SELECT COUNT(DISTINCT session_ip) as num_guests
+					FROM ' . $this->sessions_table . '
+					WHERE session_user_id = ' . ANONYMOUS . '
+						AND session_time >= ' . (time() - ($this->config['load_online_time'] * 60));
+				break;
+		}
+		$result = $this->db->sql_query($sql);
+		$guest_counter = (int) $this->db->sql_fetchfield('num_guests');
+		$this->db->sql_freeresult($result);
+
+		return $guest_counter;
+	}
+
+	/**
+	 * Get forum data
+	 *
+	 * @return array
+	 */
+	public function get_forum_data(): array
+	{
+		static $forum_data;
+
+		if (isset($forum_data))
+		{
+			return $forum_data;
+		}
+
+		// Forum info
+		$sql_ary = [
+			'SELECT'	=> 'f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id',
+			'FROM'		=> [
+				$this->forums_table    => 'f',
+			],
+			'ORDER_BY'	=> 'f.left_id ASC',
+		];
+
+		/**
+		 * Modify the forum data SQL query for getting additional fields if needed
+		 *
+		 * @event core.viewonline_modify_forum_data_sql
+		 * @var	array	sql_ary			The SQL array
+		 * @since 3.1.5-RC1
+		 */
+		$vars = ['sql_ary'];
+		extract($this->dispatcher->trigger_event('core.viewonline_modify_forum_data_sql', compact($vars)));
+
+		$result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary), 600);
+		unset($sql_ary);
+
+		$forum_data = [];
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$forum_data[$row['forum_id']] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $forum_data;
+	}
+
+	/**
+	 * Build and execute the sessions query and return the rowset.
+	 *
+	 * @param bool $show_guests
+	 * @param string $order_by
+	 * @param int &$guest_counter
+	 * @return array
+	 */
+	public function get_session_data_rowset(bool &$show_guests, string $order_by, int &$guest_counter): array
+	{
+		$forum_data = $this->get_forum_data();
+
+		$sql_ary = [
+			'SELECT'    => 'u.user_id, u.username, u.username_clean, u.user_type, u.user_colour, s.session_id, s.session_time, s.session_page, s.session_ip, s.session_browser, s.session_viewonline, s.session_forum_id',
+			'FROM'      => [
+				$this->users_table     => 'u',
+				$this->sessions_table  => 's',
+			],
+			'WHERE'     => 'u.user_id = s.session_user_id
+				AND s.session_time >= ' . (time() - ($this->config['load_online_time'] * 60)) .
+				(($show_guests) ? '' : ' AND s.session_user_id <> ' . ANONYMOUS),
+			'ORDER_BY'  => $order_by,
+		];
+
+		/**
+		 * Modify the SQL query for getting the user data to display viewonline list
+		 *
+		 * @event core.viewonline_modify_sql
+		 * @var	array	sql_ary			The SQL array
+		 * @var	bool	show_guests		Do we display guests in the list
+		 * @var	int		guest_counter	Number of guests displayed
+		 * @var	array	forum_data		Array with forum data
+		 * @since 3.1.0-a1
+		 * @changed 3.1.0-a2 Added vars guest_counter and forum_data
+		 */
+		$vars = ['sql_ary', 'show_guests', 'guest_counter', 'forum_data'];
+		extract($this->dispatcher->trigger_event('core.viewonline_modify_sql', compact($vars)));
+
+		$result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary));
+		$session_data_rowset = $this->db->sql_fetchrowset($result);
+		$this->db->sql_freeresult($result);
+
+		return $session_data_rowset;
+	}
+}
diff --git a/phpBB/phpbb/mention/controller/mention.php b/phpBB/phpbb/mention/controller/mention.php
index 37a5cfd3238..5bf3766ef31 100644
--- a/phpBB/phpbb/mention/controller/mention.php
+++ b/phpBB/phpbb/mention/controller/mention.php
@@ -13,19 +13,48 @@
 
 namespace phpbb\mention\controller;
 
+use phpbb\auth\auth;
+use phpbb\config\config;
+use phpbb\controller\helper;
+use phpbb\db\driver\driver_interface;
 use phpbb\di\service_collection;
+use phpbb\form\form_helper;
+use phpbb\mention\source\source_interface;
 use phpbb\request\request_interface;
+use phpbb\user;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
 
 class mention
 {
+	/** @var string Form name used for mentions form key check */
+	protected const MENTION_FORM_NAME = 'posting';
+
+	/** @var auth */
+	protected $auth;
+
+	/** @var config */
+	protected $config;
+
+	/** @var driver_interface */
+	protected $db;
+
+	/** @var form_helper */
+	protected $form_helper;
+
 	/** @var service_collection */
 	protected $mention_sources;
 
 	/** @var  request_interface */
 	protected $request;
 
+	/** @var helper */
+	protected $helper;
+
+	/** @var user */
+	protected $user;
+
 	/** @var string */
 	protected $phpbb_root_path;
 
@@ -35,15 +64,25 @@ class mention
 	/**
 	 * Constructor
 	 *
-	 * @param service_collection|array $mention_sources
+	 * @param auth $auth
+	 * @param config $config
+	 * @param driver_interface $db
+	 * @param form_helper $form_helper
+	 * @param service_collection $mention_sources
 	 * @param request_interface $request
+	 * @param helper $helper
 	 * @param string $phpbb_root_path
 	 * @param string $phpEx
 	 */
-	public function __construct($mention_sources, request_interface $request, string $phpbb_root_path, string $phpEx)
+	public function __construct(auth $auth, config $config, driver_interface $db, form_helper $form_helper, service_collection $mention_sources, request_interface $request, helper $helper, string $phpbb_root_path, string $phpEx)
 	{
+		$this->auth = $auth;
+		$this->config = $config;
+		$this->db = $db;
+		$this->form_helper = $form_helper;
 		$this->mention_sources = $mention_sources;
 		$this->request = $request;
+		$this->helper = $helper;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $phpEx;
 	}
@@ -51,20 +90,23 @@ public function __construct($mention_sources, request_interface $request, string
 	/**
 	 * Handle requests to mention controller
 	 *
-	 * @return JsonResponse|RedirectResponse
+	 * @return Response
 	 */
-	public function handle()
+	public function handle(): Response
 	{
-		if (!$this->request->is_ajax())
+		$forum_id = $this->request->variable('forum_id', 0);
+		$topic_id = $this->request->variable('topic_id', 0);
+
+		if (!$this->request->is_ajax() || !$this->check_form_token() || !$this->can_mention($forum_id, $topic_id))
 		{
-			return new RedirectResponse(append_sid($this->phpbb_root_path . 'index.' . $this->php_ext));
+			return new RedirectResponse($this->helper->route('phpbb_index_controller'));
 		}
 
 		$keyword = $this->request->variable('keyword', '', true);
-		$topic_id = $this->request->variable('topic_id', 0);
 		$names = [];
 		$has_names_remaining = false;
 
+		/** @var source_interface $source */
 		foreach ($this->mention_sources as $source)
 		{
 			$has_names_remaining = !$source->get($names, $keyword, $topic_id) || $has_names_remaining;
@@ -73,6 +115,47 @@ public function handle()
 		return new JsonResponse([
 			'names' => array_values($names),
 			'all' => !$has_names_remaining,
+			'form_tokens' => $this->form_helper->get_form_tokens(self::MENTION_FORM_NAME),
 		]);
 	}
+
+	/**
+	 * Check whether user is able to use mention
+	 *
+	 * @param int $forum_id Forum ID
+	 * @param int $topic_id Topic IC
+	 *
+	 * @return bool True if user can mention, false if not
+	 */
+	protected function can_mention(int $forum_id, int $topic_id): bool
+	{
+		// Retrieve forum_id for topic_id
+		if ($topic_id)
+		{
+			$sql = 'SELECT forum_id
+				FROM ' . TOPICS_TABLE . '
+				WHERE topic_id = ' . (int) $topic_id;
+			$result = $this->db->sql_query($sql);
+			$forum_id = (int) $this->db->sql_fetchfield('forum_id');
+			$this->db->sql_freeresult($result);
+		}
+
+		// No forum id, aborting here
+		if (!$forum_id)
+		{
+			return false;
+		}
+
+		return $this->config['allow_mentions'] && $this->auth->acl_get('u_mention') && $this->auth->acl_get('f_mention', $forum_id);
+	}
+
+	/**
+	 * Check form tokens
+	 *
+	 * @return bool
+	 */
+	protected function check_form_token(): bool
+	{
+		return $this->form_helper->check_form_tokens(self::MENTION_FORM_NAME);
+	}
 }
diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php
index ae1c1d8614a..dde80bea752 100644
--- a/phpBB/phpbb/message/admin_form.php
+++ b/phpBB/phpbb/message/admin_form.php
@@ -39,14 +39,15 @@ class admin_form extends form
 	* @param \phpbb\config\config $config
 	* @param \phpbb\config\db_text $config_text
 	* @param \phpbb\db\driver\driver_interface $db
+	* @param \phpbb\controller\helper $controller_helper
 	* @param \phpbb\user $user
 	* @param \phpbb\event\dispatcher_interface $dispatcher
 	* @param string $phpbb_root_path
 	* @param string $phpEx
 	*/
-	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\config\db_text $config_text, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, \phpbb\event\dispatcher_interface $dispatcher, $phpbb_root_path, $phpEx)
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\config\db_text $config_text, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $controller_helper, \phpbb\user $user, \phpbb\event\dispatcher_interface $dispatcher, $phpbb_root_path, $phpEx)
 	{
-		parent::__construct($auth, $config, $db, $user, $phpbb_root_path, $phpEx);
+		parent::__construct($auth, $config, $db, $controller_helper, $user, $phpbb_root_path, $phpEx);
 		$this->config_text = $config_text;
 		$this->dispatcher = $dispatcher;
 	}
@@ -85,7 +86,7 @@ public function bind(\phpbb\request\request_interface $request)
 	/**
 	* {inheritDoc}
 	*/
-	public function submit(\messenger $messenger)
+	public function submit(\phpbb\di\service_collection $messenger)
 	{
 		if (!$this->subject)
 		{
@@ -155,7 +156,6 @@ public function submit(\messenger $messenger)
 			}
 
 			$this->message->set_sender($this->user->ip, $this->sender_name, $this->sender_address, $this->user->lang_name);
-			$this->message->set_sender_notify_type(NOTIFY_EMAIL);
 		}
 
 		$this->message->set_template('contact_admin');
@@ -164,8 +164,7 @@ public function submit(\messenger $messenger)
 		$this->message->add_recipient(
 			$this->user->lang['ADMINISTRATOR'],
 			$this->config['board_contact'],
-			$this->config['default_lang'],
-			NOTIFY_EMAIL
+			$this->config['default_lang']
 		);
 
 		$this->message->set_template_vars(array(
diff --git a/phpBB/phpbb/message/form.php b/phpBB/phpbb/message/form.php
index c23b1689065..5e942473cc2 100644
--- a/phpBB/phpbb/message/form.php
+++ b/phpBB/phpbb/message/form.php
@@ -22,6 +22,8 @@ abstract class form
 	protected $auth;
 	/** @var \phpbb\config\config */
 	protected $config;
+	/** @var \phpbb\controller\helper */
+	protected $controller_helper;
 	/** @var \phpbb\db\driver\driver_interface */
 	protected $db;
 	/** @var \phpbb\message\message */
@@ -47,17 +49,19 @@ abstract class form
 	* @param \phpbb\auth\auth $auth
 	* @param \phpbb\config\config $config
 	* @param \phpbb\db\driver\driver_interface $db
+	* @param \phpbb\controller\helper $controller_helper
 	* @param \phpbb\user $user
 	* @param string $phpbb_root_path
 	* @param string $phpEx
 	*/
-	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, $phpbb_root_path, $phpEx)
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $controller_helper, \phpbb\user $user, $phpbb_root_path, $phpEx)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->phpEx = $phpEx;
 		$this->user = $user;
 		$this->auth = $auth;
 		$this->config = $config;
+		$this->controller_helper = $controller_helper;
 		$this->db = $db;
 
 		$this->message = new message($config['server_name']);
@@ -111,7 +115,7 @@ public function check_allow()
 	*/
 	public function get_return_message()
 	{
-		return sprintf($this->user->lang['RETURN_INDEX'], '<a href="' . append_sid($this->phpbb_root_path . 'index.' . $this->phpEx) . '">', '</a>');
+		return sprintf($this->user->lang['RETURN_INDEX'], '<a href="' . $this->controller_helper->route('phpbb_index_controller') . '">', '</a>');
 	}
 
 	/**
@@ -129,10 +133,10 @@ public function bind(\phpbb\request\request_interface $request)
 	/**
 	* Submit form, generate the email and send it
 	*
-	* @param \messenger $messenger
+	* @param \phpbb\di\service_collection $messenger
 	* @return void
 	*/
-	public function submit(\messenger $messenger)
+	public function submit(\phpbb\di\service_collection $messenger)
 	{
 		if (!check_form_key('memberlist_email'))
 		{
@@ -153,7 +157,7 @@ public function submit(\messenger $messenger)
 
 			$this->message->send($messenger, phpbb_get_board_contact($this->config, $this->phpEx));
 
-			meta_refresh(3, append_sid($this->phpbb_root_path . 'index.' . $this->phpEx));
+			meta_refresh(3, $this->controller_helper->route('phpbb_index_controller'));
 			trigger_error($this->user->lang['EMAIL_SENT'] . '<br /><br />' . $this->get_return_message());
 		}
 	}
diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php
index d77f56c73f0..9eae8719a47 100644
--- a/phpBB/phpbb/message/message.php
+++ b/phpBB/phpbb/message/message.php
@@ -13,6 +13,8 @@
 
 namespace phpbb\message;
 
+use phpbb\messenger\method\messenger_interface;
+
 /**
 * Class message
 * Holds all information for an email and sends it in the end
@@ -24,29 +26,33 @@ class message
 
 	/** @var string */
 	protected $subject = '';
+
 	/** @var string */
 	protected $body = '';
+
 	/** @var string */
 	protected $template = '';
+
 	/** @var array */
 	protected $template_vars = array();
 
 	/** @var string */
 	protected $sender_ip = '';
+
 	/** @var string */
 	protected $sender_name = '';
+
 	/** @var string */
 	protected $sender_address = '';
+
 	/** @var string */
 	protected $sender_lang = '';
+
 	/** @var string|int */
 	protected $sender_id = '';
+
 	/** @var string */
 	protected $sender_username = '';
-	/** @var string */
-	protected $sender_jabber = '';
-	/** @var int */
-	protected $sender_notify_type = NOTIFY_EMAIL;
 
 	/** @var array */
 	protected $recipients;
@@ -117,9 +123,7 @@ public function add_recipient_from_user_row(array $user)
 			$user['username'],
 			$user['user_email'],
 			$user['user_lang'],
-			$user['user_notify_type'],
-			$user['username'],
-			$user['user_jabber']
+			$user['username']
 		);
 	}
 
@@ -129,20 +133,16 @@ public function add_recipient_from_user_row(array $user)
 	* @param string $recipient_name		Displayed sender name
 	* @param string $recipient_address	Email address
 	* @param string $recipient_lang
-	* @param int $recipient_notify_type	Used notification methods (Jabber, Email, ...)
 	* @param string $recipient_username	User Name (used for AntiAbuse header)
-	* @param string $recipient_jabber
 	* @return void
 	*/
-	public function add_recipient($recipient_name, $recipient_address, $recipient_lang, $recipient_notify_type = NOTIFY_EMAIL, $recipient_username = '', $recipient_jabber = '')
+	public function add_recipient($recipient_name, $recipient_address, $recipient_lang, $recipient_username = '')
 	{
 		$this->recipients[] = array(
 			'name'			=> $recipient_name,
-			'address'		=> $recipient_address,
+			'user_email'	=> $recipient_address,
 			'lang'			=> $recipient_lang,
 			'username'		=> $recipient_username,
-			'jabber'		=> $recipient_jabber,
-			'notify_type'	=> $recipient_notify_type,
 			'to_name'		=> $recipient_name,
 		);
 	}
@@ -161,11 +161,8 @@ public function set_sender_from_user($user)
 			$user->data['user_email'],
 			$user->lang_name,
 			$user->data['user_id'],
-			$user->data['username'],
-			$user->data['user_jabber']
+			$user->data['username']
 		);
-
-		$this->set_sender_notify_type($user->data['user_notify_type']);
 	}
 
 	/**
@@ -177,10 +174,9 @@ public function set_sender_from_user($user)
 	* @param string $sender_lang
 	* @param int $sender_id				User ID
 	* @param string $sender_username	User Name (used for AntiAbuse header)
-	* @param string $sender_jabber
 	* @return void
 	*/
-	public function set_sender($sender_ip, $sender_name, $sender_address, $sender_lang = '', $sender_id = 0, $sender_username = '', $sender_jabber = '')
+	public function set_sender($sender_ip, $sender_name, $sender_address, $sender_lang = '', $sender_id = 0, $sender_username = '')
 	{
 		$this->sender_ip = $sender_ip;
 		$this->sender_name = $sender_name;
@@ -188,18 +184,6 @@ public function set_sender($sender_ip, $sender_name, $sender_address, $sender_la
 		$this->sender_lang = $sender_lang;
 		$this->sender_id = $sender_id;
 		$this->sender_username = $sender_username;
-		$this->sender_jabber = $sender_jabber;
-	}
-
-	/**
-	* Which notification type should be used? Jabber, Email, ...?
-	*
-	* @param int $sender_notify_type
-	* @return void
-	*/
-	public function set_sender_notify_type($sender_notify_type)
-	{
-		$this->sender_notify_type = $sender_notify_type;
 	}
 
 	/**
@@ -220,11 +204,9 @@ public function cc_sender()
 
 		$this->recipients[] = array(
 			'lang'			=> $this->sender_lang,
-			'address'		=> $this->sender_address,
+			'user_email'	=> $this->sender_address,
 			'name'			=> $this->sender_name,
 			'username'		=> $this->sender_username,
-			'jabber'		=> $this->sender_jabber,
-			'notify_type'	=> $this->sender_notify_type,
 			'to_name'		=> $this->recipients[0]['to_name'],
 		);
 	}
@@ -232,11 +214,11 @@ public function cc_sender()
 	/**
 	* Send the email
 	*
-	* @param \messenger $messenger
+	* @param \phpbb\di\service_collection $messenger
 	* @param string $contact
 	* @return void
 	*/
-	public function send(\messenger $messenger, $contact)
+	public function send(\phpbb\di\service_collection $messenger, $contact)
 	{
 		if (!count($this->recipients))
 		{
@@ -245,38 +227,48 @@ public function send(\messenger $messenger, $contact)
 
 		foreach ($this->recipients as $recipient)
 		{
-			$messenger->template($this->template, $recipient['lang']);
-			$messenger->replyto($this->sender_address);
-			$messenger->to($recipient['address'], $recipient['name']);
-			$messenger->im($recipient['jabber'], $recipient['username']);
-
-			$messenger->headers('X-AntiAbuse: Board servername - ' . $this->server_name);
-			$messenger->headers('X-AntiAbuse: User IP - ' . $this->sender_ip);
+			/** @psalm-suppress InvalidTemplateParam */
+			$messenger_collection_iterator = $messenger->getIterator();
 
-			if ($this->sender_id)
-			{
-				$messenger->headers('X-AntiAbuse: User_id - ' . $this->sender_id);
-			}
-			if ($this->sender_username)
+			/**
+			 * @var messenger_interface $messenger_method
+			 * @psalm-suppress UndefinedMethod
+			 */
+			foreach ($messenger_collection_iterator as $messenger_method)
 			{
-				$messenger->headers('X-AntiAbuse: Username - ' . $this->sender_username);
-			}
+				$messenger_method->set_use_queue(false);
+				$messenger_method->template($this->template, $recipient['lang']);
+				$messenger_method->set_addresses($recipient);
+				$messenger_method->reply_to($this->sender_address);
 
-			$messenger->subject(html_entity_decode($this->subject, ENT_COMPAT));
+				$messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name);
+				$messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip);
+				if ($this->sender_id)
+				{
+					$messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id);
+				}
 
-			$messenger->assign_vars(array(
-				'BOARD_CONTACT'	=> $contact,
-				'TO_USERNAME'	=> html_entity_decode($recipient['to_name'], ENT_COMPAT),
-				'FROM_USERNAME'	=> html_entity_decode($this->sender_name, ENT_COMPAT),
-				'MESSAGE'		=> html_entity_decode($this->body, ENT_COMPAT))
-			);
+				if ($this->sender_username)
+				{
+					$messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username);
+				}
 
-			if (count($this->template_vars))
-			{
-				$messenger->assign_vars($this->template_vars);
-			}
+				$messenger_method->subject(html_entity_decode($this->subject, ENT_COMPAT));
 
-			$messenger->send($recipient['notify_type']);
+				$messenger_method->assign_vars([
+					'BOARD_CONTACT'	=> $contact,
+					'TO_USERNAME'	=> html_entity_decode($recipient['to_name'], ENT_COMPAT),
+					'FROM_USERNAME'	=> html_entity_decode($this->sender_name, ENT_COMPAT),
+					'MESSAGE'		=> html_entity_decode($this->body, ENT_COMPAT),
+				]);
+
+				if (count($this->template_vars))
+				{
+					$messenger_method->assign_vars($this->template_vars);
+				}
+
+				$messenger_method->send();
+			}
 		}
 	}
 }
diff --git a/phpBB/phpbb/message/topic_form.php b/phpBB/phpbb/message/topic_form.php
index e8344417efe..15a4f30ac20 100644
--- a/phpBB/phpbb/message/topic_form.php
+++ b/phpBB/phpbb/message/topic_form.php
@@ -108,7 +108,7 @@ public function bind(\phpbb\request\request_interface $request)
 	/**
 	* {inheritDoc}
 	*/
-	public function submit(\messenger $messenger)
+	public function submit(\phpbb\di\service_collection $messenger)
 	{
 		if (!$this->recipient_address || !preg_match('/^' . get_preg_expression('email') . '$/i', $this->recipient_address))
 		{
@@ -129,10 +129,8 @@ public function submit(\messenger $messenger)
 		$this->message->add_recipient(
 			$this->recipient_name,
 			$this->recipient_address,
-			$this->recipient_lang,
-			NOTIFY_EMAIL
+			$this->recipient_lang
 		);
-		$this->message->set_sender_notify_type(NOTIFY_EMAIL);
 
 		parent::submit($messenger);
 	}
diff --git a/phpBB/phpbb/message/user_form.php b/phpBB/phpbb/message/user_form.php
index 007e5754077..69189a81f11 100644
--- a/phpBB/phpbb/message/user_form.php
+++ b/phpBB/phpbb/message/user_form.php
@@ -34,7 +34,7 @@ class user_form extends form
 	*/
 	protected function get_user_row($user_id)
 	{
-		$sql = 'SELECT user_id, username, user_colour, user_email, user_allow_viewemail, user_lang, user_jabber, user_notify_type
+		$sql = 'SELECT user_id, username, user_colour, user_email, user_allow_viewemail, user_lang
 			FROM ' . USERS_TABLE . '
 			WHERE user_id = ' . (int) $user_id . '
 				AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')';
@@ -96,7 +96,7 @@ public function bind(\phpbb\request\request_interface $request)
 	/**
 	* {inheritDoc}
 	*/
-	public function submit(\messenger $messenger)
+	public function submit(\phpbb\di\service_collection $messenger)
 	{
 		if (!$this->subject)
 		{
diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php
new file mode 100644
index 00000000000..d4d2310ca8f
--- /dev/null
+++ b/phpBB/phpbb/messenger/method/base.php
@@ -0,0 +1,484 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\messenger\method;
+
+use phpbb\config\config;
+use phpbb\di\service_collection;
+use phpbb\event\dispatcher;
+use phpbb\extension\manager;
+use phpbb\language\language;
+use phpbb\log\log_interface;
+use phpbb\path_helper;
+use phpbb\request\request;
+use phpbb\messenger\queue;
+use phpbb\template\assets_bag;
+use phpbb\template\twig\lexer;
+use phpbb\user;
+
+/**
+ * Messenger base class
+ */
+abstract class base implements messenger_interface
+{
+	/** @var array */
+	protected $additional_headers = [];
+
+	/** @var assets_bag */
+	protected $assets_bag;
+
+	/** @var config */
+	protected $config;
+
+	/** @var dispatcher */
+	protected $dispatcher;
+
+	/** @var manager */
+	protected $ext_manager;
+
+	/** @var language */
+	protected $language;
+
+	/** @var log_interface */
+	protected $log;
+
+	/** @var string */
+	protected $msg = '';
+
+	/** @var queue */
+	protected $queue;
+
+	/** @var  path_helper */
+	protected $path_helper;
+
+	/** @var  request */
+	protected $request;
+
+	/** @var string */
+	protected $root_path;
+
+	/** @var string */
+	protected $subject = '';
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var string */
+	protected $template_cache_path;
+
+	/** @var service_collection */
+	protected $twig_extensions_collection;
+
+	/** @var lexer */
+	protected $twig_lexer;
+
+	/** @var bool */
+	protected $use_queue = true;
+
+	/** @var user */
+	protected $user;
+
+	/**
+	 * Messenger base class constructor
+	 *
+	 * @param assets_bag $assets_bag
+	 * @param config $config
+	 * @param dispatcher $dispatcher
+	 * @param language $language
+	 * @param queue $queue
+	 * @param path_helper $path_helper
+	 * @param request $request
+	 * @param service_collection $twig_extensions_collection
+	 * @param lexer $twig_lexer
+	 * @param user $user
+	 * @param string $phpbb_root_path
+	 * @param string $template_cache_path
+	 * @param manager $ext_manager
+	 * @param log_interface $log
+	 */
+	public function __construct(
+		assets_bag $assets_bag,
+		config $config,
+		dispatcher $dispatcher,
+		language $language,
+		queue $queue,
+		path_helper $path_helper,
+		request $request,
+		service_collection $twig_extensions_collection,
+		lexer $twig_lexer,
+		user $user,
+		string $phpbb_root_path,
+		string $template_cache_path,
+		manager|null $ext_manager = null,
+		log_interface|null $log = null
+	)
+	{
+		$this->assets_bag = $assets_bag;
+		$this->config = $config;
+		$this->dispatcher = $dispatcher;
+		$this->ext_manager = $ext_manager;
+		$this->language = $language;
+		$this->log = $log;
+		$this->queue = $queue;
+		$this->path_helper = $path_helper;
+		$this->request = $request;
+		$this->twig_extensions_collection = $twig_extensions_collection;
+		$this->twig_lexer = $twig_lexer;
+		$this->user = $user;
+		$this->root_path = $phpbb_root_path;
+		$this->template_cache_path = $template_cache_path;
+
+		$this->set_use_queue();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	abstract public function is_enabled(): bool;
+
+	/**
+	 * Sets the use of messenger queue flag
+	 *
+	 * @param bool $use_queue Flag indicating if cached queue to be used
+	 *
+	 * @return void
+	 */
+	public function set_use_queue(bool $use_queue = true): void
+	{
+		$this->use_queue = $use_queue;
+	}
+
+	/**
+	 * Initializes all the data (address, template file, etc) or resets to default
+	 *
+	 * @return void
+	 */
+	abstract public function init(): void;
+
+	/**
+	 * Set addresses for to/im as available
+	 *
+	 * @param array $user_row User row
+	 *
+	 * @return void
+	 */
+	abstract public function set_addresses(array $user_row): void;
+
+	/**
+	 * Get messenger method fie queue object name
+	 *
+	 * @return string
+	 */
+	abstract public function get_queue_object_name(): string;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function subject(string $subject = ''): void
+	{
+		$this->subject = $subject;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	abstract public function send(): bool;
+
+	/**
+	 * Send messages from the queue
+	 *
+	 * @param array $queue_data Queue data array
+	 *
+	 * @return void
+	 */
+	abstract public function process_queue(array &$queue_data): void;
+
+	/**
+	 * Set email template to use
+	 *
+	 * @param string	$template_file			Email template file name
+	 * @param string	$template_lang			Email template language
+	 * @param string	$template_path			Email template path
+	 * @param string	$template_dir_prefix	Email template directory prefix
+	 *
+	 * @return void
+	 */
+	public function template(string $template_file, string $template_lang = '', string $template_path = '', string $template_dir_prefix = ''): void
+	{
+		$template_dir_prefix = (!$template_dir_prefix || $template_dir_prefix[0] === '/') ? $template_dir_prefix : '/' . $template_dir_prefix;
+
+		$this->setup_template();
+
+		if (!trim($template_lang))
+		{
+			// fall back to board default language if the user's language is
+			// missing $template_file.  If this does not exist either,
+			// $this->template->set_filenames will do a trigger_error
+			$template_lang = basename($this->config['default_lang']);
+		}
+
+		$ext_template_paths = [
+			[
+				'name' 		=> $template_lang . '_email',
+				'ext_path' 	=> 'language/' . $template_lang . '/email' . $template_dir_prefix,
+			],
+		];
+
+		if ($template_path)
+		{
+			$template_paths = [
+				$template_path . $template_dir_prefix,
+			];
+		}
+		else
+		{
+			$template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/';
+			$template_path .= $template_lang . '/email';
+
+			$template_paths = [
+				$template_path . $template_dir_prefix,
+			];
+
+			$board_language = basename($this->config['default_lang']);
+
+			// we can only specify default language fallback when the path is not a custom one for which we
+			// do not know the default language alternative
+			if ($template_lang !== $board_language)
+			{
+				$fallback_template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/';
+				$fallback_template_path .= $board_language . '/email';
+
+				$template_paths[] = $fallback_template_path . $template_dir_prefix;
+
+				$ext_template_paths[] = [
+					'name'		=> $board_language . '_email',
+					'ext_path'	=> 'language/' . $board_language . '/email' . $template_dir_prefix,
+				];
+			}
+			// If everything fails just fall back to en template
+			if ($template_lang !== 'en' && $board_language !== 'en')
+			{
+				$fallback_template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/';
+				$fallback_template_path .= 'en/email';
+
+				$template_paths[] = $fallback_template_path . $template_dir_prefix;
+
+				$ext_template_paths[] = [
+					'name'		=> 'en_email',
+					'ext_path'	=> 'language/en/email' . $template_dir_prefix,
+				];
+			}
+		}
+
+		$this->set_template_paths($ext_template_paths, $template_paths);
+
+		$this->template->set_filenames([
+			'body'		=> $template_file . '.txt',
+		]);
+	}
+
+	/**
+	 * Assign variables to email template
+	 *
+	 * @param array	$vars	Array of VAR => VALUE to assign to email template
+	 *
+	 * @return void
+	 */
+	public function assign_vars(array $vars): void
+	{
+		$this->setup_template();
+		$this->template->assign_vars($vars);
+	}
+
+	/**
+	 * Assign block of variables to email template
+	 *
+	 * @param string	$blockname	Template block name
+	 * @param array		$vars		Array of VAR => VALUE to assign to email template block
+	 *
+	 * @return void
+	 */
+	public function assign_block_vars(string $blockname, array $vars): void
+	{
+		$this->setup_template();
+
+		$this->template->assign_block_vars($blockname, $vars);
+	}
+
+	/**
+	 * Prepare message before sending out to the recipients
+	 *
+	 * @return void
+	 */
+	public function prepare_message(): void
+	{
+		// We add some standard variables we always use, no need to specify them always
+		$this->assign_vars([
+			'U_BOARD'	=> generate_board_url(),
+			'EMAIL_SIG'	=> str_replace('<br />', "\n", "-- \n" . html_entity_decode($this->config['board_email_sig'], ENT_COMPAT)),
+			'SITENAME'	=> html_entity_decode($this->config['sitename'], ENT_COMPAT),
+		]);
+
+		$subject = $this->subject;
+		$template = $this->template;
+		/**
+		 * Event to modify the template before parsing
+		 *
+		 * @event core.modify_notification_template
+		 * @var	string	subject		The message subject
+		 * @var string	template	The (readonly) template object
+		 * @since 3.2.4-RC1
+		 * @changed 4.0.0-a1 Removed vars: method, break.
+		 */
+		$vars = ['subject', 'template'];
+		extract($this->dispatcher->trigger_event('core.modify_notification_template', compact($vars)));
+
+		// Parse message through template
+		$message = trim($this->template->assign_display('body'));
+
+		/**
+		 * Event to modify notification message text after parsing
+		 *
+		 * @event core.modify_notification_message
+		 * @var	string	message	The message text
+		 * @var	string	subject	The message subject
+		 * @since 3.1.11-RC1
+		 * @changed 4.0.0-a1 Removed vars: method, break.
+		 */
+		$vars = ['message', 'subject'];
+		extract($this->dispatcher->trigger_event('core.modify_notification_message', compact($vars)));
+
+		$this->subject = $subject;
+		$this->msg = $message;
+		unset($subject, $message, $template);
+
+		// Because we use \n for newlines in the body message we need to fix line encoding errors for those admins who uploaded email template files in the wrong encoding
+		$this->msg = str_replace("\r\n", "\n", $this->msg);
+
+		// We now try and pull a subject from the email body ... if it exists,
+		// do this here because the subject may contain a variable
+		$drop_header = '';
+		$match = [];
+		if (preg_match('#^(Subject):(.*?)$#m', $this->msg, $match))
+		{
+			$this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : $this->language->lang('NO_EMAIL_SUBJECT'));
+			$drop_header .= '[\r\n]*?' . preg_quote($match[0], '#');
+		}
+		else
+		{
+			$this->subject = (($this->subject != '') ? $this->subject : $this->language->lang('NO_EMAIL_SUBJECT'));
+		}
+
+		if (preg_match('#^(List-Unsubscribe):(.*?)$#m', $this->msg, $match))
+		{
+			$drop_header .= '[\r\n]*?' . preg_quote($match[0], '#');
+			$this->additional_headers[$match[1]] = trim($match[2]);
+		}
+
+		if ($drop_header)
+		{
+			$this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg));
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function error(string $msg): void
+	{
+		// Session doesn't exist, create it
+		if (!isset($this->user->session_id) || $this->user->session_id === '')
+		{
+			$this->user->session_begin();
+		}
+
+		$type = strtoupper($this->get_queue_object_name());
+		$calling_page = html_entity_decode($this->request->server('PHP_SELF'), ENT_COMPAT);
+		$message = '<strong>' . $type . '</strong><br><em>' . htmlspecialchars($calling_page, ENT_COMPAT) . '</em><br><br>' . $msg . '<br>';
+		if ($this->log)
+		{
+			$this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_ERROR_' . $type, false, [$message]);
+		}
+	}
+
+	/**
+	 * Save message data to the messenger file queue
+	 *
+	 * @return void
+	 */
+	public function save_queue(): void
+	{
+		if ($this->use_queue)
+		{
+			$this->queue->save();
+		}
+	}
+
+	/**
+	 * Setup template engine
+	 *
+	 * @return void
+	 */
+	protected function setup_template(): void
+	{
+		if (isset($this->template) && $this->template instanceof \phpbb\template\template)
+		{
+			return;
+		}
+
+		$template_environment = new \phpbb\template\twig\environment(
+			$this->assets_bag,
+			$this->config,
+			new \phpbb\filesystem\filesystem(),
+			$this->path_helper,
+			$this->template_cache_path,
+			$this->ext_manager,
+			new \phpbb\template\twig\loader(),
+			$this->dispatcher,
+			[]
+		);
+		$template_environment->setLexer($this->twig_lexer);
+
+		$this->template = new \phpbb\template\twig\twig(
+			$this->path_helper,
+			$this->config,
+			new \phpbb\template\context(),
+			$template_environment,
+			$this->template_cache_path,
+			$this->user,
+			$this->twig_extensions_collection,
+			$this->ext_manager
+		);
+	}
+
+	/**
+	 * Set template paths to load
+	 *
+	 * @param string|array $path_name	Email template path name
+	 * @param string|array $paths		Email template paths
+	 *
+	 * @return void
+	 */
+	protected function set_template_paths(array|string $path_name, array|string $paths): void
+	{
+		$this->setup_template();
+		$this->template->set_custom_style($path_name, $paths);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function header(string $header_name, mixed $header_value): void
+	{
+	}
+}
diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php
new file mode 100644
index 00000000000..b601fca232e
--- /dev/null
+++ b/phpBB/phpbb/messenger/method/email.php
@@ -0,0 +1,588 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\messenger\method;
+
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Mailer\Transport;
+use Symfony\Component\Mailer\Mailer;
+use Symfony\Component\Mailer\Transport\AbstractTransport;
+use Symfony\Component\Mailer\Transport\TransportInterface;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Email as symfony_email;
+use Symfony\Component\Mime\Header\Headers;
+
+/**
+ * Messenger class
+ */
+class email extends base
+{
+	/** @var array */
+	private const PRIORITY_MAP = [
+		symfony_email::PRIORITY_HIGHEST => 'Highest',
+		symfony_email::PRIORITY_HIGH => 'High',
+		symfony_email::PRIORITY_NORMAL => 'Normal',
+		symfony_email::PRIORITY_LOW => 'Low',
+		symfony_email::PRIORITY_LOWEST => 'Lowest',
+	];
+
+	/**
+	 * @var string
+	 *
+	 * Symfony Mailer transport DSN
+	 */
+	protected string $dsn = '';
+
+	/** @var symfony_email */
+	protected symfony_email $email;
+
+	/** @var Address From address */
+	protected Address $from;
+
+	/** @var Headers Email headers */
+	protected Headers $headers;
+
+	/**
+	 * @var int
+	 *
+	 * Possible values are:
+	 * symfony_email::PRIORITY_HIGHEST
+	 * symfony_email::PRIORITY_HIGH
+	 * symfony_email::PRIORITY_NORMAL
+	 * symfony_email::PRIORITY_LOW
+	 * symfony_email::PRIORITY_LOWEST
+	 */
+	protected int $mail_priority = symfony_email::PRIORITY_NORMAL;
+
+	/** @var \phpbb\messenger\queue */
+	protected $queue;
+
+	/** @var Address */
+	protected Address $reply_to;
+
+	/** @var AbstractTransport */
+	protected AbstractTransport $transport;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_queue_object_name(): string
+	{
+		return 'email';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function is_enabled(): bool
+	{
+		return (bool) $this->config['email_enable'];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function init(): void
+	{
+		$this->email = new symfony_email();
+		$this->headers = $this->email->getHeaders();
+		$this->subject =  $this->msg = '';
+		$this->mail_priority = symfony_email::PRIORITY_NORMAL;
+
+		$this->additional_headers = [];
+		$this->set_use_queue();
+		unset($this->template, $this->reply_to, $this->from);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function set_use_queue(bool $use_queue = true): void
+	{
+		$this->use_queue = !$this->config['email_package_size'] ? false : $use_queue;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function set_addresses(array $user_row): void
+	{
+		if (!empty($user_row['user_email']))
+		{
+			$this->to($user_row['user_email'], $user_row['username'] ?? '');
+		}
+	}
+
+	/**
+	 * Sets email address to send to
+	 *
+	 * @param string	$address	Email "To" recipient address
+	 * @param string	$realname	Email "To" recipient name
+	 * @return void
+	 */
+	public function to(string $address, string $realname = ''): void
+	{
+		if (!$address = trim($address))
+		{
+			return;
+		}
+
+		$to = new Address($address, trim($realname));
+		$this->email->getTo() ? $this->email->addTo($to) : $this->email->to($to);
+	}
+
+	/**
+	 * Sets cc address to send to
+	 *
+	 * @param string	$address	Email carbon copy recipient address
+	 * @param string	$realname	Email carbon copy recipient name
+	 * @return void
+	 */
+	public function cc(string $address, string $realname = ''): void
+	{
+		if (!$address = trim($address))
+		{
+			return;
+		}
+
+		$cc = new Address($address, trim($realname));
+		$this->email->getCc() ? $this->email->addCc($cc) : $this->email->cc($cc);
+	}
+
+	/**
+	 * Sets bcc address to send to
+	 *
+	 * @param string	$address	Email black carbon copy recipient address
+	 * @param string	$realname	Email black carbon copy recipient name
+	 * @return void
+	 */
+	public function bcc(string $address, string $realname = ''): void
+	{
+		if (!$address = trim($address))
+		{
+			return;
+		}
+
+		$bcc = new Address($address, trim($realname));
+		$this->email->getBcc() ? $this->email->addBcc($bcc) : $this->email->bcc($bcc);
+	}
+
+	/**
+	 * Set the reply to address
+	 *
+	 * @param string	$address	Email "Reply to" address
+	 * @param string	$realname	Email "Reply to" recipient name
+	 * @return void
+	 */
+	public function reply_to(string $address, string $realname = ''): void
+	{
+		if (!$address = trim($address))
+		{
+			return;
+		}
+
+		$this->reply_to = new Address($address, trim($realname));
+		$this->email->getReplyTo() ? $this->email->addReplyTo($this->reply_to) : $this->email->replyTo($this->reply_to);
+	}
+
+	/**
+	 * Set the from address
+	 *
+	 * @param string	$address	Email "from" address
+	 * @param string	$realname	Email "from" recipient name
+	 * @return void
+	 */
+	public function from(string $address, string $realname = ''): void
+	{
+		if (!$address = trim($address))
+		{
+			return;
+		}
+
+		$this->from = new Address($address, trim($realname));
+		$this->email->getFrom() ? $this->email->addFrom($this->from) : $this->email->from($this->from);
+	}
+
+	/**
+	 * Set up subject for mail
+	 *
+	 * @param string	$subject	Email subject
+	 * @return void
+	 */
+	public function subject(string $subject = ''): void
+	{
+		parent::subject(trim($subject));
+		$this->email->subject($this->subject);
+	}
+
+	/**
+	 * Adds X-AntiAbuse headers
+	 *
+	 * @param \phpbb\config\config	$config		Config object
+	 * @param \phpbb\user			$user		User object
+	 * @return void
+	 */
+	public function anti_abuse_headers(\phpbb\config\config $config, \phpbb\user $user): void
+	{
+		$this->header('X-AntiAbuse', 'Board servername - ' . $config['server_name']);
+		$this->header('X-AntiAbuse', 'User_id - ' . $user->data['user_id']);
+		$this->header('X-AntiAbuse', 'Username - ' . $user->data['username']);
+		$this->header('X-AntiAbuse', 'User IP - ' . $user->ip);
+	}
+
+	/**
+	 * Set the email priority
+	 *
+	 * Possible values are:
+	 * symfony_email::PRIORITY_HIGHEST = 1
+	 * symfony_email::PRIORITY_HIGH = 2
+	 * symfony_email::PRIORITY_NORMAL = 3
+	 * symfony_email::PRIORITY_LOW = 4
+	 * symfony_email::PRIORITY_LOWEST = 5
+	 *
+	 * @param int	$priority	Email priority level
+	 * @return void
+	 */
+	public function set_mail_priority(int $priority = symfony_email::PRIORITY_NORMAL): void
+	{
+		$this->email->priority($priority);
+	}
+
+	/**
+	 * Set email headers
+	 *
+	 * @return void
+	 */
+	protected function build_headers(): void
+	{
+		$board_contact = trim($this->config['board_contact']);
+		$contact_name = html_entity_decode($this->config['board_contact_name'], ENT_COMPAT);
+
+		if (empty($this->email->getReplyTo()))
+		{
+			$this->reply_to($board_contact, $contact_name);
+		}
+
+		if (empty($this->email->getFrom()))
+		{
+			$this->from($board_contact, $contact_name);
+		}
+
+		$this->email->priority($this->mail_priority);
+
+		$headers = [
+			'Return-Path'		=> new Address($this->config['board_email']),
+			'Sender'			=> new Address($this->config['board_email']),
+			'X-MSMail-Priority'	=> self::PRIORITY_MAP[$this->mail_priority],
+			'X-Mailer'			=> 'phpBB',
+			'X-MimeOLE'			=> 'phpBB',
+			'X-phpBB-Origin'	=> 'phpbb://' . str_replace(['http://', 'https://'], ['', ''], generate_board_url()),
+		];
+
+		// Add additional headers
+		$headers = array_merge($headers, $this->additional_headers);
+
+		/**
+		 * Event to modify email header entries
+		 *
+		 * @event core.modify_email_headers
+		 * @var	array	headers	Array containing email header entries
+		 * @since 3.1.11-RC1
+		 */
+		$vars = ['headers'];
+		extract($this->dispatcher->trigger_event('core.modify_email_headers', compact($vars)));
+
+		foreach ($headers as $header => $value)
+		{
+			$this->header($header, $value);
+		}
+	}
+
+	/**
+	 * Generates valid DSN for Symfony Mailer transport
+	 *
+	 * @param string $dsn Symfony Mailer transport DSN
+	 * @return void
+	 */
+	public function set_dsn(string $dsn = ''): void
+	{
+		if (!empty($dsn))
+		{
+			$this->dsn = $dsn;
+		}
+		else if ($this->config['smtp_delivery'])
+		{
+			if (empty($this->config['smtp_host']))
+			{
+				$this->dsn = 'null://null';
+			}
+			else
+			{
+				$user = urlencode($this->config['smtp_username']);
+				$password = urlencode($this->config['smtp_password']);
+				$smtp_host = urlencode($this->config['smtp_host']);
+				$smtp_port = $this->config['smtp_port'];
+
+				$this->dsn = "smtp://$user:$password@$smtp_host:$smtp_port";
+			}
+		}
+		else
+		{
+			$this->dsn = 'sendmail://default';
+		}
+	}
+
+	/**
+	 * Get Symfony Mailer transport DSN
+	 *
+	 * @return string
+	 */
+	public function get_dsn(): string
+	{
+		return $this->dsn;
+	}
+
+	/**
+	 * Generates a valid transport to send email
+	 *
+	 * @return void
+	 */
+	public function set_transport(): void
+	{
+		if (empty($this->dsn))
+		{
+			$this->set_dsn();
+		}
+
+		$this->transport = Transport::fromDsn($this->dsn);
+
+		if ($this->config['smtp_delivery'] && method_exists($this->transport, 'getStream'))
+		{
+			// Set ssl context options, see http://php.net/manual/en/context.ssl.php
+			$options['ssl'] = [
+				'verify_peer' => (bool) $this->config['smtp_verify_peer'],
+				'verify_peer_name' => (bool) $this->config['smtp_verify_peer_name'],
+				'allow_self_signed' => (bool) $this->config['smtp_allow_self_signed'],
+			];
+			$this->transport->getStream()->setStreamOptions($options);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function process_queue(array &$queue_data): void
+	{
+		$queue_object_name = $this->get_queue_object_name();
+		$messages_count = count($queue_data[$queue_object_name]['data']);
+
+		if (!$this->is_enabled() || !$messages_count)
+		{
+			unset($queue_data[$queue_object_name]);
+			return;
+		}
+
+		@set_time_limit(0);
+
+		$package_size = $queue_data[$queue_object_name]['package_size'] ?? 0;
+		$num_items = (!$package_size || $messages_count < $package_size) ? $messages_count : $package_size;
+		$mailer = $this->get_mailer();
+
+		for ($i = 0; $i < $num_items; $i++)
+		{
+			// Make variables available...
+			extract(array_shift($queue_data[$queue_object_name]['data']));
+
+			$break = false;
+			/**
+			 * Event to send message via external transport
+			 *
+			 * @event core.notification_message_process
+			 * @var	string		break	Flag indicating if the function return after hook
+			 * @var	string		email	The Symfony Email object
+			 * @since 3.2.4-RC1
+			 * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses, subject, msg.
+			 */
+			$vars = [
+				'break',
+				'email',
+			];
+			extract($this->dispatcher->trigger_event('core.notification_message_process', compact($vars)));
+
+			if (!$break)
+			{
+				try
+				{
+					$mailer->send($email);
+				}
+				catch (TransportExceptionInterface $e)
+				{
+					$this->error($e->getDebug());
+					continue;
+				}
+			}
+		}
+
+		// No more data for this object? Unset it
+		if (!count($queue_data[$queue_object_name]['data']))
+		{
+			unset($queue_data[$queue_object_name]);
+		}
+	}
+
+	/**
+	 * Get mailer object
+	 *
+	 * @return MailerInterface Symfony Mailer object
+	 */
+	protected function get_mailer(): MailerInterface
+	{
+		return new Mailer($this->transport);
+	}
+
+	/**
+	 * Get mailer transport object
+	 *
+	 * @return TransportInterface Symfony Mailer transport object
+	 */
+	public function get_transport(): TransportInterface
+	{
+		return $this->transport;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function send(): bool
+	{
+		$this->prepare_message();
+
+		$this->email->subject($this->subject);
+		$this->email->text($this->msg);
+
+		$break = false;
+		$subject = $this->subject;
+		$msg = $this->msg;
+		$email = $this->email;
+		/**
+		 * Event to send message via external transport
+		 *
+		 * @event core.notification_message_email
+		 * @var	bool	break	Flag indicating if the function return after hook
+		 * @var	string	subject	The message subject
+		 * @var	string	msg		The message text
+		 * @var	string	email	The Symfony Email object
+		 * @since 3.2.4-RC1
+		 * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses
+		 */
+		$vars = [
+			'break',
+			'subject',
+			'msg',
+			'email',
+		];
+		extract($this->dispatcher->trigger_event('core.notification_message_email', compact($vars)));
+		$this->email = $email;
+
+		$this->build_headers();
+
+		if ($break)
+		{
+			return true;
+		}
+
+		// Send message ...
+		if (!$this->use_queue)
+		{
+			$mailer = $this->get_mailer();
+
+			$subject = $this->subject;
+			$msg = $this->msg;
+			$headers = $this->headers;
+			$email = $this->email;
+			/**
+			 * Modify data before sending out emails with PHP's mail function
+			 *
+			 * @event core.phpbb_mail_before
+			 * @var	string	email		The Symfony Email object
+			 * @var	string	subject		The message subject
+			 * @var	string	msg			The message text
+			 * @var string	headers		The email headers
+			 * @since 3.3.6-RC1
+			 * @changed 4.0.0-a1 Added vars: email. Removed vars: to, eol, additional_parameters.
+			 */
+			$vars = [
+				'email',
+				'subject',
+				'msg',
+				'headers',
+			];
+			extract($this->dispatcher->trigger_event('core.phpbb_mail_before', compact($vars)));
+
+			$this->subject = $subject;
+			$this->msg = $msg;
+			$this->headers = $headers;
+			$this->email = $email;
+
+			try
+			{
+				$mailer->send($this->email);
+			}
+			catch (TransportExceptionInterface $e)
+			{
+				$this->error($e->getDebug());
+				return false;
+			}
+
+			/**
+			 * Execute code after sending out emails with PHP's mail function
+			 *
+			 * @event core.phpbb_mail_after
+			 * @var	string	email		The Symfony Email object
+			 * @var	string	subject		The message subject
+			 * @var	string	msg			The message text
+			 * @var string	headers		The email headers
+			 * @since 3.3.6-RC1
+			 * @changed 4.0.0-a1 Added vars: email. Removed vars: to, eol, additional_parameters, $result.
+			 */
+			$vars = [
+				'email',
+				'subject',
+				'msg',
+				'headers',
+			];
+			extract($this->dispatcher->trigger_event('core.phpbb_mail_after', compact($vars)));
+		}
+		else
+		{
+			$this->queue->init('email', $this->config['email_package_size']);
+			$this->queue->put('email', [
+				'email'	=> $this->email,
+			]);
+		}
+
+		// Reset the object
+		$this->init();
+
+		return true;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function header(string $header_name, mixed $header_value): void
+	{
+		$this->headers->addHeader($header_name, $header_value);
+	}
+}
diff --git a/phpBB/phpbb/messenger/method/messenger_interface.php b/phpBB/phpbb/messenger/method/messenger_interface.php
new file mode 100644
index 00000000000..d9eb247f770
--- /dev/null
+++ b/phpBB/phpbb/messenger/method/messenger_interface.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\messenger\method;
+
+/**
+ * Messenger method interface class
+ */
+interface messenger_interface
+{
+	/**
+	 * Check if the messenger method is enabled
+	 *
+	 * @return bool
+	 */
+	public function is_enabled(): bool;
+
+	/**
+	 * Set up subject for the message
+	 *
+	 * @param string	$subject	Email subject
+	 *
+	 * @return void
+	 */
+	public function subject(string $subject = ''): void;
+
+	/**
+	 * Send out messages
+	 *
+	 * @return bool
+	 */
+	public function send(): bool;
+
+	/**
+	 * Add error message to log
+	 *
+	 * @param string	$msg	Error message text
+	 *
+	 * @return void
+	 */
+
+	public function error(string $msg): void;
+
+	/**
+	 * Add message header
+	 *
+	 * @param string	$header_name	Message header name
+	 * @param mixed		$header_value	Message header value
+	 *
+	 * @return void
+	 */
+	public function header(string $header_name, mixed $header_value): void;
+}
diff --git a/phpBB/phpbb/messenger/queue.php b/phpBB/phpbb/messenger/queue.php
new file mode 100644
index 00000000000..4e572a6b07e
--- /dev/null
+++ b/phpBB/phpbb/messenger/queue.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\messenger;
+
+use phpbb\config\config;
+use phpbb\event\dispatcher;
+use phpbb\di\service_collection;
+use phpbb\filesystem\filesystem;
+
+/**
+ * Handling messenger file queue
+ */
+class queue
+{
+	/** @var string */
+	protected $cache_file;
+
+	/** @var config */
+	protected $config;
+
+	/** @var array */
+	protected $data = [];
+
+	/** @var dispatcher */
+	protected $dispatcher;
+
+	/** @var \phpbb\filesystem\filesystem_interface */
+	protected $filesystem;
+
+	/** @var service_collection */
+	protected $messenger_method_collection;
+
+	/** @var array */
+	protected $queue_data = [];
+
+	/**
+	 * Messenger queue constructor.
+	 *
+	 * @param config $config
+	 * @param dispatcher $dispatcher
+	 * @param service_collection $messenger_method_collection
+	 * @param string $cache_file
+	 */
+	public function __construct(config $config, dispatcher $dispatcher, service_collection $messenger_method_collection, $cache_file)
+	{
+		$this->config = $config;
+		$this->dispatcher = $dispatcher;
+		$this->messenger_method_collection = $messenger_method_collection;
+		$this->filesystem = new filesystem();
+		$this->cache_file = $cache_file;
+	}
+
+	/**
+	 * Init a queue object
+	 *
+	 * @param string $object 	Queue object type: email/etc
+	 * @param int $package_size Size of the messenger package to send
+	 * @return void
+	 */
+	public function init(string $object, int $package_size): void
+	{
+		$this->data[$object] = [];
+		$this->data[$object]['package_size'] = $package_size;
+		$this->data[$object]['data'] = [];
+	}
+
+	/**
+	 * Put message into the messenger file queue
+	 *
+	 * @param string $object 		Queue object type: email/etc
+	 * @param array $message_data	Message data to send
+	 * @return void
+	 */
+	public function put(string $object, array $message_data): void
+	{
+		$this->data[$object]['data'][] = $message_data;
+	}
+
+	/**
+	 * Process the messenger file queue (using lock file)
+	 *
+	 * @return void
+	 */
+	public function process(): void
+	{
+		$lock = new \phpbb\lock\flock($this->cache_file);
+		$lock->acquire();
+
+		// avoid races, check file existence once
+		$have_cache_file = file_exists($this->cache_file);
+		if (!$have_cache_file || $this->config['last_queue_run'] > time() - $this->config['queue_interval'])
+		{
+			if (!$have_cache_file)
+			{
+				$this->config->set('last_queue_run', time(), false);
+			}
+
+			$lock->release();
+			return;
+		}
+
+		$this->config->set('last_queue_run', time(), false);
+
+		include($this->cache_file);
+
+		/** @psalm-suppress InvalidTemplateParam */
+		$messenger_collection_iterator = $this->messenger_method_collection->getIterator();
+
+		/**
+		 * @var \phpbb\messenger\method\messenger_interface $messenger_method
+		 * @psalm-suppress UndefinedMethod
+		 */
+		foreach ($messenger_collection_iterator as $messenger_method)
+		{
+			if (isset($this->queue_data[$messenger_method->get_queue_object_name()]))
+			{
+				$messenger_method->process_queue($this->queue_data);
+			}
+		}
+
+		if (!count($this->queue_data))
+		{
+			@unlink($this->cache_file);
+		}
+		else
+		{
+			if ($fp = @fopen($this->cache_file, 'wb'))
+			{
+				fwrite($fp, "<?php\nif (!defined('IN_PHPBB')) exit;\n\$this->queue_data = unserialize(" . var_export(serialize($this->queue_data), true) . ");\n\n?>");
+				fclose($fp);
+
+				if (function_exists('opcache_invalidate'))
+				{
+					@opcache_invalidate($this->cache_file);
+				}
+
+				try
+				{
+					$this->filesystem->phpbb_chmod($this->cache_file, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
+				}
+				catch (\phpbb\filesystem\exception\filesystem_exception $e)
+				{
+					// Do nothing
+				}
+			}
+		}
+
+		$lock->release();
+	}
+
+	/**
+	 * Save message data to the messenger file queue
+	 *
+	 * @return void
+	 */
+	public function save(): void
+	{
+		if (!count($this->data))
+		{
+			return;
+		}
+
+		$lock = new \phpbb\lock\flock($this->cache_file);
+		$lock->acquire();
+
+		if (file_exists($this->cache_file))
+		{
+			include($this->cache_file);
+
+			foreach ($this->queue_data as $object => $data_ary)
+			{
+				if (isset($this->data[$object]) && count($this->data[$object]))
+				{
+					$this->data[$object]['data'] = array_merge($data_ary['data'], $this->data[$object]['data']);
+				}
+				else
+				{
+					$this->data[$object]['data'] = $data_ary['data'];
+				}
+			}
+		}
+
+		if ($fp = @fopen($this->cache_file, 'w'))
+		{
+			fwrite($fp, "<?php\nif (!defined('IN_PHPBB')) exit;\n\$this->queue_data = unserialize(" . var_export(serialize($this->data), true) . ");\n\n?>");
+			fclose($fp);
+
+			if (function_exists('opcache_invalidate'))
+			{
+				@opcache_invalidate($this->cache_file);
+			}
+
+			try
+			{
+				$this->filesystem->phpbb_chmod($this->cache_file, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
+			}
+			catch (\phpbb\filesystem\exception\filesystem_exception $e)
+			{
+				// Do nothing
+			}
+
+			$this->data = [];
+		}
+
+		$lock->release();
+	}
+}
diff --git a/phpBB/phpbb/notification/controller/mark_read.php b/phpBB/phpbb/notification/controller/mark_read.php
new file mode 100644
index 00000000000..0371c71f51c
--- /dev/null
+++ b/phpBB/phpbb/notification/controller/mark_read.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\notification\controller;
+
+use phpbb\event\dispatcher;
+use phpbb\exception\http_exception;
+use phpbb\language\language;
+use phpbb\notification\manager;
+use phpbb\notification\type\type_interface;
+use phpbb\request\request;
+use phpbb\user;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
+
+class mark_read
+{
+	/** @var dispatcher  */
+	protected $dispatcher;
+
+	/** @var language */
+	protected $language;
+
+	/** @var manager */
+	protected $manager;
+
+	/** @var request */
+	protected $request;
+
+	/** @var user */
+	protected $user;
+
+	/** @var string */
+	protected $phpbb_root_path;
+
+	/**
+	 * Constructor
+	 *
+	 * @param dispatcher	$dispatcher		Event dispatcher
+	 * @param language		$language		Language object
+	 * @param manager		$manager		Notification manager
+	 * @param request		$request		Request object
+	 * @param user			$user			User object
+	 * @param string		$phpbb_root_path phpBB root path
+	 */
+	public function __construct(dispatcher $dispatcher, language $language, manager $manager, request $request, user $user, string $phpbb_root_path)
+	{
+		$this->dispatcher = $dispatcher;
+		$this->language = $language;
+		$this->manager = $manager;
+		$this->request = $request;
+		$this->user = $user;
+		$this->phpbb_root_path = $phpbb_root_path;
+	}
+
+	/**
+	 * Mark notification as read
+	 *
+	 * @param int $id Notification ID
+	 *
+	 * @return Response
+	 *
+	 * @throws http_exception
+	 *
+	 * @psalm-suppress InvalidArgument
+	 */
+	public function handle(int $id): Response
+	{
+		$mark_notification = $id;
+
+		if ($this->user->data['user_id'] == ANONYMOUS)
+		{
+			if ($this->request->is_ajax())
+			{
+				throw new http_exception(403, 'LOGIN_REQUIRED');
+			}
+			login_box('', $this->language->lang('LOGIN_REQUIRED'));
+		}
+
+		if (!check_link_hash($this->request->variable('hash', ''), 'mark_notification_read'))
+		{
+			// Link hash error
+			throw new http_exception(403, 'NOT_AUTHORISED');
+		}
+
+		$notification = $this->manager->load_notifications('notification.method.board', [
+			'notification_id'	=> $mark_notification,
+		]);
+
+		if (!isset($notification['notifications'][$mark_notification]))
+		{
+			// Notification id not found
+			throw new http_exception(404, 'PAGE_NOT_FOUND');
+		}
+
+		$notification = $notification['notifications'][$mark_notification];
+
+		$notification->mark_read();
+
+		/**
+		 * You can use this event to perform additional tasks or redirect user elsewhere.
+		 *
+		 * @event core.index_mark_notification_after
+		 * @var		int				mark_notification	Notification ID
+		 * @var		type_interface	notification		Notification instance
+		 * @since 3.2.6-RC1
+		 */
+		$vars = ['mark_notification', 'notification'];
+		extract($this->dispatcher->trigger_event('core.index_mark_notification_after', compact($vars)));
+
+		if ($this->request->is_ajax())
+		{
+			$data = [
+				'success'	=> true,
+			];
+			return new JsonResponse($data);
+		}
+
+		if (($redirect = $this->request->variable('redirect', '')))
+		{
+			return new RedirectResponse(append_sid($this->phpbb_root_path . $redirect));
+		}
+
+		return new RedirectResponse($notification->get_redirect_url());
+	}
+}
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php
index 721b37acac6..d95408671d1 100644
--- a/phpBB/phpbb/notification/manager.php
+++ b/phpBB/phpbb/notification/manager.php
@@ -233,7 +233,7 @@ public function mark_notifications_by_id($method_name, $notification_id, $time =
 
 		if ($method instanceof \phpbb\notification\method\method_interface && $method->is_available())
 		{
-			$method->mark_notifications_by_id($notification_id, $time, $mark_read);
+			$method->mark_notifications_by_id($notification_id, $this->user->id(), $time, $mark_read);
 		}
 	}
 
@@ -708,7 +708,7 @@ public function get_global_subscriptions($user_id = false)
 	*
 	* @param string $item_type Type identifier of the subscription
 	* @param int $item_id The id of the item
-	* @param string $method The method of the notification e.g. 'board', 'email', or 'jabber'
+	* @param string $method The method of the notification e.g. 'board', 'email'
 	*                       (if null a subscription will be added for all the defaults methods)
 	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
 	*/
@@ -765,7 +765,7 @@ public function add_subscription($item_type, $item_id = 0, $method = null, $user
 	*
 	* @param string $item_type Type identifier of the subscription
 	* @param int $item_id The id of the item
-	* @param string $method The method of the notification e.g. 'board', 'email', or 'jabber'
+	* @param string $method The method of the notification e.g. 'board', 'email'
 	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
 	*/
 	public function delete_subscription($item_type, $item_id = 0, $method = null, $user_id = false)
diff --git a/phpBB/phpbb/notification/method/base.php b/phpBB/phpbb/notification/method/base.php
index 4a183ca5081..6180f88e557 100644
--- a/phpBB/phpbb/notification/method/base.php
+++ b/phpBB/phpbb/notification/method/base.php
@@ -102,7 +102,7 @@ public function mark_notifications_by_parent($notification_type_id, $item_parent
 	/**
 	* {@inheritdoc}
 	*/
-	public function mark_notifications_by_id($notification_id, $time = false, $mark_read = true)
+	public function mark_notifications_by_id($notification_id, $user_id, $time = false, $mark_read = true)
 	{
 	}
 
diff --git a/phpBB/phpbb/notification/method/board.php b/phpBB/phpbb/notification/method/board.php
index faa53576e0e..212559e0257 100644
--- a/phpBB/phpbb/notification/method/board.php
+++ b/phpBB/phpbb/notification/method/board.php
@@ -344,14 +344,15 @@ public function mark_notifications_by_parent($notification_type_id, $item_parent
 	/**
 	* {@inheritdoc}
 	*/
-	public function mark_notifications_by_id($notification_id, $time = false, $mark_read = true)
+	public function mark_notifications_by_id($notification_id, $user_id, $time = false, $mark_read = true)
 	{
 		$time = ($time !== false) ? $time : time();
 
 		$sql = 'UPDATE ' . $this->notifications_table . '
 			SET notification_read = ' . ($mark_read ? 1 : 0) . '
 			WHERE notification_time <= ' . (int) $time . '
-				AND ' . ((is_array($notification_id)) ? $this->db->sql_in_set('notification_id', $notification_id) : 'notification_id = ' . (int) $notification_id);
+				AND ' . ((is_array($notification_id)) ? $this->db->sql_in_set('notification_id', $notification_id) : 'notification_id = ' . (int) $notification_id) .
+				' AND user_id = ' . (int) $user_id;
 		$this->db->sql_query($sql);
 	}
 
diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php
index cffd259c0e4..d18867927ae 100644
--- a/phpBB/phpbb/notification/method/email.php
+++ b/phpBB/phpbb/notification/method/email.php
@@ -14,40 +14,58 @@
 namespace phpbb\notification\method;
 
 use phpbb\notification\type\type_interface;
+use phpbb\user;
+use phpbb\user_loader;
+use phpbb\config\config;
+use phpbb\db\driver\driver_interface;
+use phpbb\di\service_collection;
 
 /**
 * Email notification method class
 * This class handles sending emails for notifications
 */
 
-class email extends \phpbb\notification\method\messenger_base
+class email extends messenger_base
 {
-	/** @var \phpbb\user */
+	/** @var user */
 	protected $user;
 
-	/** @var \phpbb\config\config */
+	/** @var config */
 	protected $config;
 
-	/** @var \phpbb\db\driver\driver_interface */
+	/** @var driver_interface */
 	protected $db;
 
 	/** @var string Notification emails table */
 	protected $notification_emails_table;
 
+	/** @var service_collection */
+	protected $messenger;
+
 	/**
 	 * Notification Method email Constructor
 	 *
-	 * @param \phpbb\user_loader $user_loader
-	 * @param \phpbb\user $user
-	 * @param \phpbb\config\config $config
-	 * @param \phpbb\db\driver\driver_interface $db
+	 * @param user_loader $user_loader
+	 * @param user $user
+	 * @param config $config
+	 * @param driver_interface $db
 	 * @param string $phpbb_root_path
 	 * @param string $php_ext
 	 * @param string $notification_emails_table
+	 * @param service_collection $messenger
 	 */
-	public function __construct(\phpbb\user_loader $user_loader, \phpbb\user $user, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, $phpbb_root_path, $php_ext, $notification_emails_table)
+	public function __construct(
+		user_loader $user_loader,
+		user $user,
+		config $config,
+		driver_interface $db,
+		$phpbb_root_path,
+		$php_ext,
+		$notification_emails_table,
+		service_collection $messenger
+	)
 	{
-		parent::__construct($user_loader, $phpbb_root_path, $php_ext);
+		parent::__construct($messenger, $user_loader, $phpbb_root_path, $php_ext);
 
 		$this->user = $user;
 		$this->config = $config;
@@ -73,7 +91,7 @@ public function get_type()
 	*											method additionally checks if the type provides an email template.
 	* @return bool
 	*/
-	public function is_available(type_interface $notification_type = null)
+	public function is_available(type_interface|null $notification_type = null)
 	{
 		return parent::is_available($notification_type) && $this->config['email_enable'] && !empty($this->user->data['user_email']);
 	}
@@ -117,7 +135,7 @@ public function notify()
 
 		$insert_buffer->flush();
 
-		$this->notify_using_messenger(NOTIFY_EMAIL);
+		$this->notify_using_messenger('messenger.method.email');
 	}
 
 	/**
diff --git a/phpBB/phpbb/notification/method/extended_method_interface.php b/phpBB/phpbb/notification/method/extended_method_interface.php
new file mode 100644
index 00000000000..866288ec3e2
--- /dev/null
+++ b/phpBB/phpbb/notification/method/extended_method_interface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\notification\method;
+
+use phpbb\controller\helper;
+use phpbb\form\form_helper;
+
+interface extended_method_interface extends method_interface
+{
+	/**
+	 * Get UCP template data for type
+	 *
+	 * @param helper $controller_helper
+	 * @param form_helper $form_helper
+	 * @return array Template data
+	 */
+	public function get_ucp_template_data(helper $controller_helper, form_helper $form_helper): array;
+}
diff --git a/phpBB/phpbb/notification/method/jabber.php b/phpBB/phpbb/notification/method/jabber.php
deleted file mode 100644
index 9a1aadb9a0d..00000000000
--- a/phpBB/phpbb/notification/method/jabber.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\notification\method;
-
-use phpbb\notification\type\type_interface;
-
-/**
-* Jabber notification method class
-* This class handles sending Jabber messages for notifications
-*/
-
-class jabber extends \phpbb\notification\method\messenger_base
-{
-	/** @var \phpbb\user */
-	protected $user;
-
-	/** @var \phpbb\config\config */
-	protected $config;
-
-	/**
-	 * Notification Method jabber Constructor
-	 *
-	 * @param \phpbb\user_loader $user_loader
-	 * @param \phpbb\user $user
-	 * @param \phpbb\config\config $config
-	 * @param string $phpbb_root_path
-	 * @param string $php_ext
-	 */
-	public function __construct(\phpbb\user_loader $user_loader, \phpbb\user $user, \phpbb\config\config $config, $phpbb_root_path, $php_ext)
-	{
-		parent::__construct($user_loader, $phpbb_root_path, $php_ext);
-
-		$this->user = $user;
-		$this->config = $config;
-	}
-
-	/**
-	* Get notification method name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'notification.method.jabber';
-	}
-
-	/**
-	* Is this method available for the user?
-	* This is checked on the notifications options
-	*
-	* @param type_interface|null $notification_type	An optional instance of a notification type. If provided, this
-	*											method additionally checks if the type provides an email template.
-	* @return bool
-	*/
-	public function is_available(type_interface $notification_type = null)
-	{
-		return parent::is_available($notification_type) && $this->global_available() && !empty($this->user->data['user_jabber']);
-	}
-
-	/**
-	* Is this method available at all?
-	* This is checked before notifications are sent
-	*/
-	public function global_available()
-	{
-		return !(
-			empty($this->config['jab_enable']) ||
-			empty($this->config['jab_host']) ||
-			empty($this->config['jab_username']) ||
-			empty($this->config['jab_password']) ||
-			!@extension_loaded('xml')
-		);
-	}
-
-	public function notify()
-	{
-		if (!$this->global_available())
-		{
-			return;
-		}
-
-		$this->notify_using_messenger(NOTIFY_IM, 'short/');
-	}
-}
diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php
index 85461b282d3..3f2532c2437 100644
--- a/phpBB/phpbb/notification/method/messenger_base.php
+++ b/phpBB/phpbb/notification/method/messenger_base.php
@@ -14,14 +14,19 @@
 namespace phpbb\notification\method;
 
 use phpbb\notification\type\type_interface;
+use phpbb\di\service_collection;
+use phpbb\user_loader;
 
 /**
-* Abstract notification method handling email and jabber notifications
+* Abstract notification method handling messenger notifications
 * using the phpBB messenger.
 */
 abstract class messenger_base extends \phpbb\notification\method\base
 {
-	/** @var \phpbb\user_loader */
+	/** @var service_collection */
+	protected $messenger;
+
+	/** @var user_loader */
 	protected $user_loader;
 
 	/** @var string */
@@ -33,12 +38,14 @@ abstract class messenger_base extends \phpbb\notification\method\base
 	/**
 	 * Notification Method Board Constructor
 	 *
-	 * @param \phpbb\user_loader $user_loader
+	 * @param service_collection $messenger
+	 * @param user_loader $user_loader
 	 * @param string $phpbb_root_path
 	 * @param string $php_ext
 	 */
-	public function __construct(\phpbb\user_loader $user_loader, $phpbb_root_path, $php_ext)
+	public function __construct(service_collection $messenger, user_loader $user_loader, $phpbb_root_path, $php_ext)
 	{
+		$this->messenger = $messenger;
 		$this->user_loader = $user_loader;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
@@ -52,7 +59,7 @@ public function __construct(\phpbb\user_loader $user_loader, $phpbb_root_path, $
 	*											only if the type is provided and if it doesn't provide an email template.
 	* @return bool
 	*/
-	public function is_available(type_interface $notification_type = null)
+	public function is_available(type_interface|null $notification_type = null)
 	{
 		return $notification_type === null || $notification_type->get_email_template() !== false;
 	}
@@ -60,12 +67,12 @@ public function is_available(type_interface $notification_type = null)
 	/**
 	* Notify using phpBB messenger
 	*
-	* @param int $notify_method				Notify method for messenger (e.g. NOTIFY_IM)
+	* @param string $notify_method			Notify method service for messenger (e.g. 'messenger.method.email'), empty string for all available methods
 	* @param string $template_dir_prefix	Base directory to prepend to the email template name
 	*
 	* @return void
 	*/
-	protected function notify_using_messenger($notify_method, $template_dir_prefix = '')
+	protected function notify_using_messenger(string $notify_method, string $template_dir_prefix = ''): void
 	{
 		if (empty($this->queue))
 		{
@@ -73,13 +80,13 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix =
 		}
 
 		// Load all users we want to notify (we need their email address)
-		$user_ids = array();
+		$user_ids = [];
 		foreach ($this->queue as $notification)
 		{
 			$user_ids[] = $notification->user_id;
 		}
 
-		// We do not send emails to banned users
+		// We do not notify banned users
 		if (!function_exists('phpbb_get_banned_user_ids'))
 		{
 			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
@@ -89,14 +96,9 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix =
 		// Load all the users we need
 		$this->user_loader->load_users(array_diff($user_ids, $banned_users), array(USER_IGNORE));
 
-		// Load the messenger
-		if (!class_exists('messenger'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
-		}
-		$messenger = new \messenger();
+		// Time to go through the queue and send notifications
+		$messenger_collection_iterator = $this->messenger->getIterator();
 
-		// Time to go through the queue and send emails
 		/** @var type_interface $notification */
 		foreach ($this->queue as $notification)
 		{
@@ -112,22 +114,29 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix =
 				continue;
 			}
 
-			$messenger->template($notification->get_email_template(), $user['user_lang'], '', $template_dir_prefix);
-
-			$messenger->set_addresses($user);
-
-			$messenger->assign_vars(array_merge(array(
-				'USERNAME'						=> $user['username'],
-
-				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications&mode=notification_options',
-			), $notification->get_email_template_variables()));
-
-			$messenger->send($notify_method);
+			/**
+			 * @var \phpbb\messenger\method\messenger_interface $messenger_method
+			 * @psalm-suppress UndefinedMethod
+			 */
+			foreach ($messenger_collection_iterator as $messenger_method)
+			{
+				if (empty($notify_method) || $messenger_collection_iterator->key() == $notify_method)
+				{
+					$messenger_method->template($notification->get_email_template(), $user['user_lang'], '', $template_dir_prefix);
+					$messenger_method->set_addresses($user);
+					$messenger_method->assign_vars(array_merge([
+						'USERNAME'					=> $user['username'],
+						'U_NOTIFICATION_SETTINGS'	=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications&mode=notification_options',
+					], $notification->get_email_template_variables()));
+
+					$messenger_method->send();
+
+					// Save the queue in the messenger method class (has to be called or these messages could be lost)
+					$messenger_method->save_queue();
+				}
+			}
 		}
 
-		// Save the queue in the messenger class (has to be called or these emails could be lost?)
-		$messenger->save_queue();
-
 		// We're done, empty the queue
 		$this->empty_queue();
 	}
diff --git a/phpBB/phpbb/notification/method/method_interface.php b/phpBB/phpbb/notification/method/method_interface.php
index 28100d755f0..2112713b1cb 100644
--- a/phpBB/phpbb/notification/method/method_interface.php
+++ b/phpBB/phpbb/notification/method/method_interface.php
@@ -114,10 +114,11 @@ public function mark_notifications_by_parent($notification_type_id, $item_parent
 	* Mark notifications read or unread
 	*
 	* @param array|int $notification_id Notification id or array of notification ids.
+	* @param int $user_id User id of notification, false to mark head for all user ids.
 	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
 	* @param bool $mark_read Define if the notification as to be set to True or False. (Default: True)
 	*/
-	public function mark_notifications_by_id($notification_id, $time = false, $mark_read = true);
+	public function mark_notifications_by_id($notification_id, $user_id, $time = false, $mark_read = true);
 
 	/**
 	* Delete a notification
diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php
new file mode 100644
index 00000000000..8923728362e
--- /dev/null
+++ b/phpBB/phpbb/notification/method/webpush.php
@@ -0,0 +1,492 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\notification\method;
+
+use Minishlink\WebPush\Subscription;
+use phpbb\config\config;
+use phpbb\controller\helper;
+use phpbb\db\driver\driver_interface;
+use phpbb\form\form_helper;
+use phpbb\log\log_interface;
+use phpbb\notification\type\type_interface;
+use phpbb\user;
+use phpbb\user_loader;
+
+/**
+* Web Push notification method class
+* This class handles sending push messages for notifications
+*/
+
+class webpush extends base implements extended_method_interface
+{
+	/** @var config */
+	protected $config;
+
+	/** @var driver_interface */
+	protected $db;
+
+	/** @var log_interface */
+	protected $log;
+
+	/** @var user_loader */
+	protected $user_loader;
+
+	/** @var user */
+	protected $user;
+
+	/** @var string */
+	protected $phpbb_root_path;
+
+	/** @var string */
+	protected $php_ext;
+
+	/** @var string Notification Web Push table */
+	protected $notification_webpush_table;
+
+	/** @var string Notification push subscriptions table */
+	protected $push_subscriptions_table;
+
+	/** @var int Fallback size for padding if endpoint is mozilla, see https://github.com/web-push-libs/web-push-php/issues/108#issuecomment-2133477054 */
+	const MOZILLA_FALLBACK_PADDING = 2820;
+
+	/** @var array Map for storing push token between db insertion and sending of notifications */
+	private array $push_token_map = [];
+
+	/**
+	 * Notification Method Web Push constructor
+	 *
+	 * @param config $config
+	 * @param driver_interface $db
+	 * @param log_interface $log
+	 * @param user_loader $user_loader
+	 * @param user $user
+	 * @param string $phpbb_root_path
+	 * @param string $php_ext
+	 * @param string $notification_webpush_table
+	 * @param string $push_subscriptions_table
+	 */
+	public function __construct(config $config, driver_interface $db, log_interface $log, user_loader $user_loader, user $user, string $phpbb_root_path,
+								string $php_ext, string $notification_webpush_table, string $push_subscriptions_table)
+	{
+		$this->config = $config;
+		$this->db = $db;
+		$this->log = $log;
+		$this->user_loader = $user_loader;
+		$this->user = $user;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+		$this->notification_webpush_table = $notification_webpush_table;
+		$this->push_subscriptions_table = $push_subscriptions_table;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_type(): string
+	{
+		return 'notification.method.webpush';
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function is_available(type_interface|null $notification_type = null): bool
+	{
+		return $this->config['webpush_enable']
+			&& $this->config['webpush_vapid_public']
+			&& $this->config['webpush_vapid_private'];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function is_enabled_by_default()
+	{
+		return (bool) $this->config['webpush_method_default_enable'];
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_notified_users($notification_type_id, array $options): array
+	{
+		$notified_users = [];
+
+		$sql = 'SELECT user_id
+			FROM ' . $this->notification_webpush_table . '
+			WHERE notification_type_id = ' . (int) $notification_type_id .
+			(isset($options['item_id']) ? ' AND item_id = ' . (int) $options['item_id'] : '') .
+			(isset($options['item_parent_id']) ? ' AND item_parent_id = ' . (int) $options['item_parent_id'] : '') .
+			(isset($options['user_id']) ? ' AND user_id = ' . (int) $options['user_id'] : '');
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$notified_users[$row['user_id']] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $notified_users;
+	}
+
+	/**
+	* Parse the queue and notify the users
+	*/
+	public function notify()
+	{
+		$insert_buffer = new \phpbb\db\sql_insert_buffer($this->db, $this->notification_webpush_table);
+
+		/** @var type_interface $notification */
+		foreach ($this->queue as $notification)
+		{
+			$data = $notification->get_insert_array();
+			$data += [
+				'push_data'				=> json_encode(array_merge(
+					$data,
+					['notification_type_name' => $notification->get_type()],
+				)),
+				'notification_time'		=> time(),
+				'push_token'			=> hash('sha256', random_bytes(32))
+			];
+			$data = self::clean_data($data);
+			$insert_buffer->insert($data);
+			$this->push_token_map[$notification->notification_type_id][$notification->item_id] = $data['push_token'];
+		}
+
+		$insert_buffer->flush();
+
+		$this->notify_using_webpush();
+
+		return false;
+	}
+
+	/**
+	 * Notify using Web Push
+	 *
+	 * @return void
+	 */
+	protected function notify_using_webpush(): void
+	{
+		if (empty($this->queue))
+		{
+			return;
+		}
+
+		// Load all users we want to notify
+		$user_ids = [];
+		foreach ($this->queue as $notification)
+		{
+			$user_ids[] = $notification->user_id;
+		}
+
+		// Do not send push notifications to banned users
+		if (!function_exists('phpbb_get_banned_user_ids'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		}
+		$banned_users = phpbb_get_banned_user_ids($user_ids);
+
+		// Load all the users we need
+		$notify_users = array_diff($user_ids, $banned_users);
+		$this->user_loader->load_users($notify_users, array(USER_IGNORE));
+
+		// Get subscriptions for users
+		$user_subscription_map = $this->get_user_subscription_map($notify_users);
+
+		$auth = [
+			'VAPID' => [
+				'subject' => generate_board_url(false),
+				'publicKey' => $this->config['webpush_vapid_public'],
+				'privateKey' => $this->config['webpush_vapid_private'],
+			],
+		];
+
+		$web_push = new \Minishlink\WebPush\WebPush($auth);
+
+		$number_of_notifications = 0;
+		$remove_subscriptions = [];
+
+		// Time to go through the queue and send notifications
+		/** @var type_interface $notification */
+		foreach ($this->queue as $notification)
+		{
+			$user = $this->user_loader->get_user($notification->user_id);
+
+			$user_subscriptions = $user_subscription_map[$notification->user_id] ?? [];
+
+			if ($user['user_type'] == USER_INACTIVE && $user['user_inactive_reason'] == INACTIVE_MANUAL
+				|| empty($user_subscriptions))
+			{
+				continue;
+			}
+
+			// Add actual Web Push data
+			$data = [
+				'item_id'	=> $notification->item_id,
+				'type_id'	=> $notification->notification_type_id,
+				'user_id'	=> $notification->user_id,
+				'version'	=> $this->config['assets_version'],
+				'token'		=> hash('sha256', $user['user_form_salt'] . $this->push_token_map[$notification->notification_type_id][$notification->item_id]),
+			];
+			$json_data = json_encode($data);
+
+			foreach ($user_subscriptions as $subscription)
+			{
+				try
+				{
+					$this->set_endpoint_padding($web_push, $subscription['endpoint']);
+					$push_subscription = Subscription::create([
+						'endpoint'			=> $subscription['endpoint'],
+						'keys'				=> [
+							'p256dh'	=> $subscription['p256dh'],
+							'auth'		=> $subscription['auth'],
+						],
+					]);
+					$web_push->queueNotification($push_subscription, $json_data);
+					$number_of_notifications++;
+				}
+				catch (\ErrorException $exception)
+				{
+					$remove_subscriptions[] = $subscription['subscription_id'];
+					$this->log->add('user', $user['user_id'], $user['user_ip'] ?? '', 'LOG_WEBPUSH_SUBSCRIPTION_REMOVED', false, [
+						'reportee_id' => $user['user_id'],
+						$user['username'],
+					]);
+				}
+			}
+		}
+
+		// Remove any subscriptions that couldn't be queued, i.e. that have invalid data
+		$this->remove_subscriptions($remove_subscriptions);
+
+		// List to fill with expired subscriptions based on return
+		$expired_endpoints = [];
+
+		try
+		{
+			foreach ($web_push->flush($number_of_notifications) as $report)
+			{
+				if (!$report->isSuccess())
+				{
+					// Fill array of endpoints to remove if subscription has expired
+					if ($report->isSubscriptionExpired())
+					{
+						$expired_endpoints[] = $report->getEndpoint();
+					}
+					else
+					{
+						$report_data = \phpbb\json\sanitizer::sanitize($report->jsonSerialize());
+						$this->log->add('admin', ANONYMOUS, '', 'LOG_WEBPUSH_MESSAGE_FAIL', false, [$report_data['reason']]);
+					}
+				}
+			}
+		}
+		catch (\ErrorException $exception)
+		{
+			$this->log->add('critical', ANONYMOUS, '', 'LOG_WEBPUSH_MESSAGE_FAIL', false, [$exception->getMessage()]);
+		}
+
+		$this->clean_expired_subscriptions($user_subscription_map, $expired_endpoints);
+
+		// We're done, empty the queue
+		$this->empty_queue();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function mark_notifications($notification_type_id, $item_id, $user_id, $time = false, $mark_read = true)
+	{
+		$sql = 'DELETE FROM ' . $this->notification_webpush_table . '
+			WHERE ' . ($notification_type_id !== false ? $this->db->sql_in_set('notification_type_id', is_array($notification_type_id) ? $notification_type_id : [$notification_type_id]) : '1=1') .
+			($user_id !== false ? ' AND ' . $this->db->sql_in_set('user_id', $user_id) : '') .
+			($item_id !== false ? ' AND ' . $this->db->sql_in_set('item_id', $item_id) : '');
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function mark_notifications_by_parent($notification_type_id, $item_parent_id, $user_id, $time = false, $mark_read = true)
+	{
+		$sql = 'DELETE FROM ' . $this->notification_webpush_table . '
+			WHERE ' . ($notification_type_id !== false ? $this->db->sql_in_set('notification_type_id', is_array($notification_type_id) ? $notification_type_id : [$notification_type_id]) : '1=1') .
+			($user_id !== false ? ' AND ' . $this->db->sql_in_set('user_id', $user_id) : '') .
+			($item_parent_id !== false ? ' AND ' . $this->db->sql_in_set('item_parent_id', $item_parent_id, false, true) : '');
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function prune_notifications($timestamp, $only_read = true): void
+	{
+		$sql = 'DELETE FROM ' . $this->notification_webpush_table . '
+			WHERE notification_time < ' . (int) $timestamp;
+		$this->db->sql_query($sql);
+
+		$this->config->set('read_notification_last_gc', (string) time(), false);
+	}
+
+	/**
+	 * Clean data to contain only what we need for webpush notifications table
+	 *
+	 * @param array $data Notification data
+	 * @return array Cleaned notification data
+	 */
+	public static function clean_data(array $data): array
+	{
+		$row = [
+			'notification_type_id'	=> null,
+			'item_id'				=> null,
+			'item_parent_id'		=> null,
+			'user_id'				=> null,
+			'push_data'				=> null,
+			'push_token'			=> null,
+			'notification_time'		=> null,
+		];
+
+		return array_intersect_key($data, $row);
+	}
+
+	/**
+	 * Get template data for the UCP
+	 *
+	 * @param helper $controller_helper
+	 * @param form_helper $form_helper
+	 *
+	 * @return array
+	 */
+	public function get_ucp_template_data(helper $controller_helper, form_helper $form_helper): array
+	{
+		$subscription_map = $this->get_user_subscription_map([$this->user->id()]);
+		$subscriptions = [];
+
+		if (isset($subscription_map[$this->user->id()]))
+		{
+			foreach ($subscription_map[$this->user->id()] as $subscription)
+			{
+				$subscriptions[] = [
+					'endpoint'			=> $subscription['endpoint'],
+					'expirationTime'	=> $subscription['expiration_time'],
+				];
+			}
+		}
+
+		return [
+			'NOTIFICATIONS_WEBPUSH_ENABLE'	=> $this->config['webpush_dropdown_subscribe'] || stripos($this->user->page['page'], 'notification_options'),
+			'U_WEBPUSH_SUBSCRIBE'			=> $controller_helper->route('phpbb_ucp_push_subscribe_controller'),
+			'U_WEBPUSH_UNSUBSCRIBE'			=> $controller_helper->route('phpbb_ucp_push_unsubscribe_controller'),
+			'VAPID_PUBLIC_KEY'				=> $this->config['webpush_vapid_public'],
+			'U_WEBPUSH_WORKER_URL'			=> $controller_helper->route('phpbb_ucp_push_worker_controller'),
+			'SUBSCRIPTIONS'					=> $subscriptions,
+			'WEBPUSH_FORM_TOKENS'			=> $form_helper->get_form_tokens(\phpbb\ucp\controller\webpush::FORM_TOKEN_UCP),
+		];
+	}
+
+	/**
+	 * Get subscriptions for notify users
+	 *
+	 * @param array $notify_users Users to notify
+	 *
+	 * @return array Subscription map
+	 */
+	protected function get_user_subscription_map(array $notify_users): array
+	{
+		// Get subscriptions for users
+		$user_subscription_map = [];
+
+		$sql = 'SELECT subscription_id, user_id, endpoint, p256dh, auth, expiration_time
+			FROM ' . $this->push_subscriptions_table . '
+			WHERE ' . $this->db->sql_in_set('user_id', $notify_users);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$user_subscription_map[$row['user_id']][] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $user_subscription_map;
+	}
+
+	/**
+	 * Remove subscriptions
+	 *
+	 * @param array $subscription_ids Subscription ids to remove
+	 * @return void
+	 */
+	public function remove_subscriptions(array $subscription_ids): void
+	{
+		if (count($subscription_ids))
+		{
+			$sql = 'DELETE FROM ' . $this->push_subscriptions_table . '
+					WHERE ' . $this->db->sql_in_set('subscription_id', $subscription_ids);
+			$this->db->sql_query($sql);
+		}
+	}
+
+	/**
+	 * Clean expired subscriptions from the database
+	 *
+	 * @param array $user_subscription_map User subscription map
+	 * @param array $expired_endpoints Expired endpoints
+	 * @return void
+	 */
+	protected function clean_expired_subscriptions(array $user_subscription_map, array $expired_endpoints): void
+	{
+		if (!count($expired_endpoints))
+		{
+			return;
+		}
+
+		$remove_subscriptions = [];
+		foreach ($expired_endpoints as $endpoint)
+		{
+			foreach ($user_subscription_map as $subscriptions)
+			{
+				foreach ($subscriptions as $subscription)
+				{
+					if (isset($subscription['endpoint']) && $subscription['endpoint'] == $endpoint)
+					{
+						$remove_subscriptions[] = $subscription['subscription_id'];
+					}
+				}
+			}
+		}
+
+		$this->remove_subscriptions($remove_subscriptions);
+	}
+
+	/**
+	 * Set web push padding for endpoint
+	 *
+	 * @param \Minishlink\WebPush\WebPush $web_push
+	 * @param string $endpoint
+	 *
+	 * @return void
+	 */
+	protected function set_endpoint_padding(\Minishlink\WebPush\WebPush $web_push, string $endpoint): void
+	{
+		if (str_contains($endpoint, 'mozilla.com') || str_contains($endpoint, 'mozaws.net'))
+		{
+			try
+			{
+				$web_push->setAutomaticPadding(self::MOZILLA_FALLBACK_PADDING);
+			}
+			catch (\Exception)
+			{
+				// This shouldn't happen since we won't pass padding length outside limits
+			}
+		}
+	}
+}
diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php
index cf0ce88a628..ad03fb11c22 100644
--- a/phpBB/phpbb/notification/type/base.php
+++ b/phpBB/phpbb/notification/type/base.php
@@ -13,6 +13,13 @@
 
 namespace phpbb\notification\type;
 
+use phpbb\auth\auth;
+use phpbb\avatar\helper as avatar_helper;
+use phpbb\controller\helper;
+use phpbb\db\driver\driver_interface;
+use phpbb\language\language;
+use phpbb\user;
+
 /**
 * Base notifications class
 */
@@ -21,16 +28,22 @@ abstract class base implements \phpbb\notification\type\type_interface
 	/** @var \phpbb\notification\manager */
 	protected $notification_manager;
 
-	/** @var \phpbb\db\driver\driver_interface */
+	/** @var avatar_helper */
+	protected $avatar_helper;
+
+	/** @var helper|null */
+	protected $controller_helper;
+
+	/** @var driver_interface */
 	protected $db;
 
-	/** @var \phpbb\language\language */
+	/** @var language */
 	protected $language;
 
-	/** @var \phpbb\user */
+	/** @var user */
 	protected $user;
 
-	/** @var \phpbb\auth\auth */
+	/** @var auth */
 	protected $auth;
 
 	/** @var string */
@@ -76,16 +89,21 @@ abstract class base implements \phpbb\notification\type\type_interface
 	/**
 	 * Notification Type Base Constructor
 	 *
-	 * @param \phpbb\db\driver\driver_interface $db
-	 * @param \phpbb\language\language          $language
-	 * @param \phpbb\user                       $user
-	 * @param \phpbb\auth\auth                  $auth
-	 * @param string                            $phpbb_root_path
-	 * @param string                            $php_ext
-	 * @param string                            $user_notifications_table
+	 * @param avatar_helper		$avatar_helper
+	 * @param helper			$controller_helper
+	 * @param driver_interface	$db
+	 * @param language			$language
+	 * @param user				$user
+	 * @param auth				$auth
+	 * @param string			$phpbb_root_path
+	 * @param string			$php_ext
+	 * @param string			$user_notifications_table
 	 */
-	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\user $user, \phpbb\auth\auth $auth, $phpbb_root_path, $php_ext, $user_notifications_table)
+	public function __construct(avatar_helper $avatar_helper, helper $controller_helper, driver_interface $db, language $language,
+								user $user, auth $auth, string $phpbb_root_path, string $php_ext, string $user_notifications_table)
 	{
+		$this->avatar_helper = $avatar_helper;
+		$this->controller_helper = $controller_helper;
 		$this->db = $db;
 		$this->language = $language;
 		$this->user = $user;
@@ -132,7 +150,6 @@ public function __get($name)
 		return $this->data[$name] ?? null;
 	}
 
-
 	/**
 	* Magic method to set data on this notification
 	*
@@ -286,18 +303,18 @@ public function prepare_for_display()
 
 		if ($this->get_url())
 		{
-			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&amp;hash=' . $mark_hash);
+			$u_mark_read = $this->controller_helper->route('phpbb_notifications_mark_read', ['id' => $this->notification_id, 'hash' => $mark_hash]);
 		}
 		else
 		{
 			$redirect = (($this->user->page['page_dir']) ? $this->user->page['page_dir'] . '/' : '') . $this->user->page['page_name'] . (($this->user->page['query_string']) ? '?' . $this->user->page['query_string'] : '');
-
-			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&amp;hash=' . $mark_hash . '&amp;redirect=' . urlencode($redirect));
+			$u_mark_read = $this->controller_helper->route('phpbb_notifications_mark_read', ['id' => $this->notification_id, 'hash' => $mark_hash, 'redirect' => $redirect]);
 		}
 
 		$avatar = $this->get_avatar();
+		$avatar_data = count($avatar) ? $this->avatar_helper->get_template_vars($avatar) : [];
 
-		return [
+		return array_merge($avatar_data, [
 			'NOTIFICATION_ID'	=> $this->notification_id,
 			'STYLING'			=> $this->get_style_class(),
 			'FORMATTED_TITLE'	=> $this->get_title(),
@@ -308,18 +325,8 @@ public function prepare_for_display()
 			'TIME'	   			=> $this->user->format_date($this->notification_time),
 			'UNREAD'			=> !$this->notification_read,
 
-			'AVATAR_SOURCE'		=> $avatar ? $avatar['src'] : '',
-			'AVATAR_TITLE'		=> $avatar ? $avatar['title'] : '',
-			'AVATAR_TYPE'		=> $avatar ? $avatar['type'] : '',
-
-			'AVATAR_WIDTH'		=> $avatar ? $avatar['width'] : 0,
-			'AVATAR_HEIGHT'		=> $avatar ? $avatar['height'] : 0,
-
-			'AVATAR_HTML'		=> $avatar ? $avatar['html'] : '',
-			'AVATAR_LAZY'		=> $avatar ? $avatar['lazy'] : true,
-
 			'U_MARK_READ'		=> (!$this->notification_read) ? $u_mark_read : '',
-		];
+		]);
 	}
 
 	/**
@@ -327,10 +334,7 @@ public function prepare_for_display()
 	*/
 
 	/**
-	* URL to unsubscribe to this notification (fall back)
-	*
-	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
-	* @return false
+	* {@inheritDoc}
 	*/
 	public function get_unsubscribe_url($method = false)
 	{
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php
index be8c8d75e90..9052f6cbcf7 100644
--- a/phpBB/phpbb/notification/type/post.php
+++ b/phpBB/phpbb/notification/type/post.php
@@ -386,7 +386,7 @@ public function create_insert_array($type_data, $pre_create_data = array())
 
 		// Topics can be "read" before they are public (while awaiting approval).
 		// Make sure that if the user has read the topic, it's marked as read in the notification
-		if ($this->inherit_read_status && isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
+		if ($this->inherit_read_status && isset($this->user_id, $pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
 		{
 			$this->notification_read = true;
 		}
diff --git a/phpBB/phpbb/notification/type/type_interface.php b/phpBB/phpbb/notification/type/type_interface.php
index 65bd15d4aa0..3ac8ea0a68e 100644
--- a/phpBB/phpbb/notification/type/type_interface.php
+++ b/phpBB/phpbb/notification/type/type_interface.php
@@ -132,14 +132,14 @@ public function get_redirect_url();
 	/**
 	* URL to unsubscribe to this notification
 	*
-	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
+	* @param string|bool $method Method name to unsubscribe from (email|etc), False to unsubscribe from all notifications for this item
 	*/
 	public function get_unsubscribe_url($method);
 
 	/**
 	* Get the user's avatar (the user who caused the notification typically)
 	*
-	* @return string
+	* @return array
 	*/
 	public function get_avatar();
 
diff --git a/phpBB/phpbb/passwords/driver/helper.php b/phpBB/phpbb/passwords/driver/helper.php
index c00054cb6b8..abe851905d1 100644
--- a/phpBB/phpbb/passwords/driver/helper.php
+++ b/phpBB/phpbb/passwords/driver/helper.php
@@ -140,6 +140,9 @@ public function get_random_salt($length, $rand_seed = '/dev/urandom')
 			}
 			$random = substr($random, 0, $length);
 		}
+		/**
+		 * @psalm-suppress FalsableReturnStatement
+		 */
 		return $random;
 	}
 
diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php
index 0f3bb4d3cb8..db45faab264 100644
--- a/phpBB/phpbb/path_helper.php
+++ b/phpBB/phpbb/path_helper.php
@@ -38,6 +38,9 @@ class path_helper
 	/** @var string */
 	protected $web_root_path;
 
+	/** @var bool Flag whether we're in adm path */
+	protected $in_adm_path = false;
+
 	/**
 	* Constructor
 	*
@@ -100,21 +103,27 @@ public function update_web_root_path($path)
 		$web_root_path = $this->get_web_root_path();
 
 		// Removes the web root path if it is already present
-		if (strpos($path, $web_root_path) === 0)
+		if (str_starts_with($path, $web_root_path))
 		{
 			$path = $this->phpbb_root_path . substr($path, strlen($web_root_path));
 		}
 
-		if (strpos($path, $this->phpbb_root_path) === 0)
+		if (str_starts_with($path, $this->phpbb_root_path))
 		{
 			$path = substr($path, strlen($this->phpbb_root_path));
 
-			if (substr($web_root_path, -8) === 'app.php/' && substr($path, 0, 7) === 'app.php')
+			if (str_ends_with($web_root_path, 'index.php/') && str_starts_with($path, 'index.php'))
 			{
-				$path = substr($path, 8);
+				$path = substr($path, strlen('index.php/'));
 			}
 
-			return filesystem_helper::clean_path($web_root_path . $path);
+			$path = filesystem_helper::clean_path($web_root_path . $path);
+
+			// Further clean path if we're in adm
+			if ($this->in_adm_path && str_starts_with($path, $this->phpbb_root_path . $this->adm_relative_path))
+			{
+				$path = substr($path, strlen($this->phpbb_root_path . $this->adm_relative_path));
+			}
 		}
 
 		return $path;
@@ -162,25 +171,30 @@ public function get_web_root_path()
 		// Path info (e.g. /foo/bar)
 		$path_info = filesystem_helper::clean_path($this->symfony_request->getPathInfo());
 
-		// Full request URI (e.g. phpBB/app.php/foo/bar)
+		// Full request URI (e.g. phpBB/index.php/foo/bar)
 		$request_uri = $this->symfony_request->getRequestUri();
 
-		// Script name URI (e.g. phpBB/app.php)
+		// Script name URI (e.g. phpBB/index.php)
 		$script_name = $this->symfony_request->getScriptName();
 
 		/*
-		* If the path info is empty but we're using app.php, then we
-		*	might be using an empty route like app.php/ which is
+		* If the path info is empty but we're using index.php, then we
+		*	might be using an empty route like index.php/ which is
 		*	supported by symfony's routing
 		*/
-		if ($path_info === '/' && preg_match('/app\.' . $this->php_ext . '\/$/', $request_uri))
+		if ($path_info === '/' && preg_match('/index\.' . $this->php_ext . '\/$/', $request_uri))
 		{
 			return $this->web_root_path = filesystem_helper::clean_path('./../' . $this->phpbb_root_path);
 		}
 
+		if ($path_info === '/' && defined('ADMIN_START') && preg_match('/\/' . preg_quote($this->adm_relative_path, '/') . 'index\.' . $this->php_ext . '$/', $script_name))
+		{
+			$this->in_adm_path = true;
+		}
+
 		/*
 		* If the path info is empty (single /), then we're not using
-		*	a route like app.php/foo/bar
+		*	a route like index.php/foo/bar
 		*/
 		if ($path_info === '/')
 		{
@@ -197,22 +211,22 @@ public function get_web_root_path()
 		* intended locations:
 		*	Referer				desired URL			desired relative root path
 		*	memberlist.php		faq.php				./
-		*	memberlist.php		app.php/foo/bar		./
-		*	app.php/foo			memberlist.php		../
-		*	app.php/foo			app.php/fox			../
-		*	app.php/foo/bar		memberlist.php		../../
+		*	memberlist.php		index.php/foo/bar		./
+		*	index.php/foo		memberlist.php		../
+		*	index.php/foo		index.php/fox			../
+		*	index.php/foo/bar	memberlist.php		../../
 		*	../page.php			memberlist.php		./phpBB/
 		*	../sub/page.php		memberlist.php		./../phpBB/
 		*
 		* The referer must be specified as a parameter in the query.
 		*/
-		if ($this->request->is_ajax() && $this->symfony_request->get('_referer'))
+		if ($this->request->is_ajax() && $this->request->header('Referer'))
 		{
 			// We need to escape $absolute_board_url because it can be partially concatenated to the result.
 			$absolute_board_url = $this->request->escape($this->symfony_request->getSchemeAndHttpHost() . $this->symfony_request->getBasePath(), true);
 
 			$referer_web_root_path = $this->get_web_root_path_from_ajax_referer(
-				$this->symfony_request->get('_referer'),
+				$this->request->header('Referer'),
 				$absolute_board_url
 			);
 			return $this->web_root_path = $referer_web_root_path;
@@ -222,11 +236,11 @@ public function get_web_root_path()
 		$corrections = substr_count($path_info, '/');
 
 		/*
-		* If the script name (e.g. phpBB/app.php) does not exists in the
-		* requestUri (e.g. phpBB/app.php/foo/template), then we are rewriting
+		* If the script name (e.g. phpBB/index.php) does not exists in the
+		* requestUri (e.g. phpBB/index.php/foo/template), then we are rewriting
 		* the URL. So we must reduce the slash count by 1.
 		*/
-		if (strpos($request_uri, $script_name) !== 0)
+		if (!str_starts_with($request_uri, $script_name))
 		{
 			$corrections--;
 		}
@@ -252,7 +266,7 @@ public function get_web_root_path_from_ajax_referer($absolute_referer_url, $abso
 		// So we just need to count the / (slashes) in the left over part of
 		// the referer and prepend ../ the the current root_path, to get the
 		// web root path of the referer.
-		if (strpos($absolute_referer_url, $absolute_board_url) === 0)
+		if (str_starts_with($absolute_referer_url, $absolute_board_url))
 		{
 			$relative_referer_path = substr($absolute_referer_url, strlen($absolute_board_url));
 			$has_params = strpos($relative_referer_path, '?');
@@ -281,7 +295,7 @@ public function get_web_root_path_from_ajax_referer($absolute_referer_url, $abso
 		// If we do not find a slash at the end of the referer, we come
 		// from a file. So the first dirname() does not need a traversal
 		// path correction.
-		if (substr($referer_dir, -1) !== '/')
+		if (!str_ends_with($referer_dir, '/'))
 		{
 			$referer_dir = dirname($referer_dir);
 		}
@@ -363,7 +377,7 @@ public function get_url_parts($url, $is_amp = true)
 		$separator = ($is_amp) ? '&amp;' : '&';
 		$params = array();
 
-		if (strpos($url, '?') !== false)
+		if (str_contains($url, '?'))
 		{
 			$base = substr($url, 0, strpos($url, '?'));
 			$args = substr($url, strlen($base) + 1);
@@ -377,7 +391,7 @@ public function get_url_parts($url, $is_amp = true)
 				}
 
 				// some parameters don't have value
-				if (strpos($argument, '=') !== false)
+				if (str_contains($argument, '='))
 				{
 					list($key, $value) = explode('=', $argument, 2);
 				}
@@ -479,12 +493,12 @@ public function get_valid_page($page, $mod_rewrite = false)
 		// URL
 		if ($url_parts === false || empty($url_parts['scheme']) || empty($url_parts['host']))
 		{
-			// Remove 'app.php/' from the page, when rewrite is enabled.
-			// Treat app.php as a reserved file name and remove on mod rewrite
+			// Remove 'index.php/' from the page, when rewrite is enabled.
+			// Treat index.php as a reserved file name and remove on mod rewrite
 			// even if it might not be in the phpBB root.
-			if ($mod_rewrite && ($app_position = strpos($page, 'app.' . $this->php_ext . '/')) !== false)
+			if ($mod_rewrite && ($app_position = strpos($page, 'index.' . $this->php_ext . '/')) !== false)
 			{
-				$page = substr($page, 0, $app_position) . substr($page, $app_position + strlen('app.' . $this->php_ext . '/'));
+				$page = substr($page, 0, $app_position) . substr($page, $app_position + strlen('index.' . $this->php_ext . '/'));
 			}
 
 			// Remove preceding slashes from page name and prepend root path
@@ -501,9 +515,9 @@ public function get_valid_page($page, $mod_rewrite = false)
 	 */
 	public function is_router_used()
 	{
-		// Script name URI (e.g. phpBB/app.php)
+		// Script name URI (e.g. phpBB/index.php)
 		$script_name = $this->symfony_request->getScriptName();
 
-		return basename($script_name) === 'app.' . $this->php_ext;
+		return basename($script_name) === 'index.' . $this->php_ext;
 	}
 }
diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php
index 79102f96a80..87fa05c5ff1 100644
--- a/phpBB/phpbb/permissions.php
+++ b/phpBB/phpbb/permissions.php
@@ -253,7 +253,6 @@ public function get_permission_lang($permission)
 		'u_pm_img'		=> array('lang' => 'ACL_U_PM_IMG', 'cat' => 'pm'),
 
 		'u_sendemail'	=> array('lang' => 'ACL_U_SENDEMAIL', 'cat' => 'misc'),
-		'u_sendim'		=> array('lang' => 'ACL_U_SENDIM', 'cat' => 'misc'),
 		'u_ignoreflood'	=> array('lang' => 'ACL_U_IGNOREFLOOD', 'cat' => 'misc'),
 		'u_hideonline'	=> array('lang' => 'ACL_U_HIDEONLINE', 'cat' => 'misc'),
 		'u_viewonline'	=> array('lang' => 'ACL_U_VIEWONLINE', 'cat' => 'misc'),
@@ -317,7 +316,6 @@ public function get_permission_lang($permission)
 		// Admin Permissions
 		'a_board'		=> array('lang' => 'ACL_A_BOARD', 'cat' => 'settings'),
 		'a_server'		=> array('lang' => 'ACL_A_SERVER', 'cat' => 'settings'),
-		'a_jabber'		=> array('lang' => 'ACL_A_JABBER', 'cat' => 'settings'),
 		'a_phpinfo'		=> array('lang' => 'ACL_A_PHPINFO', 'cat' => 'settings'),
 
 		'a_forum'		=> array('lang' => 'ACL_A_FORUM', 'cat' => 'forums'),
diff --git a/phpBB/phpbb/php/ini.php b/phpBB/phpbb/php/ini.php
deleted file mode 100644
index 441e3ff7f6b..00000000000
--- a/phpBB/phpbb/php/ini.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\php;
-
-/**
-* Wrapper class for ini_get function.
-*
-* Provides easier handling of the different interpretations of ini values.
-* @deprecated 3.2.10 (To be removed 4.0.0)
-*/
-class ini
-{
-	/**
-	* Simple wrapper for ini_get()
-	* See http://php.net/manual/en/function.ini-get.php
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool|string		False if configuration option does not exist,
-	*							the configuration option value (string) otherwise.
-	*/
-	public function get($varname)
-	{
-		return ini_get($varname);
-	}
-
-	/**
-	* Gets the configuration option value as a trimmed string.
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool|string		False if configuration option does not exist,
-	*							the configuration option value (string) otherwise.
-	*/
-	public function get_string($varname)
-	{
-		$value = $this->get($varname);
-
-		if ($value === false)
-		{
-			return false;
-		}
-
-		return trim($value);
-	}
-
-	/**
-	* Gets configuration option value as a boolean.
-	* Interprets the string value 'off' as false.
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool				False if configuration option does not exist.
-	*							False if configuration option is disabled.
-	*							True otherwise.
-	*/
-	public function get_bool($varname)
-	{
-		$value = $this->get_string($varname);
-
-		if (empty($value) || strtolower($value) == 'off')
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	* Gets configuration option value as an integer.
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool|int			False if configuration option does not exist,
-	*							false if configuration option value is not numeric,
-	*							the configuration option value (integer) otherwise.
-	*/
-	public function get_int($varname)
-	{
-		$value = $this->get_string($varname);
-
-		if (!is_numeric($value))
-		{
-			return false;
-		}
-
-		return (int) $value;
-	}
-
-	/**
-	* Gets configuration option value as a float.
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool|float		False if configuration option does not exist,
-	*							false if configuration option value is not numeric,
-	*							the configuration option value (float) otherwise.
-	*/
-	public function get_float($varname)
-	{
-		$value = $this->get_string($varname);
-
-		if (!is_numeric($value))
-		{
-			return false;
-		}
-
-		return (float) $value;
-	}
-
-	/**
-	* Gets configuration option value in bytes.
-	* Converts strings like '128M' to bytes (integer or float).
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool|int|float	False if configuration option does not exist,
-	*							false if configuration option value is not well-formed,
-	*							the configuration option value otherwise.
-	*/
-	public function get_bytes($varname)
-	{
-		$value = $this->get_string($varname);
-
-		if ($value === false)
-		{
-			return false;
-		}
-
-		if (is_numeric($value))
-		{
-			// Already in bytes.
-			return phpbb_to_numeric($value);
-		}
-		else if (is_string($value))
-		{
-			if (strlen($value) < 2)
-			{
-				// Single character.
-				return false;
-			}
-			else if (strlen($value) < 3 && $value[0] === '-')
-			{
-				// Two characters but the first one is a minus.
-				return false;
-			}
-		}
-
-		$value_lower = strtolower($value);
-		$value_numeric = phpbb_to_numeric($value);
-
-		switch ($value_lower[strlen($value_lower) - 1])
-		{
-			case 'g':
-				$value_numeric *= 1024;
-			case 'm':
-				$value_numeric *= 1024;
-			case 'k':
-				$value_numeric *= 1024;
-			break;
-
-			default:
-				// It's not already in bytes (and thus numeric)
-				// and does not carry a unit.
-				return false;
-		}
-
-		return $value_numeric;
-	}
-}
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php
index db5a1d6dd91..18fdfe588de 100644
--- a/phpBB/phpbb/plupload/plupload.php
+++ b/phpBB/phpbb/plupload/plupload.php
@@ -344,8 +344,9 @@ protected function integrate_uploaded_file($form_name, $chunk, $file_path)
 		}
 
 		$tmp_file = $this->temporary_filepath($upload['tmp_name']);
+		$filesystem = new \phpbb\filesystem\filesystem();
 
-		if (!phpbb_is_writable($this->temporary_directory) || !move_uploaded_file($upload['tmp_name'], $tmp_file))
+		if (!$filesystem->is_writable($this->temporary_directory) || !move_uploaded_file($upload['tmp_name'], $tmp_file))
 		{
 			$this->emit_error(103, 'PLUPLOAD_ERR_MOVE_UPLOADED');
 		}
diff --git a/phpBB/phpbb/report/controller/report.php b/phpBB/phpbb/report/controller/report.php
index b8e2b04583b..4a11f5e88eb 100644
--- a/phpBB/phpbb/report/controller/report.php
+++ b/phpBB/phpbb/report/controller/report.php
@@ -13,6 +13,8 @@
 
 namespace phpbb\report\controller;
 
+use phpbb\captcha\plugins\confirm_type;
+use phpbb\captcha\plugins\plugin_interface;
 use phpbb\exception\http_exception;
 use phpbb\report\report_handler_interface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -39,6 +41,11 @@ class report
 	 */
 	protected $helper;
 
+	/**
+	 * @var \phpbb\language\language $language
+	 */
+	protected $language;
+
 	/**
 	 * @var \phpbb\request\request_interface
 	 */
@@ -72,13 +79,14 @@ class report
 	 */
 	protected $report_reason_provider;
 
-	public function __construct(\phpbb\config\config $config, \phpbb\user $user, \phpbb\template\template $template, \phpbb\controller\helper $helper, \phpbb\request\request_interface $request, \phpbb\captcha\factory $captcha_factory, \phpbb\report\handler_factory $report_factory, \phpbb\report\report_reason_list_provider $ui_provider, $phpbb_root_path, $php_ext)
+	public function __construct(\phpbb\config\config $config, \phpbb\user $user, \phpbb\template\template $template, \phpbb\controller\helper $helper, \phpbb\language\language $language, \phpbb\request\request_interface $request, \phpbb\captcha\factory $captcha_factory, \phpbb\report\handler_factory $report_factory, \phpbb\report\report_reason_list_provider $ui_provider, $phpbb_root_path, $php_ext)
 	{
 		$this->config			= $config;
 		$this->user				= $user;
 		$this->template			= $template;
 		$this->helper			= $helper;
 		$this->request			= $request;
+		$this->language			= $language;
 		$this->phpbb_root_path	= $phpbb_root_path;
 		$this->php_ext			= $php_ext;
 		$this->captcha_factory	= $captcha_factory;
@@ -131,7 +139,7 @@ public function handle($id, $mode)
 		if ($this->config['enable_post_confirm'] && !$this->user->data['is_registered'])
 		{
 			$captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
-			$captcha->init(CONFIRM_REPORT);
+			$captcha->init(confirm_type::REPORT);
 		}
 
 		//Has the report been cancelled?
@@ -140,7 +148,9 @@ public function handle($id, $mode)
 			return new RedirectResponse($redirect_url, 302);
 		}
 
-		// Check CAPTCHA, if the form was submited
+		add_form_key('report');
+
+		// Check CAPTCHA, if the form was submitted
 		if (!empty($submit) && isset($captcha))
 		{
 			$captcha_template_array = $this->check_captcha($captcha);
@@ -148,6 +158,11 @@ public function handle($id, $mode)
 			$s_hidden_fields = $captcha_template_array['hidden_fields'];
 		}
 
+		if (!empty($submit) && !check_form_key('report'))
+		{
+			$error[] = $this->language->lang('FORM_INVALID');
+		}
+
 		// Handle request
 		try
 		{
@@ -298,18 +313,17 @@ protected function assign_template_data($mode, $id, $reason_id, $report_text, $u
 	/**
 	 * Check CAPTCHA
 	 *
-	 * @param	object	$captcha	A phpBB CAPTCHA object
+	 * @param	plugin_interface	$captcha	A phpBB CAPTCHA object
 	 * @return	array	template variables which ensures that CAPTCHA's work correctly
 	 */
-	protected function check_captcha($captcha)
+	protected function check_captcha(plugin_interface $captcha)
 	{
 		$error = array();
 		$captcha_hidden_fields = '';
 
-		$visual_confirmation_response = $captcha->validate();
-		if ($visual_confirmation_response)
+		if ($captcha->validate() !== true)
 		{
-			$error[] = $visual_confirmation_response;
+			$error[] = $captcha->get_error();
 		}
 
 		if (count($error) === 0)
diff --git a/phpBB/phpbb/request/deactivated_super_global.php b/phpBB/phpbb/request/deactivated_super_global.php
index 0ab19c5bb37..7056bda3509 100644
--- a/phpBB/phpbb/request/deactivated_super_global.php
+++ b/phpBB/phpbb/request/deactivated_super_global.php
@@ -70,11 +70,11 @@ private function error()
 	/**
 	* Redirects isset to the correct request class call.
 	*
-	* @param	string	$offset	The key of the super global being accessed.
+	* @param	mixed	$offset	The key of the super global being accessed.
 	*
 	* @return	bool	Whether the key on the super global exists.
 	*/
-	public function offsetExists($offset): bool
+	public function offsetExists(mixed $offset): bool
 	{
 		return $this->request->is_set($offset, $this->super_global);
 	}
@@ -82,17 +82,17 @@ public function offsetExists($offset): bool
 	/**#@+
 	* Part of the \ArrayAccess implementation, will always result in a FATAL error.
 	*/
-	public function offsetGet($offset): void
+	#[\ReturnTypeWillChange] public function offsetGet($offset): void
 	{
 		$this->error();
 	}
 
-	public function offsetSet($offset, $value): void
+	#[\ReturnTypeWillChange] public function offsetSet($offset, $value): void
 	{
 		$this->error();
 	}
 
-	public function offsetUnset($offset): void
+	#[\ReturnTypeWillChange] public function offsetUnset($offset): void
 	{
 		$this->error();
 	}
diff --git a/phpBB/phpbb/request/request.php b/phpBB/phpbb/request/request.php
index cf81dc42c6e..047304cfe1b 100644
--- a/phpBB/phpbb/request/request.php
+++ b/phpBB/phpbb/request/request.php
@@ -57,7 +57,7 @@ class request implements request_interface
 	* Initialises the request class, that means it stores all input data in {@link $input input}
 	* and then calls {@link \phpbb\request\deactivated_super_global \phpbb\request\deactivated_super_global}
 	*/
-	public function __construct(\phpbb\request\type_cast_helper_interface $type_cast_helper = null, $disable_super_globals = true)
+	public function __construct(\phpbb\request\type_cast_helper_interface|null $type_cast_helper = null, $disable_super_globals = true)
 	{
 		if ($type_cast_helper)
 		{
@@ -70,12 +70,12 @@ public function __construct(\phpbb\request\type_cast_helper_interface $type_cast
 
 		foreach ($this->super_globals as $const => $super_global)
 		{
-			$this->input[$const] = isset($GLOBALS[$super_global]) ? $GLOBALS[$super_global] : array();
+			$this->input[$const] = isset($GLOBALS[$super_global]) ? (array) $GLOBALS[$super_global] : array();
 		}
 
 		// simulate request_order = GP
-		$this->original_request = $this->input[request_interface::REQUEST];
-		$this->input[request_interface::REQUEST] = $this->input[request_interface::POST] + $this->input[request_interface::GET];
+		$this->original_request = (array) $this->input[request_interface::REQUEST];
+		$this->input[request_interface::REQUEST] = (array) $this->input[request_interface::POST] + (array) $this->input[request_interface::GET];
 
 		if ($disable_super_globals)
 		{
@@ -184,7 +184,7 @@ public function overwrite($var_name, $value, $super_global = request_interface::
 	* @param	int				$super_global	(\phpbb\request\request_interface::POST|GET|REQUEST|COOKIE)
 	*											Specifies which super global should be used
 	*
-	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
+	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link type_cast_helper_interface::set_var} to ensure that the type is the
 	*					the same as that of $default. If the variable is not set $default is returned.
 	*/
 	public function variable($var_name, $default, $multibyte = false, $super_global = request_interface::REQUEST)
@@ -208,7 +208,7 @@ public function variable($var_name, $default, $multibyte = false, $super_global
 	* @param	int				$super_global	(\phpbb\request\request_interface::POST|GET|REQUEST|COOKIE)
 	* 											Specifies which super global should be used
 	*
-	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
+	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link type_cast_helper_interface::set_var} to ensure that the type is the
 	*					the same as that of $default. If the variable is not set $default is returned.
 	*/
 	public function untrimmed_variable($var_name, $default, $multibyte = false, $super_global = request_interface::REQUEST)
@@ -401,7 +401,7 @@ public function variable_names($super_global = request_interface::REQUEST)
 	* 											Specifies which super global should be used
 	* @param	bool			$trim			Indicates whether trim() should be applied to string values.
 	*
-	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
+	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link type_cast_helper_interface::set_var} to ensure that the type is the
 	*					the same as that of $default. If the variable is not set $default is returned.
 	*/
 	protected function _variable($var_name, $default, $multibyte = false, $super_global = request_interface::REQUEST, $trim = true)
diff --git a/phpBB/phpbb/request/request_interface.php b/phpBB/phpbb/request/request_interface.php
index 9ebd4c25e39..add58736eab 100644
--- a/phpBB/phpbb/request/request_interface.php
+++ b/phpBB/phpbb/request/request_interface.php
@@ -59,7 +59,7 @@ public function overwrite($var_name, $value, $super_global = request_interface::
 	* @param	int				$super_global		(\phpbb\request\request_interface::POST|GET|REQUEST|COOKIE)
 	* 										Specifies which super global shall be changed
 	*
-	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
+	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link type_cast_helper_interface::set_var} to ensure that the type is the
 	*					the same as that of $default. If the variable is not set $default is returned.
 	*/
 	public function variable($var_name, $default, $multibyte = false, $super_global = request_interface::REQUEST);
@@ -81,7 +81,7 @@ public function variable($var_name, $default, $multibyte = false, $super_global
 	 * @param	int				$super_global		(\phpbb\request\request_interface::POST|GET|REQUEST|COOKIE)
 	 * 										Specifies which super global shall be changed
 	 *
-	 * @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
+	 * @return	mixed	The value of $_REQUEST[$var_name] run through {@link type_cast_helper_interface::set_var} to ensure that the type is the
 	 *					the same as that of $default. If the variable is not set $default is returned.
 	 */
 	public function raw_variable($var_name, $default, $super_global = request_interface::REQUEST);
diff --git a/phpBB/phpbb/routing/helper.php b/phpBB/phpbb/routing/helper.php
index b26fc3fd93e..989de18db6d 100644
--- a/phpBB/phpbb/routing/helper.php
+++ b/phpBB/phpbb/routing/helper.php
@@ -118,15 +118,15 @@ public function route($route, array $params = array(), $is_amp = true, $session_
 			$base_url .= '/' . $page_name;
 		}
 
-		// If enable_mod_rewrite is false we need to replace the current front-end by app.php, otherwise we need to remove it.
-		$base_url = str_replace('/' . $page_name, empty($this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '', $base_url);
+		// If enable_mod_rewrite is false we need to replace the current front-end by index.php, otherwise we need to remove it.
+		$base_url = str_replace('/' . $page_name, empty($this->config['enable_mod_rewrite']) ? '/index.' . $this->php_ext : '', $base_url);
 
-		// We need to update the base url to move to the directory of the app.php file if the current script is not app.php
-		if ($page_name !== 'app.php' && !$this->config['force_server_vars'])
+		// We need to update the base url to move to the directory of the index.php file if the current script is not index.php
+		if ((str_starts_with($base_url, '/adm') || $page_name !== 'index.php') && !$this->config['force_server_vars'])
 		{
 			if (empty($this->config['enable_mod_rewrite']))
 			{
-				$base_url = str_replace('/app.' . $this->php_ext, '/' . $this->phpbb_root_path . 'app.' . $this->php_ext, $base_url);
+				$base_url = str_replace('/index.' . $this->php_ext, '/' . $this->phpbb_root_path . 'index.' . $this->php_ext, $base_url);
 			}
 			else
 			{
@@ -148,7 +148,7 @@ public function route($route, array $params = array(), $is_amp = true, $session_
 
 		if ($reference_type === UrlGeneratorInterface::RELATIVE_PATH && empty($this->config['enable_mod_rewrite']))
 		{
-			$route_url = 'app.' . $this->php_ext . '/' . $route_url;
+			$route_url = 'index.' . $this->php_ext . '/' . $route_url;
 		}
 
 		return append_sid($route_url . $anchor, false, $is_amp, $session_id, true);
diff --git a/phpBB/phpbb/routing/loader_resolver.php b/phpBB/phpbb/routing/loader_resolver.php
index de3adcaa348..2e21d8bb3d8 100644
--- a/phpBB/phpbb/routing/loader_resolver.php
+++ b/phpBB/phpbb/routing/loader_resolver.php
@@ -33,7 +33,7 @@ public function __construct($loaders = [])
 	/**
 	 * {@inheritdoc}
 	 */
-	public function resolve($resource, $type = null): false|\Symfony\Component\Config\Loader\LoaderInterface
+	public function resolve($resource, $type = null): \Symfony\Component\Config\Loader\LoaderInterface|false
 	{
 		/** @var \Symfony\Component\Config\Loader\LoaderInterface $loader */
 		foreach ($this->loaders as $loader)
diff --git a/phpBB/phpbb/routing/resources_locator/default_resources_locator.php b/phpBB/phpbb/routing/resources_locator/default_resources_locator.php
index 8cbf089b2a1..12866248fff 100644
--- a/phpBB/phpbb/routing/resources_locator/default_resources_locator.php
+++ b/phpBB/phpbb/routing/resources_locator/default_resources_locator.php
@@ -48,7 +48,7 @@ class default_resources_locator implements resources_locator_interface
 	 * @param string		$environment		Name of the current environment
 	 * @param manager|null	$extension_manager	Extension manager
 	 */
-	public function __construct($phpbb_root_path, $environment, manager $extension_manager = null)
+	public function __construct($phpbb_root_path, $environment, manager|null $extension_manager = null)
 	{
 		$this->phpbb_root_path		= $phpbb_root_path;
 		$this->environment			= $environment;
diff --git a/phpBB/phpbb/routing/router.php b/phpBB/phpbb/routing/router.php
index 18d32ca12ba..dfbdea87073 100644
--- a/phpBB/phpbb/routing/router.php
+++ b/phpBB/phpbb/routing/router.php
@@ -146,7 +146,7 @@ public function get_routes()
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getRouteCollection()
+	public function getRouteCollection(): RouteCollection
 	{
 		return $this->get_routes();
 	}
@@ -154,7 +154,7 @@ public function getRouteCollection()
 	/**
 	 * {@inheritdoc}
 	 */
-	public function setContext(RequestContext $context)
+	public function setContext(RequestContext $context): void
 	{
 		$this->context = $context;
 
@@ -189,6 +189,17 @@ public function generate(string $name, array $parameters = [], int $referenceTyp
 	 */
 	public function match(string $pathinfo): array
 	{
+		// Remove query string
+		$pathinfo = parse_url($pathinfo, PHP_URL_PATH);
+
+		if ($pathinfo === null)
+		{
+			throw new RuntimeException('Malformed pathinfo given to the router.');
+		}
+
+		// Remove index.php if present
+		$pathinfo = preg_replace('/^\/index\.php\//', '/', $pathinfo);
+
 		return $this->get_matcher()->match($pathinfo);
 	}
 
diff --git a/phpBB/phpbb/search/backend/base.php b/phpBB/phpbb/search/backend/base.php
index e195e0f4c04..4c43b20eaac 100644
--- a/phpBB/phpbb/search/backend/base.php
+++ b/phpBB/phpbb/search/backend/base.php
@@ -112,17 +112,16 @@ protected function obtain_ids(string $search_key, int &$result_count, array &$id
 				}
 			}
 
-			// change the start to the actual end of the current request if the sort direction differs
-			// from the direction in the cache and reverse the ids later
+			// If the sort direction differs from the direction in the cache, then recalculate array keys
 			if ($reverse_ids)
 			{
-				$start = $result_count - $start - $per_page;
-
-				// the user requested a page past the last index
-				if ($start < 0)
-				{
-					return self::SEARCH_RESULT_NOT_IN_CACHE;
-				}
+				$keys = array_keys($stored_ids);
+				array_walk($keys, function (&$value, $key) use ($result_count)
+					{
+						$value = ($value >= 0) ? $result_count - $value - 1 : $value;
+					}
+				);
+				$stored_ids = array_combine($keys, $stored_ids);
 			}
 
 			for ($i = $start, $n = $start + $per_page; ($i < $n) && ($i < $result_count); $i++)
@@ -138,11 +137,6 @@ protected function obtain_ids(string $search_key, int &$result_count, array &$id
 			}
 			unset($stored_ids);
 
-			if ($reverse_ids)
-			{
-				$id_ary = array_reverse($id_ary);
-			}
-
 			if (!$complete)
 			{
 				return self::SEARCH_RESULT_INCOMPLETE;
@@ -178,6 +172,8 @@ protected function save_ids(string $search_key, string $keywords, array $author_
 		}
 
 		$store_ids = array_slice($id_ary, 0, $length);
+		$id_range = range($start, $start + $length - 1);
+		$store_ids = array_combine($id_range, $store_ids);
 
 		// create a new resultset if there is none for this search_key yet
 		// or add the ids to the existing resultset
@@ -212,29 +208,26 @@ protected function save_ids(string $search_key, string $keywords, array $author_
 			$this->db->sql_query($sql);
 
 			$store = array(-1 => $result_count, -2 => $sort_dir);
-			$id_range = range($start, $start + $length - 1);
 		}
 		else
 		{
 			// we use one set of results for both sort directions so we have to calculate the indizes
-			// for the reversed array and we also have to reverse the ids themselves
+			// for the reversed array
 			if ($store[-2] != $sort_dir)
 			{
-				$store_ids = array_reverse($store_ids);
-				$id_range = range($store[-1] - $start - $length, $store[-1] - $start - 1);
-			}
-			else
-			{
-				$id_range = range($start, $start + $length - 1);
+				$keys = array_keys($store_ids);
+				array_walk($keys, function (&$value, $key) use ($store) {
+					$value = $store[-1] - $value - 1;
+				});
+				$store_ids = array_combine($keys, $store_ids);
 			}
 		}
 
-		$store_ids = array_combine($id_range, $store_ids);
-
 		// append the ids
 		if (is_array($store_ids))
 		{
 			$store += $store_ids;
+			ksort($store);
 
 			// if the cache is too big
 			if (count($store) - 2 > 20 * $this->config['search_block_size'])
@@ -328,7 +321,7 @@ protected function destroy_cache(array $words, $authors = false): void
 	/**
 	 * {@inheritdoc}
 	 */
-	public function create_index(int &$post_counter = 0): ?array
+	public function create_index(int &$post_counter = 0): array|null
 	{
 		$max_post_id = $this->get_max_post_id();
 		$forums_indexing_enabled = $this->forum_ids_with_indexing_enabled();
@@ -389,7 +382,7 @@ public function create_index(int &$post_counter = 0): ?array
 	/**
 	 * {@inheritdoc}
 	 */
-	public function delete_index(int &$post_counter = null): ?array
+	public function delete_index(int|null &$post_counter = null): array|null
 	{
 		$max_post_id = $this->get_max_post_id();
 
diff --git a/phpBB/phpbb/search/backend/fulltext_mysql.php b/phpBB/phpbb/search/backend/fulltext_mysql.php
index 7635b503faa..99cb6c51df3 100644
--- a/phpBB/phpbb/search/backend/fulltext_mysql.php
+++ b/phpBB/phpbb/search/backend/fulltext_mysql.php
@@ -550,7 +550,6 @@ public function keyword_search(string $type, string $fields, string $terms, arra
 		}
 		$this->db->sql_freeresult($result);
 
-		$id_ary = array_unique($id_ary);
 		// if the total result count is not cached yet, retrieve it from the db
 		if (!$result_count && count($id_ary))
 		{
@@ -576,10 +575,10 @@ public function keyword_search(string $type, string $fields, string $terms, arra
 				$id_ary[] = (int) $row[$field];
 			}
 			$this->db->sql_freeresult($result);
-
-			$id_ary = array_unique($id_ary);
 		}
 
+		$id_ary = array_unique($id_ary);
+
 		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
 		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
 		$id_ary = array_slice($id_ary, 0, (int) $per_page);
@@ -758,6 +757,8 @@ public function author_search(string $type, bool $firstpost_only, array $sort_by
 		// Build the query for really selecting the post_ids
 		if ($type == 'posts')
 		{
+			// For sorting by non-unique columns, add unique sort key to avoid duplicated rows in results
+			$sql_sort .= ', p.post_id' . (($sort_dir == 'a') ? ' ASC' : ' DESC');
 			$sql = "SELECT $sql_select
 				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
 				WHERE $sql_author
@@ -821,10 +822,10 @@ public function author_search(string $type, bool $firstpost_only, array $sort_by
 				$id_ary[] = (int) $row[$field];
 			}
 			$this->db->sql_freeresult($result);
-
-			$id_ary = array_unique($id_ary);
 		}
 
+		$id_ary = array_unique($id_ary);
+
 		if (count($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
@@ -912,7 +913,7 @@ public function tidy(): void
 	/**
 	 * {@inheritdoc}
 	 */
-	public function create_index(int &$post_counter = 0): ?array
+	public function create_index(int &$post_counter = 0): array|null
 	{
 		// Make sure we can actually use MySQL with fulltext indexes
 		if ($error = $this->init())
@@ -984,7 +985,7 @@ public function create_index(int &$post_counter = 0): ?array
 	/**
 	 * {@inheritdoc}
 	 */
-	public function delete_index(int &$post_counter = null): ?array
+	public function delete_index(int|null &$post_counter = null): array|null
 	{
 		// Make sure we can actually use MySQL with fulltext indexes
 		if ($error = $this->init())
diff --git a/phpBB/phpbb/search/backend/fulltext_native.php b/phpBB/phpbb/search/backend/fulltext_native.php
index ca71ae8bae9..7416544a36d 100644
--- a/phpBB/phpbb/search/backend/fulltext_native.php
+++ b/phpBB/phpbb/search/backend/fulltext_native.php
@@ -308,7 +308,11 @@ public function split_keywords(string &$keywords, string $terms): bool
 		);
 
 		$keywords = preg_replace($match, $replace, $keywords);
-		$num_keywords = count(explode(' ', $keywords));
+
+		// Ensure a space exists before +, - and | to make the split and count work correctly
+		$countable_keywords = preg_replace('/(?<!\s)(\+|\-|\|)/', ' $1', $keywords);
+
+		$num_keywords = count(explode(' ', $countable_keywords));
 
 		// We limit the number of allowed keywords to minimize load on the database
 		if ($this->config['max_num_search_keywords'] && $num_keywords > $this->config['max_num_search_keywords'])
@@ -1000,6 +1004,8 @@ public function keyword_search(string $type, string $fields, string $terms, arra
 			$this->db->sql_freeresult($result);
 		}
 
+		$id_ary = array_unique($id_ary);
+
 		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
 		$this->save_ids($search_key, $this->search_query, $author_ary, $total_results, $id_ary, $start, $sort_dir);
 		$id_ary = array_slice($id_ary, 0, (int) $per_page);
@@ -1221,6 +1227,8 @@ public function author_search(string $type, bool $firstpost_only, array $sort_by
 		// Build the query for really selecting the post_ids
 		if ($type == 'posts')
 		{
+			// For sorting by non-unique columns, add unique sort key to avoid duplicated rows in results
+			$sql_sort .= ', p.post_id' . (($sort_dir == 'a') ? ' ASC' : ' DESC');
 			$sql = "SELECT $select
 				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t' : '') . "
 				WHERE $sql_author
@@ -1285,6 +1293,8 @@ public function author_search(string $type, bool $firstpost_only, array $sort_by
 			$this->db->sql_freeresult($result);
 		}
 
+		$id_ary = array_unique($id_ary);
+
 		if (count($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $total_results, $id_ary, $start, $sort_dir);
@@ -1567,7 +1577,7 @@ public function tidy(): void
 		// Remove common words
 		if ($this->config['num_posts'] >= 100 && $this->config['fulltext_native_common_thres'])
 		{
-			$common_threshold = ((double) $this->config['fulltext_native_common_thres']) / 100.0;
+			$common_threshold = ((float) $this->config['fulltext_native_common_thres']) / 100.0;
 			// First, get the IDs of common words
 			$sql = 'SELECT word_id, word_text
 				FROM ' . $this->search_wordlist_table . '
@@ -1617,7 +1627,7 @@ public function tidy(): void
 	/**
 	 * {@inheritdoc}
 	 */
-	public function delete_index(int &$post_counter = null): ?array
+	public function delete_index(int|null &$post_counter = null): array|null
 	{
 		$truncate_tables = [
 			$this->search_wordlist_table,
@@ -2024,14 +2034,14 @@ public function get_acp_options(): array
 		</dl>
 		<dl>
 			<dt><label for="fulltext_native_common_thres">' . $this->language->lang('COMMON_WORD_THRESHOLD') . $this->language->lang('COLON') . '</label><br /><span>' . $this->language->lang('COMMON_WORD_THRESHOLD_EXPLAIN') . '</span></dt>
-			<dd><input id="fulltext_native_common_thres" type="text" name="config[fulltext_native_common_thres]" value="' . (double) $this->config['fulltext_native_common_thres'] . '" /> %</dd>
+			<dd><input id="fulltext_native_common_thres" type="text" name="config[fulltext_native_common_thres]" value="' . (float) $this->config['fulltext_native_common_thres'] . '" /> %</dd>
 		</dl>
 		';
 
 		// These are fields required in the config table
 		return array(
 			'tpl'		=> $tpl,
-			'config'	=> array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:255', 'fulltext_native_max_chars' => 'integer:0:255', 'fulltext_native_common_thres' => 'double:0:100')
+			'config'	=> array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:255', 'fulltext_native_max_chars' => 'integer:0:255', 'fulltext_native_common_thres' => 'float:0:100')
 		);
 	}
 }
diff --git a/phpBB/phpbb/search/backend/fulltext_postgres.php b/phpBB/phpbb/search/backend/fulltext_postgres.php
index 6c4ac059324..22bd84851f6 100644
--- a/phpBB/phpbb/search/backend/fulltext_postgres.php
+++ b/phpBB/phpbb/search/backend/fulltext_postgres.php
@@ -478,8 +478,6 @@ public function keyword_search(string $type, string $fields, string $terms, arra
 		}
 		$this->db->sql_freeresult($result);
 
-		$id_ary = array_unique($id_ary);
-
 		// if the total result count is not cached yet, retrieve it from the db
 		if (!$result_count)
 		{
@@ -509,10 +507,10 @@ public function keyword_search(string $type, string $fields, string $terms, arra
 				$id_ary[] = $row[$field];
 			}
 			$this->db->sql_freeresult($result);
-
-			$id_ary = array_unique($id_ary);
 		}
 
+		$id_ary = array_unique($id_ary);
+
 		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
 		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
 		$id_ary = array_slice($id_ary, 0, (int) $per_page);
@@ -683,6 +681,8 @@ public function author_search(string $type, bool $firstpost_only, array $sort_by
 		// Build the query for really selecting the post_ids
 		if ($type == 'posts')
 		{
+			// For sorting by non-unique columns, add unique sort key to avoid duplicated rows in results
+			$sql_sort .= ', p.post_id' . (($sort_dir == 'a') ? ' ASC' : ' DESC');
 			$sql = "SELECT p.post_id
 				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
 				WHERE $sql_author
@@ -775,10 +775,10 @@ public function author_search(string $type, bool $firstpost_only, array $sort_by
 				$id_ary[] = (int) $row[$field];
 			}
 			$this->db->sql_freeresult($result);
-
-			$id_ary = array_unique($id_ary);
 		}
 
+		$id_ary = array_unique($id_ary);
+
 		if (count($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
@@ -867,7 +867,7 @@ public function tidy(): void
 	/**
 	 * {@inheritdoc}
 	 */
-	public function create_index(int &$post_counter = 0): ?array
+	public function create_index(int &$post_counter = 0): array|null
 	{
 		// Make sure we can actually use PostgreSQL with fulltext indexes
 		if ($error = $this->init())
@@ -926,7 +926,7 @@ public function create_index(int &$post_counter = 0): ?array
 	/**
 	 * {@inheritdoc}
 	 */
-	public function delete_index(int &$post_counter = null): ?array
+	public function delete_index(int|null &$post_counter = null): array|null
 	{
 		// Make sure we can actually use PostgreSQL with fulltext indexes
 		if ($error = $this->init())
diff --git a/phpBB/phpbb/search/backend/fulltext_sphinx.php b/phpBB/phpbb/search/backend/fulltext_sphinx.php
index 5092f67ae5b..444e14d0548 100644
--- a/phpBB/phpbb/search/backend/fulltext_sphinx.php
+++ b/phpBB/phpbb/search/backend/fulltext_sphinx.php
@@ -629,7 +629,7 @@ public function tidy(): void
 	/**
 	 * {@inheritdoc}
 	 */
-	public function create_index(int &$post_counter = 0): ?array
+	public function create_index(int &$post_counter = 0): array|null
 	{
 		if (!$this->index_created())
 		{
@@ -656,7 +656,7 @@ public function create_index(int &$post_counter = 0): ?array
 	/**
 	 * {@inheritdoc}
 	*/
-	public function delete_index(int &$post_counter = null): ?array
+	public function delete_index(int|null &$post_counter = null): array|null
 	{
 		if ($this->index_created())
 		{
@@ -774,7 +774,7 @@ protected function sphinx_clean_search_string($search_string)
 		 */
 		// $search_string = preg_replace('#[0-9]{1,3}\K,(?=[0-9]{3})#', '', $search_string);
 
-		return $search_string;
+		return $search_string ?: '';
 	}
 
 	/**
@@ -952,7 +952,7 @@ protected function config_generate()
 				array('read_timeout',				'5'),
 				array('max_children',				'30'),
 				array('pid_file',					$this->config['fulltext_sphinx_data_path'] . 'searchd.pid'),
-				array('binlog_path',				$this->config['fulltext_sphinx_data_path']),
+				array('binlog_path',				rtrim($this->config['fulltext_sphinx_data_path'], '/\\')), // Trim trailing slash
 			),
 		);
 
diff --git a/phpBB/phpbb/search/backend/search_backend_interface.php b/phpBB/phpbb/search/backend/search_backend_interface.php
index 82ea0d03ffd..b620ef98c04 100644
--- a/phpBB/phpbb/search/backend/search_backend_interface.php
+++ b/phpBB/phpbb/search/backend/search_backend_interface.php
@@ -163,7 +163,7 @@ public function tidy(): void;
 	 * @param int $post_counter
 	 * @return array|null array with current status or null if finished
 	 */
-	public function create_index(int &$post_counter = 0): ?array;
+	public function create_index(int &$post_counter = 0): array|null;
 
 	/**
 	 * Drop fulltext index
@@ -171,7 +171,7 @@ public function create_index(int &$post_counter = 0): ?array;
 	 * @param int $post_counter
 	 * @return array|null array with current status or null if finished
 	 */
-	public function delete_index(int &$post_counter = 0): ?array;
+	public function delete_index(int &$post_counter = 0): array|null;
 
 	/**
 	 * Returns true if both FULLTEXT indexes exist
diff --git a/phpBB/phpbb/search/backend/sphinx/config.php b/phpBB/phpbb/search/backend/sphinx/config.php
index 2dac3a86877..d9ba56a5f2c 100644
--- a/phpBB/phpbb/search/backend/sphinx/config.php
+++ b/phpBB/phpbb/search/backend/sphinx/config.php
@@ -28,7 +28,7 @@ class config
 	* @param	string 					$name	The name of the section that shall be returned
 	* @return	config_section|null		The section object or null if none was found
 	*/
-	public function get_section_by_name(string $name): ?config_section
+	public function get_section_by_name(string $name): config_section|null
 	{
 		for ($i = 0, $size = count($this->sections); $i < $size; $i++)
 		{
diff --git a/phpBB/phpbb/search/backend/sphinx/config_section.php b/phpBB/phpbb/search/backend/sphinx/config_section.php
index a3f522209fd..eff5bb29534 100644
--- a/phpBB/phpbb/search/backend/sphinx/config_section.php
+++ b/phpBB/phpbb/search/backend/sphinx/config_section.php
@@ -60,7 +60,7 @@ public function set_end_comment(string $end_comment): void
 	* @return	config_variable|null	The first variable object from this section with the
 	*										given name or null if none was found
 	*/
-	public function get_variable_by_name(string $name): ?config_variable
+	public function get_variable_by_name(string $name): config_variable|null
 	{
 		for ($i = 0, $size = count($this->variables); $i < $size; $i++)
 		{
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 7adc190a522..40a26dad4f9 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -125,10 +125,10 @@ static function extract_current_page($root_path)
 			$page .= '?' . $query_string;
 		}
 
-		// The script path from the webroot to the current directory (for example: /phpBB3/adm/) : always prefixed with / and ends in /
+		// The script path from the webroot to the current directory (for example: /phpBB/adm/) : always prefixed with / and ends in /
 		$script_path = $symfony_request->getBasePath();
 
-		// The script path from the webroot to the phpBB root (for example: /phpBB3/)
+		// The script path from the webroot to the phpBB root (for example: /phpBB/)
 		$script_dirs = explode('/', $script_path);
 		array_splice($script_dirs, -count($page_dirs));
 		$root_script_path = implode('/', $script_dirs) . (count($root_dirs) ? '/' . implode('/', $root_dirs) : '');
@@ -174,45 +174,26 @@ function extract_current_hostname()
 		// Should be a string and lowered
 		$host = (string) strtolower($host);
 
-		// If host is equal the cookie domain or the server name (if config is set), then we assume it is valid
-		if ((isset($config['cookie_domain']) && $host === $config['cookie_domain']) || (isset($config['server_name']) && $host === $config['server_name']))
+		if (!empty($config['server_name']))
 		{
-			return $host;
+			return $config['server_name'];
 		}
 
-		// Is the host actually a IP? If so, we use the IP... (IPv4)
-		if (long2ip(ip2long($host)) === $host)
+		if (!empty($config['cookie_domain']))
 		{
-			return $host;
+			return (strpos($config['cookie_domain'], '.') === 0) ? substr($config['cookie_domain'], 1) : $config['cookie_domain'];
 		}
 
-		// Now return the hostname (this also removes any port definition). The http:// is prepended to construct a valid URL, hosts never have a scheme assigned
-		$host = @parse_url('http://' . $host);
+		// Try using provided host if neither cookie_domain nor server_name are set in config
+		$host = @parse_url('https://' . $host);
 		$host = (!empty($host['host'])) ? $host['host'] : '';
-
-		// Remove any portions not removed by parse_url (#)
-		$host = str_replace('#', '', $host);
-
-		// If, by any means, the host is now empty, we will use a "best approach" way to guess one
-		if (empty($host))
+		if (!empty($host))
 		{
-			if (!empty($config['server_name']))
-			{
-				$host = $config['server_name'];
-			}
-			else if (!empty($config['cookie_domain']))
-			{
-				$host = (strpos($config['cookie_domain'], '.') === 0) ? substr($config['cookie_domain'], 1) : $config['cookie_domain'];
-			}
-			else
-			{
-				// Set to OS hostname or localhost
-				$host = (function_exists('php_uname')) ? php_uname('n') : 'localhost';
-			}
+			return $host;
 		}
 
-		// It may be still no valid host, but for sure only a hostname (we may further expand on the cookie domain... if set)
-		return $host;
+		// Fallback to OS hostname or localhost
+		return (function_exists('php_uname')) ? php_uname('n') : 'localhost';
 	}
 
 	/**
@@ -450,10 +431,10 @@ function session_begin($update_session_page = true)
 						// Is user banned? Are they excluded? Won't return on ban, exists within method
 						$this->check_ban_for_current_session($config);
 
-						// Update user last visit time accordingly, but in a minute or so
-						if ((int) $this->data['session_time'] - (int) $this->data['user_lastvisit'] > 60)
+						// Update user last active time accordingly, but in a minute or so
+						if ($this->time_now - (int) $this->data['user_last_active'] > 60)
 						{
-							$this->update_user_lastvisit();
+							$this->update_last_active_time();
 						}
 
 						return true;
@@ -700,8 +681,8 @@ function session_create($user_id = false, $set_admin = false, $persist_login = f
 			{
 				$this->session_id = $this->data['session_id'];
 
-				// Only sync user last visit time in a minute or so after last session data update or if the page changes
-				if ((int) $this->data['session_time'] - (int) $this->data['user_lastvisit'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page']))
+				// Only update session DB a minute or so after last update or if page changes
+				if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page']))
 				{
 					// Update the last visit time
 					$this->update_user_lastvisit();
@@ -818,28 +799,38 @@ function session_create($user_id = false, $set_admin = false, $persist_login = f
 
 			unset($cookie_expire);
 
-			$sql = 'SELECT COUNT(session_id) AS sessions
-					FROM ' . SESSIONS_TABLE . '
-					WHERE session_user_id = ' . (int) $this->data['user_id'] . '
-					AND session_time >= ' . (int) ($this->time_now - (max((int) $config['session_length'], (int) $config['form_token_lifetime'])));
-			$result = $db->sql_query($sql);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			if ((int) $row['sessions'] <= 1 || empty($this->data['user_form_salt']))
+			if ($this->data['user_id'] != ANONYMOUS)
 			{
-				$this->data['user_form_salt'] = unique_id();
-				// Update the form key
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_form_salt = \'' . $db->sql_escape($this->data['user_form_salt']) . '\'
+				$sql = 'SELECT COUNT(session_id) AS sessions
+						FROM ' . SESSIONS_TABLE . '
+						WHERE session_user_id = ' . (int) $this->data['user_id'] . '
+						AND session_time >= ' . (int) ($this->time_now - (max((int) $config['session_length'], (int) $config['form_token_lifetime'])));
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if ((int) $row['sessions'] <= 1 || empty($this->data['user_form_salt']))
+				{
+					$this->data['user_form_salt'] = unique_id();
+					// Update the form key
+					$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_form_salt = \'' . $db->sql_escape($this->data['user_form_salt']) . '\',
+						user_last_active = ' . (int) $this->time_now . '
 					WHERE user_id = ' . (int) $this->data['user_id'];
-				$db->sql_query($sql);
+					$db->sql_query($sql);
+				}
+			}
+			else
+			{
+				$this->update_last_active_time();
 			}
 		}
 		else
 		{
 			$this->data['session_time'] = $this->data['session_last_visit'] = $this->time_now;
 
+			$this->update_user_lastvisit();
+
 			if ($phpbb_container->getParameter('session.force_sid'))
 			{
 				$SID = '?sid=';
@@ -847,9 +838,6 @@ function session_create($user_id = false, $set_admin = false, $persist_login = f
 			}
 		}
 
-		// Update the last visit time
-		$this->update_user_lastvisit();
-
 		$session_data = $sql_ary;
 		/**
 		* Event to send new session data to extension
@@ -976,8 +964,8 @@ function session_gc()
 		}
 
 		/**
-		 * Get most recent session for each registered user to sync user last visit with it
-		 * Inner SELECT gets most recent sessions for each unique session_user_id
+		 * Get expired sessions for registered users, only most recent for each user
+		 * Inner SELECT gets most recent expired sessions for unique session_user_id
 		 * Outer SELECT gets data for them
 		 */
 		$sql_select = 'SELECT s1.session_page, s1.session_user_id, s1.session_time AS recent_time
@@ -985,7 +973,8 @@ function session_gc()
 			INNER JOIN (
 				SELECT session_user_id, MAX(session_time) AS recent_time
 				FROM ' . SESSIONS_TABLE . '
-				WHERE session_user_id <> ' . ANONYMOUS . '
+				WHERE session_time < ' . ($this->time_now - (int) $config['session_length']) . '
+					AND session_user_id <> ' . ANONYMOUS . '
 				GROUP BY session_user_id
 			) AS s2
 			ON s1.session_user_id = s2.session_user_id
@@ -1710,12 +1699,43 @@ public function update_user_lastvisit()
 	{
 		global $db;
 
-		if (isset($this->data['session_time'], $this->data['user_id']))
+		if (isset($this->data['session_time'], $this->data['user_id']) && !$this->is_push_notification_request())
 		{
 			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_lastvisit = ' . (int) $this->data['session_time'] . '
+				SET user_lastvisit = ' . (int) $this->data['session_time'] . ',
+					user_last_active = ' . $this->time_now . '
 				WHERE user_id = ' . (int) $this->data['user_id'];
 			$db->sql_query($sql);
 		}
 	}
+
+	/**
+	 * Update user's last active time
+	 *
+	 * @return void
+	 */
+	public function update_last_active_time()
+	{
+		global $db;
+
+		if (isset($this->time_now, $this->data['user_id']) && !$this->is_push_notification_request())
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_last_active = ' . $this->time_now . '
+				WHERE user_id = ' . (int) $this->data['user_id'];
+			$db->sql_query($sql);
+		}
+	}
+
+	/**
+	 * Determine if the request is an Ajax request from the web push service worker
+	 *
+	 * @return bool True if the request is an Ajax request and the page URL contains '/push/notification', otherwise false
+	 */
+	protected function is_push_notification_request(): bool
+	{
+		global $request;
+
+		return $request->is_ajax() && str_contains($this->page['page'], '/push/notification');
+	}
 }
diff --git a/phpBB/phpbb/storage/adapter/adapter_interface.php b/phpBB/phpbb/storage/adapter/adapter_interface.php
index 5bd6525a733..db7a5475d4a 100644
--- a/phpBB/phpbb/storage/adapter/adapter_interface.php
+++ b/phpBB/phpbb/storage/adapter/adapter_interface.php
@@ -13,88 +13,53 @@
 
 namespace phpbb\storage\adapter;
 
-use phpbb\storage\exception\exception;
+use phpbb\storage\exception\storage_exception;
 
 interface adapter_interface
 {
 	/**
 	 * Set adapter parameters
 	 *
-	 * @param array	options	Storage-specific options.
+	 * @param array $options options	Storage-specific options.
 	 */
 	public function configure(array $options): void;
 
 	/**
-	 * Dumps content into a file
+	 * Reads a file as a stream
 	 *
-	 * @param string $path
-	 * @param string $content
-	 * @throws exception When the file cannot be written
-	 */
-	public function put_contents(string $path, string $content): void;
-
-	/**
-	 * Read the contents of a file
+	 * @param string $path File to read
 	 *
-	 * @param string $path The file to read
-	 *
-	 * @return string Returns file contents
-	 * @throws exception When cannot read file contents
+	 * @return resource Returns a file pointer
+	 * @throws storage_exception When unable to open file
 	 */
-	public function get_contents(string $path): string;
+	public function read(string $path);
 
 	/**
-	 * Checks the existence of files or directories
+	 * Writes a new file using a stream
 	 *
-	 * @param string $path file/directory to check
+	 * @param string $path The target file
+	 * @param resource $resource The resource
 	 *
-	 * @return bool Returns true if the file/directory exist, false otherwise.
+	 * @return int Returns the number of bytes written
+	 * @throws storage_exception When target file exists
+	 * When target file cannot be created
 	 */
-	public function exists(string $path): bool;
+	public function write(string $path, $resource): int;
 
 	/**
 	 * Removes files or directories
 	 *
 	 * @param string $path file/directory to remove
 	 *
-	 * @throws exception When removal fails.
+	 * @throws storage_exception When removal fails.
 	 */
 	public function delete(string $path): void;
 
-	/**
-	 * Rename a file or a directory
-	 *
-	 * @param string $path_orig The original file/direcotry
-	 * @param string $path_dest The target file/directory
-	 *
-	 * @throws exception When file/directory cannot be renamed
-	 */
-	public function rename(string $path_orig, string $path_dest): void;
-
-	/**
-	 * Copies a file
-	 *
-	 * @param string $path_orig The original filename
-	 * @param string $path_dest The target filename
-	 *
-	 * @throws exception When the file cannot be copied
-	 */
-	public function copy(string $path_orig, string $path_dest): void;
-
-	/**
-	 * Get direct link
-	 *
-	 * @param string $path The file
-	 *
-	 * @return string Returns link.
-	 */
-	public function get_link(string $path): string;
-
 	/**
 	 * Get space available in bytes
 	 *
 	 * @return float Returns available space
-	 * @throws exception When unable to retrieve available storage space
+	 * @throws storage_exception When unable to retrieve available storage space
 	 */
 	public function free_space(): float;
 }
diff --git a/phpBB/phpbb/storage/adapter/local.php b/phpBB/phpbb/storage/adapter/local.php
index be4b3399d69..3099df62415 100644
--- a/phpBB/phpbb/storage/adapter/local.php
+++ b/phpBB/phpbb/storage/adapter/local.php
@@ -13,18 +13,15 @@
 
 namespace phpbb\storage\adapter;
 
-use phpbb\storage\stream_interface;
-use phpbb\storage\exception\exception;
+use phpbb\storage\exception\storage_exception;
 use phpbb\filesystem\exception\filesystem_exception;
 use phpbb\filesystem\filesystem;
 use phpbb\filesystem\helper as filesystem_helper;
-use phpbb\mimetype\guesser;
-use FastImageSize\FastImageSize;
 
 /**
  * Experimental
  */
-class local implements adapter_interface, stream_interface
+class local implements adapter_interface
 {
 	/**
 	 * Filesystem component
@@ -33,20 +30,6 @@ class local implements adapter_interface, stream_interface
 	 */
 	protected $filesystem;
 
-	/**
-	 * FastImageSize
-	 *
-	 * @var FastImageSize
-	 */
-	protected $imagesize;
-
-	/**
-	 * Mimetype Guesser component
-	 *
-	 * @var guesser
-	 */
-	protected $mimetype_guesser;
-
 	/**
 	 * @var string path
 	 */
@@ -63,208 +46,38 @@ class local implements adapter_interface, stream_interface
 	 */
 	protected $root_path;
 
-	/**
-	 * Relative path from $phpbb_root_path to the storage folder
-	 * Always finish with slash (/) character
-	 * Example:
-	 * - images/avatars/upload/
-	 *
-	 * @var string path
-	 */
-	protected $path;
-
 	/**
 	 * Constructor
 	 *
 	 * @param filesystem $filesystem
-	 * @param FastImageSize $imagesize
-	 * @param guesser $mimetype_guesser
 	 * @param string $phpbb_root_path
 	 */
-	public function __construct(filesystem $filesystem, FastImageSize $imagesize, guesser $mimetype_guesser, string $phpbb_root_path)
+	public function __construct(filesystem $filesystem, string $phpbb_root_path)
 	{
 		$this->filesystem = $filesystem;
-		$this->imagesize = $imagesize;
-		$this->mimetype_guesser = $mimetype_guesser;
 		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
 	/**
 	 * {@inheritdoc}
-	 */
-	public function configure(array $options): void
-	{
-		$this->path = $options['path'];
-
-		if (substr($this->path, -1, 1) !== '/')
-		{
-			$this->path = $this->path . '/';
-		}
-
-		$this->root_path = filesystem_helper::realpath($this->phpbb_root_path . $options['path']) . DIRECTORY_SEPARATOR;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function put_contents(string $path, string $content): void
-	{
-		$this->ensure_directory_exists($path);
-
-		try
-		{
-			$this->filesystem->dump_file($this->root_path . $this->get_path($path) . $this->get_filename($path), $content);
-		}
-		catch (filesystem_exception $e)
-		{
-			throw new exception('STORAGE_CANNOT_WRITE_FILE', $path, array(), $e);
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_contents(string $path): string
-	{
-		$content = @file_get_contents($this->root_path . $this->get_path($path) . $this->get_filename($path));
-
-		if ($content === false)
-		{
-			throw new exception('STORAGE_CANNOT_READ_FILE', $path);
-		}
-
-		return $content;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function exists(string $path): bool
-	{
-		return $this->filesystem->exists($this->root_path . $this->get_path($path) . $this->get_filename($path));
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function delete(string $path): void
-	{
-		try
-		{
-			$this->filesystem->remove($this->root_path . $this->get_path($path) . $this->get_filename($path));
-		}
-		catch (filesystem_exception $e)
-		{
-			throw new exception('STORAGE_CANNOT_DELETE', $path, array(), $e);
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function rename(string $path_orig, string $path_dest): void
-	{
-		$this->ensure_directory_exists($path_dest);
-
-		try
-		{
-			$this->filesystem->rename($this->root_path . $this->get_path($path_orig) . $this->get_filename($path_orig), $this->root_path . $this->get_path($path_dest) . $this->get_filename($path_dest), false);
-		}
-		catch (filesystem_exception $e)
-		{
-			throw new exception('STORAGE_CANNOT_RENAME', $path_orig, array(), $e);
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function copy(string $path_orig, string $path_dest): void
-	{
-		$this->ensure_directory_exists($path_dest);
-
-		try
-		{
-			$this->filesystem->copy($this->root_path . $this->get_path($path_orig) . $this->get_filename($path_orig), $this->root_path . $this->get_path($path_dest) . $this->get_filename($path_dest), false);
-		}
-		catch (filesystem_exception $e)
-		{
-			throw new exception('STORAGE_CANNOT_COPY', $path_orig, array(), $e);
-		}
-	}
-
-	/**
-	 * Creates a directory recursively.
-	 *
-	 * @param string	$path	The directory path
-	 *
-	 * @throws exception	On any directory creation failure
-	 */
-	protected function create_dir(string $path): void
-	{
-		try
-		{
-			$this->filesystem->mkdir($this->root_path . $path);
-		}
-		catch (filesystem_exception $e)
-		{
-			throw new exception('STORAGE_CANNOT_CREATE_DIR', $path, array(), $e);
-		}
-	}
-
-	/**
-	 * Ensures that the directory of a file exists.
-	 *
-	 * @param string	$path	The file path
-	 *
-	 * @throws exception	On any directory creation failure
-	 */
-	protected function ensure_directory_exists(string $path): void
-	{
-		$path = dirname($this->root_path . $this->get_path($path) . $this->get_filename($path));
-		$path = filesystem_helper::make_path_relative($path, $this->root_path);
-
-		if (!$this->exists($path))
-		{
-			$this->create_dir($path);
-		}
-	}
-
-	/**
-	 * Get the path to the file
 	 *
-	 * @param string $path The file path
-	 * @return string
-	 */
-	protected function get_path(string $path): string
-	{
-		$dirname = dirname($path);
-		$dirname = ($dirname != '.') ? $dirname . DIRECTORY_SEPARATOR : '';
-
-		return $dirname;
-	}
-
-	/**
-	 * To be used in other PR
 	 *
-	 * @param string $path The file path
-	 * @return string
 	 */
-	protected function get_filename(string $path): string
+	public function configure(array $options): void
 	{
-		return basename($path);
+		$this->root_path = filesystem_helper::realpath($this->phpbb_root_path . $options['path']) . DIRECTORY_SEPARATOR;
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function read_stream(string $path)
+	public function read(string $path)
 	{
-		$stream = @fopen($this->root_path . $this->get_path($path) . $this->get_filename($path), 'rb');
+		$stream = @fopen($this->root_path . $path, 'rb');
 
 		if (!$stream)
 		{
-			throw new exception('STORAGE_CANNOT_OPEN_FILE', $path);
+			throw new storage_exception('STORAGE_CANNOT_OPEN_FILE', $path);
 		}
 
 		return $stream;
@@ -273,112 +86,39 @@ public function read_stream(string $path)
 	/**
 	 * {@inheritdoc}
 	 */
-	public function write_stream(string $path, $resource): void
+	public function write(string $path, $resource): int
 	{
-		$this->ensure_directory_exists($path);
-
-		$stream = @fopen($this->root_path . $this->get_path($path) . $this->get_filename($path), 'w+b');
+		$stream = @fopen($this->root_path . $path, 'w+b');
 
 		if (!$stream)
 		{
-			throw new exception('STORAGE_CANNOT_CREATE_FILE', $path);
+			throw new storage_exception('STORAGE_CANNOT_CREATE_FILE', $path);
 		}
 
-		if (stream_copy_to_stream($resource, $stream) === false)
+		if (($size = stream_copy_to_stream($resource, $stream)) === false)
 		{
 			fclose($stream);
-			throw new exception('STORAGE_CANNOT_COPY_RESOURCE');
+			throw new storage_exception('STORAGE_CANNOT_COPY_RESOURCE');
 		}
 
 		fclose($stream);
+
+		return $size;
 	}
 
 	/**
-	 * Get file size
-	 *
-	 * @param string	$path	The file
-	 *
-	 * @throws exception		When cannot get size
-	 *
-	 * @return array Properties
-	 * @throws exception		When cannot get size
-	 *
+	 * {@inheritdoc}
 	 */
-	public function file_size(string $path): array
+	public function delete(string $path): void
 	{
-		$size = @filesize($this->root_path . $this->get_path($path) . $this->get_filename($path));
-
-		if ($size === null)
+		try
 		{
-			throw new exception('STORAGE_CANNOT_GET_FILESIZE');
+			$this->filesystem->remove($this->root_path . $path);
 		}
-
-		return ['size' => $size];
-	}
-
-	/**
-	 * Get file mimetype
-	 *
-	 * @param string	$path	The file
-	 *
-	 * @return array	Properties
-	 */
-	public function file_mimetype(string $path): array
-	{
-		return ['mimetype' => $this->mimetype_guesser->guess($this->root_path . $this->get_path($path) . $this->get_filename($path))];
-	}
-
-	/**
-	 * Get image dimensions
-	 *
-	 * @param string	$path	The file
-	 *
-	 * @return array	Properties
-	 */
-	protected function image_dimensions(string $path): array
-	{
-		$size = $this->imagesize->getImageSize($this->root_path . $this->get_path($path) . $this->get_filename($path));
-
-		// For not supported types like swf
-		if ($size === false)
+		catch (filesystem_exception $e)
 		{
-			$imsize = getimagesize($this->root_path . $this->get_path($path) . $this->get_filename($path));
-			$size = ['width' => $imsize[0], 'height' => $imsize[1]];
+			throw new storage_exception('STORAGE_CANNOT_DELETE', $path, array(), $e);
 		}
-
-		return ['image_width' => $size['width'], 'image_height' => $size['height']];
-	}
-
-	/**
-	 * Get image width
-	 *
-	 * @param string	$path	The file
-	 *
-	 * @return array	Properties
-	 */
-	public function file_image_width(string $path): array
-	{
-		return $this->image_dimensions($path);
-	}
-
-	/**
-	 * Get image height
-	 *
-	 * @param string	$path	The file
-	 *
-	 * @return array	Properties
-	 */
-	public function file_image_height(string $path): array
-	{
-		return $this->image_dimensions($path);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_link(string $path): string
-	{
-		return generate_board_url() . '/' . $this->path . $path;
 	}
 
 	/**
@@ -386,20 +126,12 @@ public function get_link(string $path): string
 	 */
 	public function free_space(): float
 	{
-		if (function_exists('disk_free_space'))
+		if (!function_exists('disk_free_space') || ($free_space = @disk_free_space($this->root_path)) === false)
 		{
-			$free_space = @disk_free_space($this->root_path);
-
-			if ($free_space === false)
-			{
-				throw new exception('STORAGE_CANNOT_GET_FREE_SPACE');
-			}
-		}
-		else
-		{
-			throw new exception('STORAGE_CANNOT_GET_FREE_SPACE');
+			throw new storage_exception('STORAGE_CANNOT_GET_FREE_SPACE');
 		}
 
 		return $free_space;
 	}
+
 }
diff --git a/phpBB/phpbb/storage/adapter_factory.php b/phpBB/phpbb/storage/adapter_factory.php
index 5d08bfa7c20..e80d25cfbc4 100644
--- a/phpBB/phpbb/storage/adapter_factory.php
+++ b/phpBB/phpbb/storage/adapter_factory.php
@@ -15,7 +15,7 @@
 
 use phpbb\config\config;
 use phpbb\di\service_collection;
-use phpbb\storage\exception\exception;
+use phpbb\storage\exception\storage_exception;
 
 class adapter_factory
 {
@@ -53,41 +53,45 @@ public function __construct(config $config, service_collection $adapters, servic
 	 *
 	 * @param string	$storage_name
 	 *
-	 * @return \phpbb\storage\adapter\adapter_interface
+	 * @return mixed
 	 */
-	public function get($storage_name)
+	public function get(string $storage_name): mixed
 	{
 		$provider_class = $this->config['storage\\' . $storage_name . '\\provider'];
 		$provider = $this->providers->get_by_class($provider_class);
 
-		if (!$provider->is_available())
+		$options = [];
+		foreach (array_keys($provider->get_options()) as $definition)
 		{
-			throw new exception('STORAGE_ADAPTER_NOT_AVAILABLE');
+			/** @psalm-suppress InvalidArrayOffset */
+			$options[$definition] = $this->config['storage\\' . $storage_name . '\\config\\' . $definition];
 		}
 
-		$adapter = $this->adapters->get_by_class($provider->get_adapter_class());
-		$adapter->configure($this->build_options($storage_name, $provider->get_options()));
-
-		return $adapter;
+		return $this->get_with_options($storage_name, $provider_class, $options);
 	}
 
 	/**
-	 * Obtains configuration for a given storage
+	 * Obtains a configured adapters with custom options
 	 *
 	 * @param string	$storage_name
-	 * @param array		$definitions
+	 * @param string	$provider_class
+	 * @param array		$options
 	 *
-	 * @return array	Returns storage configuration values
+	 * @return mixed
 	 */
-	public function build_options($storage_name, array $definitions)
+	public function get_with_options(string $storage_name, string $provider_class, array $options): mixed
 	{
-		$options = [];
+		$provider = $this->providers->get_by_class($provider_class);
 
-		foreach (array_keys($definitions) as $definition)
+		if (!$provider->is_available())
 		{
-			$options[$definition] = $this->config['storage\\' . $storage_name . '\\config\\' . $definition];
+			throw new storage_exception('STORAGE_ADAPTER_NOT_AVAILABLE');
 		}
 
-		return $options;
+		$adapter = $this->adapters->get_by_class($provider->get_adapter_class());
+		$options['storage'] = $storage_name; // Inject storage name into options so it can be used by extensions
+		$adapter->configure($options);
+
+		return $adapter;
 	}
 }
diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php
index d9e108e098a..dc60c894b16 100644
--- a/phpBB/phpbb/storage/controller/attachment.php
+++ b/phpBB/phpbb/storage/controller/attachment.php
@@ -22,9 +22,13 @@
 use phpbb\event\dispatcher_interface;
 use phpbb\exception\http_exception;
 use phpbb\language\language;
+use phpbb\mimetype\extension_guesser;
 use phpbb\request\request;
+use phpbb\storage\provider\local;
 use phpbb\storage\storage;
 use phpbb\user;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\Request as symfony_request;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -34,26 +38,41 @@
 /**
  * Controller for /download/attachment/{id} routes
  */
-class attachment extends controller
+class attachment
 {
 	/** @var auth */
 	protected $auth;
 
+	/** @var service */
+	protected $cache;
+
 	/** @var config */
 	protected $config;
 
 	/** @var content_visibility */
 	protected $content_visibility;
 
+	/** @var driver_interface */
+	protected $db;
+
 	/** @var dispatcher_interface */
 	protected $dispatcher;
 
+	/** @var extension_guesser */
+	protected $extension_guesser;
+
 	/** @var language */
 	protected $language;
 
 	/** @var request */
 	protected $request;
 
+	/** @var storage */
+	protected $storage;
+
+	/** @var symfony_request */
+	protected $symfony_request;
+
 	/** @var user */
 	protected $user;
 
@@ -66,22 +85,26 @@ class attachment extends controller
 	 * @param content_visibility	$content_visibility
 	 * @param driver_interface		$db
 	 * @param dispatcher_interface	$dispatcher
+	 * @param extension_guesser		$extension_guesser
 	 * @param language				$language
 	 * @param request				$request
 	 * @param storage				$storage
 	 * @param symfony_request		$symfony_request
 	 * @param user					$user
 	 */
-	public function __construct(auth $auth, service $cache, config $config, content_visibility $content_visibility, driver_interface $db, dispatcher_interface $dispatcher, language $language, request $request, storage $storage, symfony_request $symfony_request, user $user)
+	public function __construct(auth $auth, service $cache, config $config, content_visibility $content_visibility, driver_interface $db, dispatcher_interface $dispatcher, extension_guesser $extension_guesser, language $language, request $request, storage $storage, symfony_request $symfony_request, user $user)
 	{
-		parent::__construct($cache, $db, $storage, $symfony_request);
-
 		$this->auth = $auth;
+		$this->cache = $cache;
 		$this->config = $config;
 		$this->content_visibility = $content_visibility;
+		$this->db = $db;
 		$this->dispatcher = $dispatcher;
+		$this->extension_guesser = $extension_guesser;
 		$this->language = $language;
 		$this->request = $request;
+		$this->storage = $storage;
+		$this->symfony_request = $symfony_request;
 		$this->user = $user;
 	}
 
@@ -108,15 +131,7 @@ public function handle_attachment(int $id, string $filename): Response
 			throw new http_exception(404, 'NO_ATTACHMENT_SELECTED');
 		}
 
-		$sql = 'SELECT attach_id, post_msg_id, topic_id, in_message, poster_id,
-				is_orphan, physical_filename, real_filename, extension, mimetype,
-				filesize, filetime
-			FROM ' . ATTACHMENTS_TABLE . "
-			WHERE attach_id = $attach_id" .
-				(($filename) ? " AND real_filename = '" . $this->db->sql_escape($filename) . "'" : '');
-		$result = $this->db->sql_query($sql);
-		$attachment = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
+		$attachment = $this->get_attachment($attach_id, $filename);
 
 		if (!$attachment)
 		{
@@ -155,12 +170,7 @@ public function handle_attachment(int $id, string $filename): Response
 			{
 				$this->phpbb_download_handle_forum_auth($attachment['topic_id']);
 
-				$sql = 'SELECT forum_id, poster_id, post_visibility
-					FROM ' . POSTS_TABLE . '
-					WHERE post_id = ' . (int) $attachment['post_msg_id'];
-				$result = $this->db->sql_query($sql);
-				$post_row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
+				$post_row = $this->get_post((int) $attachment['post_msg_id']);
 
 				if (!$post_row || !$this->content_visibility->is_visible('post', $post_row['forum_id'], $post_row))
 				{
@@ -171,11 +181,11 @@ public function handle_attachment(int $id, string $filename): Response
 			else
 			{
 				// Attachment is in a private message.
-				$post_row = array('forum_id' => false);
+				$post_row = ['forum_id' => false];
 				$this->phpbb_download_handle_pm_auth( $attachment['post_msg_id']);
 			}
 
-			$extensions = array();
+			$extensions = [];
 			if (!extension_allowed($post_row['forum_id'], $attachment['extension'], $extensions))
 			{
 				throw new http_exception(403, 'EXTENSION_DISABLED_AFTER_POSTING', [$attachment['extension']]);
@@ -184,16 +194,12 @@ public function handle_attachment(int $id, string $filename): Response
 
 		$display_cat = $extensions[$attachment['extension']]['display_cat'];
 
-		if ($thumbnail)
-		{
-			$attachment['physical_filename'] = 'thumb_' . $attachment['physical_filename'];
-		}
-		else if ($display_cat == attachment_category::NONE && !$attachment['is_orphan'])
+		if ($display_cat == attachment_category::IMAGE || $display_cat == attachment_category::THUMB)
 		{
-			if (!(($display_cat == attachment_category::IMAGE || $display_cat == attachment_category::THUMB) && !$this->user->optionget('viewimg')))
+			// Do not display if either display inline is disabled or user is not allowed to view images
+			if (!$this->config['img_display_inlined'] || !$this->user->optionget('viewimg'))
 			{
-				// Update download count
-				$this->phpbb_increment_downloads($attachment['attach_id']);
+				$display_cat = ATTACHMENT_CATEGORY_NONE;
 			}
 		}
 
@@ -214,13 +220,13 @@ public function handle_attachment(int $id, string $filename): Response
 		 * @changed 3.3.0-a1		Remove display_cat variable
 		 * @changed 3.3.0-a1		Remove mode variable
 		 */
-		$vars = array(
+		$vars = [
 			'attach_id',
 			'attachment',
 			'extensions',
 			'thumbnail',
 			'redirect',
-		);
+		];
 		extract($this->dispatcher->trigger_event('core.download_file_send_to_browser_before', compact($vars)));
 
 		// If the redirect variable have been overwritten, do redirect there
@@ -235,6 +241,16 @@ public function handle_attachment(int $id, string $filename): Response
 			throw new http_exception(404, 'ERROR_NO_ATTACHMENT');
 		}
 
+		if ($thumbnail)
+		{
+			$attachment['physical_filename'] = 'thumb_' . $attachment['physical_filename'];
+		}
+		else if ($display_cat == attachment_category::NONE && !$attachment['is_orphan'])
+		{
+			// Update download count
+			$this->phpbb_increment_downloads($attachment['attach_id']);
+		}
+
 		/**
 		 * Event to alter attachment before it is sent to browser.
 		 *
@@ -245,26 +261,17 @@ public function handle_attachment(int $id, string $filename): Response
 		 * @changed 3.3.0-a1		Removed size variable
 		 * @changed 3.3.0-a1		Removed filename variable
 		 */
-		$vars = array(
+		$vars = [
 			'attachment',
-		);
+		];
 		extract($this->dispatcher->trigger_event('core.send_file_to_browser_before', compact($vars)));
 
-		// TODO: The next lines should go better in prepare, also the mimetype is handled by the storage table
-		// so probably can be removed
-
-		$response = new StreamedResponse();
-
-		// Content-type header
-		$response->headers->set('Content-Type', $attachment['mimetype']);
+		$sec_fetch_dest = $this->request->header('Sec-Fetch-Dest');
 
-		// Display file types in browser and force download for others
-		if (strpos($attachment['mimetype'], 'image') !== false
-			|| strpos($attachment['mimetype'], 'audio') !== false
-			|| strpos($attachment['mimetype'], 'video') !== false
-		)
+		// Only set inline if category is set to image, mimetype says it's an image, and browser either sends no Sec-Fetch-Dest header or explicitly marks the request as an image
+		if ($display_cat == attachment_category::IMAGE && $this->allow_serve_inline($attachment['mimetype'], $sec_fetch_dest))
 		{
-			$disposition = $response->headers->makeDisposition(
+			$disposition = HeaderUtils::makeDisposition(
 				ResponseHeaderBag::DISPOSITION_INLINE,
 				$attachment['real_filename'],
 				$this->filenameFallback($attachment['real_filename'])
@@ -272,40 +279,113 @@ public function handle_attachment(int $id, string $filename): Response
 		}
 		else
 		{
-			$disposition = $response->headers->makeDisposition(
+			// Correct the mime type - we force application/octet-stream for all files, except images
+			$attachment['mimetype'] = 'application/octet-stream';
+
+			$disposition = HeaderUtils::makeDisposition(
 				ResponseHeaderBag::DISPOSITION_ATTACHMENT,
 				$attachment['real_filename'],
 				$this->filenameFallback($attachment['real_filename'])
 			);
 		}
 
+		if ($this->config['storage\\attachment\\provider'] === local::class)
+		{
+			$response = new BinaryFileResponse($this->config['storage\\attachment\\config\\path'] . '/' . $attachment['physical_filename']);
+		}
+		else
+		{
+			$response = new StreamedResponse();
+
+			$fp = $this->storage->read($attachment['physical_filename']);
+
+			$output = fopen('php://output', 'w+b');
+
+			$response->setCallback(function () use ($fp, $output) {
+				stream_copy_to_stream($fp, $output);
+				fclose($fp);
+				fclose($output);
+				flush();
+
+				// Terminate script to avoid the execution of terminate events
+				// This avoids possible errors with db connection closed
+				exit;
+			});
+		}
+
+		// Close db connection and unload cache
+		$this->cache->unload();
+		$this->db->sql_close();
+
+		// Don't cache attachments on proxies
+		$response->setPrivate();
+
+		// Content-type and content-disposition headers
+		$response->headers->set('Content-Type', $attachment['mimetype']);
 		$response->headers->set('Content-Disposition', $disposition);
 
-		// Set expires header for browser cache
-		$time = new \DateTime();
-		$response->setExpires($time->modify('+1 year'));
+		// Send restrictive CSP for file served to browser
+		$response->headers->set('Content-Security-Policy', "default-src 'none'; style-src 'self' 'unsafe-inline'; img-src 'self'; script-src 'none'; object-src 'none'; frame-src 'none';");
+
+		@set_time_limit(0);
 
-		return parent::handle($attachment['physical_filename']);
+		return $response;
 	}
 
 	/**
-	 * Remove non valid characters https://github.com/symfony/http-foundation/commit/c7df9082ee7205548a97031683bc6550b5dc9551
+	 * Get attachment data
+	 *
+	 * @param int $attach_id The attach_id of the attachment
+	 * @param string $filename The real filename of the attachment (optional)
+	 *
+	 * @return array|null Array with attachment data or null if the attachment is not found
 	 */
-	protected function filenameFallback($filename)
+	protected function get_attachment(int $attach_id, string $filename): array|null
 	{
-		$filename = preg_replace(['/[^\x20-\x7e]/', '/%/', '/\//', '/\\\\/'], '', $filename);
+		$sql = 'SELECT attach_id, post_msg_id, topic_id, in_message, poster_id,
+				is_orphan, physical_filename, real_filename, extension, mimetype,
+				filesize, filetime
+			FROM ' . ATTACHMENTS_TABLE . "
+			WHERE attach_id = $attach_id" .
+			(($filename) ? " AND real_filename = '" . $this->db->sql_escape($filename) . "'" : '');
+		$result = $this->db->sql_query($sql);
+		$attachment = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		return $attachment ?: null;
+	}
+
+	/**
+	 * Get post data
+	 *
+	 * @param int $post_id The post_id of the post
+	 *
+	 * @return array|null Array with post data or null if the post is not found
+	 */
+	protected function get_post(int $post_id): array|null
+	{
+		$sql = 'SELECT forum_id, poster_id, post_visibility
+					FROM ' . POSTS_TABLE . '
+					WHERE post_id = ' . (int) $post_id;
+		$result = $this->db->sql_query($sql);
+		$post_row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
 
-		return (!empty($filename)) ?: 'File';
+		return $post_row ?: null;
 	}
 
 	/**
-	 * {@inheritdoc}
+	 * Remove non valid characters https://github.com/symfony/http-foundation/commit/c7df9082ee7205548a97031683bc6550b5dc9551
+	 *
+	 * @param string $filename The filename to sanitize
+	  *
+	  * @return string Sanitized filename
 	 */
-	protected function prepare(StreamedResponse $response, string $file): void
+	protected function filenameFallback(string $filename): string
 	{
-		$response->setPrivate();	// By default should be private, but make sure of it
+		$filename = (string) preg_replace(['/[^\x20-\x7e]/', '/%/', '/\//', '/\\\\/'], '', $filename);
 
-		parent::prepare($response, $file);
+		return $filename ?: 'File';
 	}
 
 	/**
@@ -368,6 +448,7 @@ protected function phpbb_download_handle_pm_auth(int $msg_id): void
 		}
 
 		$allowed = $this->phpbb_download_check_pm_auth($msg_id);
+		$user_id = $this->user->data['user_id'];
 
 		/**
 		 * Event to modify PM attachments download auth
@@ -378,7 +459,7 @@ protected function phpbb_download_handle_pm_auth(int $msg_id): void
 		 * @var	int		user_id		The user id for auth check
 		 * @since 3.1.11-RC1
 		 */
-		$vars = array('allowed', 'msg_id', 'user_id');
+		$vars = ['allowed', 'msg_id', 'user_id'];
 		extract($this->dispatcher->trigger_event('core.modify_pm_attach_download_auth', compact($vars)));
 
 		if (!$allowed)
@@ -405,7 +486,8 @@ protected function phpbb_download_check_pm_auth(int $msg_id): bool
 				AND (
 					user_id = ' . (int) $user_id . '
 					OR author_id = ' . (int) $user_id . '
-				)';
+				)
+			';
 		$result = $this->db->sql_query_limit($sql, 1);
 		$allowed = (bool) $this->db->sql_fetchfield('msg_id');
 		$this->db->sql_freeresult($result);
@@ -430,7 +512,6 @@ protected function phpbb_increment_downloads(int $id): void
 
 	/**
 	 * Check if downloading item is allowed
-	 * FIXME (See: https://tracker.phpbb.com/browse/PHPBB3-15264 and http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=51921)
 	 */
 	protected function download_allowed(): bool
 	{
@@ -443,22 +524,22 @@ protected function download_allowed(): bool
 
 		if (!$url)
 		{
-			return ($this->config['secure_allow_empty_referer']) ? true : false;
+			return (bool) $this->config['secure_allow_empty_referer'];
 		}
 
 		// Split URL into domain and script part
 		$url = @parse_url($url);
 
-		if ($url === false)
+		if ($url === false || !isset($url['host']))
 		{
-			return ($this->config['secure_allow_empty_referer']) ? true : false;
+			return (bool) $this->config['secure_allow_empty_referer'];
 		}
 
 		$hostname = $url['host'];
 		unset($url);
 
-		$allowed = ($this->config['secure_allow_deny']) ? false : true;
-		$iplist = array();
+		$allowed = !$this->config['secure_allow_deny'];
+		$iplist = [];
 
 		if (($ip_ary = @gethostbynamel($hostname)) !== false)
 		{
@@ -480,61 +561,77 @@ protected function download_allowed(): bool
 			$server_name = $this->config['server_name'];
 		}
 
-		if (preg_match('#^.*?' . preg_quote($server_name, '#') . '.*?$#i', $hostname))
+		if (preg_match('#(?:^|\\.)' . preg_quote($server_name, '#') . '$#i', $hostname))
 		{
-			$allowed = true;
+			return true;
 		}
 
 		// Get IP's and Hostnames
-		if (!$allowed)
+		$sql = 'SELECT site_ip, site_hostname, ip_exclude
+			FROM ' . SITELIST_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$sql = 'SELECT site_ip, site_hostname, ip_exclude
-				FROM ' . SITELIST_TABLE;
-			$result = $this->db->sql_query($sql);
+			$site_ip = trim($row['site_ip']);
+			$site_hostname = trim($row['site_hostname']);
 
-			while ($row = $this->db->sql_fetchrow($result))
+			if ($site_ip)
 			{
-				$site_ip = trim($row['site_ip']);
-				$site_hostname = trim($row['site_hostname']);
-
-				if ($site_ip)
+				foreach ($iplist as $ip)
 				{
-					foreach ($iplist as $ip)
+					if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($site_ip, '#')) . '$#i', $ip))
 					{
-						if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($site_ip, '#')) . '$#i', $ip))
+						if ($row['ip_exclude'])
+						{
+							$allowed = !$this->config['secure_allow_deny'];
+							break 2;
+						}
+						else
 						{
-							if ($row['ip_exclude'])
-							{
-								$allowed = ($this->config['secure_allow_deny']) ? false : true;
-								break 2;
-							}
-							else
-							{
-								$allowed = ($this->config['secure_allow_deny']) ? true : false;
-							}
+							$allowed = (bool) $this->config['secure_allow_deny'];
 						}
 					}
 				}
+			}
 
-				if ($site_hostname)
+			if ($site_hostname)
+			{
+				if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($site_hostname, '#')) . '$#i', $hostname))
 				{
-					if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($site_hostname, '#')) . '$#i', $hostname))
+					if ($row['ip_exclude'])
 					{
-						if ($row['ip_exclude'])
-						{
-							$allowed = ($this->config['secure_allow_deny']) ? false : true;
-							break;
-						}
-						else
-						{
-							$allowed = ($this->config['secure_allow_deny']) ? true : false;
-						}
+						$allowed = !$this->config['secure_allow_deny'];
+						break;
+					}
+					else
+					{
+						$allowed = (bool) $this->config['secure_allow_deny'];
 					}
 				}
 			}
-			$this->db->sql_freeresult($result);
 		}
+		$this->db->sql_freeresult($result);
 
 		return $allowed;
 	}
+
+	/**
+	 * Return whether image type should be allowed to be displayed inline based on the mimetype and potentially Sec-Fetch-Dest header
+	 *
+	 * @param string $mimetype Image mime type
+	 * @param string $sec_fetch_dest Sec-Fetch-Dest header field content
+	 * @return bool
+	 */
+	protected function allow_serve_inline(string $mimetype, string $sec_fetch_dest): bool
+	{
+		// Allow image types that are known to be supported by all major browsers, and that are known to be safe when rendered inline
+		$allowed_types = ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/avif', 'image/bmp', 'image/tiff'];
+		if (in_array($mimetype, $allowed_types, true))
+		{
+			return true;
+		}
+
+		return str_starts_with($mimetype, 'image') && (empty($sec_fetch_dest) || $sec_fetch_dest === 'image');
+	}
 }
diff --git a/phpBB/phpbb/storage/controller/avatar.php b/phpBB/phpbb/storage/controller/avatar.php
index 7055961230b..c4406f73888 100644
--- a/phpBB/phpbb/storage/controller/avatar.php
+++ b/phpBB/phpbb/storage/controller/avatar.php
@@ -16,11 +16,12 @@
 use phpbb\cache\service;
 use phpbb\config\config;
 use phpbb\db\driver\driver_interface;
+use phpbb\mimetype\extension_guesser;
 use phpbb\storage\storage;
+use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\Request as symfony_request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
  * Controller for /download/avatar/{file} routes
@@ -39,12 +40,13 @@ class avatar extends controller
 	 * @param service				$cache
 	 * @param config				$config
 	 * @param driver_interface		$db
+	 * @param extension_guesser		$extension_guesser
 	 * @param storage				$storage
 	 * @param symfony_request		$symfony_request
 	 */
-	public function __construct(service $cache, config $config, driver_interface $db, storage $storage, symfony_request $symfony_request)
+	public function __construct(service $cache, config $config, driver_interface $db, extension_guesser $extension_guesser, storage $storage, symfony_request $symfony_request)
 	{
-		parent::__construct($cache, $db, $storage, $symfony_request);
+		parent::__construct($cache, $db , $extension_guesser, $storage, $symfony_request);
 
 		$this->config = $config;
 	}
@@ -88,7 +90,7 @@ protected function decode_filename(string $file): string
 		}
 
 		$ext	= substr(strrchr($file, '.'), 1);
-		$file	= (int) $file;
+		$file	= (int) $file; // This removes the timestamp leaving only the user id
 
 		return $this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $file . '.' . $ext;
 	}
@@ -96,11 +98,11 @@ protected function decode_filename(string $file): string
 	/**
 	 * {@inheritdoc}
 	 */
-	protected function prepare(StreamedResponse $response, string $file): void
+	protected function prepare(Response $response, string $file): void
 	{
 		$response->setPublic();
 
-		$disposition = $response->headers->makeDisposition(
+		$disposition = HeaderUtils::makeDisposition(
 			ResponseHeaderBag::DISPOSITION_INLINE,
 			rawurlencode($file)
 		);
diff --git a/phpBB/phpbb/storage/controller/controller.php b/phpBB/phpbb/storage/controller/controller.php
index 54f95aa2242..bdf59ae2ddb 100644
--- a/phpBB/phpbb/storage/controller/controller.php
+++ b/phpBB/phpbb/storage/controller/controller.php
@@ -16,7 +16,8 @@
 use phpbb\cache\service;
 use phpbb\db\driver\driver_interface;
 use phpbb\exception\http_exception;
-use phpbb\storage\exception\exception;
+use phpbb\mimetype\extension_guesser;
+use phpbb\storage\exception\storage_exception;
 use phpbb\storage\storage;
 use Symfony\Component\HttpFoundation\Request as symfony_request;
 use Symfony\Component\HttpFoundation\Response;
@@ -33,6 +34,9 @@ class controller
 	/** @var driver_interface */
 	protected $db;
 
+	/** @var extension_guesser */
+	protected $extension_guesser;
+
 	/** @var storage */
 	protected $storage;
 
@@ -47,10 +51,11 @@ class controller
 	 * @param storage				$storage
 	 * @param symfony_request		$symfony_request
 	 */
-	public function __construct(service $cache, driver_interface $db, storage $storage, symfony_request $symfony_request)
+	public function __construct(service $cache, driver_interface $db, extension_guesser $extension_guesser, storage $storage, symfony_request $symfony_request)
 	{
 		$this->cache = $cache;
 		$this->db = $db;
+		$this->extension_guesser = $extension_guesser;
 		$this->storage = $storage;
 		$this->symfony_request = $symfony_request;
 	}
@@ -63,12 +68,10 @@ public function __construct(service $cache, driver_interface $db, storage $stora
 	 * @return Response a Symfony response object
 	 *
 	 * @throws http_exception when can't access $file
-	 * @throws exception when there is an error reading the file
+	 * @throws storage_exception when there is an error reading the file
 	 */
 	public function handle(string $file): Response
 	{
-		$response = new StreamedResponse();
-
 		if (!static::is_allowed($file))
 		{
 			throw new http_exception(403, 'Forbidden');
@@ -79,6 +82,21 @@ public function handle(string $file): Response
 			throw new http_exception(404, 'Not Found');
 		}
 
+		$response = new StreamedResponse();
+		$fp = $this->storage->read($file);
+		$output = fopen('php://output', 'w+b');
+
+		$response->setCallback(function () use ($fp, $output) {
+			stream_copy_to_stream($fp, $output);
+			fclose($fp);
+			fclose($output);
+			flush();
+
+			// Terminate script to avoid the execution of terminate events
+			// This avoids possible errors with db connection closed
+			exit;
+		});
+
 		static::prepare($response, $file);
 
 		if (headers_sent())
@@ -86,6 +104,14 @@ public function handle(string $file): Response
 			throw new http_exception(500, 'Headers already sent');
 		}
 
+		// Close db connection and unload cache
+		$this->cache->unload();
+		$this->db->sql_close();
+
+		$response->isNotModified($this->symfony_request);
+
+		@set_time_limit(0);
+
 		return $response;
 	}
 
@@ -116,24 +142,22 @@ protected function file_exists(string $file): bool
 	/**
 	 * Prepare response
 	 *
-	 * @param StreamedResponse $response
+	 * @param Response $response
 	 * @param string $file File path
 	 *
 	 * @return void
-	 * @throws exception when there is an error reading the file
+	 * @throws storage_exception when there is an error reading the file
 	 */
-	protected function prepare(StreamedResponse $response, string $file): void
+	protected function prepare(Response $response, string $file): void
 	{
-		$file_info = $this->storage->file_info($file);
-
 		// Add Content-Type header
 		if (!$response->headers->has('Content-Type'))
 		{
 			try
 			{
-				$content_type = $file_info->get('mimetype');
+				$content_type = $this->extension_guesser->guess($file);
 			}
-			catch (exception $e)
+			catch (storage_exception $e)
 			{
 				$content_type = 'application/octet-stream';
 			}
@@ -146,43 +170,13 @@ protected function prepare(StreamedResponse $response, string $file): void
 		{
 			try
 			{
-				$response->headers->set('Content-Length', $file_info->get('size'));
+				$response->headers->set('Content-Length', $this->storage->file_size($file));
 			}
-			catch (exception $e)
+			catch (storage_exception $e)
 			{
 				// Just don't send this header
 			}
 		}
 
-		@set_time_limit(0);
-
-		$fp = $this->storage->read_stream($file);
-
-		// Close db connection
-		$this->file_gc();
-
-		$output = fopen('php://output', 'w+b');
-
-		$response->setCallback(function () use ($fp, $output) {
-			stream_copy_to_stream($fp, $output);
-			fclose($fp);
-			fclose($output);
-			flush();
-
-			// Terminate script to avoid the execution of terminate events
-			// This avoid possible errors with db connection closed
-			exit;
-		});
-
-		$response->isNotModified($this->symfony_request);
-	}
-
-	/**
-	* Garbage Collection
-	*/
-	protected function file_gc(): void
-	{
-		$this->cache->unload(); // Equivalent to $this->cache->get_driver()->unload();
-		$this->db->sql_close();
 	}
 }
diff --git a/phpBB/phpbb/storage/exception/action_in_progress_exception.php b/phpBB/phpbb/storage/exception/action_in_progress_exception.php
new file mode 100644
index 00000000000..1e6f01495e6
--- /dev/null
+++ b/phpBB/phpbb/storage/exception/action_in_progress_exception.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\storage\exception;
+
+class action_in_progress_exception extends storage_exception
+{
+}
diff --git a/phpBB/phpbb/storage/exception/no_action_in_progress_exception.php b/phpBB/phpbb/storage/exception/no_action_in_progress_exception.php
new file mode 100644
index 00000000000..5b5e63fc07e
--- /dev/null
+++ b/phpBB/phpbb/storage/exception/no_action_in_progress_exception.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\storage\exception;
+
+class no_action_in_progress_exception extends storage_exception
+{
+}
diff --git a/phpBB/phpbb/storage/exception/exception.php b/phpBB/phpbb/storage/exception/storage_exception.php
similarity index 88%
rename from phpBB/phpbb/storage/exception/exception.php
rename to phpBB/phpbb/storage/exception/storage_exception.php
index 8268530c160..b7635218a32 100644
--- a/phpBB/phpbb/storage/exception/exception.php
+++ b/phpBB/phpbb/storage/exception/storage_exception.php
@@ -15,7 +15,7 @@
 
 use phpbb\exception\runtime_exception;
 
-class exception extends runtime_exception
+class storage_exception extends runtime_exception
 {
 	/**
 	 * Constructor
@@ -26,7 +26,7 @@ class exception extends runtime_exception
 	 * @param \Exception|null	$previous	The previous runtime_exception used for the runtime_exception chaining
 	 * @param integer			$code		The Exception code
 	 */
-	public function __construct($message = '', $filename = '', $parameters = [], \Exception $previous = null, $code = 0)
+	public function __construct($message = '', $filename = '', $parameters = [], \Exception|null $previous = null, $code = 0)
 	{
 		parent::__construct($message, array_merge(array('filename' => $filename), $parameters), $previous, $code);
 	}
@@ -36,7 +36,7 @@ public function __construct($message = '', $filename = '', $parameters = [], \Ex
 	 *
 	 * @return string
 	 */
-	public function get_filename()
+	public function get_filename(): string
 	{
 		$parameters = $this->get_parameters();
 		return $parameters['filename'];
diff --git a/phpBB/phpbb/storage/file_info.php b/phpBB/phpbb/storage/file_info.php
deleted file mode 100644
index 2e938468380..00000000000
--- a/phpBB/phpbb/storage/file_info.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-namespace phpbb\storage;
-
-use phpbb\storage\exception\exception;
-use phpbb\storage\adapter\adapter_interface;
-
-class file_info
-{
-	/**
-	 * @var adapter_interface
-	 */
-	protected $adapter;
-
-	/**
-	 * Path of the file
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * Stores the properties of $path file, so dont have to be consulted  multiple times.
-	 * For example, when you need the width of an image, using getimagesize() you get
-	 * both dimensions, so you store both here, and when you get the height, you dont have
-	 * to call getimagesize() again
-	 *
-	 * @var array
-	 */
-	protected $properties;
-
-	/**
-	 * Constructor
-	 *
-	 * @param adapter_interface $adapter
-	 * @param string $path
-	 */
-	public function __construct(adapter_interface $adapter, $path)
-	{
-		$this->adapter = $adapter;
-		$this->path = $path;
-		$this->properties = [];
-	}
-
-	/**
-	 * Load propertys lazily
-	 *
-	 * @param string	$name		The property name.
-	 *
-	 * @return string	Returns the property value
-	 */
-	public function get($name)
-	{
-		if (!isset($this->properties[$name]))
-		{
-			if (!method_exists($this->adapter, 'file_' . $name))
-			{
-				throw new exception('STORAGE_METHOD_NOT_IMPLEMENTED');
-			}
-
-			$this->properties = array_merge($this->properties, call_user_func([$this->adapter, 'file_' . $name], $this->path));
-		}
-
-		return $this->properties[$name];
-	}
-
-	/**
-	 * Alias of \phpbb\storage\file_info->get()
-	 */
-	public function __get($name)
-	{
-		return $this->get($name);
-	}
-}
diff --git a/phpBB/phpbb/storage/file_tracker.php b/phpBB/phpbb/storage/file_tracker.php
new file mode 100644
index 00000000000..991eef2d7e0
--- /dev/null
+++ b/phpBB/phpbb/storage/file_tracker.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\storage;
+
+use phpbb\cache\driver\driver_interface as cache;
+use phpbb\db\driver\driver_interface as db;
+use phpbb\storage\exception\storage_exception;
+
+class file_tracker
+{
+	/**
+	 * Cache driver
+	 * @var cache
+	 */
+	protected $cache;
+
+	/**
+	 * @var db
+	 */
+	protected $db;
+
+	/**
+	 * @var string
+	 */
+	protected $storage_table;
+
+	/**
+	 * Constructor
+	 *
+	 * @param cache			$cache
+	 * @param db			$db
+	 * @param string		$storage_table
+	 */
+	public function __construct(cache $cache, db $db, string $storage_table)
+	{
+		$this->cache = $cache;
+		$this->db = $db;
+		$this->storage_table = $storage_table;
+	}
+
+	/**
+	 * Track file in database
+	 *
+	 * @param string $storage	Storage name
+	 * @param string $path		The target file
+	 * @param int $size			Size in bytes
+	 */
+	public function track_file(string $storage, string $path, int $size): void
+	{
+		$file = [
+			'file_path'		=> $path,
+			'filesize'		=> $size,
+		];
+
+		$this->track_files($storage, [$file]);
+	}
+
+	/**
+	 * Track files in database
+	 *
+	 * @param string $storage	Storage name
+	 * @param array $files		Array of files to track
+	 */
+	public function track_files(string $storage, array $files): void
+	{
+		$sql_ary = [];
+		foreach ($files as $file)
+		{
+			$sql_ary[] = [
+				'storage'		=> $storage,
+				'file_path'		=> $file['file_path'],
+				'filesize'		=> $file['filesize'],
+			];
+		}
+
+		$this->db->sql_multi_insert($this->storage_table, $sql_ary);
+
+		$this->cache->destroy('_storage_' . $storage . '_totalsize');
+		$this->cache->destroy('_storage_' . $storage . '_numfiles');
+	}
+
+	/**
+	 * Untrack file
+	 *
+	 * @param string	$storage		Storage name
+	 * @param string	$path			The target file
+	 */
+	public function untrack_file(string $storage, $path): void
+	{
+		$sql_ary = [
+			'file_path'		=> $path,
+			'storage'		=> $storage,
+		];
+
+		$sql = 'DELETE FROM ' . $this->storage_table . '
+			WHERE ' . $this->db->sql_build_array('DELETE', $sql_ary);
+		$this->db->sql_query($sql);
+
+		$this->cache->destroy('_storage_' . $storage . '_totalsize');
+		$this->cache->destroy('_storage_' . $storage . '_numfiles');
+	}
+
+	/**
+	 * Check if a file is tracked
+	 *
+	 * @param string $storage	Storage name
+	 * @param string $path		The file
+	 *
+	 * @return bool	True if file is tracked
+	 */
+	public function is_tracked(string $storage, string $path): bool
+	{
+		$sql_ary = [
+			'file_path'		=> $path,
+			'storage'		=> $storage,
+		];
+
+		$sql = 'SELECT file_id
+			FROM ' .  $this->storage_table . '
+			WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary);
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		return $row !== false;
+	}
+
+	/**
+	 * Get file size in bytes
+	 *
+	 * @param string $path The file
+	 *
+	 * @return int Size in bytes.
+	 *
+	 * @throws storage_exception When unable to retrieve file size
+	 */
+	public function file_size(string $storage, string $path): int
+	{
+		$sql_ary = [
+			'file_path'		=> $path,
+			'storage'		=> $storage,
+		];
+
+		$sql = 'SELECT filesize
+			FROM ' .  $this->storage_table . '
+			WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary);
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		return (int) $row['filesize'];
+	}
+
+	/**
+	 * Get number of tracked storage files for a storage
+	 *
+	 * @param string $storage Storage name
+	 *
+	 * @return int	Number of files
+	 */
+	public function total_files(string $storage): int
+	{
+		$number_files = $this->cache->get('_storage_' . $storage. '_numfiles');
+
+		if ($number_files === false)
+		{
+			$sql = 'SELECT COUNT(file_id) AS numfiles
+				FROM ' .  $this->storage_table . "
+				WHERE storage = '" . $this->db->sql_escape($storage) . "'";
+			$result = $this->db->sql_query($sql);
+
+			$number_files = $this->db->sql_fetchfield('numfiles');
+			$this->cache->put('_storage_' . $storage . '_numfiles', $number_files);
+
+			$this->db->sql_freeresult($result);
+		}
+
+		return (int) $number_files;
+	}
+
+	/**
+	 * Get total storage size
+	 *
+	 * @param string $storage Storage name
+	 *
+	 * @return float	Size in bytes
+	 */
+	public function total_size(string $storage): float
+	{
+		$total_size = $this->cache->get('_storage_' . $storage . '_totalsize');
+
+		if ($total_size === false)
+		{
+			$sql = 'SELECT SUM(filesize) AS totalsize
+				FROM ' .  $this->storage_table . "
+				WHERE storage = '" . $this->db->sql_escape($storage) . "'";
+			$result = $this->db->sql_query($sql);
+
+			$total_size = $this->db->sql_fetchfield('totalsize');
+			$this->cache->put('_storage_' . $storage . '_totalsize', $total_size);
+
+			$this->db->sql_freeresult($result);
+		}
+
+		return (float) $total_size;
+	}
+}
diff --git a/phpBB/phpbb/storage/helper.php b/phpBB/phpbb/storage/helper.php
new file mode 100644
index 00000000000..429e9b0a7ca
--- /dev/null
+++ b/phpBB/phpbb/storage/helper.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\storage;
+
+use phpbb\config\config;
+use phpbb\di\service_collection;
+
+class helper
+{
+	/** @var config */
+	protected $config;
+
+	/** @var adapter_factory */
+	protected $adapter_factory;
+
+	/** @var state_helper */
+	protected $state_helper;
+
+	/** @var service_collection */
+	protected $provider_collection;
+
+	/** @var service_collection */
+	protected $adapter_collection;
+
+	/**
+	 * Constructor
+	 *
+	 * @param config $config
+	 * @param adapter_factory $adapter_factory
+	 * @param state_helper $state_helper
+	 * @param service_collection $provider_collection
+	 * @param service_collection $adapter_collection
+ */
+	public function __construct(config $config, adapter_factory $adapter_factory, state_helper $state_helper, service_collection $provider_collection, service_collection $adapter_collection)
+	{
+		$this->config = $config;
+		$this->adapter_factory = $adapter_factory;
+		$this->state_helper = $state_helper;
+		$this->provider_collection = $provider_collection;
+		$this->adapter_collection = $adapter_collection;
+	}
+
+	/**
+	 * Get adapter definitions from a provider
+	 *
+	 * @param string $provider_class Provider class
+	 *
+	 * @return array Adapter definitions
+	 */
+	public function get_provider_options(string $provider_class) : array
+	{
+		return $this->provider_collection->get_by_class($provider_class)->get_options();
+	}
+
+	/**
+	 * Get the current provider from config
+	 *
+	 * @param string $storage_name Storage name
+	 *
+	 * @return string The current provider
+	 */
+	public function get_current_provider(string $storage_name) : string
+	{
+		return (string) $this->config['storage\\' . $storage_name . '\\provider'];
+	}
+
+	/**
+	 * Get the current value of the definition of a storage from config
+	 *
+	 * @param string $storage_name Storage name
+	 * @param string $definition Definition
+	 *
+	 * @return string Definition value
+	 */
+	public function get_current_definition(string $storage_name, string $definition) : string
+	{
+		return (string) $this->config['storage\\' . $storage_name . '\\config\\' . $definition];
+	}
+
+	/**
+	 * Get current storage adapter
+	 *
+	 * @param string $storage_name Storage adapter name
+	 *
+	 * @return object Storage adapter instance
+	 */
+	public function get_current_adapter(string $storage_name): object
+	{
+		static $adapters = [];
+
+		if (!isset($adapters[$storage_name]))
+		{
+			$adapters[$storage_name] = $this->adapter_factory->get($storage_name);
+		}
+
+		return $adapters[$storage_name];
+	}
+
+	/**
+	 * Get new storage adapter
+	 *
+	 * @param string $storage_name
+	 *
+	 * @return mixed Storage adapter instance
+	 */
+	public function get_new_adapter(string $storage_name): mixed
+	{
+		static $adapters = [];
+
+		if (!isset($adapters[$storage_name]))
+		{
+			$provider_class = $this->state_helper->new_provider($storage_name);
+			$definitions = array_keys($this->get_provider_options($provider_class));
+
+			$options = [];
+			foreach ($definitions as $definition)
+			{
+				$options[$definition] = $this->state_helper->new_definition_value($storage_name, $definition);
+			}
+
+			$adapters[$storage_name] = $this->adapter_factory->get_with_options($storage_name, $provider_class, $options);
+		}
+
+		return $adapters[$storage_name];
+	}
+
+	/**
+	 * Delete configuration options for a given storage
+	 *
+	 * @param string $storage_name
+	 *
+	 * @return void
+	 */
+	public function delete_storage_options(string $storage_name): void
+	{
+		$provider = $this->get_current_provider($storage_name);
+		$options = $this->get_provider_options($provider);
+
+		foreach (array_keys($options) as $definition)
+		{
+			$this->config->delete('storage\\' . $storage_name . '\\config\\' . $definition);
+		}
+	}
+
+	/**
+	 * Set a provider in configuration for a given storage
+	 *
+	 * @param string $storage_name
+	 * @param string $provider
+	 *
+	 * @return void
+	 */
+	public function set_storage_provider(string $storage_name, string $provider): void
+	{
+		$this->config->set('storage\\' . $storage_name . '\\provider', $provider);
+	}
+
+	/**
+	 * Set storage options in configuration for a given storage
+	 *
+	 * @param string $storage_name
+	 * @param string $definition
+	 * @param string $value
+	 *
+	 * @return void
+	 */
+	public function set_storage_definition(string $storage_name, string $definition, string $value): void
+	{
+		$this->config->set('storage\\' . $storage_name . '\\config\\' . $definition, $value);
+	}
+
+	/**
+	 * Copy a file from the current adapter to the new adapter
+	 *
+	 * @param $storage_name
+	 * @param $file
+	 *
+	 * @return void
+	 */
+	public function copy_file_to_new_adapter($storage_name, $file): void
+	{
+		$current_adapter = $this->get_current_adapter($storage_name);
+		$new_adapter = $this->get_new_adapter($storage_name);
+
+		$stream = $current_adapter->read($file);
+		$new_adapter->write($file, $stream);
+	}
+
+
+	/**
+	 * Updates a storage with the info provided in the form (that is stored in the state at this point)
+	 *
+	 * @param string $storage_name Storage name
+	 */
+	public function update_storage_config(string $storage_name) : void
+	{
+		// Remove old storage config
+		$this->delete_storage_options($storage_name);
+
+		// Update provider
+		$new_provider = $this->state_helper->new_provider($storage_name);
+		$this->set_storage_provider($storage_name, $new_provider);
+
+		// Set new storage config
+		$new_options = $this->get_provider_options($new_provider);
+
+		foreach (array_keys($new_options) as $definition)
+		{
+			$new_definition_value = $this->state_helper->new_definition_value($storage_name, $definition);
+			$this->set_storage_definition($storage_name, $definition, $new_definition_value);
+		}
+	}
+
+}
diff --git a/phpBB/phpbb/storage/provider/local.php b/phpBB/phpbb/storage/provider/local.php
index 3bec0c5ce5b..11bca055ce8 100644
--- a/phpBB/phpbb/storage/provider/local.php
+++ b/phpBB/phpbb/storage/provider/local.php
@@ -13,16 +13,38 @@
 
 namespace phpbb\storage\provider;
 
+use phpbb\language\language;
+
 class local implements provider_interface
 {
+	/**
+	 * @var language
+	 */
+	protected $language;
+
+	/**
+	 * Constructor
+	 *
+	 * @param language $language
+	 */
+	public function __construct(language $language)
+	{
+		$this->language = $language;
+	}
+
 	/**
 	 * {@inheritdoc}
 	 */
-	public function get_name()
+	public function get_name(): string
 	{
 		return 'local';
 	}
 
+	public function get_title(): string
+	{
+		return $this->language->lang('STORAGE_ADAPTER_LOCAL_NAME');
+	}
+
 	/**
 	 * {@inheritdoc}
 	 */
@@ -34,17 +56,24 @@ public function get_adapter_class(): string
 	/**
 	 * {@inheritdoc}
 	 */
-	public function get_options()
+	public function get_options(): array
 	{
 		return [
-			'path' => ['type' => 'text'],
+			'path' => [
+				'title' => $this->language->lang('STORAGE_ADAPTER_LOCAL_OPTION_PATH'),
+				'description' => $this->language->lang('STORAGE_ADAPTER_LOCAL_OPTION_PATH_EXPLAIN'),
+				'form_macro' => [
+					'tag' => 'input',
+					'type' => 'text',
+				],
+			],
 		];
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function is_available()
+	public function is_available(): bool
 	{
 		return true;
 	}
diff --git a/phpBB/phpbb/storage/provider/provider_interface.php b/phpBB/phpbb/storage/provider/provider_interface.php
index 484b660aa8d..7baac79f722 100644
--- a/phpBB/phpbb/storage/provider/provider_interface.php
+++ b/phpBB/phpbb/storage/provider/provider_interface.php
@@ -20,7 +20,14 @@ interface provider_interface
 	 *
 	 * @return string
 	 */
-	public function get_name();
+	public function get_name(): string;
+
+	/**
+	 * Gets adapter title for acp
+	 *
+	 * @return string
+	 */
+	public function get_title(): string;
 
 	/**
 	 * Gets adapter class
@@ -32,14 +39,74 @@ public function get_adapter_class(): string;
 	/**
 	 * Gets adapter options
 	 *
-	 * @return array	Configuration keys
+	 * Example:
+	 * public function get_options()
+	 * {
+	 * 	return [
+	 * 		'text-test' => [
+	 * 			'title' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_TEXT_TEST'),
+	 * 			'description' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_TEXT_TEST_EXPLAIN'),
+	 * 			'form_macro' => [
+	 * 				'tag' => 'input',
+	 * 				'type' => 'text',
+	 * 			],
+	 * 		],
+	 * 		'password-test' => [
+	 * 			'title' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_PASSWORD_TEST'),
+	 * 			'description' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_PASSWORD_TEST_EXPLAIN'),
+	 * 			'form_macro' => [
+	 * 				'tag' => 'input',
+	 * 				'type' => 'password',
+	 * 			],
+	 * 		],
+	 * 		'radio-test' => [
+	 * 			'title' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_RADIO_TEST'),
+	 * 			'description' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_RADIO_TEST_EXPLAIN'),
+	 * 			'form_macro' => [
+	 * 				'tag' => 'radio',
+	 * 				'buttons' => [
+	 * 					[
+	 * 						'type' => 'radio',
+	 * 						'value' => '1',
+	 * 						'label' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_RADIO_TEST_LABEL_ONE'),
+	 * 					],
+	 * 					[
+	 * 						'type' => 'radio',
+	 * 						'value' => '2',
+	 * 						'label' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_RADIO_TEST_LABEL_TWO'),
+	 * 					],
+	 * 				],
+	 * 			],
+	 * 		],
+	 * 		'select-test' => [
+	 * 			'title' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_SELECT_TEST'),
+	 * 			'description' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_SELECT_TEST_EXPLAIN'),
+	 * 			'form_macro' => [
+	 * 				'tag' => 'select',
+	 * 				'options' => [
+	 * 					['value' => 'one', 'label' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_SELECT_TEST_LABEL_ONE')],
+	 * 					['value' => 'two', 'label' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_SELECT_TEST_LABEL_TWO')],
+	 * 				],
+	 * 			],
+	 * 		],
+	 * 		'textarea-test' => [
+	 * 			'title' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_TEXTAREA_TEST'),
+	 * 			'description' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_TEXTAREA_TEST_EXPLAIN'),
+	 * 			'form_macro' => [
+	 * 				'tag' => 'textarea',
+	 * 			]
+	 * 		],
+	 * 	];
+	 * }
+	 *
+	 * @return array    Configuration keys
 	 */
-	public function get_options();
+	public function get_options(): array;
 
 	/**
 	 * Return true if the adapter is available
 	 *
 	 * @return bool
 	 */
-	public function is_available();
+	public function is_available(): bool;
 }
diff --git a/phpBB/phpbb/storage/state_helper.php b/phpBB/phpbb/storage/state_helper.php
new file mode 100644
index 00000000000..82523f0aa01
--- /dev/null
+++ b/phpBB/phpbb/storage/state_helper.php
@@ -0,0 +1,278 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\storage;
+
+use phpbb\config\config;
+use phpbb\config\db_text;
+use phpbb\di\service_collection;
+use phpbb\request\request;
+use phpbb\storage\exception\action_in_progress_exception;
+use phpbb\storage\exception\no_action_in_progress_exception;
+
+class state_helper
+{
+	/** @var config */
+	protected $config;
+
+	/** @var db_text $config_text */
+	protected $config_text;
+
+	/** @var service_collection */
+	protected $provider_collection;
+
+	/**
+	 * @param config $config
+	 * @param db_text $config_text
+	 * @param service_collection $provider_collection
+	 */
+	public function __construct(config $config, db_text $config_text, service_collection $provider_collection)
+	{
+		$this->config = $config;
+		$this->config_text = $config_text;
+		$this->provider_collection = $provider_collection;
+	}
+
+	/**
+	 * Returns if there is an action in progress
+	 *
+	 * @return bool
+	 */
+	public function is_action_in_progress(): bool
+	{
+		return !empty(json_decode($this->config_text->get('storage_update_state'), true));
+	}
+
+	/**
+	 * Get new provider for the specified storage
+	 *
+	 * @param string $storage_name
+	 *
+	 * @return string
+	 */
+	public function new_provider(string $storage_name): string
+	{
+		$state = $this->load_state();
+
+		return $state['storages'][$storage_name]['provider'];
+	}
+
+	/**
+	 * Get new definition value for the specified storage
+	 *
+	 * @param string $storage_name
+	 * @param string $definition
+	 *
+	 * @return string
+	 */
+	public function new_definition_value(string $storage_name, string $definition): string
+	{
+		$state = $this->load_state();
+
+		return $state['storages'][$storage_name]['config'][$definition];
+	}
+
+	/**
+	 * Get the update type
+	 *
+	 * @return update_type
+	 */
+	public function update_type(): update_type
+	{
+		$state = $this->load_state();
+
+		return update_type::from($state['update_type']);
+	}
+
+	/**
+	 * Get the current storage index
+	 *
+	 * @return int
+	 */
+	public function storage_index(): int
+	{
+		$state = $this->load_state();
+
+		return $state['storage_index'];
+	}
+
+	/**
+	 * Update the storage index
+	 *
+	 * @param int $storage_index
+	 *
+	 * @return void
+	 */
+	public function set_storage_index(int $storage_index): void
+	{
+		$state = $this->load_state();
+
+		$state['storage_index'] = $storage_index;
+
+		$this->save_state($state);
+	}
+
+	/**
+	 * Get the current remove storage index
+	 *
+	 * @return int
+	 */
+	public function remove_storage_index(): int
+	{
+		$state = $this->load_state();
+
+		return $state['remove_storage_index'];
+	}
+
+	/**
+	 * Update the remove storage index
+	 *
+	 * @param int $storage_index
+	 *
+	 * @return void
+	 */
+	public function set_remove_storage_index(int $storage_index): void
+	{
+		$state = $this->load_state();
+
+		$state['remove_storage_index'] = $storage_index;
+
+		$this->save_state($state);
+	}
+
+	/**
+	 * Get the file index
+	 *
+	 * @return int
+	 */
+	public function file_index(): int
+	{
+		$state = $this->load_state();
+
+		return $state['file_index'];
+	}
+
+	/**
+	 * Set the file index
+	 *
+	 * @param int $file_index
+	 * @return void
+	 */
+	public function set_file_index(int $file_index): void
+	{
+		$state = $this->load_state();
+
+		$state['file_index'] = $file_index;
+
+		$this->save_state($state);
+	}
+
+	/**
+	 * Get the storage names to be updated
+	 *
+	 * @return array
+	 */
+	public function storages(): array
+	{
+		$state = $this->load_state();
+
+		return array_keys($state['storages']);
+	}
+
+	/**
+	 * Start a indexing or delete process.
+	 *
+	 * @param update_type $update_type
+	 * @param array $modified_storages
+	 * @param request $request
+	 *
+	 * @throws action_in_progress_exception  If there is an action in progress
+	 * @throws \JsonException
+	 */
+	public function init(update_type $update_type, array $modified_storages, request $request): void
+	{
+		// Is not possible to start a new process when there is one already running
+		if ($this->is_action_in_progress())
+		{
+			throw new action_in_progress_exception();
+		}
+
+		$state = [
+			// Save the value of the checkbox, to remove all files from the
+			// old storage once they have been successfully moved
+			'update_type' => $update_type->value,
+			'storages' => [],
+			'storage_index' => 0,
+			'file_index' => 0,
+			'remove_storage_index' => 0,
+		];
+
+		// Save in the state the selected storages and their new configuration
+		foreach ($modified_storages as $storage_name)
+		{
+			$state['storages'][$storage_name] = [];
+
+			$state['storages'][$storage_name]['provider'] = $request->variable([$storage_name, 'provider'], '');
+
+			$options = $this->provider_collection->get_by_class($request->variable([$storage_name, 'provider'], ''))->get_options();
+
+			foreach (array_keys($options) as $definition)
+			{
+				/** @psalm-suppress InvalidArrayOffset */
+				$state['storages'][$storage_name]['config'][$definition] = $request->variable([$storage_name, $definition], '');
+			}
+		}
+
+		$this->save_state($state);
+	}
+
+	/**
+	 * Clear the state
+	 *
+	 * @throws \JsonException
+	 */
+	public function clear_state(): void
+	{
+		$this->save_state();
+	}
+
+	/**
+	 * Load the state from the database
+	 *
+	 * @return array
+	 *
+	 * @throws no_action_in_progress_exception If there is no action in progress
+	 */
+	private function load_state(): array
+	{
+		// Is not possible to execute an action over state if is empty
+		if (!$this->is_action_in_progress())
+		{
+			throw new no_action_in_progress_exception();
+		}
+
+		return json_decode($this->config_text->get('storage_update_state'), true) ?? [];
+	}
+
+	/**
+	 * Save the specified state in the database
+	 *
+	 * @param array $state
+	 *
+	 * @throws \JsonException
+	 */
+	private function save_state(array $state = []): void
+	{
+		$this->config_text->set('storage_update_state', json_encode($state, JSON_THROW_ON_ERROR));
+	}
+}
diff --git a/phpBB/phpbb/storage/storage.php b/phpBB/phpbb/storage/storage.php
index 8e4620ab236..b07ea624416 100644
--- a/phpBB/phpbb/storage/storage.php
+++ b/phpBB/phpbb/storage/storage.php
@@ -13,9 +13,8 @@
 
 namespace phpbb\storage;
 
-use phpbb\cache\driver\driver_interface as cache;
-use phpbb\db\driver\driver_interface as db;
-use phpbb\storage\exception\exception;
+use phpbb\storage\adapter\adapter_interface;
+use phpbb\storage\exception\storage_exception;
 
 /**
  * Experimental
@@ -23,52 +22,37 @@
 class storage
 {
 	/**
-	 * @var \phpbb\storage\adapter\adapter_interface
+	 * @var adapter_interface
 	 */
 	protected $adapter;
 
 	/**
-	 * @var db
-	 */
-	protected $db;
-
-	/**
-	 * Cache driver
-	 * @var cache
-	 */
-	protected $cache;
-
-	/**
-	 * @var \phpbb\storage\adapter_factory
+	 * @var adapter_factory
 	 */
 	protected $factory;
 
 	/**
-	 * @var string
+	 * @var file_tracker
 	 */
-	protected $storage_name;
+	protected $file_tracker;
 
 	/**
 	 * @var string
 	 */
-	protected $storage_table;
+	protected $storage_name;
 
 	/**
 	 * Constructor
 	 *
-	 * @param db								$db
-	 * @param cache								$cache
-	 * @param \phpbb\storage\adapter_factory	$factory
+	 * @param adapter_factory 					$factory
+	 * @param file_tracker						$file_tracker
 	 * @param string							$storage_name
-	 * @param string							$storage_table
 	 */
-	public function __construct(db $db, cache $cache, adapter_factory $factory, $storage_name, $storage_table)
+	public function __construct(adapter_factory $factory, file_tracker $file_tracker, string $storage_name)
 	{
-		$this->db = $db;
-		$this->cache = $cache;
 		$this->factory = $factory;
+		$this->file_tracker = $file_tracker;
 		$this->storage_name = $storage_name;
-		$this->storage_table = $storage_table;
 	}
 
 	/**
@@ -76,7 +60,7 @@ public function __construct(db $db, cache $cache, adapter_factory $factory, $sto
 	 *
 	 * @return string
 	 */
-	public function get_name()
+	public function get_name(): string
 	{
 		return $this->storage_name;
 	}
@@ -84,9 +68,9 @@ public function get_name()
 	/**
 	 * Returns an adapter instance
 	 *
-	 * @return \phpbb\storage\adapter\adapter_interface
+	 * @return adapter_interface
 	 */
-	protected function get_adapter()
+	protected function get_adapter(): mixed
 	{
 		if ($this->adapter === null)
 		{
@@ -96,400 +80,124 @@ protected function get_adapter()
 		return $this->adapter;
 	}
 
-	/**
-	 * Dumps content into a file
-	 *
-	 * @param string	$path		The file to be written to.
-	 * @param string	$content		The data to write into the file.
-	 *
-	 * @throws exception	When the file already exists
-	 * 						When the file cannot be written
-	 */
-	public function put_contents($path, $content)
-	{
-		if ($this->exists($path))
-		{
-			throw new exception('STORAGE_FILE_EXISTS', $path);
-		}
-
-		$this->get_adapter()->put_contents($path, $content);
-		$this->track_file($path);
-	}
-
-	/**
-	 * Read the contents of a file
-	 *
-	 * @param string	$path	The file to read
-	 *
-	 * @throws exception	When the file doesn't exist
-	 * 						When cannot read file contents
-	 *
-	 * @return string	Returns file contents
-	 *
-	 */
-	public function get_contents($path)
-	{
-		if (!$this->exists($path))
-		{
-			throw new exception('STORAGE_FILE_NO_EXIST', $path);
-		}
-
-		return $this->get_adapter()->get_contents($path);
-	}
-
-	/**
-	 * Checks the existence of files or directories
-	 *
-	 * @param string	$path		file/directory to check
-	 * @param bool		$full_check	check in the filesystem too
-	 *
-	 * @return bool	Returns true if the file/directory exist, false otherwise
-	 */
-	public function exists($path, $full_check = false)
-	{
-		return ($this->is_tracked($path) && (!$full_check || $this->get_adapter()->exists($path)));
-	}
-
-	/**
-	 * Removes files or directories
-	 *
-	 * @param string	$path	file/directory to remove
-	 *
-	 * @throws exception	When removal fails
-	 *						When the file doesn't exist
-	 */
-	public function delete($path)
-	{
-		if (!$this->exists($path))
-		{
-			throw new exception('STORAGE_FILE_NO_EXIST', $path);
-		}
-
-		$this->get_adapter()->delete($path);
-		$this->untrack_file($path);
-	}
-
-	/**
-	 * Rename a file or a directory
-	 *
-	 * @param string	$path_orig	The original file/direcotry
-	 * @param string	$path_dest	The target file/directory
-	 *
-	 * @throws exception	When the file doesn't exist
-	 *						When target exists
-	 * 						When file/directory cannot be renamed
-	 */
-	public function rename($path_orig, $path_dest)
-	{
-		if (!$this->exists($path_orig))
-		{
-			throw new exception('STORAGE_FILE_NO_EXIST', $path_orig);
-		}
-
-		if ($this->exists($path_dest))
-		{
-			throw new exception('STORAGE_FILE_EXISTS', $path_dest);
-		}
-
-		$this->get_adapter()->rename($path_orig, $path_dest);
-		$this->track_rename($path_orig, $path_dest);
-	}
-
-	/**
-	 * Copies a file
-	 *
-	 * @param string	$path_orig	The original filename
-	 * @param string	$path_dest	The target filename
-	 *
-	 * @throws exception	When the file doesn't exist
-	 *						When target exists
-	 * 						When the file cannot be copied
-	 */
-	public function copy($path_orig, $path_dest)
-	{
-		if (!$this->exists($path_orig))
-		{
-			throw new exception('STORAGE_FILE_NO_EXIST', $path_orig);
-		}
-
-		if ($this->exists($path_dest))
-		{
-			throw new exception('STORAGE_FILE_EXISTS', $path_dest);
-		}
-
-		$this->get_adapter()->copy($path_orig, $path_dest);
-		$this->track_file($path_dest);
-	}
-
 	/**
 	 * Reads a file as a stream
 	 *
-	 * @param string	$path	File to read
+	 * @param string $path	File to read
 	 *
-	 * @throws exception	When the file doesn't exist
+	 * @return resource    Returns a file pointer
+	 * @throws storage_exception	When the file doesn't exist
 	 *						When unable to open file
 	 *
-	 * @return resource	Returns a file pointer
 	 */
-	public function read_stream($path)
+	public function read(string $path)
 	{
 		if (!$this->exists($path))
 		{
-			throw new exception('STORAGE_FILE_NO_EXIST', $path);
+			throw new storage_exception('STORAGE_FILE_NO_EXIST', $path);
 		}
 
-		$stream = null;
-		$adapter = $this->get_adapter();
-
-		if ($adapter instanceof stream_interface)
-		{
-			$stream = $adapter->read_stream($path);
-		}
-		else
-		{
-			// Simulate the stream
-			$stream = fopen('php://temp', 'w+b');
-			fwrite($stream, $adapter->get_contents($path));
-			rewind($stream);
-		}
-
-		return $stream;
+		return $this->get_adapter()->read($path);
 	}
 
 	/**
 	 * Writes a new file using a stream
 	 *
-	 * @param string	$path		The target file
+	 * @param string $path		The target file
 	 * @param resource	$resource	The resource
 	 *
-	 * @throws exception	When the file exist
+	 * @throws storage_exception    When the file exist
 	 *						When target file cannot be created
 	 */
-	public function write_stream($path, $resource)
+	public function write(string $path, $resource): void
 	{
 		if ($this->exists($path))
 		{
-			throw new exception('STORAGE_FILE_EXISTS', $path);
+			throw new storage_exception('STORAGE_FILE_EXISTS', $path);
 		}
 
 		if (!is_resource($resource))
 		{
-			throw new exception('STORAGE_INVALID_RESOURCE');
+			throw new storage_exception('STORAGE_INVALID_RESOURCE');
 		}
 
-		$adapter = $this->get_adapter();
-
-		if ($adapter instanceof stream_interface)
-		{
-			$adapter->write_stream($path, $resource);
-			$this->track_file($path);
-		}
-		else
-		{
-			// Simulate the stream
-			$adapter->put_contents($path, stream_get_contents($resource));
-		}
+		$size = $this->get_adapter()->write($path, $resource);
+		$this->file_tracker->track_file($this->storage_name, $path, $size);
 	}
 
 	/**
-	 * Track file in database
+	 * Removes files or directories
 	 *
-	 * @param string	$path		The target file
-	 * @param bool		$update		Update file size when already tracked
+	 * @param string $path	file/directory to remove
+	 *
+	 * @throws storage_exception    When removal fails
+	 *						When the file doesn't exist
 	 */
-	public function track_file($path, $update = false)
+	public function delete(string $path): void
 	{
-		if (!$this->get_adapter()->exists($path))
-		{
-			throw new exception('STORAGE_FILE_NO_EXIST', $path);
-		}
-
-		$sql_ary = array(
-			'file_path'		=> $path,
-			'storage'		=> $this->get_name(),
-		);
-
-		// Get file, if exist update filesize, if not add new record
-		$sql = 'SELECT * FROM ' .  $this->storage_table . '
-				WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary);
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			// Don't call the file_info method, because it check's if the file is tracked
-			// and is not (for now). This method check if the file exists using the adapter
-			// at the beginning.
-			$file = new file_info($this->get_adapter(), $path);
-			$sql_ary['filesize'] = $file->size;
-
-			$sql = 'INSERT INTO ' . $this->storage_table . $this->db->sql_build_array('INSERT', $sql_ary);
-			$this->db->sql_query($sql);
-		}
-		else if ($update)
+		if (!$this->exists($path))
 		{
-			$file = $this->file_info($path);
-			$sql = 'UPDATE ' . $this->storage_table . '
-				SET filesize = ' . $file->size . '
-				WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary);
-			$this->db->sql_query($sql);
+			throw new storage_exception('STORAGE_FILE_NO_EXIST', $path);
 		}
 
-		$this->cache->destroy('_storage_' . $this->get_name() . '_totalsize');
-		$this->cache->destroy('_storage_' . $this->get_name() . '_numfiles');
-	}
-
-	/**
-	 * Untrack file
-	 *
-	 * @param string	$path		The target file
-	 */
-	public function untrack_file($path)
-	{
-		$sql_ary = array(
-			'file_path'		=> $path,
-			'storage'		=> $this->get_name(),
-		);
-
-		$sql = 'DELETE FROM ' . $this->storage_table . '
-			WHERE ' . $this->db->sql_build_array('DELETE', $sql_ary);
-		$this->db->sql_query($sql);
-
-		$this->cache->destroy('_storage_' . $this->get_name() . '_totalsize');
-		$this->cache->destroy('_storage_' . $this->get_name() . '_numfiles');
+		$this->get_adapter()->delete($path);
+		$this->file_tracker->untrack_file($this->get_name(), $path);
 	}
 
 	/**
-	 * Check if a file is tracked
-	 *
-	 * @param string	$path	The file
+	 * Checks the existence of files or directories
 	 *
-	 * @return bool	True if file is tracked
-	 */
-	public function is_tracked($path)
-	{
-		$sql_ary = array(
-			'file_path'		=> $path,
-			'storage'		=> $this->get_name(),
-		);
-
-		$sql = 'SELECT file_id FROM ' .  $this->storage_table . '
-				WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary);
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		return ($row) ? true : false;
-	}
-
-	/**
-	 * Rename tracked file
+	 * @param string	$path		file/directory to check
 	 *
-	 * @param string	$path_orig	The original file/direcotry
-	 * @param string	$path_dest	The target file/directory
+	 * @return bool	Returns true if the file/directory exist, false otherwise
 	 */
-	protected function track_rename($path_orig, $path_dest)
+	public function exists(string $path): bool
 	{
-		$sql = 'UPDATE ' . $this->storage_table . "
-			SET file_path = '" . $this->db->sql_escape($path_dest) . "'
-			WHERE file_path = '" . $this->db->sql_escape($path_orig) . "'
-				AND storage = '" . $this->db->sql_escape($this->get_name()) . "'";
-		$this->db->sql_query($sql);
+		return $this->file_tracker->is_tracked($this->get_name(), $path);
 	}
 
 	/**
-	 * Get file info
-	 *
-	 * @param string	$path	The file
+	 * Get file size in bytes
 	 *
-	 * @throws exception    When the adapter doesn't implement the method
-	 *													When the file doesn't exist
+	 * @param string $path The file
 	 *
-	 * @return \phpbb\storage\file_info	Returns file_info object
+	 * @return int Size in bytes.
 	 */
-	public function file_info($path)
+	public function file_size(string $path): int
 	{
-		if (!$this->exists($path))
-		{
-			throw new exception('STORAGE_FILE_NO_EXIST', $path);
-		}
-
-		return new file_info($this->get_adapter(), $path);
+		return $this->file_tracker->file_size($this->get_name(), $path);
 	}
 
 	/**
-	 * Get direct link
-	 *
-	 * @param string	$path	The file
-	 *
-	 * @return string	Returns link.
+	 * Return the number of files stored in this storage
 	 *
+	 * @return int Number of files.
 	 */
-	public function get_link($path)
+	public function total_files(): int
 	{
-		return $this->get_adapter()->get_link($path);
+		return $this->file_tracker->total_files($this->get_name());
 	}
 
 	/**
 	 * Get total storage size
 	 *
-	 * @return int	Size in bytes
+	 * @return float	Size in bytes
 	 */
-	public function get_size()
+	public function total_size(): float
 	{
-		$total_size = $this->cache->get('_storage_' . $this->get_name() . '_totalsize');
-
-		if ($total_size === false)
-		{
-			$sql = 'SELECT SUM(filesize) AS totalsize
-				FROM ' .  $this->storage_table . "
-				WHERE storage = '" . $this->db->sql_escape($this->get_name()) . "'";
-			$result = $this->db->sql_query($sql);
-
-			$total_size = (int) $this->db->sql_fetchfield('totalsize');
-			$this->cache->put('_storage_' . $this->get_name() . '_totalsize', $total_size);
-
-			$this->db->sql_freeresult($result);
-		}
-
-		return (int) $total_size;
-	}
-
-	/**
-	 * Get number of storage files
-	 *
-	 * @return int	Number of files
-	 */
-	public function get_num_files()
-	{
-		$number_files = $this->cache->get('_storage_' . $this->get_name() . '_numfiles');
-
-		if ($number_files === false)
-		{
-			$sql = 'SELECT COUNT(file_id) AS numfiles
-				FROM ' .  $this->storage_table . "
-				WHERE storage = '" . $this->db->sql_escape($this->get_name()) . "'";
-			$result = $this->db->sql_query($sql);
-
-			$number_files = (int) $this->db->sql_fetchfield('numfiles');
-			$this->cache->put('_storage_' . $this->get_name() . '_numfiles', $number_files);
-
-			$this->db->sql_freeresult($result);
-		}
-
-		return (int) $number_files;
+		return $this->file_tracker->total_size($this->get_name());
 	}
 
 	/**
 	 * Get space available in bytes
 	 *
-	 * @throws exception		When unable to retrieve available storage space
+	 * @return float    Returns available space
+	 * @throws storage_exception		When unable to retrieve available storage space
 	 *
-	 * @return float	Returns available space
 	 */
 	public function free_space()
 	{
 		return $this->get_adapter()->free_space();
 	}
+
 }
diff --git a/phpBB/phpbb/storage/stream_interface.php b/phpBB/phpbb/storage/stream_interface.php
deleted file mode 100644
index 9687a2d9109..00000000000
--- a/phpBB/phpbb/storage/stream_interface.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-namespace phpbb\storage;
-
-use phpbb\storage\exception\exception;
-
-interface stream_interface
-{
-	/**
-	 * Reads a file as a stream
-	 *
-	 * @param string $path File to read
-	 *
-	 * @return resource Returns a file pointer
-	 * @throws exception When unable to open file
-	 */
-	public function read_stream(string $path);
-
-	/**
-	 * Writes a new file using a stream
-	 *
-	 * @param string $path The target file
-	 * @param resource $resource The resource
-	 *
-	 * @return void
-	 * @throws exception When target file exists
-	 * When target file cannot be created
-	 */
-	public function write_stream(string $path, $resource): void;
-}
diff --git a/phpBB/phpbb/storage/update_type.php b/phpBB/phpbb/storage/update_type.php
new file mode 100644
index 00000000000..32f25ad13d9
--- /dev/null
+++ b/phpBB/phpbb/storage/update_type.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\storage;
+
+enum update_type: int
+{
+	case CONFIG = 0;
+	case COPY = 1;
+	case MOVE = 2;
+}
diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php
index 68d3e9ad899..68351076fd9 100644
--- a/phpBB/phpbb/template/twig/environment.php
+++ b/phpBB/phpbb/template/twig/environment.php
@@ -66,7 +66,7 @@ class environment extends \Twig\Environment
 	* @param dispatcher_interface|null	$phpbb_dispatcher	Event dispatcher object
 	* @param array $options Array of options to pass to Twig
 	*/
-	public function __construct(assets_bag $assets_bag, config $phpbb_config, filesystem $filesystem, path_helper $path_helper, $cache_path, manager $extension_manager = null, LoaderInterface $loader = null, dispatcher_interface $phpbb_dispatcher = null, $options = array())
+	public function __construct(assets_bag $assets_bag, config $phpbb_config, filesystem $filesystem, path_helper $path_helper, $cache_path, manager|null $extension_manager = null, LoaderInterface|null $loader = null, dispatcher_interface|null $phpbb_dispatcher = null, $options = array())
 	{
 		$this->phpbb_config = $phpbb_config;
 
@@ -161,6 +161,16 @@ public function get_assets_bag()
 		return $this->assets_bag;
 	}
 
+	/**
+	 * Gets the event dispatcher instance
+	 *
+	 * @return dispatcher_interface
+	 */
+	public function get_phpbb_dispatcher()
+	{
+		return $this->phpbb_dispatcher;
+	}
+
 	/**
 	* Get the namespace look up order
 	*
@@ -271,7 +281,7 @@ private function inject_assets($output, $placeholder_salt)
 	* @return \Twig\Template A template instance representing the given template name
 	* @throws \Twig\Error\LoaderError
 	*/
-	public function loadTemplate(string $cls, string $name, int $index = null) : \Twig\Template
+	public function loadTemplate(string $cls, string $name, int|null $index = null) : \Twig\Template
 	{
 		if (strpos($name, '@') === false)
 		{
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
index 2e920dbe4be..982601e41bd 100644
--- a/phpBB/phpbb/template/twig/extension.php
+++ b/phpBB/phpbb/template/twig/extension.php
@@ -14,6 +14,8 @@
 namespace phpbb\template\twig;
 
 use Twig\Error\RuntimeError;
+use Twig\Extension\CoreExtension;
+use Twig\Runtime\EscaperRuntime;
 
 class extension extends \Twig\Extension\AbstractExtension
 {
@@ -93,6 +95,7 @@ public function getFunctions()
 			new \Twig\TwigFunction('lang', array($this, 'lang')),
 			new \Twig\TwigFunction('lang_defined', array($this, 'lang_defined')),
 			new \Twig\TwigFunction('lang_js', [$this, 'lang_js']),
+			new \Twig\TwigFunction('lang_raw', [$this, 'lang_raw']),
 			new \Twig\TwigFunction('get_class', 'get_class'),
 		);
 	}
@@ -163,7 +166,7 @@ public function loop_subset(\Twig\Environment $env, $item, $start, $end = null,
 		// We always include the last element (this was the past design)
 		$end = ($end == -1 || $end === null) ? null : $end + 1;
 
-		return twig_slice($env, $item, $start, $end, $preserveKeys);
+		return CoreExtension::slice($env->getCharset(), $item, $start, $end, $preserveKeys);
 	}
 
 	/**
@@ -212,6 +215,18 @@ public function lang_js(): string
 	{
 		$args = func_get_args();
 
-		return twig_escape_filter($this->environment, call_user_func_array([$this, 'lang'], $args), 'js');
+		return $this->environment->getRuntime(EscaperRuntime::class)->escape(call_user_func_array([$this, 'lang'], $args), 'js');
+	}
+
+	/**
+	 * Get raw value associated with lang key
+	 *
+	 * @param string $key
+	 *
+	 * @return array|string Raw value associated with lang key
+	 */
+	public function lang_raw(string $key): array|string
+	{
+		return call_user_func_array(array($this->language, 'lang_raw'), [$key]);
 	}
 }
diff --git a/phpBB/phpbb/template/twig/extension/avatar.php b/phpBB/phpbb/template/twig/extension/avatar.php
index fb7ec92655f..753fa07b257 100644
--- a/phpBB/phpbb/template/twig/extension/avatar.php
+++ b/phpBB/phpbb/template/twig/extension/avatar.php
@@ -13,16 +13,35 @@
 
 namespace phpbb\template\twig\extension;
 
+use phpbb\avatar\helper;
+use phpbb\template\twig\environment;
+use Twig\Error\Error;
 use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 
 class avatar extends AbstractExtension
 {
+	/**
+	 * @var helper
+	 */
+	private $avatar_helper;
+
+	/**
+	 * Constructor for avatar extension
+	 *
+	 * @param helper $avatar_helper
+	 */
+	public function __construct(helper $avatar_helper)
+	{
+		$this->avatar_helper = $avatar_helper;
+	}
+
 	/**
 	 * Get the name of this extension
 	 *
 	 * @return string
 	 */
-	public function getName()
+	public function getName(): string
 	{
 		return 'avatar';
 	}
@@ -30,53 +49,48 @@ public function getName()
 	/**
 	 * Returns a list of global functions to add to the existing list.
 	 *
-	 * @return \Twig\TwigFunction[] An array of global functions
+	 * @return TwigFunction[] An array of global functions
 	 */
 	public function getFunctions(): array
 	{
-		return array(
-			new \Twig\TwigFunction('avatar', array($this, 'get_avatar')),
-		);
+		return [
+			new TwigFunction('avatar', [$this, 'get_avatar'], ['needs_environment' => true]),
+		];
 	}
 
 	/**
 	 * Get avatar for placing into templates.
 	 *
 	 * How to use in a template:
-	 * - {{ avatar('mode', row, alt, ignore_config, lazy) }}
+	 * - {{ avatar(row, alt, ignore_config, lazy) }}
 	 *
 	 * The mode and row (group_row or user_row) are required.
 	 * The other fields (alt|ignore_config|lazy) are optional.
 	 *
-	 * @uses \phpbb_get_group_avatar()
-	 * @uses \phpbb_get_user_avatar()
-	 *
 	 * @return string	The avatar HTML for the specified mode
 	 */
-	public function get_avatar()
+	public function get_avatar(environment $environment, array $row): string
 	{
-		$args = func_get_args();
-
-		$mode = (string) $args[0];
-		$row = (array) $args[1];
-		$alt = isset($args[2]) ? (string) $args[2] : false;
-		$ignore_config = isset($args[3]) ? (bool) $args[3] : false;
-		$lazy = isset($args[4]) ? (bool) $args[4] : false;
-
-		// To prevent having to redefine alt attribute ('USER_AVATAR'|'GROUP_AVATAR'), we check if an alternative has been provided
-		switch ($mode)
+		try
 		{
-			case 'group':
-				return $alt ? phpbb_get_group_avatar($row, $alt, $ignore_config, $lazy) : phpbb_get_group_avatar($row);
-			break;
-
-			case 'user':
-				return $alt ? phpbb_get_user_avatar($row, $alt, $ignore_config, $lazy) : phpbb_get_user_avatar($row);
-			break;
-
-			default:
+			// Quickly return if required data is missing
+			if (!isset($row['src'], $row['width'], $row['height'], $row['title']))
+			{
 				return '';
-			break;
+			}
+
+			return $environment->render('macros/avatar.twig', [
+				'SRC'		=> !empty($row['lazy']) ? $this->avatar_helper->get_no_avatar_source() : $row['src'],
+				'DATA_SRC'	=> !empty($row['lazy']) ? $row['src'] : '',
+				'WIDTH'		=> $row['width'],
+				'HEIGHT'	=> $row['height'],
+				'TITLE'		=> $row['title'],
+				'LAZY'		=> $row['lazy'] ?? false,
+			]);
+		}
+		catch (Error $e)
+		{
+			return '';
 		}
 	}
 }
diff --git a/phpBB/phpbb/template/twig/extension/forms.php b/phpBB/phpbb/template/twig/extension/forms.php
index 4d8de94b9d3..bf1bed006e9 100644
--- a/phpBB/phpbb/template/twig/extension/forms.php
+++ b/phpBB/phpbb/template/twig/extension/forms.php
@@ -129,6 +129,7 @@ public function input(environment $environment, array $form_data): string
 				'MAX'		=> (int) ($form_data['max'] ?? 0),
 				'STEP'		=> (int) ($form_data['step'] ?? 0),
 				'CHECKED'	=> (bool) ($form_data['checked'] ?? false),
+				'DISABLED'	=> (bool) ($form_data['disabled'] ?? false),
 				'VALUE'		=> (string) ($form_data['value']),
 			]);
 		}
@@ -151,10 +152,7 @@ public function radio_buttons(environment $environment, array $form_data): strin
 		try
 		{
 			return $environment->render('macros/forms/radio_buttons.twig', [
-				'FIRST_BUTTON'			=> $form_data['buttons'][0],
-				'FIRST_BUTTON_LABEL'	=> $form_data['buttons'][0]['label'],
-				'SECOND_BUTTON'			=> $form_data['buttons'][1],
-				'SECOND_BUTTON_LABEL'	=> $form_data['buttons'][1]['label'],
+				'BUTTONS'	=>	$form_data['buttons'],
 			]);
 		}
 		catch (\Twig\Error\Error $e)
@@ -179,12 +177,13 @@ public function select(environment $environment, array $form_data): string
 				'CLASS'			=> (string) ($form_data['class'] ?? ''),
 				'ID'			=> (string) ($form_data['id'] ?? ''),
 				'DATA'			=> $form_data['data'] ?? [],
-				'NAME'			=> (string) $form_data['name'],
+				'NAME'			=> (string) ($form_data['name'] ?? ''),
 				'TOGGLEABLE'	=> (bool) ($form_data['toggleable'] ?? false),
 				'OPTIONS'		=> $form_data['options'] ?? [],
 				'GROUP_ONLY'	=> (bool) ($form_data['group_only'] ?? false),
 				'SIZE'			=> (int) ($form_data['size'] ?? 0),
 				'MULTIPLE'		=> (bool) ($form_data['multiple'] ?? false),
+				'ONCHANGE'		=> (string) ($form_data['onchange'] ?? ''),
 			]);
 		}
 		catch (\Twig\Error\Error $e)
@@ -206,13 +205,14 @@ public function textarea(environment $environment, array $form_data): string
 		try
 		{
 			return $environment->render('macros/forms/textarea.twig', [
-				'CLASS'			=> (string) ($form_data['class'] ?? ''),
-				'ID'		=> (string) $form_data['id'],
-				'DATA'			=> $form_data['data'] ?? [],
+				'CLASS'		=> (string) ($form_data['class'] ?? ''),
+				'ID'		=> (string) ($form_data['id'] ?? ''),
+				'DATA'		=> $form_data['data'] ?? [],
 				'NAME'		=> (string) $form_data['name'],
-				'ROWS'		=> (int) $form_data['rows'],
-				'COLS'		=> (int) $form_data['cols'],
-				'CONTENT'	=> (string) $form_data['content'],
+				'ROWS'		=> (int) ($form_data['rows'] ?? ''),
+				'COLS'		=> (int) ($form_data['cols'] ?? ''),
+				'CONTENT'	=> (string) ($form_data['content'] ?? ''),
+				'PLACEHOLDER'	=> (string) ($form_data['placeholder'] ?? ''),
 			]);
 		}
 		catch (\Twig\Error\Error $e)
diff --git a/phpBB/phpbb/template/twig/extension/icon.php b/phpBB/phpbb/template/twig/extension/icon.php
index 8edd33bbc7d..e43780377c6 100644
--- a/phpBB/phpbb/template/twig/extension/icon.php
+++ b/phpBB/phpbb/template/twig/extension/icon.php
@@ -269,7 +269,7 @@ protected function prepare_svg(\Twig\TemplateWrapper $file, &$view_box = '')
 		$string = $doc->saveHTML();
 		$string = preg_replace('/\s+/', ' ', $string);
 
-		return $string;
+		return $string ?: '';
 	}
 
 	/**
@@ -280,7 +280,7 @@ protected function prepare_svg(\Twig\TemplateWrapper $file, &$view_box = '')
 	 *
 	 * {{ Icon('font', {
 	 * 		'bullhorn': topicrow.S_POST_GLOBAL or topicrow.S_POST_ANNOUNCE,
-	 * 		'star': topicrow.S_POST_STICKY,
+	 * 		'thumbtack': topicrow.S_POST_STICKY,
 	 * 		'lock': topicrow.S_TOPIC_LOCKED,
 	 * 		'fire': topicrow.S_TOPIC_HOT,
 	 * 		'file': true,
diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index 1d07bb2a991..ea43740d161 100644
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -139,7 +139,7 @@ protected function strip_surrounding_quotes($tokens, $code)
 		// E.g. 'asdf'"' -> asdf'"
 		// E.g. "asdf'"" -> asdf'"
 		// E.g. 'asdf'" -> 'asdf'"
-		return preg_replace('#<!-- (' . implode('|', $tokens) . ') (([\'"])?(.*?)\1) -->#', '<!-- $1 $2 -->', $code);
+		return preg_replace('#<!-- (' . implode('|', $tokens) . ') (([\'"])?(.*?)\1) -->#', '<!-- $1 $2 -->', $code) ?: '';
 	}
 
 	/**
@@ -162,7 +162,7 @@ protected function fix_inline_variable_tokens($tokens, $code)
 			return "<!-- {$matches[1]} {$matches[2]} -->";
 		};
 
-		return preg_replace_callback('#<!-- (' . implode('|', $tokens) . ') (.+?) -->#', $callback, $code);
+		return preg_replace_callback('#<!-- (' . implode('|', $tokens) . ') (.+?) -->#', $callback, $code) ?: '';
 	}
 
 	/**
@@ -177,7 +177,7 @@ protected function fix_inline_variable_tokens($tokens, $code)
 	*/
 	protected function add_surrounding_quotes($tokens, $code)
 	{
-		return preg_replace('#<!-- (' . implode('|', $tokens) . ') (.+?) -->#', '<!-- $1 \'$2\' -->', $code);
+		return preg_replace('#<!-- (' . implode('|', $tokens) . ') (.+?) -->#', '<!-- $1 \'$2\' -->', $code) ?: '';
 	}
 
 	/**
@@ -253,7 +253,7 @@ public function fix_begin_tokens($code, $parent_nodes = array())
 			return "{% for {$name} in {$parent}{$name}{$subset} %}{$body}{% endfor %}";
 		};
 
-		return preg_replace_callback('#<!-- BEGIN ((?:[a-zA-Z0-9_]+\.)*)([!a-zA-Z0-9_]+)(\([0-9,\-]+\))? -->(.+?)<!-- END \1\2 -->#s', $callback, $code);
+		return preg_replace_callback('#<!-- BEGIN ((?:[a-zA-Z0-9_]+\.)*)([!a-zA-Z0-9_]+)(\([0-9,\-]+\))? -->(.+?)<!-- END \1\2 -->#s', $callback, $code) ?: '';
 	}
 
 	/**
@@ -285,7 +285,7 @@ protected function fix_if_tokens($code)
 			return "<!-- {$matches[1]}IF{$inner}-->";
 		};
 
-		return preg_replace_callback('#<!-- (ELSE)?IF((.*?) (?:\(*!?[\$|\.]([^\s]+)(.*?))?)-->#', $callback, $code);
+		return preg_replace_callback('#<!-- (ELSE)?IF((.*?) (?:\(*!?[\$|\.]([^\s]+)(.*?))?)-->#', $callback, $code) ?: '';
 	}
 
 	/**
@@ -320,7 +320,7 @@ protected function fix_define_tokens($code)
 		// Replace all of our variables, ~ $VARNAME ~, with Twig style, ~ definition.VARNAME ~
 		$code = preg_replace('#~ \$([a-zA-Z0-9_\.]+) ~#', '~ definition.$1 ~', $code);
 
-		return $code;
+		return $code ?: '';
 	}
 
 	/**
@@ -330,7 +330,7 @@ protected function fix_define_tokens($code)
 	*
 	* @param string $code
 	* @param array $twig_tags All tags we want to create a mask for
-	* @return string
+	* @return null|string
 	*/
 	protected function replace_twig_tag_masks($code, $twig_tags)
 	{
diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 4eddcbcf388..1334fe2ad27 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -24,9 +24,13 @@ class event extends \Twig\Node\Node
 	/** @var \phpbb\template\twig\environment */
 	protected $environment;
 
-	public function __construct(\Twig\Node\Expression\AbstractExpression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
+	/** @var array */
+	protected $template_event_priority_array;
+
+	public function __construct(\Twig\Node\Expression\AbstractExpression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null, $template_event_priority_array = [])
 	{
 		$this->environment = $environment;
+		$this->template_event_priority_array = $template_event_priority_array;
 
 		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
 	}
@@ -42,10 +46,20 @@ public function compile(\Twig\Compiler $compiler)
 
 		$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name');
 
+		$template_event_listeners = [];
+
+		// Group and sort extension template events in according to their priority (0 by default if not set)
 		foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
 		{
 			$ext_namespace = str_replace('/', '_', $ext_namespace);
+			$priority_key = intval($this->template_event_priority_array[$ext_namespace][$location] ?? 0);
+			$template_event_listeners[$priority_key][] = $ext_namespace;
+		}
+		krsort($template_event_listeners);
 
+		$template_event_listeners = array_merge(...$template_event_listeners);
+		foreach ($template_event_listeners as $ext_namespace)
+		{
 			if ($this->environment->isDebug())
 			{
 				// If debug mode is enabled, lets check for new/removed EVENT
@@ -54,8 +68,7 @@ public function compile(\Twig\Compiler $compiler)
 				//  purge the cache when a new event template file is added)
 				$compiler
 					->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
-					->indent()
-				;
+					->indent();
 			}
 
 			if ($this->environment->isDebug() || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
@@ -66,16 +79,14 @@ public function compile(\Twig\Compiler $compiler)
 					// We set the namespace lookup order to be this extension first, then the main path
 					->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
 					->write("\$this->env->loadTemplate(\$this->env->getTemplateClass('@{$ext_namespace}/{$location}.html'), '@{$ext_namespace}/{$location}.html')->display(\$context);\n")
-					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
-				;
+					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n");
 			}
 
 			if ($this->environment->isDebug())
 			{
 				$compiler
 					->outdent()
-					->write("}\n\n")
-				;
+					->write("}\n\n");
 			}
 		}
 	}
diff --git a/phpBB/phpbb/template/twig/tokenparser/defineparser.php b/phpBB/phpbb/template/twig/tokenparser/defineparser.php
index ce394c08963..7ab37bb1265 100644
--- a/phpBB/phpbb/template/twig/tokenparser/defineparser.php
+++ b/phpBB/phpbb/template/twig/tokenparser/defineparser.php
@@ -28,15 +28,16 @@ public function parse(\Twig\Token $token)
 	{
 		$lineno = $token->getLine();
 		$stream = $this->parser->getStream();
-		$name = $this->parser->getExpressionParser()->parseExpression();
+
+		$nameToken = $stream->expect(\Twig\Token::NAME_TYPE);
+		$name = new \Twig\Node\Expression\Variable\ContextVariable($nameToken->getValue(), $nameToken->getLine());
 
 		$capture = false;
-		if ($stream->test(\Twig\Token::OPERATOR_TYPE, '='))
+		if ($stream->nextIf(\Twig\Token::OPERATOR_TYPE, '='))
 		{
-			$stream->next();
-			$value = $this->parser->getExpressionParser()->parseExpression();
+			$value = $this->parser->parseExpression();
 
-			if ($value instanceof \Twig\Node\Expression\NameExpression)
+			if ($value instanceof \Twig\Node\Expression\Variable\ContextVariable)
 			{
 				// This would happen if someone improperly formed their DEFINE syntax
 				// e.g. <!-- DEFINE $VAR = foo -->
diff --git a/phpBB/phpbb/template/twig/tokenparser/event.php b/phpBB/phpbb/template/twig/tokenparser/event.php
index 7b9742cc956..d5a6cd46e34 100644
--- a/phpBB/phpbb/template/twig/tokenparser/event.php
+++ b/phpBB/phpbb/template/twig/tokenparser/event.php
@@ -18,6 +18,9 @@ class event extends \Twig\TokenParser\AbstractTokenParser
 	/** @var \phpbb\template\twig\environment */
 	protected $environment;
 
+	/** @var array */
+	protected $template_event_priority_array;
+
 	/**
 	* Constructor
 	*
@@ -26,6 +29,25 @@ class event extends \Twig\TokenParser\AbstractTokenParser
 	public function __construct(\phpbb\template\twig\environment $environment)
 	{
 		$this->environment = $environment;
+		$phpbb_dispatcher = $this->environment->get_phpbb_dispatcher();
+
+		$template_event_priority_array = [];
+		/**
+		 * Allows assigning priority to template event listeners
+		 *
+		 * @event core.twig_event_tokenparser_constructor
+		 * @var	array	template_event_priority_array	Array with template event priority assignments per extension namespace
+		 *
+		 * @since 4.0.0-a1
+		 */
+		if ($phpbb_dispatcher)
+		{
+			$vars = ['template_event_priority_array'];
+			extract($phpbb_dispatcher->trigger_event('core.twig_event_tokenparser_constructor', compact($vars)));
+		}
+
+		$this->template_event_priority_array = $template_event_priority_array;
+		unset($template_event_priority_array);
 	}
 
 	/**
@@ -42,7 +64,7 @@ public function parse(\Twig\Token $token)
 		$stream = $this->parser->getStream();
 		$stream->expect(\Twig\Token::BLOCK_END_TYPE);
 
-		return new \phpbb\template\twig\node\event($expr, $this->environment, $token->getLine(), $this->getTag());
+		return new \phpbb\template\twig\node\event($expr, $this->environment, $token->getLine(), $this->getTag(), $this->template_event_priority_array);
 	}
 
 	/**
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index 1259618175c..f9c45a57fe8 100644
--- a/phpBB/phpbb/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
@@ -70,9 +70,9 @@ public function __construct(
 		\phpbb\template\context $context,
 		environment $twig_environment,
 		$cache_path,
-		\phpbb\user $user = null,
+		\phpbb\user|null $user = null,
 		$extensions = [],
-		\phpbb\extension\manager $extension_manager = null
+		\phpbb\extension\manager|null $extension_manager = null
 	)
 	{
 		$this->path_helper = $path_helper;
@@ -88,7 +88,10 @@ public function __construct(
 
 		foreach ($extensions as $extension)
 		{
-			$this->twig->addExtension($extension);
+			if (!$this->twig->hasExtension(get_class($extension)))
+			{
+				$this->twig->addExtension($extension);
+			}
 		}
 
 		// Add admin namespace
diff --git a/phpBB/phpbb/textformatter/parser_interface.php b/phpBB/phpbb/textformatter/parser_interface.php
index ad611fb5b46..1430bfd5d38 100644
--- a/phpBB/phpbb/textformatter/parser_interface.php
+++ b/phpBB/phpbb/textformatter/parser_interface.php
@@ -91,8 +91,6 @@ public function get_errors();
 	* Set a variable to be used by the parser
 	*
 	*  - max_font_size
-	*  - max_img_height
-	*  - max_img_width
 	*  - max_smilies
 	*  - max_urls
 	*
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index 7195f959152..ecb36fb7e98 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -355,20 +355,10 @@ function ($m)
 		// Register some vars with a default value. Those should be set at runtime by whatever calls
 		// the parser
 		$configurator->registeredVars['max_font_size'] = 0;
-		$configurator->registeredVars['max_img_height'] = 0;
-		$configurator->registeredVars['max_img_width'] = 0;
 
 		// Load the Emoji plugin and modify its tag's template to obey viewsmilies
 		$tag = $configurator->Emoji->getTag();
-		$tag->template = '<xsl:choose>
-			<xsl:when test="@tseq">
-				<img alt="{.}" class="emoji" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/{@tseq}.svg"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<img alt="{.}" class="emoji" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/{@seq}.svg"/>
-			</xsl:otherwise>
-		</xsl:choose>';
-		$tag->template = '<xsl:choose><xsl:when test="$S_VIEWSMILIES">' . str_replace('class="emoji"', 'class="emoji smilies"', $tag->template) . '</xsl:when><xsl:otherwise><xsl:value-of select="."/></xsl:otherwise></xsl:choose>';
+		$tag->template = '<span class="emoji"><xsl:value-of select="."/></span>';
 
 		/**
 		* Modify the s9e\TextFormatter configurator after the default settings are set
@@ -657,7 +647,7 @@ protected function merge_templates(array $style_templates)
 		// Return the template as-is if there's only one style or all styles share the same template
 		if (count(array_unique($style_templates)) === 1)
 		{
-			return end($style_templates);
+			return end($style_templates) ?: '';
 		}
 
 		// Group identical templates together
diff --git a/phpBB/phpbb/textformatter/s9e/renderer.php b/phpBB/phpbb/textformatter/s9e/renderer.php
index bdd3aa89c17..040605d26b8 100644
--- a/phpBB/phpbb/textformatter/s9e/renderer.php
+++ b/phpBB/phpbb/textformatter/s9e/renderer.php
@@ -13,6 +13,10 @@
 
 namespace phpbb\textformatter\s9e;
 
+use phpbb\auth\auth;
+use phpbb\config\config;
+use phpbb\user;
+
 /**
 * s9e\TextFormatter\Renderer adapter
 */
@@ -146,11 +150,11 @@ public function configure_quote_helper(quote_helper $quote_helper)
 	/**
 	* Automatically set the smilies path based on config
 	*
-	* @param  \phpbb\config\config $config
+	* @param  config $config
 	* @param  \phpbb\path_helper   $path_helper
 	* @return void
 	*/
-	public function configure_smilies_path(\phpbb\config\config $config, \phpbb\path_helper $path_helper)
+	public function configure_smilies_path(config $config, \phpbb\path_helper $path_helper)
 	{
 		/**
 		* @see smiley_text()
@@ -165,12 +169,12 @@ public function configure_smilies_path(\phpbb\config\config $config, \phpbb\path
 	*
 	* Should set the locale as well as the viewcensor/viewimg/viewsmilies options.
 	*
-	* @param  \phpbb\user          $user
-	* @param  \phpbb\config\config $config
-	* @param  \phpbb\auth\auth     $auth
+	* @param auth $auth
+	* @param config $config
+	* @param user $user
 	* @return void
 	*/
-	public function configure_user(\phpbb\user $user, \phpbb\config\config $config, \phpbb\auth\auth $auth)
+	public function configure_user(auth $auth, config $config, user $user): void
 	{
 		$censor = $user->optionget('viewcensors') || !$config['allow_nocensors'] || !$auth->acl_get('u_chgcensors');
 
diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 6ac30a00024..1c26563f050 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -201,8 +201,8 @@ protected function guess_bbcodes(array $record)
 	*/
 	protected function guess_magic_url(array $record)
 	{
-		// Look for <!-- m --> or for a URL tag that's not immediately followed by <s>
-		return (strpos($record['text'], '<!-- m -->') !== false || preg_match('(<URL [^>]++>(?!<s>))', $record['text']));
+		// Look for magic URL markers or for a URL tag that's not immediately followed by <s>
+		return preg_match('#<!-- ([lmwe]) -->.*?<!-- \1 -->#', $record['text']) || preg_match('(<URL [^>]++>(?!<s>))', $record['text']);
 	}
 
 	/**
@@ -219,11 +219,11 @@ protected function guess_smilies(array $record)
 	/**
 	* {@inheritdoc}
 	*/
-	public function reparse_range($min_id, $max_id)
+	public function reparse_range($min_id, $max_id, bool $force_bbcode_reparsing = false)
 	{
 		foreach ($this->get_records_by_range($min_id, $max_id) as $record)
 		{
-			$this->reparse_record($record);
+			$this->reparse_record($record, $force_bbcode_reparsing);
 		}
 	}
 
@@ -231,13 +231,17 @@ public function reparse_range($min_id, $max_id)
 	* Reparse given record
 	*
 	* @param array $record Associative array containing the record's data
+	* @param bool $force_bbcode_reparsing Flag indicating if BBCode should be reparsed unconditionally
 	*/
-	protected function reparse_record(array $record)
+	protected function reparse_record(array $record, bool $force_bbcode_reparsing = false)
 	{
+		// Guess magic URL state based on actual record content before adding fields
+		$record['enable_magic_url'] = $this->guess_magic_url($record);
 		$record = $this->add_missing_fields($record);
-		$flags = ($record['enable_bbcode']) ? OPTION_FLAG_BBCODE : 0;
-		$flags |= ($record['enable_smilies']) ? OPTION_FLAG_SMILIES : 0;
-		$flags |= ($record['enable_magic_url']) ? OPTION_FLAG_LINKS : 0;
+
+		$flags = ($record['enable_bbcode'] || $force_bbcode_reparsing) ? OPTION_FLAG_BBCODE : 0;
+		$flags |= ($record['enable_smilies'] || $force_bbcode_reparsing) ? OPTION_FLAG_SMILIES : 0;
+		$flags |= ($record['enable_magic_url'] || $force_bbcode_reparsing) ? OPTION_FLAG_LINKS : 0;
 		$unparsed = array_merge(
 			$record,
 			generate_text_for_edit($record['text'], $record['bbcode_uid'], $flags)
@@ -253,12 +257,12 @@ protected function reparse_record(array $record)
 			$unparsed['bbcode_uid'],
 			$bitfield,
 			$flags,
-			$unparsed['enable_bbcode'],
-			$unparsed['enable_magic_url'],
-			$unparsed['enable_smilies'],
-			$unparsed['enable_img_bbcode'],
-			$unparsed['enable_quote_bbcode'],
-			$unparsed['enable_url_bbcode'],
+			$unparsed['enable_bbcode'] || $force_bbcode_reparsing,
+			$unparsed['enable_magic_url'] || $force_bbcode_reparsing,
+			$unparsed['enable_smilies'] || $force_bbcode_reparsing,
+			$unparsed['enable_img_bbcode'] || $force_bbcode_reparsing,
+			$unparsed['enable_quote_bbcode'] || $force_bbcode_reparsing,
+			$unparsed['enable_url_bbcode'] || $force_bbcode_reparsing,
 			'text_reparser.' . $this->get_name()
 		);
 
diff --git a/phpBB/phpbb/textreparser/reparser_interface.php b/phpBB/phpbb/textreparser/reparser_interface.php
index 912de100580..99e1c267785 100644
--- a/phpBB/phpbb/textreparser/reparser_interface.php
+++ b/phpBB/phpbb/textreparser/reparser_interface.php
@@ -41,6 +41,7 @@ public function set_name($name);
 	*
 	* @param integer $min_id Lower bound
 	* @param integer $max_id Upper bound
+	* @param bool $force_bbcode_reparsing Flag indicating if BBCode should be reparsed unconditionally
 	*/
-	public function reparse_range($min_id, $max_id);
+	public function reparse_range($min_id, $max_id, bool $force_bbcode_reparsing = false);
 }
diff --git a/phpBB/phpbb/ucp/controller/delete_cookies.php b/phpBB/phpbb/ucp/controller/delete_cookies.php
new file mode 100644
index 00000000000..3ab0b3ee3dc
--- /dev/null
+++ b/phpBB/phpbb/ucp/controller/delete_cookies.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\ucp\controller;
+
+use phpbb\config\config;
+use phpbb\controller\helper;
+use phpbb\event\dispatcher_interface;
+use phpbb\language\language;
+use phpbb\request\request_interface;
+use phpbb\user;
+
+class delete_cookies
+{
+	/** @var config */
+	private $config;
+
+	/** @var dispatcher_interface */
+	private $dispatcher;
+
+	/** @var helper */
+	private $helper;
+
+	/** @var language */
+	private $language;
+
+	/** @var request_interface */
+	private $request;
+
+	/** @var user */
+	private $user;
+
+	/** @var string phpBB root path */
+	private $phpbb_root_path;
+
+	/** @var string PHP extension */
+	private $php_ext;
+
+	/**
+	 * Constructor for delete_cookies controller
+	 *
+	 * @param config $config
+	 * @param dispatcher_interface $dispatcher
+	 * @param helper $helper
+	 * @param language $language
+	 * @param request_interface $request
+	 * @param user $user
+	 * @param string $phpbb_root_path
+	 * @param string $php_ext
+	 */
+	public function __construct(config $config, dispatcher_interface $dispatcher, helper $helper, language $language, request_interface $request, user $user, string $phpbb_root_path, string $php_ext)
+	{
+		$this->config = $config;
+		$this->dispatcher = $dispatcher;
+		$this->helper = $helper;
+		$this->language = $language;
+		$this->request = $request;
+		$this->user = $user;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+	}
+
+	/**
+	 * Handle delete cookies requests
+	 *
+	 * @return void
+	 */
+	public function handle()
+	{
+		$this->language->add_lang(['ucp']);
+
+		// Delete Cookies with dynamic names (do NOT delete poll cookies)
+		if (confirm_box(true))
+		{
+			$set_time = time() - 31536000;
+
+			foreach ($this->request->variable_names(request_interface::COOKIE) as $cookie_name)
+			{
+				// Only delete board cookies
+				if (strpos($cookie_name, $this->config['cookie_name'] . '_') !== 0)
+				{
+					continue;
+				}
+
+				$cookie_name = str_replace($this->config['cookie_name'] . '_', '', $cookie_name);
+
+				/**
+				 * Event to save custom cookies from deletion
+				 *
+				 * @event core.ucp_delete_cookies
+				 * @var	string	cookie_name		Cookie name to checking
+				 * @var	bool	retain_cookie	Do we retain our cookie or not, true if retain
+				 * @since 3.1.3-RC1
+				 * @changed 3.3.13-RC1 Moved to new delete_cookies controller
+				 */
+				$retain_cookie = false;
+				$vars = ['cookie_name', 'retain_cookie'];
+				extract($this->dispatcher->trigger_event('core.ucp_delete_cookies', compact($vars)));
+				if ($retain_cookie)
+				{
+					continue;
+				}
+
+				// Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_
+				if (strpos($cookie_name, 'poll_') !== 0)
+				{
+					$this->user->set_cookie($cookie_name, '', $set_time);
+				}
+			}
+
+			$this->user->set_cookie('track', '', $set_time);
+			$this->user->set_cookie('u', '', $set_time);
+			$this->user->set_cookie('k', '', $set_time);
+			$this->user->set_cookie('sid', '', $set_time);
+
+			// We destroy the session here, the user will be logged out nevertheless
+			$this->user->session_kill();
+			$this->user->session_begin();
+
+			meta_refresh(3, $this->helper->route('phpbb_index_controller'));
+
+			$message = $this->language->lang('COOKIES_DELETED') . '<br><br>' . $this->language->lang('RETURN_INDEX', '<a href="' . $this->helper->route('phpbb_index_controller') . '">', '</a>');
+			trigger_error($message);
+		}
+		else
+		{
+			confirm_box(false, 'DELETE_COOKIES', '');
+		}
+
+		redirect($this->helper->route('phpbb_index_controller'));
+	}
+}
diff --git a/phpBB/phpbb/ucp/controller/oauth.php b/phpBB/phpbb/ucp/controller/oauth.php
new file mode 100644
index 00000000000..923f026b641
--- /dev/null
+++ b/phpBB/phpbb/ucp/controller/oauth.php
@@ -0,0 +1,467 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\ucp\controller;
+
+use phpbb\auth\provider_collection;
+use phpbb\captcha\factory;
+use phpbb\captcha\plugins\confirm_type;
+use phpbb\config\config;
+use phpbb\controller\helper;
+use phpbb\event\dispatcher;
+use phpbb\exception\http_exception;
+use phpbb\language\language;
+use phpbb\request\request;
+use phpbb\request\request_interface;
+use phpbb\template\template;
+use phpbb\user;
+use Symfony\Component\HttpFoundation\Response;
+
+class oauth
+{
+	/** @var provider_collection Auth provider collection */
+	protected $auth_collection;
+
+	/** @var factory Captcha factory */
+	protected $captcha_factory;
+
+	/** @var config Config */
+	protected $config;
+
+	/** @var dispatcher Event dispatcher */
+	protected $dispatcher;
+
+	/** @var helper Controller helper */
+	protected $helper;
+
+	/** @var language Language */
+	protected $language;
+
+	/** @var request Request class instance */
+	protected $request;
+
+	/** @var template Template class */
+	protected $template;
+
+	/** @var user User class */
+	protected $user;
+
+	/** @var string phpBB root path */
+	protected $phpbb_root_path;
+
+	/** @var string PHP extension */
+	protected $php_ext;
+
+	/**
+	 * Constructor for oauth controller
+	 *
+	 * @param provider_collection $auth_collection
+	 * @param factory $captcha_factory
+	 * @param config $config
+	 * @param dispatcher $dispatcher
+	 * @param helper $helper
+	 * @param language $language
+	 * @param request $request
+	 * @param template $template
+	 * @param user $user
+	 * @param string $phpbb_root_path
+	 * @param string $php_ext
+	 */
+	public function __construct(provider_collection $auth_collection, factory $captcha_factory, config $config,
+		dispatcher $dispatcher, helper $helper, language $language, request $request, template $template,
+		user $user, string $phpbb_root_path, string $php_ext)
+	{
+		$this->auth_collection = $auth_collection;
+		$this->captcha_factory = $captcha_factory;
+		$this->config = $config;
+		$this->dispatcher = $dispatcher;
+		$this->helper = $helper;
+		$this->language = $language;
+		$this->request = $request;
+		$this->template = $template;
+		$this->user = $user;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+	}
+
+	/**
+	 * Handle oauth authentication requests
+	 *
+	 * @param string $oauth_service Oauth service to authenticate with
+	 * @return void
+	 */
+	public function authenticate(string $oauth_service)
+	{
+		$this->language->add_lang('ucp');
+
+		$this->request->overwrite('oauth_service', $oauth_service);
+
+		$auth_provider = $this->auth_collection->get_provider();
+
+		// Check if auth provider supports linking
+		$provider_data = $auth_provider->get_auth_link_data();
+		if ($provider_data === null)
+		{
+			throw new http_exception(Response::HTTP_UNAUTHORIZED, 'UCP_AUTH_LINK_NOT_SUPPORTED');
+		}
+
+		if ($this->request->variable('link', false) || $this->user->data['is_registered'])
+		{
+			$link_data = ['link_method' => 'auth_link'];
+
+			$error = $auth_provider->link_account($link_data);
+
+			if ($error)
+			{
+				throw new http_exception(Response::HTTP_BAD_REQUEST, $error);
+			}
+
+			// Redirect to UCP page if there was no error linking the account
+			if ($this->user->data['is_registered'])
+			{
+				redirect(append_sid("{$this->phpbb_root_path}ucp.$this->php_ext?i=ucp_auth_link&mode=auth_link"));
+			} else
+			{
+				$query_params = [
+					'login_link_oauth_service' => $this->request->variable('oauth_service', ''),
+				];
+				phpbb_redirect_to_controller('phpbb_ucp_oauth_link_account_controller', $query_params);
+			}
+		}
+		else
+		{
+			// Redirect to login page to handle actual login process for oauth service
+			$url_params = [
+				'mode'			=> 'login',
+				'login'			=> 'external',
+				'oauth_service'	=> $this->request->variable('oauth_service', '')
+			];
+
+			if ($this->request->is_set('code'))
+			{
+				$url_params += [
+					'code'			=> $this->request->variable('code', ''),
+					'state'			=> $this->request->variable('state', ''),
+					'scope'			=> $this->request->variable('scope', ''),
+				];
+			}
+			redirect(append_sid("{$this->phpbb_root_path}ucp.$this->php_ext", $url_params));
+		}
+	}
+
+	/**
+	 * Handle login requests for oauth
+	 *
+	 * @param string $oauth_service Oauth service to login with
+	 * @return void
+	 */
+	public function login(string $oauth_service)
+	{
+		$this->request->overwrite('oauth_service', $oauth_service);
+
+		$provider = $this->auth_collection->get_provider();
+		if (!$provider instanceof \phpbb\auth\provider\oauth\oauth)
+		{
+			// Handle differently once we move away from the shitty concept of having oauth as auth provider ...
+			throw new http_exception(Response::HTTP_UNAUTHORIZED, 'NOT_AUTHORISED');
+		}
+
+		// Skip any potential login with username and password by supplying empty values.
+		// Only oauth provider can reach this. Valid oauth login requests don't need a username and password and won't use it.
+		// Requests that are not valid oauth login requests will be rejected due to the empty password.
+		$result = $provider->login('', '');
+
+		// The result parameter is always an array, holding the relevant information...
+		if ($result['status'] == LOGIN_SUCCESS)
+		{
+			$redirect = $this->request->variable('redirect', "{$this->phpbb_root_path}index.{$this->php_ext}");
+
+			/**
+			 * This event allows an extension to modify the redirection when a user successfully logs in
+			 *
+			 * @event core.oauth_login_redirect
+			 * @var  string	redirect	Redirect string
+			 * @var	bool	admin		Is admin?
+			 * @var	array	result		Result from auth provider
+			 * @since 3.3.17
+			 */
+			$vars = array('redirect', 'admin', 'result');
+			extract($this->dispatcher->trigger_event('core.oauth_login_redirect', compact($vars)));
+
+			$redirect = reapply_sid($redirect);
+
+			// Special case... the user is effectively banned, but we allow founders to login
+			if (defined('IN_CHECK_BAN') && $result['user_row']['user_type'] != USER_FOUNDER)
+			{
+				return;
+			}
+
+			redirect($redirect);
+		}
+
+		if ($result['status'] == LOGIN_BREAK)
+		{
+			trigger_error($result['error_msg']);
+		}
+
+		switch ($result['status'])
+		{
+			case LOGIN_ERROR_ATTEMPTS:
+				$captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
+				$captcha->init(confirm_type::LOGIN);
+
+				$this->template->assign_vars(array(
+					'CAPTCHA_TEMPLATE'			=> $captcha->get_template(),
+				));
+			// no break;
+
+			// Username, password, etc...
+			default:
+				$error = $this->language->lang($result['error_msg']);
+
+				// Assign admin contact to some error messages
+				if ($result['error_msg'] == 'LOGIN_ERROR_USERNAME' || $result['error_msg'] == 'LOGIN_ERROR_PASSWORD')
+				{
+					$error = $this->language->lang(
+						$result['error_msg'],
+						'<a href="' . append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=contactadmin') . '">', '</a>'
+					);
+				}
+
+			break;
+		}
+
+		/**
+		 * This event allows an extension to process when a user fails a login attempt
+		 *
+		 * @event core.oauth_login_failed
+		 * @var array   result      Login result data
+		 * @var string  username    User name used to login
+		 * @var string  password    Password used to login
+		 * @var string  error         Error message
+		 * @since 3.1.3-RC1
+		 */
+		$vars = array('result', 'username', 'password', 'error');
+		extract($this->dispatcher->trigger_event('core.oauth_login_failed', compact($vars)));
+
+		trigger_error($error);
+	}
+
+	/**
+	 * Handle linking accounts via Oauth
+	 *
+	 * @return Response
+	 */
+	public function link_account(): Response
+	{
+		$this->language->add_lang('ucp');
+
+		// Initialize necessary variables
+		$login_error = null;
+		$login_link_error = null;
+		$login_username = null;
+
+		// Build the data array
+		$data = $this->get_login_link_data_array();
+
+		// Unable to continue without data for linking
+		if (empty($data))
+		{
+			$login_link_error = $this->language->lang('LOGIN_LINK_NO_DATA_PROVIDED');
+		}
+
+		// Set the link_method to login_link
+		$data['link_method'] = 'login_link';
+
+		// Check if we have all necessary data for login
+		$auth_provider = $this->auth_collection->get_provider();
+		$result = $auth_provider->login_link_has_necessary_data($data);
+		if ($result !== null)
+		{
+			$login_link_error = $this->language->lang($result);
+		}
+
+		// Perform link action if there is no error
+		if (!$login_link_error)
+		{
+			if ($this->request->is_set_post('login'))
+			{
+				$login_username = $this->request->variable('login_username', '', true, request_interface::POST);
+				$login_password = $this->request->untrimmed_variable('login_password', '', true, request_interface::POST);
+
+				$login_result = $auth_provider->login($login_username, $login_password);
+
+				// We only care if there is or is not an error
+				$login_error = $this->process_login_result($login_result);
+
+				if (!$login_error)
+				{
+					// Give the user_id to the data
+					$data['user_id'] = $login_result['user_row']['user_id'];
+
+					// The user is now logged in, attempt to link the user to the external account
+					$result = $auth_provider->link_account($data);
+
+					if ($result)
+					{
+						$login_link_error = $this->language->lang($result);
+					}
+					else
+					{
+						// Finish login
+						$this->user->session_create($login_result['user_row']['user_id']);
+						redirect(append_sid("{$this->phpbb_root_path}index.$this->php_ext"));
+					}
+				}
+			}
+		}
+
+		$tpl_ary = [
+			// Common template elements
+			'LOGIN_LINK_ERROR'		=> $login_link_error,
+			'PASSWORD_CREDENTIAL'	=> 'login_password',
+			'USERNAME_CREDENTIAL'	=> 'login_username',
+			'S_HIDDEN_FIELDS'		=> $this->get_hidden_fields($data),
+
+			// Registration elements
+			'REGISTER_ACTION'	=> append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'mode=register'),
+
+			// Login elements
+			'LOGIN_ERROR'		=> $login_error,
+			'LOGIN_USERNAME'	=> $login_username,
+		];
+
+		/**
+		 * Event to perform additional actions before ucp_login_link is displayed
+		 *
+		 * @event core.ucp_login_link_template_after
+		 * @var	array							data				Login link data
+		 * @var	\phpbb\auth\provider\provider_interface	auth_provider		Auth provider
+		 * @var	string							login_link_error	Login link error
+		 * @var	string							login_error			Login error
+		 * @var	string							login_username		Login username
+		 * @var	array							tpl_ary				Template variables
+		 * @since 3.2.4-RC1
+		 * @changed 3.3.17 Moved to oauth controller
+		 */
+		$vars = ['data', 'auth_provider', 'login_link_error', 'login_error', 'login_username', 'tpl_ary'];
+		extract($this->dispatcher->trigger_event('core.ucp_login_link_template_after', compact($vars)));
+
+		$this->template->assign_vars($tpl_ary);
+
+		return $this->helper->render('ucp_login_link.html', $this->language->lang('UCP_LOGIN_LINK'));
+	}
+
+	/**
+	 * Builds the login_link data array
+	 *
+	 * @return	array	All login_link data. This is all GET data whose names
+	 *					begin with 'login_link_'
+	 */
+	protected function get_login_link_data_array(): array
+	{
+		$var_names = $this->request->variable_names(request_interface::GET);
+		$login_link_data = [];
+		$string_start_length = strlen('login_link_');
+
+		foreach ($var_names as $var_name)
+		{
+			if (strpos($var_name, 'login_link_') === 0)
+			{
+				$key_name = substr($var_name, $string_start_length);
+				$login_link_data[$key_name] = $this->request->variable($var_name, '', false, request_interface::GET);
+			}
+		}
+
+		return $login_link_data;
+	}
+
+	/**
+	 * Processes the result array from the login process
+	 * @param array $result	The login result array
+	 * @return	string|null	If there was an error in the process, a string is
+	 *						returned. If the login was successful, then null is
+	 *						returned.
+	 */
+	protected function process_login_result(array $result): string|null
+	{
+		$login_error = null;
+
+		if ($result['status'] != LOGIN_SUCCESS)
+		{
+			// Handle all errors first
+			if ($result['status'] == LOGIN_BREAK)
+			{
+				trigger_error($result['error_msg']);
+			}
+
+			switch ($result['status'])
+			{
+				case LOGIN_ERROR_ATTEMPTS:
+					$captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
+					$captcha->init(confirm_type::LOGIN);
+
+					$this->template->assign_vars(array(
+						'CAPTCHA_TEMPLATE'			=> $captcha->get_template(),
+					));
+
+					$login_error = $this->language->lang($result['error_msg']);
+					break;
+
+				case LOGIN_ERROR_PASSWORD_CONVERT:
+					$login_error = $this->language->lang(
+						$result['error_msg'],
+						($this->config['email_enable']) ? '<a href="' . append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'mode=sendpassword') . '">' : '',
+						($this->config['email_enable']) ? '</a>' : '',
+						($this->config['board_contact']) ? '<a href="mailto:' . htmlspecialchars($this->config['board_contact'], ENT_COMPAT) . '">' : '',
+						($this->config['board_contact']) ? '</a>' : ''
+					);
+					break;
+
+				// Username, password, etc...
+				default:
+					$login_error = $this->language->lang($result['error_msg']);
+
+					// Assign admin contact to some error messages
+					if ($result['error_msg'] == 'LOGIN_ERROR_USERNAME' || $result['error_msg'] == 'LOGIN_ERROR_PASSWORD')
+					{
+						$login_error = (!$this->config['board_contact']) ? $this->language->lang($result['error_msg'], '', '') : $this->language->lang($result['error_msg'], '<a href="mailto:' . htmlspecialchars($this->config['board_contact'], ENT_COMPAT) . '">', '</a>');
+					}
+
+					break;
+			}
+		}
+
+		return $login_error;
+	}
+
+	/**
+	 * Builds the hidden fields string from the data array.
+	 *
+	 * @param array $data	This function only includes data in the array
+	 *							that has a key that begins with 'login_link_'
+	 * @return	string	A string of hidden fields that can be included in the
+	 *					template
+	 */
+	protected function get_hidden_fields(array $data): string
+	{
+		$fields = array();
+
+		foreach ($data as $key => $value)
+		{
+			$fields['login_link_' . $key] = $value;
+		}
+
+		return build_hidden_fields($fields);
+	}
+}
diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php
index af28db9335c..5d8feb8f787 100644
--- a/phpBB/phpbb/ucp/controller/reset_password.php
+++ b/phpBB/phpbb/ucp/controller/reset_password.php
@@ -25,6 +25,7 @@
 use phpbb\request\request;
 use phpbb\template\template;
 use phpbb\user;
+use phpbb\messenger\method\email;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -50,6 +51,9 @@ class reset_password
 	/** @var log_interface */
 	protected $log;
 
+	/** @var email */
+	protected $email_method;
+
 	/** @var manager */
 	protected $passwords_manager;
 
@@ -80,6 +84,7 @@ class reset_password
 	 * @param helper $helper
 	 * @param language $language
 	 * @param log_interface $log
+	 * @param email $email_method
 	 * @param manager $passwords_manager
 	 * @param request $request
 	 * @param template $template
@@ -89,7 +94,7 @@ class reset_password
 	 * @param string $php_ext
 	 */
 	public function __construct(config $config, driver_interface $db, dispatcher $dispatcher, helper $helper,
-								language $language, log_interface $log, manager $passwords_manager,
+								language $language, log_interface $log, email $email_method, manager $passwords_manager,
 								request $request, template $template, user $user, string $users_table,
 								string $root_path, string $php_ext)
 	{
@@ -99,6 +104,7 @@ public function __construct(config $config, driver_interface $db, dispatcher $di
 		$this->helper = $helper;
 		$this->language = $language;
 		$this->log = $log;
+		$this->email_method = $email_method;
 		$this->passwords_manager = $passwords_manager;
 		$this->request = $request;
 		$this->template = $template;
@@ -170,7 +176,7 @@ public function request()
 			}
 
 			$sql_array = [
-				'SELECT'	=> 'user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type,'
+				'SELECT'	=> 'user_id, username, user_permissions, user_email, user_type,'
 								. ' user_lang, user_inactive_reason, reset_token, reset_token_expiration',
 				'FROM'		=> [$this->users_table => 'u'],
 				'WHERE'		=> "user_email = '" . $this->db->sql_escape($email) . "'" .
@@ -208,7 +214,7 @@ public function request()
 			}
 			else
 			{
-				$message = $this->language->lang('PASSWORD_RESET_LINK_SENT') . '<br /><br />' . $this->language->lang('RETURN_INDEX', '<a href="' . append_sid("{$this->root_path}index.{$this->php_ext}") . '">', '</a>');
+				$message = $this->language->lang('PASSWORD_RESET_LINK_SENT') . '<br /><br />' . $this->language->lang('RETURN_INDEX', '<a href="' . $this->helper->route('phpbb_index_controller') . '">', '</a>');
 
 				if (empty($rowset))
 				{
@@ -242,7 +248,7 @@ public function request()
 
 				$sql_ary = [
 					'reset_token'				=> $reset_token,
-					'reset_token_expiration'	=> strtotime('+1 day'),
+					'reset_token_expiration'	=> $this->user::get_token_expiration(),
 				];
 
 				$sql = 'UPDATE ' . $this->users_table . '
@@ -250,29 +256,18 @@ public function request()
 					WHERE user_id = ' . $user_row['user_id'];
 				$this->db->sql_query($sql);
 
-				if (!class_exists('messenger'))
-				{
-					include($this->root_path . 'includes/functions_messenger.' . $this->php_ext);
-				}
-
-				/** @var \messenger $messenger */
-				$messenger = new \messenger(false);
-
-				$messenger->template('user_forgot_password', $user_row['user_lang']);
-
-				$messenger->set_addresses($user_row);
-
-				$messenger->anti_abuse_headers($this->config, $this->user);
-
-				$messenger->assign_vars([
-						'USERNAME'			=> html_entity_decode($user_row['username'], ENT_COMPAT),
-						'U_RESET_PASSWORD'	=> generate_board_url(true) . $this->helper->route('phpbb_ucp_reset_password_controller', [
-							'u'		=> $user_row['user_id'],
-							'token'	=> $reset_token,
-						], false)
+				$this->email_method->set_use_queue(false);
+				$this->email_method->template('user_forgot_password', $user_row['user_lang']);
+				$this->email_method->set_addresses($user_row);
+				$this->email_method->anti_abuse_headers($this->config, $this->user);
+				$this->email_method->assign_vars([
+					'USERNAME'			=> html_entity_decode($user_row['username'], ENT_COMPAT),
+					'U_RESET_PASSWORD'	=> generate_board_url(true) . $this->helper->route('phpbb_ucp_reset_password_controller', [
+						'u'		=> $user_row['user_id'],
+						'token'	=> $reset_token,
+					], false)
 				]);
-
-				$messenger->send($user_row['user_notify_type']);
+				$this->email_method->send();
 
 				return $this->helper->message($message);
 			}
@@ -313,7 +308,7 @@ public function reset()
 		add_form_key('ucp_reset_password');
 
 		$sql_array = [
-			'SELECT'	=> 'user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type,'
+			'SELECT'	=> 'user_id, username, user_permissions, user_email, user_type,'
 				. ' user_lang, user_inactive_reason, reset_token, reset_token_expiration',
 			'FROM'		=> [$this->users_table => 'u'],
 			'WHERE'		=> 'user_id = ' . $user_id,
@@ -340,7 +335,7 @@ public function reset()
 		$user_row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
 
-		$message = $this->language->lang('RESET_TOKEN_EXPIRED_OR_INVALID') . '<br /><br />' . $this->language->lang('RETURN_INDEX', '<a href="' . append_sid("{$this->root_path}index.{$this->php_ext}") . '">', '</a>');
+		$message = $this->language->lang('RESET_TOKEN_EXPIRED_OR_INVALID') . '<br /><br />' . $this->language->lang('RETURN_INDEX', '<a href="' . $this->helper->route('phpbb_index_controller') . '">', '</a>');
 
 		if (empty($user_row))
 		{
@@ -407,6 +402,7 @@ public function reset()
 			{
 				$sql_ary = [
 					'user_password'				=> $this->passwords_manager->hash($data['new_password']),
+					'user_passchg'				=> time(),
 					'user_login_attempts'		=> 0,
 					'reset_token'				=> '',
 					'reset_token_expiration'	=> 0,
@@ -420,7 +416,7 @@ public function reset()
 					'reportee_id' => $user_row['user_id'],
 					$user_row['username']
 				]);
-				meta_refresh(3, append_sid("{$this->root_path}index.{$this->php_ext}"));
+				meta_refresh(3, $this->helper->route('phpbb_index_controller'));
 				return $this->helper->message($this->language->lang('PASSWORD_RESET'));
 			}
 		}
diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php
new file mode 100644
index 00000000000..28b2cc65da8
--- /dev/null
+++ b/phpBB/phpbb/ucp/controller/webpush.php
@@ -0,0 +1,429 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\ucp\controller;
+
+use phpbb\config\config;
+use phpbb\controller\helper as controller_helper;
+use phpbb\db\driver\driver_interface;
+use phpbb\event\dispatcher_interface;
+use phpbb\exception\http_exception;
+use phpbb\form\form_helper;
+use phpbb\json\sanitizer as json_sanitizer;
+use phpbb\language\language;
+use phpbb\notification\manager;
+use phpbb\path_helper;
+use phpbb\request\request_interface;
+use phpbb\symfony_request;
+use phpbb\user;
+use phpbb\user_loader;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Error\RuntimeError;
+use Twig\Error\SyntaxError;
+
+class webpush
+{
+	/** @var string UCP form token name */
+	public const FORM_TOKEN_UCP = 'ucp_webpush';
+
+	/** @var config */
+	protected $config;
+
+	/** @var controller_helper */
+	protected $controller_helper;
+
+	/** @var driver_interface */
+	protected $db;
+
+	/** @var dispatcher_interface */
+	protected $dispatcher;
+
+	/** @var form_helper */
+	protected $form_helper;
+
+	/** @var language */
+	protected $language;
+
+	/** @var manager */
+	protected $notification_manager;
+
+	/** @var path_helper */
+	protected $path_helper;
+
+	/** @var request_interface */
+	protected $request;
+
+	/** @var user_loader */
+	protected $user_loader;
+
+	/** @var user */
+	protected $user;
+
+	/** @var Environment */
+	protected $template;
+
+	/** @var string */
+	protected $notification_webpush_table;
+
+	/** @var string */
+	protected $push_subscriptions_table;
+
+	/**
+	 * Constructor for webpush controller
+	 *
+	 * @param config $config
+	 * @param controller_helper $controller_helper
+	 * @param driver_interface $db
+	 * @param dispatcher_interface $dispatcher
+	 * @param form_helper $form_helper
+	 * @param language $language
+	 * @param manager $notification_manager
+	 * @param path_helper $path_helper
+	 * @param request_interface $request
+	 * @param user_loader $user_loader
+	 * @param user $user
+	 * @param Environment $template
+	 * @param string $notification_webpush_table
+	 * @param string $push_subscriptions_table
+	 */
+	public function __construct(config $config, controller_helper $controller_helper, driver_interface $db, dispatcher_interface $dispatcher, form_helper $form_helper, language $language, manager $notification_manager,
+								path_helper $path_helper, request_interface $request, user_loader $user_loader, user $user, Environment $template, string $notification_webpush_table, string $push_subscriptions_table)
+	{
+		$this->config = $config;
+		$this->controller_helper = $controller_helper;
+		$this->db = $db;
+		$this->dispatcher = $dispatcher;
+		$this->form_helper = $form_helper;
+		$this->language = $language;
+		$this->notification_manager = $notification_manager;
+		$this->path_helper = $path_helper;
+		$this->request = $request;
+		$this->user_loader = $user_loader;
+		$this->user = $user;
+		$this->template = $template;
+		$this->notification_webpush_table = $notification_webpush_table;
+		$this->push_subscriptions_table = $push_subscriptions_table;
+	}
+
+	/**
+	 * Handle request to retrieve notification data
+	 *
+	 * @return JsonResponse
+	 */
+	public function notification(): JsonResponse
+	{
+		if (!$this->request->is_ajax() || $this->user->data['is_bot'] || $this->user->data['user_type'] == USER_INACTIVE)
+		{
+			throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION');
+		}
+
+		if ($this->user->id() !== ANONYMOUS)
+		{
+			$notification_data = $this->get_user_notifications();
+		}
+		else
+		{
+			$notification_data = $this->get_anonymous_notifications();
+		}
+
+		return new JsonResponse($notification_data, 200, [], true);
+	}
+
+	/**
+	 * Get notification data for logged in user
+	 *
+	 * @return string Notification data
+	 */
+	private function get_user_notifications(): string
+	{
+		// Subscribe should only be available for logged-in "normal" users
+		if ($this->user->data['user_type'] == USER_IGNORE)
+		{
+			throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION');
+		}
+
+		$item_id = $this->request->variable('item_id', 0);
+		$type_id = $this->request->variable('type_id', 0);
+
+		$sql = 'SELECT push_data
+			FROM ' . $this->notification_webpush_table . '
+			WHERE user_id = ' . (int) $this->user->id() . '
+				AND notification_type_id = ' . (int) $type_id . '
+				AND item_id = ' . (int) $item_id;
+		$result = $this->db->sql_query($sql);
+		$notification_data = $this->db->sql_fetchfield('push_data');
+		$this->db->sql_freeresult($result);
+
+		if (!$notification_data)
+		{
+			throw new http_exception(Response::HTTP_BAD_REQUEST, 'AJAX_ERROR_TEXT');
+		}
+
+		return $this->get_notification_data($notification_data) ?: '';
+	}
+
+	/**
+	 * Get notification data for not logged in user via token
+	 *
+	 * @return string
+	 */
+	private function get_anonymous_notifications(): string
+	{
+		$token = $this->request->variable('token', '');
+
+		if ($token)
+		{
+			$item_id = $this->request->variable('item_id', 0);
+			$type_id = $this->request->variable('type_id', 0);
+			$user_id = $this->request->variable('user_id', 0);
+
+			$sql = 'SELECT push_data, push_token
+				FROM ' . $this->notification_webpush_table . '
+				WHERE user_id = ' . (int) $user_id . '
+					AND notification_type_id = ' . (int) $type_id . '
+					AND item_id = ' . (int) $item_id;
+			$result = $this->db->sql_query($sql);
+			$notification_row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$notification_row || !isset($notification_row['push_data']) || !isset($notification_row['push_token']))
+			{
+				throw new http_exception(Response::HTTP_BAD_REQUEST, 'AJAX_ERROR_TEXT');
+			}
+
+			$notification_data = $notification_row['push_data'];
+			$push_token = $notification_row['push_token'];
+
+			// Check if passed push token is valid
+			$sql = 'SELECT user_form_salt, user_lang
+				FROM ' . USERS_TABLE . '
+				WHERE user_id = ' . (int) $user_id;
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			$user_form_token = $row['user_form_salt'];
+			$user_lang = $row['user_lang'];
+
+			$expected_push_token = hash('sha256', $user_form_token . $push_token);
+			if ($expected_push_token === $token)
+			{
+				if ($user_lang !== $this->language->get_used_language())
+				{
+					$this->language->set_user_language($user_lang, true);
+				}
+				return $this->get_notification_data($notification_data) ?: '';
+			}
+		}
+
+		throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION');
+	}
+
+	/**
+	 * Get notification data for output from json encoded data stored in database
+	 *
+	 * @param string $notification_data Encoded data stored in database
+	 *
+	 * @return false|string Data for notification output with javascript
+	 */
+	private function get_notification_data(string $notification_data): false|string
+	{
+		$row_data = json_decode($notification_data, true);
+
+		// Old notification data is pre-parsed and just needs to be returned
+		if (isset($row_data['heading']))
+		{
+			return $notification_data;
+		}
+
+		// Get notification from row_data
+		$notification = $this->notification_manager->get_item_type_class($row_data['notification_type_name'], $row_data);
+
+		// Load users for notification
+		$this->user_loader->load_users($notification->users_to_query());
+
+		return json_encode([
+			'heading'	=> html_entity_decode($this->config['sitename'], ENT_QUOTES, 'UTF-8'),
+			'title'		=> strip_tags(html_entity_decode($notification->get_title(), ENT_NOQUOTES, 'UTF-8')),
+			'text'		=> strip_tags(html_entity_decode($notification->get_reference(), ENT_NOQUOTES, 'UTF-8')),
+			'url'		=> htmlspecialchars_decode($notification->get_url()),
+			'avatar'	=> $notification->get_avatar(),
+		]);
+	}
+
+	/**
+	 * Handle request to push worker javascript
+	 *
+	 * @return Response
+	 * @throws LoaderError
+	 * @throws RuntimeError
+	 * @throws SyntaxError
+	 */
+	public function worker(): Response
+	{
+		$content = $this->template->render('push_worker.js.twig', [
+			'U_WEBPUSH_GET_NOTIFICATION'	=> $this->controller_helper->route('phpbb_ucp_push_get_notification_controller'),
+			'ASSETS_VERSION'				=> $this->config['assets_version'],
+		]);
+
+		$response = new Response($content);
+		$response->headers->set('Content-Type', 'text/javascript; charset=UTF-8');
+
+		if (!empty($this->user->data['is_bot']))
+		{
+			// Let reverse proxies know we detected a bot.
+			$response->headers->set('X-PHPBB-IS-BOT', 'yes');
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Check (un)subscribe form for valid link hash
+	 *
+	 * @throws http_exception If form is invalid or user should not request (un)subscription
+	 * @return void
+	 */
+	protected function check_subscribe_requests(): void
+	{
+		if (!$this->form_helper->check_form_tokens(self::FORM_TOKEN_UCP))
+		{
+			throw new http_exception(Response::HTTP_BAD_REQUEST, 'FORM_INVALID');
+		}
+
+		// Subscribe should only be available for logged-in "normal" users
+		if (!$this->request->is_ajax() || $this->user->id() === ANONYMOUS || $this->user->data['is_bot']
+			|| $this->user->data['user_type'] == USER_IGNORE || $this->user->data['user_type'] == USER_INACTIVE)
+		{
+			throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION');
+		}
+	}
+
+	/**
+	 * Handle subscribe requests
+	 *
+	 * @param symfony_request $symfony_request
+	 * @return JsonResponse
+	 */
+	public function subscribe(symfony_request $symfony_request): JsonResponse
+	{
+		$this->check_subscribe_requests();
+
+		$data = json_sanitizer::decode($symfony_request->attributes->get('data', ''));
+
+		if (!$this->verify_endpoint($data['endpoint']))
+		{
+			throw new http_exception(Response::HTTP_BAD_REQUEST, 'NOTIFY_WEB_PUSH_UNSUPPORTED_SERVICE');
+		}
+
+		$sql = 'INSERT INTO ' . $this->push_subscriptions_table . ' ' . $this->db->sql_build_array('INSERT', [
+			'user_id'			=> $this->user->id(),
+			'endpoint'			=> $data['endpoint'],
+			'expiration_time'	=> $data['expiration_time'] ?? 0,
+			'p256dh'			=> $data['keys']['p256dh'],
+			'auth'				=> $data['keys']['auth'],
+		]);
+		$this->db->sql_query($sql);
+
+		return new JsonResponse([
+			'success'		=> true,
+			'form_tokens'	=> $this->form_helper->get_form_tokens(self::FORM_TOKEN_UCP),
+		]);
+	}
+
+	/**
+	 * Verify that the endpoint is valid and belongs to a known push service
+	 *
+	 * @param string $endpoint Endpoint URL to verify
+	 * @return bool True if endpoint is valid URL and belongs to a known push service, false otherwise
+	 */
+	protected function verify_endpoint(string $endpoint): bool
+	{
+		$parts = parse_url($endpoint);
+
+		// Basic URL structural check
+		if (!$parts || !isset($parts['scheme'], $parts['host']))
+		{
+			return false;
+		}
+
+		// MUST be HTTPS: https://datatracker.ietf.org/doc/html/rfc8030#section-8
+		if (strtolower($parts['scheme']) !== 'https')
+		{
+			return false;
+		}
+
+		// Only allow endpoints for known push services (e.g. Mozilla, Google)
+		// See https://github.com/pushpad/known-push-services for list of known services
+		$allowed_services = [
+			'android.googleapis.com',
+			'fcm.googleapis.com',
+			'updates.push.services.mozilla.com',
+			'updates-autopush.stage.mozaws.net',
+			'updates-autopush.dev.mozaws.net',
+			'.notify.windows.com',
+			'.push.apple.com',
+		];
+
+		/**
+		 * Event to modify allowed services for web push notifications
+		 *
+		 * @event core.ucp_webpush_controller_verify_endpoint
+		 * @var array allowed_services Allowed service URLs
+		 * @since 4.0.0-a2
+		 */
+		$vars = [
+			'allowed_services',
+		];
+		extract($this->dispatcher->trigger_event('core.ucp_webpush_controller_verify_endpoint', compact($vars)));
+
+		foreach ($allowed_services as $allowed_host)
+		{
+			// Use str_ends_with to support subdomains like 'web.push.apple.com'
+			if (str_ends_with(strtolower($parts['host']), $allowed_host))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Handle unsubscribe requests
+	 *
+	 * @param symfony_request $symfony_request
+	 * @return JsonResponse
+	 */
+	public function unsubscribe(symfony_request $symfony_request): JsonResponse
+	{
+		$this->check_subscribe_requests();
+
+		$data = json_sanitizer::decode($symfony_request->attributes->get('data', ''));
+
+		$endpoint = $data['endpoint'];
+
+		$sql = 'DELETE FROM ' . $this->push_subscriptions_table . '
+			WHERE user_id = ' . (int) $this->user->id() . "
+				AND endpoint = '" . $this->db->sql_escape($endpoint) . "'";
+		$this->db->sql_query($sql);
+
+		return new JsonResponse([
+			'success'		=> true,
+			'form_tokens'	=> $this->form_helper->get_form_tokens(self::FORM_TOKEN_UCP),
+		]);
+	}
+}
diff --git a/phpBB/phpbb/update/controller.php b/phpBB/phpbb/update/controller.php
new file mode 100644
index 00000000000..cdbc53495b9
--- /dev/null
+++ b/phpBB/phpbb/update/controller.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\update;
+
+use phpbb\filesystem\filesystem_interface;
+use phpbb\language\language;
+
+class controller
+{
+	/** @var filesystem_interface Filesystem manager */
+	private filesystem_interface $filesystem;
+
+	/** @var get_updates Updater class */
+	private get_updates $updater;
+
+	/** @var language Translation handler */
+	private language $language;
+
+	/** @var string phpBB root path */
+	private string $phpbb_root_path;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param filesystem_interface $filesystem
+	 * @param get_updates $updater
+	 * @param language $language
+	 * @param string $phpbb_root_path
+	 */
+	public function __construct(
+		filesystem_interface $filesystem,
+		get_updates $updater,
+		language $language,
+		string $phpbb_root_path)
+	{
+		$this->filesystem = $filesystem;
+		$this->language = $language;
+		$this->updater = $updater;
+		$this->phpbb_root_path = $phpbb_root_path;
+	}
+
+	/**
+	 * Handle requests.
+	 *
+	 * @param string $download The download URL.
+	 *
+	 * @return string[] Unencoded json response.
+	 */
+	public function handle(string $download): array
+	{
+		$update_path = $this->phpbb_root_path . 'store/update.zip';
+		$status = ['status' => 'continue'];
+		if (!$this->filesystem->exists($update_path))
+		{
+			$result = $this->updater->download($download, $update_path);
+			if (!$result)
+			{
+				return $this->error_response('UPDATE_PACKAGE_DOWNLOAD_FAILURE');
+			}
+
+			return $status;
+		}
+
+		if (!$this->filesystem->exists($update_path . '.sig'))
+		{
+			$result = $this->updater->download($download . '.sig', $update_path . '.sig');
+			if (!$result)
+			{
+				return $this->error_response('UPDATE_SIGNATURE_DOWNLOAD_FAILURE');
+			}
+
+			return $status;
+		}
+
+		if (!$this->filesystem->exists($this->phpbb_root_path . 'store/update') || !is_dir($this->phpbb_root_path . 'store/update'))
+		{
+			$result = $this->updater->validate($update_path, $update_path . '.sig');
+			if (!$result)
+			{
+				return $this->error_response('UPDATE_SIGNATURE_INVALID');
+			}
+
+			$result = $this->updater->extract($update_path, $this->phpbb_root_path . 'store/update');
+			if (!$result)
+			{
+				return $this->error_response('UPDATE_PACKAGE_EXTRACT_FAILURE');
+			}
+
+			return $status;
+		}
+
+		if (!$this->filesystem->exists($this->phpbb_root_path . 'install') || !is_dir($this->phpbb_root_path . 'install'))
+		{
+			$result = $this->updater->copy($this->phpbb_root_path . 'store/update');
+			if (!$result)
+			{
+				return $this->error_response('UPDATE_FILES_COPY_FAILURE');
+			}
+
+			return $status;
+		}
+
+		$this->filesystem->remove([
+			$this->phpbb_root_path . 'store/update',
+			$update_path,
+			$update_path . '.sig'
+		]);
+
+		$status['status'] = 'done';
+		return $status;
+	}
+
+	/**
+	 * Create error response
+	 *
+	 * @param string $error_key
+	 * @return array Error response
+	 */
+	protected function error_response(string $error_key): array
+	{
+		return [
+			'status' => 'error',
+			'error' => $this->language->lang($error_key),
+		];
+	}
+}
diff --git a/phpBB/phpbb/update/get_updates.php b/phpBB/phpbb/update/get_updates.php
new file mode 100644
index 00000000000..7b79000c6dd
--- /dev/null
+++ b/phpBB/phpbb/update/get_updates.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\update;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use phpbb\filesystem\exception\filesystem_exception;
+use phpbb\filesystem\filesystem_interface;
+use SodiumException;
+use ZipArchive;
+
+class get_updates
+{
+	/** @var filesystem_interface Filesystem manager */
+	protected filesystem_interface $filesystem;
+
+	/** @var Client HTTP client */
+	protected Client $http_client;
+
+	/** @var ZipArchive Zip extractor */
+	protected ZipArchive $zipper;
+
+	/** @var string Public key to verify package  */
+	protected string $public_key;
+
+	/** @var string phpBB root path */
+	private string $phpbb_root_path;
+
+	/**
+	 * Constructor
+	 *
+	 * @param filesystem_interface $filesystem
+	 * @param string $public_key
+	 * @param string $phpbb_root_path
+	 */
+	public function __construct(
+		filesystem_interface $filesystem,
+		string $public_key,
+		string $phpbb_root_path)
+	{
+		$this->filesystem = $filesystem;
+		$this->http_client = new Client();
+		$this->zipper = new ZipArchive();
+		$this->public_key = base64_decode($public_key);
+		$this->phpbb_root_path = $phpbb_root_path;
+	}
+
+	/**
+	 * Download the update package.
+	 *
+	 * @param string $url			Download link to the update.
+	 * @param string $storage_path	Location for the download.
+	 *
+	 * @return bool Whether the download completed successfully.
+	 */
+	public function download(string $url, string $storage_path): bool
+	{
+		try
+		{
+			$this->http_client->request('GET', $url, [
+				'sink' => $storage_path,
+				'allow_redirects' => false
+			]);
+		}
+		catch (GuzzleException)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Validate the downloaded file.
+	 *
+	 * @param string $file_path			Path to the download.
+	 * @param string $signature_path	The signature file.
+	 *
+	 * @return bool Whether the signature is correct or not.
+	 */
+	public function validate(string $file_path, string $signature_path): bool
+	{
+		if (file_exists($file_path) === false || !is_readable($file_path))
+		{
+			return false;
+		}
+
+		if (file_exists($signature_path) === false || !is_readable($signature_path))
+		{
+			return false;
+		}
+
+		$signature = file_get_contents($signature_path);
+
+		$hash = hash_file('sha384', $file_path, true);
+		if ($hash === false)
+		{
+			return false;
+		}
+
+		$raw_signature = base64_decode($signature, true);
+		if ($raw_signature === false)
+		{
+			return false;
+		}
+
+		$raw_public_key = base64_decode($this->public_key, true);
+		if ($raw_public_key === false)
+		{
+			return false;
+		}
+
+		try
+		{
+			return sodium_crypto_sign_verify_detached($raw_signature, $hash, $raw_public_key);
+		}
+		catch (SodiumException)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Extract the downloaded archive.
+	 *
+	 * @param string $zip_file	Path to the archive.
+	 * @param string $to		Path to where to extract the archive to.
+	 *
+	 * @return bool Whether the extraction completed successfully.
+	 */
+	public function extract(string $zip_file, string $to): bool
+	{
+		if ($this->zipper->open($zip_file) === false)
+		{
+			return false;
+		}
+
+		$result = $this->zipper->extractTo($to);
+		$this->zipper->close();
+
+		return $result;
+	}
+
+	/**
+	 * Copy the update package to the root folder.
+	 *
+	 * @param string $src_dir Where to copy from.
+	 *
+	 * @return bool Whether the files were copied successfully.
+	 */
+	public function copy(string $src_dir): bool
+	{
+		try
+		{
+			$this->filesystem->mirror($src_dir, $this->phpbb_root_path);
+		}
+		catch (filesystem_exception)
+		{
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index 20a54fe9e4e..e90539a8a00 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -27,7 +27,7 @@ class user extends \phpbb\session
 	protected $language;
 
 	var $style = array();
-	var $date_format;
+	var $date_format = '';
 
 	/**
 	* DateTimeZone object holding the timezone of the user
@@ -59,7 +59,7 @@ class user extends \phpbb\session
 	* @param \phpbb\language\language	$lang			phpBB's Language loader
 	* @param string						$datetime_class	Class name of datetime class
 	*/
-	function __construct(\phpbb\language\language $lang, $datetime_class)
+	public function __construct(\phpbb\language\language $lang, $datetime_class)
 	{
 		global $phpbb_root_path;
 
@@ -80,6 +80,16 @@ public function is_setup()
 		return $this->is_setup_flag;
 	}
 
+	/**
+	 * Get expiration time for user tokens, e.g. activation or reset password tokens
+	 *
+	 * @return int Expiration for user tokens
+	 */
+	public static function get_token_expiration(): int
+	{
+		return strtotime('+1 day') ?: 0;
+	}
+
 	/**
 	 * Magic getter for BC compatibility
 	 *
@@ -617,12 +627,12 @@ function add_lang_ext($ext_name, $lang_set, $use_db = false, $use_help = false)
 	* Format user date
 	*
 	* @param int $gmepoch unix timestamp
-	* @param string|false $format date format in date() notation. | used to indicate relative dates, for example |d m Y|, h:i is translated to Today, h:i.
+	* @param string $format date format in date() notation. | used to indicate relative dates, for example |d m Y|, h:i is translated to Today, h:i.
 	* @param bool $forcedate force non-relative date format.
 	*
 	* @return mixed translated date
 	*/
-	function format_date($gmepoch, $format = false, $forcedate = false)
+	function format_date($gmepoch, $format = '', $forcedate = false)
 	{
 		global $phpbb_dispatcher;
 		static $utc;
@@ -699,7 +709,7 @@ public function create_timezone($user_timezone = null)
 	* @param ?\DateTimeZone $timezone Time zone of the time.
 	* @return \phpbb\datetime Date time object linked to the current users locale
 	*/
-	public function create_datetime(string $time = 'now', ?\DateTimeZone $timezone = null)
+	public function create_datetime(string $time = 'now', \DateTimeZone|null $timezone = null)
 	{
 		$timezone = $timezone ?: $this->create_timezone();
 		return new $this->datetime($this, $time, $timezone);
@@ -713,7 +723,7 @@ public function create_datetime(string $time = 'now', ?\DateTimeZone $timezone =
 	* @param	?\DateTimeZone	$timezone	Timezone of the date/time, falls back to timezone of current user
 	* @return	string|false			Returns the unix timestamp or false if date is invalid
 	*/
-	public function get_timestamp_from_format($format, $time, ?\DateTimeZone $timezone = null)
+	public function get_timestamp_from_format($format, $time, \DateTimeZone|null $timezone = null)
 	{
 		$timezone = $timezone ?: $this->create_timezone();
 		$date = \DateTime::createFromFormat($format, $time, $timezone);
diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php
index 5d84a843a3a..47c0e63ed7f 100644
--- a/phpBB/phpbb/user_loader.php
+++ b/phpBB/phpbb/user_loader.php
@@ -197,6 +197,8 @@ public function get_avatar($user_id, $query = false, $lazy = false)
 		}
 
 		$row = [
+			'id'			=> $user['user_id'],
+			'username'		=> $user['username'],
 			'avatar'		=> $user['user_avatar'],
 			'avatar_type'	=> $user['user_avatar_type'],
 			'avatar_width'	=> $user['user_avatar_width'],
diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php
index 8986bede0ce..e75e38a35c0 100644
--- a/phpBB/phpbb/version_helper.php
+++ b/phpBB/phpbb/version_helper.php
@@ -171,10 +171,10 @@ public function compare($version1, $version2, $operator = null)
 	 * @param string $version
 	 * @return bool Bool true or false
 	 */
-	public function is_stable($version)
+	public function is_stable(string $version): bool
 	{
 		$matches = false;
-		preg_match('/^[\d\.]+/', $version, $matches);
+		preg_match('/^[\d.]+/', $version, $matches);
 
 		if (empty($matches[0]))
 		{
@@ -184,6 +184,20 @@ public function is_stable($version)
 		return $this->compare($version, $matches[0], '>=');
 	}
 
+	/**
+	 * Get branch for version, e.g. 3.2 for version 3.2.5
+	 *
+	 * @param string $version Version to get branch from
+	 * @return string Branch for version or empty string if version is not of expected format
+	 */
+	protected function get_branch(string $version): string
+	{
+		$matches = [];
+		preg_match('/^(\d+\.\d+).*$/', $version, $matches);
+
+		return $matches[1] ?? '';
+	}
+
 	/**
 	* Gets the latest version for the current branch the user is on
 	*
@@ -192,27 +206,37 @@ public function is_stable($version)
 	* @return string
 	* @throws version_check_exception
 	*/
-	public function get_latest_on_current_branch($force_update = false, $force_cache = false)
+	public function get_latest_on_current_branch(bool $force_update = false, bool $force_cache = false): string
 	{
 		$versions = $this->get_versions_matching_stability($force_update, $force_cache);
 
-		$self = $this;
 		$current_version = $this->current_version;
 
-		// Filter out any versions less than the current version
-		$versions = array_filter($versions, function($data) use ($self, $current_version) {
-			return $self->compare($data['current'], $current_version, '>=');
+		// Get the branch information for the current version
+		$current_branch = $this->get_branch($current_version);
+		if (isset($versions[$current_branch]) && empty($versions[$current_branch]['eol']))
+		{
+			return $versions[$current_branch]['current'];
+		}
+
+		// Sort versions in version ascending order so we can loop from the lowest version to the highest version.
+		uksort($versions, function($version1, $version2) {
+			return $this->compare($version1, $version2, '>');
 		});
 
-		// Get the lowest version from the previous list.
-		return array_reduce($versions, function($value, $data) use ($self) {
-			if ($value === null || $self->compare($data['current'], $value, '<'))
+		// Find next available version from versions info.
+		// Will suggest newer branches when EoL has been reached for the current branch, and/or version from newer branch
+		// is needed for having all known security issues fixed ('security' > latest on branch).
+		foreach ($versions as $branch => $data)
+		{
+			if ($this->compare($branch, $current_branch, '>=') && empty($data['eol'])
+				&& (empty($data['security']) || $this->compare($data['security'], $data['current'], '<=')))
 			{
 				return $data['current'];
 			}
+		}
 
-			return $value;
-		});
+		return '';
 	}
 
 	/**
@@ -226,36 +250,43 @@ public function get_latest_on_current_branch($force_update = false, $force_cache
 	 * @return array Version info or empty array if there are no updates
 	 * @throws \RuntimeException
 	 */
-	public function get_update_on_branch($force_update = false, $force_cache = false)
+	public function get_update_on_branch(bool $force_update = false, bool $force_cache = false): array
 	{
 		$versions = $this->get_versions_matching_stability($force_update, $force_cache);
 
-		$self = $this;
 		$current_version = $this->current_version;
 
-		// Filter out any versions less than the current version
-		$versions = array_filter($versions, function($data) use ($self, $current_version) {
-			return $self->compare($data['current'], $current_version, '>=');
+		// Use current branch information if it exists
+		$current_branch = $this->get_branch($current_version);
+		$current_branch_data = $versions[$current_branch] ?? null;
+		if ($current_branch_data && empty($current_branch_data['eol'])
+			&& (empty($current_branch_data['security']) || $this->compare($current_branch_data['security'], $current_version, '<=')))
+		{
+			return ($this->compare($current_branch_data['current'], $current_version, '>')) ? $current_branch_data : [];
+		}
+
+		// Sort versions in version ascending order so we can loop from the lowest version to the highest version.
+		uksort($versions, function($version1, $version2) {
+			return $this->compare($version1, $version2, '>');
 		});
 
-		// Get the lowest version from the previous list.
-		$update_info = array_reduce($versions, function($value, $data) use ($self, $current_version) {
-			if ($value === null && $self->compare($data['current'], $current_version, '>='))
+		foreach ($versions as $branch => $data)
+		{
+			if ($this->compare($branch, $current_branch, '>=') && empty($data['eol'])
+				&& (empty($data['security']) || $this->compare($data['security'], $data['current'], '<=')))
 			{
-				if (!$data['eol'] && (!$data['security'] || $self->compare($data['security'], $data['current'], '<=')))
+				if ($this->compare($data['current'], $current_version, '>'))
 				{
-					return ($self->compare($data['current'], $current_version, '>')) ? $data : array();
+					return $data;
 				}
 				else
 				{
-					return null;
+					break;
 				}
 			}
+		}
 
-			return $value;
-		});
-
-		return $update_info === null ? array() : $update_info;
+		return [];
 	}
 
 	/**
@@ -276,9 +307,7 @@ public function get_ext_update_on_branch($force_update = false, $force_cache = f
 		$self = $this;
 		$current_version = $this->current_version;
 
-		// Get current phpBB branch from version, e.g.: 3.2
-		preg_match('/^(\d+\.\d+).*$/', $this->config['version'], $matches);
-		$current_branch = $matches[1];
+		$current_branch = $this->get_branch($this->config['version']);
 
 		// Filter out any versions less than the current version
 		$versions = array_filter($versions, function($data) use ($self, $current_version) {
@@ -382,7 +411,7 @@ public function get_versions($force_update = false, $force_cache = false)
 		}
 		else if ($info === false || $force_update)
 		{
-			$info = $this->file_downloader->get($this->host, $this->path, $this->file, $this->use_ssl ? 443 : 80);
+			$info = $this->file_downloader->get($this->host, $this->path, $this->file, $this->use_ssl ? 443 : 80, 30);
 			$error_string = $this->file_downloader->get_error_string();
 
 			if (!empty($error_string))
diff --git a/phpBB/phpbb/viewonline_helper.php b/phpBB/phpbb/viewonline_helper.php
deleted file mode 100644
index 647d3dbf193..00000000000
--- a/phpBB/phpbb/viewonline_helper.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb;
-
-use phpbb\filesystem\helper as filesystem_helper;
-
-/**
- * Class to handle viewonline related tasks
- */
-class viewonline_helper
-{
-	/** @var \phpbb\db\driver\driver_interface */
-	protected $db;
-
-	/**
-	 * @param \phpbb\db\driver\driver_interface $db
-	 */
-	public function __construct(\phpbb\db\driver\driver_interface $db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Get forum IDs for topics
-	 *
-	 * Retrieve forum IDs and add the data into the session data array
-	 * Array structure matches sql_fethrowset() result array
-	 *
-	 * @param array $session_data_rowset Users' session data array
-	 * @return void
-	 */
-	public function get_forum_ids(array &$session_data_rowset): void
-	{
-		$topic_ids = $match = [];
-		foreach ($session_data_rowset as $number => $row)
-		{
-			if ($row['session_forum_id'] == 0 && preg_match('#t=([0-9]+)#', $row['session_page'], $match))
-			{
-				$topic_ids[$number] = (int) $match[1];
-			}
-		}
-
-		if (count($topic_ids = array_unique($topic_ids)))
-		{
-			$sql_ary = [
-				'SELECT'	=> 't.topic_id, t.forum_id',
-				'FROM'		=> [
-					TOPICS_TABLE => 't',
-				],
-				'WHERE'		=> $this->db->sql_in_set('t.topic_id', $topic_ids),
-				'ORDER_BY'	=> 't.topic_id',
-			];
-			$result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary));
-			$forum_ids_rowset = $this->db->sql_fetchrowset($result);
-			$this->db->sql_freeresult($result);
-
-			foreach ($forum_ids_rowset as $forum_ids_row)
-			{
-				$session_data_row_number = array_search((int) $forum_ids_row['topic_id'], $topic_ids);
-				$session_data_rowset[$session_data_row_number]['session_forum_id'] = (int) $forum_ids_row['forum_id'];
-			}
-		}
-	}
-
-	/**
-	 * Get user page
-	 *
-	 * @param string $session_page User's session page
-	 * @return array Match array filled by preg_match()
-	 */
-	public function get_user_page($session_page)
-	{
-		$session_page = filesystem_helper::clean_path($session_page);
-		if (strpos($session_page, './') === 0)
-		{
-			$session_page = substr($session_page, 2);
-		}
-
-		preg_match('#^((\.\./)*([a-z0-9/_-]+))#i', $session_page, $on_page);
-		if (empty($on_page))
-		{
-			$on_page[1] = '';
-		}
-
-		return $on_page;
-	}
-}
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 79ba5585e93..f5d134e06f6 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -41,6 +41,9 @@
 $submit = $request->is_set_post('post') && !$refresh && !$preview;
 $mode		= $request->variable('mode', '');
 
+/** @var \phpbb\controller\helper $controller_helper */
+$controller_helper = $phpbb_container->get('controller.helper');
+
 // Only assign required URL parameters
 $forum_id = 0;
 $topic_id = 0;
@@ -178,7 +181,7 @@
 // Was cancel pressed? If so then redirect to the appropriate page
 if ($cancel)
 {
-	$redirect = ($post_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $post_id) . '#p' . $post_id : (($topic_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $topic_id) : (($forum_id) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) : append_sid("{$phpbb_root_path}index.$phpEx")));
+	$redirect = ($post_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $post_id) . '#p' . $post_id : (($topic_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $topic_id) : (($forum_id) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) : $controller_helper->route('phpbb_index_controller')));
 	redirect($redirect);
 }
 
@@ -306,7 +309,7 @@
 // Check permissions
 if ($user->data['is_bot'])
 {
-	redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+	redirect($controller_helper->route('phpbb_index_controller'));
 }
 
 // Is the user able to read within this forum?
@@ -455,8 +458,10 @@
 
 if ($config['enable_post_confirm'] && !$user->data['is_registered'])
 {
-	$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
-	$captcha->init(CONFIRM_POST);
+	/** @var \phpbb\captcha\factory $captcha_factory */
+	$captcha_factory = $phpbb_container->get('captcha.factory');
+	$captcha = $captcha_factory->get_instance($config['captcha_plugin']);
+	$captcha->init(\phpbb\captcha\plugins\confirm_type::POST);
 }
 
 // Is the user able to post within this forum?
@@ -846,6 +851,7 @@
 				'disable_smilies'	=> false,
 				'disable_magic_url'	=> false,
 				'attach_sig'		=> true,
+				'notify'			=> false,
 				'lock_topic'		=> false,
 
 				'topic_type'		=> POST_NORMAL,
@@ -1207,15 +1213,9 @@
 
 	if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply')))
 	{
-		$captcha_data = array(
-			'message'	=> $request->variable('message', '', true),
-			'subject'	=> $request->variable('subject', '', true),
-			'username'	=> $request->variable('username', '', true),
-		);
-		$vc_response = $captcha->validate($captcha_data);
-		if ($vc_response)
+		if ($captcha->validate() !== true)
 		{
-			$error[] = $vc_response;
+			$error[] = $captcha->get_error();
 		}
 	}
 
@@ -1427,7 +1427,14 @@
 	// Store message, sync counters
 	if (!count($error) && $submit)
 	{
-		if ($submit)
+		/** @var \phpbb\lock\posting $posting_lock */
+		$posting_lock = $phpbb_container->get('posting.lock');
+
+		// Get creation time and form token, must be already checked at this point
+		$creation_time	= abs($request->variable('creation_time', 0));
+		$form_token = $request->variable('form_token', '');
+
+		if ($posting_lock->acquire($creation_time, $form_token))
 		{
 			// Lock/Unlock Topic
 			$change_topic_status = $post_data['topic_status'];
@@ -1592,7 +1599,7 @@
 			);
 			extract($phpbb_dispatcher->trigger_event('core.posting_modify_submit_post_after', compact($vars)));
 
-			if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === true) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
+			if ($config['enable_post_confirm'] && !$user->data['is_registered'] && $captcha->is_solved() === true && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
 			{
 				$captcha->reset();
 			}
@@ -1618,6 +1625,11 @@
 
 			redirect($redirect_url);
 		}
+		else
+		{
+			// Posting was already locked before, hence form submission was already attempted once and is now invalid
+			$error[] = $language->lang('FORM_INVALID');
+		}
 	}
 }
 
@@ -1907,8 +1919,6 @@
 $form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || !$config['allow_attachments'] || !$auth->acl_get('u_attach') || !$auth->acl_get('f_attach', $forum_id)) ? '' : ' enctype="multipart/form-data"';
 add_form_key('posting');
 
-/** @var \phpbb\controller\helper $controller_helper */
-$controller_helper = $phpbb_container->get('controller.helper');
 
 // Build array of variables for main posting page
 $page_data = array(
@@ -1951,7 +1961,7 @@
 	'S_BBCODE_CHECKED'			=> ($bbcode_checked) ? ' checked="checked"' : '',
 	'S_SMILIES_ALLOWED'			=> $smilies_status,
 	'S_SMILIES_CHECKED'			=> ($smilies_checked) ? ' checked="checked"' : '',
-	'S_SIG_ALLOWED'				=> ($auth->acl_get('f_sigs', $forum_id) && $config['allow_sig'] && $user->data['is_registered']) ? true : false,
+	'S_SIG_ALLOWED'				=> ($user->data['is_registered'] && $config['allow_sig'] && $auth->acl_get('f_sigs', $forum_id) && $auth->acl_get('u_sig')) ? true : false,
 	'S_SIGNATURE_CHECKED'		=> ($sig_checked) ? ' checked="checked"' : '',
 	'S_NOTIFY_ALLOWED'			=> (!$user->data['is_registered'] || ($mode == 'edit' && $user->data['user_id'] != $post_data['poster_id']) || !$config['allow_topic_notify'] || !$config['email_enable']) ? false : true,
 	'S_NOTIFY_CHECKED'			=> ($notify_checked) ? ' checked="checked"' : '',
diff --git a/phpBB/search.php b/phpBB/search.php
index 68325bda7f1..92d431c9362 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -19,6 +19,9 @@
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
 
+/** @var \phpbb\controller\helper $controller_helper */
+$controller_helper = $phpbb_container->get('controller.helper');
+
 // Start session management
 $user->session_begin();
 $auth->acl($user->data);
@@ -90,8 +93,21 @@
 	break;
 }
 
+$search_auth_check_override = false;
+/**
+* This event allows you to override search auth checks
+*
+* @event core.search_auth_check_override
+* @var	bool	search_auth_check_override	Whether or not the search auth check overridden
+* @since 3.3.14-RC1
+*/
+$vars = [
+	'search_auth_check_override',
+];
+extract($phpbb_dispatcher->trigger_event('core.search_auth_check_override', compact($vars)));
+
 // Is user able to search? Has search been disabled?
-if (!$auth->acl_get('u_search') || !$auth->acl_getf_global('f_search') || !$config['load_search'])
+if (!$search_auth_check_override && (!$auth->acl_get('u_search') || !$auth->acl_getf_global('f_search') || !$config['load_search']))
 {
 	$template->assign_var('S_NO_SEARCH', true);
 	trigger_error('NO_SEARCH');
@@ -234,6 +250,15 @@
 		$ex_fid_ary = array_unique(array_merge(array_keys($auth->acl_getf('!f_read', true)), array_keys($auth->acl_getf('!f_search', true))));
 	}
 
+	// Consider if there are any forums where can read forum = no, can read topics = yes
+	// In these cases, the user should see the topic title in the search results but not the link to the topic (or any posts) because they don't have the permissions
+	if ($request->variable('sr', '') == 'topics' && $search_fields == 'titleonly')
+	{
+		// The user could get here from a quick search through the viewforum page, or by doing a main search displayed by topics and searching only the topic titles.
+		// Allow the 'can read topics = yes' forums back in to the search by removing from $ex_fid_ary any of the 'can read topics' forums
+		$ex_fid_ary = array_diff($ex_fid_ary, array_keys($auth->acl_getf('f_list_topics', true)));
+	}
+
 	$not_in_fid = (count($ex_fid_ary)) ? 'WHERE ' . $db->sql_in_set('f.forum_id', $ex_fid_ary, true) . " OR (f.forum_password <> '' AND fa.user_id <> " . (int) $user->data['user_id'] . ')' : "";
 
 	$sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.right_id, f.forum_password, f.forum_flags, fa.user_id
@@ -332,7 +357,13 @@
 	}
 
 	// define some variables needed for retrieving post_id/topic_id information
-	$sort_by_sql = array('a' => 'u.username_clean', 't' => (($show_results == 'posts') ? 'p.post_time' : 't.topic_last_post_time'), 'f' => 'f.forum_id', 'i' => 't.topic_title', 's' => (($show_results == 'posts') ? 'p.post_subject' : 't.topic_title'));
+	$sort_by_sql = [
+		'a' => 'u.username_clean',
+		't' => (($show_results == 'posts') ? 'p.post_time' : 't.topic_last_post_time'),
+		'f' => 'f.forum_id',
+		'i' => 't.topic_title',
+		's' => (($show_results == 'posts') ? 'p.post_subject' : 't.topic_title')
+	];
 
 	/**
 	* Event to modify the SQL parameters before pre-made searches
@@ -398,11 +429,11 @@
 				$sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
 
 				$sort_join = ($sort_key == 'f') ? FORUMS_TABLE . ' f, ' : '';
-				$sql_sort = ($sort_key == 'f') ? ' AND f.forum_id = p.forum_id ' . $sql_sort : $sql_sort;
+				$sql_sort = ($sort_key == 'f') ? ' AND f.forum_id = t.forum_id ' . $sql_sort : $sql_sort;
 
 				if ($sort_days)
 				{
-					$last_post_time = 'AND p.post_time > ' . (time() - ($sort_days * 24 * 3600));
+					$last_post_time = 'AND ' . ($show_results == 'posts' ? 'p.post_time' : 't.topic_last_post_time') . ' > ' . (time() - ($sort_days * 24 * 3600));
 				}
 				else
 				{
@@ -412,7 +443,7 @@
 				if ($sort_key == 'a')
 				{
 					$sort_join = USERS_TABLE . ' u, ';
-					$sql_sort = ' AND u.user_id = p.poster_id ' . $sql_sort;
+					$sql_sort = ' AND u.user_id = ' . ($show_results == 'posts' ? 'p.poster_id ' : 't.topic_last_poster_id ') . $sql_sort;
 				}
 				if ($show_results == 'posts')
 				{
@@ -428,14 +459,13 @@
 				}
 				else
 				{
-					$sql = 'SELECT DISTINCT ' . $sort_by_sql[$sort_key] . ", p.topic_id
-						FROM $sort_join" . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t
+					$sql = 'SELECT DISTINCT ' . $sort_by_sql[$sort_key] . ", t.topic_id
+						FROM $sort_join" . TOPICS_TABLE . " t
 						WHERE t.topic_posts_approved = 1
 							AND t.topic_moved_id = 0
-							AND p.topic_id = t.topic_id
 							$last_post_time
 							AND $m_approve_topics_fid_sql
-							" . ((count($ex_fid_ary)) ? ' AND ' . $db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '') . "
+							" . ((count($ex_fid_ary)) ? ' AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . "
 						$sql_sort";
 					$field = 'topic_id';
 				}
@@ -456,7 +486,7 @@
 				gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
 				$s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = '';
 
-				$template->assign_var('U_MARK_ALL_READ', ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'hash=' . generate_link_hash('global') . '&amp;mark=forums&amp;mark_time=' . time()) : '');
+				$template->assign_var('U_MARK_ALL_READ', ($user->data['is_registered'] || $config['load_anon_lastread']) ? $controller_helper->route('phpbb_index_controller', ['hash' => generate_link_hash('global'), 'mark' => 'forums', 'mark_time' => time()]) : '');
 			break;
 
 			case 'newposts':
@@ -674,10 +704,10 @@
 	$hilit = str_replace(' ', '|', $hilit);
 
 	$u_hilit = urlencode(html_entity_decode(str_replace('|', ' ', $hilit), ENT_COMPAT));
-	$u_show_results = '&amp;sr=' . $show_results;
+	$u_show_results = 'sr=' . $show_results;
 	$u_search_forum = implode('&amp;fid%5B%5D=', $search_forum);
 
-	$u_search = append_sid("{$phpbb_root_path}search.$phpEx", $u_sort_param . $u_show_results);
+	$u_search = append_sid("{$phpbb_root_path}search.$phpEx", (($u_sort_param) ? $u_sort_param . '&amp;' : '') . $u_show_results);
 	$u_search .= ($search_id) ? '&amp;search_id=' . $search_id : '';
 	$u_search .= ($u_hilit) ? '&amp;keywords=' . urlencode(html_entity_decode($keywords, ENT_COMPAT)) : '';
 	$u_search .= ($search_terms != 'all') ? '&amp;terms=' . $search_terms : '';
@@ -1139,10 +1169,10 @@
 					'S_TOPIC_DELETED'		=> $topic_deleted,
 					'S_HAS_POLL'			=> (bool) $row['poll_start'],
 
-					'U_LAST_POST'			=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
+					'U_LAST_POST'			=> $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'] : false,
 					'U_LAST_POST_AUTHOR'	=> get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
 					'U_TOPIC_AUTHOR'		=> get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-					'U_NEWEST_POST'			=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&amp;view=unread') . '#unread',
+					'U_NEWEST_POST'			=> $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&amp;view=unread') . '#unread' : false,
 					'U_MCP_REPORT'			=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&amp;mode=reports&amp;t=' . $result_topic_id),
 					'U_MCP_QUEUE'			=> $u_mcp_queue,
 				);
@@ -1212,7 +1242,7 @@
 				'TOPIC_REPLIES'		=> $replies,
 				'TOPIC_VIEWS'		=> $row['topic_views'],
 
-				'U_VIEW_TOPIC'		=> $view_topic_url,
+				'U_VIEW_TOPIC'		=> $auth->acl_get('f_read', $forum_id) ? $view_topic_url : false,
 				'U_VIEW_FORUM'		=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id),
 				'U_VIEW_POST'		=> (!empty($row['post_id'])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id'] . (($u_hilit) ? '&amp;hilit=' . $u_hilit : '')) . '#p' . $row['post_id'] : '',
 			));
diff --git a/phpBB/styles/all/js/push_worker.js.twig b/phpBB/styles/all/js/push_worker.js.twig
new file mode 100644
index 00000000000..115c5094274
--- /dev/null
+++ b/phpBB/styles/all/js/push_worker.js.twig
@@ -0,0 +1,89 @@
+/**
+ * Event listener for install event
+ */
+self.addEventListener('install', () => {
+	// Call to ensure service worker is correctly updated
+	self.skipWaiting();
+});
+
+/**
+ * Event listener for activate event
+ */
+self.addEventListener('activate', event => {
+	event.waitUntil(self.clients.claim());
+});
+
+/**
+ * Event listener for push event
+ */
+self.addEventListener('push', event => {
+	if (typeof event.data === 'undefined') {
+		return;
+	}
+
+	let itemId = 0;
+	let typeId = 0;
+	let userId = 0;
+	let notificationVersion = 0;
+	let pushToken = '';
+	try {
+		const notificationData = event.data.json();
+		itemId = notificationData.item_id;
+		typeId = notificationData.type_id;
+		userId = notificationData.user_id;
+		notificationVersion = parseInt(notificationData.version, 10);
+		pushToken = notificationData.token;
+	} catch {
+		event.waitUntil(self.registration.showNotification(event.data.text()));
+		return;
+	}
+
+	event.waitUntil((async() => {
+		const getNotificationUrl = '{{ U_WEBPUSH_GET_NOTIFICATION }}';
+		const assetsVersion = parseInt('{{ ASSETS_VERSION }}', 10);
+
+		// Force update if versions differ
+		if (assetsVersion !== notificationVersion) {
+			await self.registration.update();
+		}
+
+		const formData = new FormData();
+		formData.append('item_id', itemId.toString(10));
+		formData.append('type_id', typeId.toString(10));
+		formData.append('user_id', userId.toString(10));
+		formData.append('token', pushToken);
+
+		try {
+			const response = await fetch(getNotificationUrl, {
+				method: 'POST',
+				headers: {
+					'X-Requested-With': 'XMLHttpRequest',
+				},
+				body: formData,
+			});
+
+			const responseData = await response.json();
+
+			const responseBody = responseData.title + '\n' + responseData.text;
+			const options = {
+				body: responseBody,
+				data: responseData,
+				icon: responseData.avatar.src,
+			};
+
+			await self.registration.showNotification(responseData.heading, options);
+		} catch (e) {
+			console.error('Push error:', e);
+		}
+	})());
+});
+
+/**
+ * Event listener for notification click
+ */
+self.addEventListener('notificationclick', event => {
+	event.notification.close();
+	if (typeof event.notification.data !== 'undefined') {
+		event.waitUntil(self.clients.openWindow(event.notification.data.url));
+	}
+});
diff --git a/phpBB/styles/all/template/macros/avatar.twig b/phpBB/styles/all/template/macros/avatar.twig
new file mode 100644
index 00000000000..6c3a3809cde
--- /dev/null
+++ b/phpBB/styles/all/template/macros/avatar.twig
@@ -0,0 +1 @@
+{% if SRC %}<img class="avatar" src="{{ SRC }}"{% if DATA_SRC %} data-src="{{ DATA_SRC }}"{% endif %}{% if WIDTH %} width="{{ WIDTH }}"{% endif %}{% if HEIGHT %} height="{{ HEIGHT }}"{% endif %} alt="{{ lang(TITLE) }}">{% endif %}
diff --git a/phpBB/styles/all/template/macros/forms/input.twig b/phpBB/styles/all/template/macros/forms/input.twig
index 1a2ff13fa39..4016ad9da3d 100644
--- a/phpBB/styles/all/template/macros/forms/input.twig
+++ b/phpBB/styles/all/template/macros/forms/input.twig
@@ -1,4 +1,4 @@
-{% apply replace({"\n": ' ', "\t": ''}) %}
+{% apply replace({"\n\t": ' ', "\t": '', "\n": ''}) %}
 	<input
 		{% if CLASS %}class="{{ CLASS }}" {% endif %}
 		{% if ID %}id="{{ ID }}" {% endif %}
@@ -14,5 +14,6 @@
 		{% if STEP %}step="{{ STEP }}" {% endif %}
 		{% if TYPE == 'password' %}autocomplete="off" {% endif %}
 		{% if CHECKED %}checked="checked" {% endif %}
+		{% if DISABLED %}disabled="disabled" {% endif %}
 		value="{{ VALUE }}">
 {% endapply %}
diff --git a/phpBB/styles/all/template/macros/forms/radio_buttons.twig b/phpBB/styles/all/template/macros/forms/radio_buttons.twig
index 1ef7804c296..4d5b5c438a7 100644
--- a/phpBB/styles/all/template/macros/forms/radio_buttons.twig
+++ b/phpBB/styles/all/template/macros/forms/radio_buttons.twig
@@ -1,2 +1,3 @@
-<label>{{ FormsInput(FIRST_BUTTON) ~ FIRST_BUTTON_LABEL }}</label>
-<label>{{ FormsInput(SECOND_BUTTON) ~ SECOND_BUTTON_LABEL }}</label>
+{% for button in BUTTONS %}
+<label>{{ FormsInput(button) ~ ' ' ~ button.label }}</label>
+{% endfor %}
diff --git a/phpBB/styles/all/template/macros/forms/select.twig b/phpBB/styles/all/template/macros/forms/select.twig
index 3cab1e71998..1ada063e575 100644
--- a/phpBB/styles/all/template/macros/forms/select.twig
+++ b/phpBB/styles/all/template/macros/forms/select.twig
@@ -1,4 +1,4 @@
-{% apply  replace({"\n": ' ', "\t": ''}) %}
+{% apply replace({"\n\t": ' ', "\t": '', "\n": ''}) %}
 	<select
 		{% if CLASS %}class="{{ CLASS }}" {% endif %}
 		{% if ID %}id="{{ ID }}" {% endif %}
@@ -6,26 +6,31 @@
 			data-{{ attribute|e }}="{{ attribute_value|e('html_attr') }}"
 		{% endfor %}
 		name="{{ NAME }}"
-		{% if TOGGLEABLE %}data-togglable-settings="true" {% endif %}
-
-		{% if MULTIPLE %}multiple="multiple" {% endif %}
-		{% if SIZE %}size="{{ SIZE }}" {% endif %}>
-{% endapply %}
+		{% if TOGGLEABLE %}data-togglable-settings="true"{% endif %}
+		{% if MULTIPLE %}multiple="multiple"{% endif %}
+		{% if ONCHANGE %}onchange="{{ ONCHANGE }}"{% endif %}
+		{% if SIZE %}size="{{ SIZE }}"{% endif %}>
 {% for element in OPTIONS %}
 	{% if not GROUP_ONLY and element.options %}
-		{% apply  replace({"\n": ' ', '\t': ''}) %}
 			<optgroup
 			{% for key, value in element.data %}
 				data-{{ key }}="{{ value }}"
 			{% endfor %}
 			label="{{ element.label }}">
-		{% endapply %}
 		{% for option in element.options %}
-			<option value="{{ option.value }}"{% if option.selected %} selected="selected"{% endif %}{% if option.disabled %} disabled="disabled" class="disabled-option"{% endif %}>{{ option.label }}</option>
+			<option
+				value="{{ option.value }}"
+				{% if option.selected %}selected="selected"{% endif %}
+				{% if option.disabled %} disabled="disabled"{% endif %}{% if option.class %} class="{{ option.class }}"{% endif %}>{{ option.label }}</option>
 		{% endfor %}
 		</optgroup>
 	{% else %}
-		<option value="{{ element.value }}"{% if element.selected %} selected="selected"{% endif %}{% if element.disabled %} disabled="disabled" class="disabled-option"{% endif %}>{{ element.label }}</option>
+		<option
+			value="{{ element.value }}"
+			{% if element.selected %} selected="selected"{% endif %}
+			{% if element.disabled %} disabled="disabled"{% endif %}{% if element.class %} class="{{ element.class }}"{% endif %}
+			{% if element.data %}{% for key, value in element.data %} data-{{ key }}="{{ value }}"{% endfor %}{% endif %}>{{ element.label }}</option>
 	{% endif %}
 {% endfor %}
 </select>
+{% endapply %}
diff --git a/phpBB/styles/all/template/macros/forms/textarea.twig b/phpBB/styles/all/template/macros/forms/textarea.twig
index e4fada13f2b..10934f067f5 100644
--- a/phpBB/styles/all/template/macros/forms/textarea.twig
+++ b/phpBB/styles/all/template/macros/forms/textarea.twig
@@ -1,10 +1,11 @@
-{% apply  replace({"\n": ' ', '\t': ''}) %}
+{% apply replace({"\n": ' ', '\t': ''}) %}
 	<textarea
 		{% if CLASS %}class="{{ CLASS }}" {% endif %}
-		id="{{ ID }}"
+		{% if ID %}id="{{ ID }}" {% endif %}
 		{% for attribute, attribute_value in DATA %}
 			data-{{ attribute|e }}="{{ attribute_value|e('html_attr') }}"
 		{% endfor %}
 		name="{{ NAME }}"
 		rows="{{ ROWS }}"
-		cols="{{ COLS }}">{% endapply %}{{ CONTENT }}</textarea>
+		cols="{{ COLS }}"
+		{% if PLACEHOLDER %}placeholder="{{ PLACEHOLDER }}"{% endif %}>{% endapply %}{{ CONTENT }}</textarea>
diff --git a/phpBB/styles/prosilver/composer.json b/phpBB/styles/prosilver/composer.json
index 51024f2285f..7b6ee810963 100644
--- a/phpBB/styles/prosilver/composer.json
+++ b/phpBB/styles/prosilver/composer.json
@@ -1,26 +1,27 @@
 {
-	"name": "phpbb/phpbb-style-prosilver",
-	"description": "phpBB Forum Software default style",
-	"type": "phpbb-style",
-	"version": "4.0.0-a1-dev",
-	"homepage": "https://www.phpbb.com",
-	"license": "GPL-2.0",
-	"authors": [
-		{
-			"name": "phpBB Limited",
-			"email": "operations@phpbb.com",
-			"homepage": "https://www.phpbb.com/go/authors"
-		}
-	],
-	"support": {
-		"issues": "https://tracker.phpbb.com",
-		"forum": "https://www.phpbb.com/community/",
-		"wiki": "https://wiki.phpbb.com",
-		"irc": "irc://irc.freenode.org/phpbb"
-	},
-	"extra": {
-		"display-name": "prosilver",
-		"phpbb-version": "4.0.0-a1-dev",
-		"parent-style":  ""
-	}
+    "name": "phpbb/phpbb-style-prosilver",
+    "description": "phpBB Forum Software default style",
+    "type": "phpbb-style",
+    "version": "4.0.0",
+    "homepage": "https://www.phpbb.com",
+    "license": "GPL-2.0-only",
+    "authors": [
+        {
+            "name": "phpBB Limited",
+            "email": "operations@phpbb.com",
+            "homepage": "https://www.phpbb.com/go/authors"
+        }
+    ],
+    "support": {
+        "issues": "https://tracker.phpbb.com",
+        "forum": "https://www.phpbb.com/community/",
+        "docs": "https://www.phpbb.com/support/docs/",
+        "irc": "irc://irc.libera.chat/phpbb",
+        "chat": "https://www.phpbb.com/support/chat/"
+    },
+    "extra": {
+        "display-name": "prosilver",
+        "phpbb-version": "4.0.0-a1",
+        "parent-style": ""
+    }
 }
diff --git a/phpBB/styles/prosilver/imgs/svg/bullhorn.svg b/phpBB/styles/prosilver/imgs/svg/bullhorn.svg
new file mode 100644
index 00000000000..2755c3b78bb
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/bullhorn.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M480 32c0-12.9-7.8-24.6-19.8-29.6s-25.7-2.2-34.9 6.9L381.7 53c-48 48-113.1 75-181 75H192 160 64c-35.3 0-64 28.7-64 64v96c0 35.3 28.7 64 64 64l0 128c0 17.7 14.3 32 32 32h64c17.7 0 32-14.3 32-32V352l8.7 0c67.9 0 133 27 181 75l43.6 43.6c9.2 9.2 22.9 11.9 34.9 6.9s19.8-16.6 19.8-29.6V300.4c18.6-8.8 32-32.5 32-60.4s-13.4-51.6-32-60.4V32zm-64 76.7V240 371.3C357.2 317.8 280.5 288 200.7 288H192V192h8.7c79.8 0 156.5-29.8 215.3-83.3z"/></svg>
diff --git a/phpBB/styles/prosilver/imgs/svg/globe.svg b/phpBB/styles/prosilver/imgs/svg/globe.svg
new file mode 100644
index 00000000000..c3405615094
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/globe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M352 256c0 22.2-1.2 43.6-3.3 64H163.3c-2.2-20.4-3.3-41.8-3.3-64s1.2-43.6 3.3-64H348.7c2.2 20.4 3.3 41.8 3.3 64zm28.8-64H503.9c5.3 20.5 8.1 41.9 8.1 64s-2.8 43.5-8.1 64H380.8c2.1-20.6 3.2-42 3.2-64s-1.1-43.4-3.2-64zm112.6-32H376.7c-10-63.9-29.8-117.4-55.3-151.6c78.3 20.7 142 77.5 171.9 151.6zm-149.1 0H167.7c6.1-36.4 15.5-68.6 27-94.7c10.5-23.6 22.2-40.7 33.5-51.5C239.4 3.2 248.7 0 256 0s16.6 3.2 27.8 13.8c11.3 10.8 23 27.9 33.5 51.5c11.6 26 20.9 58.2 27 94.7zm-209 0H18.6C48.6 85.9 112.2 29.1 190.6 8.4C165.1 42.6 145.3 96.1 135.3 160zM8.1 192H131.2c-2.1 20.6-3.2 42-3.2 64s1.1 43.4 3.2 64H8.1C2.8 299.5 0 278.1 0 256s2.8-43.5 8.1-64zM194.7 446.6c-11.6-26-20.9-58.2-27-94.6H344.3c-6.1 36.4-15.5 68.6-27 94.6c-10.5 23.6-22.2 40.7-33.5 51.5C272.6 508.8 263.3 512 256 512s-16.6-3.2-27.8-13.8c-11.3-10.8-23-27.9-33.5-51.5zM135.3 352c10 63.9 29.8 117.4 55.3 151.6C112.2 482.9 48.6 426.1 18.6 352H135.3zm358.1 0c-30 74.1-93.6 130.9-171.9 151.6c25.5-34.2 45.2-87.7 55.3-151.6H493.4z"/></svg>
diff --git a/phpBB/styles/prosilver/imgs/svg/thumbtack.svg b/phpBB/styles/prosilver/imgs/svg/thumbtack.svg
new file mode 100644
index 00000000000..9a0adc18fa9
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/thumbtack.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M32 32C32 14.3 46.3 0 64 0H320c17.7 0 32 14.3 32 32s-14.3 32-32 32H290.5l11.4 148.2c36.7 19.9 65.7 53.2 79.5 94.7l1 3c3.3 9.8 1.6 20.5-4.4 28.8s-15.7 13.3-26 13.3H32c-10.3 0-19.9-4.9-26-13.3s-7.7-19.1-4.4-28.8l1-3c13.8-41.5 42.8-74.8 79.5-94.7L93.5 64H64C46.3 64 32 49.7 32 32zM160 384h64v96c0 17.7-14.3 32-32 32s-32-14.3-32-32V384z"/></svg>
diff --git a/phpBB/styles/prosilver/imgs/svg/toggle-off.svg b/phpBB/styles/prosilver/imgs/svg/toggle-off.svg
new file mode 100644
index 00000000000..9bd31a7bf5e
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/toggle-off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 32 32"><path fill="currentColor" d="M9 7c-.621 0-1.227.066-1.813.188a9.238 9.238 0 0 0-.875.218A9.073 9.073 0 0 0 .72 12.5c-.114.27-.227.531-.313.813A8.848 8.848 0 0 0 0 16c0 .93.145 1.813.406 2.656c.004.008-.004.024 0 .032A9.073 9.073 0 0 0 5.5 24.28c.27.114.531.227.813.313A8.83 8.83 0 0 0 9 24.999h14c4.957 0 9-4.043 9-9s-4.043-9-9-9zm0 2c3.879 0 7 3.121 7 7s-3.121 7-7 7s-7-3.121-7-7c0-.242.008-.484.031-.719A6.985 6.985 0 0 1 9 9m5.625 0H23c3.879 0 7 3.121 7 7s-3.121 7-7 7h-8.375C16.675 21.348 18 18.828 18 16c0-2.828-1.324-5.348-3.375-7"/></svg>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/imgs/svg/toggle-on.svg b/phpBB/styles/prosilver/imgs/svg/toggle-on.svg
new file mode 100644
index 00000000000..83d2e59c0ce
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/toggle-on.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 32 32"><path fill="currentColor" d="M9 7c-4.96 0-9 4.035-9 9s4.04 9 9 9h14c4.957 0 9-4.043 9-9s-4.043-9-9-9zm14 2c3.879 0 7 3.121 7 7s-3.121 7-7 7s-7-3.121-7-7s3.121-7 7-7"/></svg>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 5b1e08b4de2..ff3471a6007 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -1,4 +1,6 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-var: 0 */
 
 (function($) {  // Avoid conflicts with other libraries
 
@@ -11,7 +13,7 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
 	var iconsArray = {
 		forum_unread: 'forum_read',
 		forum_unread_subforum: 'forum_read_subforum',
-		forum_unread_locked: 'forum_read_locked'
+		forum_unread_locked: 'forum_read_locked',
 	};
 
 	$('li.row').find('dl[class*="forum_unread"]').each(function() {
@@ -52,9 +54,9 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
 		global_unread: 'global_read',
 		announce_unread: 'announce_read',
 		sticky_unread: 'sticky_read',
-		topic_unread: 'topic_read'
+		topic_unread: 'topic_read',
 	};
-	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
+	var iconsState = [ '', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine' ];
 	var unreadClassSelectors;
 	var classMap = {};
 	var classNames = [];
@@ -206,7 +208,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 		var mostVotes = 0;
 
 		// Set min-height to prevent the page from jumping when the content changes
-		var updatePanelHeight = function (height) {
+		var updatePanelHeight = function(height) {
 			height = (typeof height === 'undefined') ? panel.find('.inner').outerHeight() : height;
 			panel.css('min-height', height);
 		};
@@ -218,7 +220,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 		}
 
 		if (!res.can_vote) {
-			poll.find('.polls, .poll_max_votes, .poll_vote, .poll_option_select').fadeOut(500, function () {
+			poll.find('.polls, .poll_max_votes, .poll_vote, .poll_option_select').fadeOut(500, function() {
 				poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show();
 			});
 		} else {
@@ -260,7 +262,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 			var barTimeLapse = (res.can_vote) ? 500 : 1500;
 			var newBarClass = (percent === 100) ? 'pollbar5' : 'pollbar' + (Math.floor(percent / 20) + 1);
 
-			setTimeout(function () {
+			setTimeout(function() {
 				bar.animate({ width: percentRel + '%' }, 500)
 					.removeClass('pollbar1 pollbar2 pollbar3 pollbar4 pollbar5')
 					.addClass(newBarClass)
@@ -292,13 +294,13 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 			resizePanel(500);
 		}, 1500);
 
-		var resizePanel = function (time) {
+		var resizePanel = function(time) {
 			var panelHeight = panel.height();
 			var innerHeight = panel.find('.inner').outerHeight();
 
 			if (panelHeight !== innerHeight) {
 				panel.css({ minHeight: '', height: panelHeight })
-					.animate({ height: innerHeight }, time, function () {
+					.animate({ height: innerHeight }, time, function() {
 						panel.css({ minHeight: innerHeight, height: '' });
 					});
 			}
@@ -332,12 +334,11 @@ $('[data-ajax]').each(function() {
 			selector: this,
 			refresh: $this.attr('data-refresh') !== undefined,
 			filter: filter,
-			callback: fn
+			callback: fn,
 		});
 	}
 });
 
-
 /**
  * This simply appends #preview to the action of the
  * QR action when you click the Full Editor & Preview button
@@ -368,7 +369,7 @@ $('.display_post').click(function(e) {
 $('.display_post_review').on('click', function(e) {
 	e.preventDefault();
 
-	let $displayPostLink = $(this);
+	const $displayPostLink = $(this);
 	$displayPostLink.closest('.post-ignore').removeClass('post-ignore');
 	$displayPostLink.hide();
 });
@@ -380,7 +381,7 @@ $('.display_post_review').on('click', function(e) {
 * In any case the link will toggle the display status of the search panel and link text will be
 * appropriately changed based on the status of the search panel.
 */
-$('#member_search').click(function () {
+$('#member_search').click(function() {
 	var $memberlistSearch = $('#memberlist_search');
 
 	$memberlistSearch.slideToggle('fast');
@@ -393,6 +394,28 @@ $('#member_search').click(function () {
 	return false;
 });
 
+/**
+ * Show to top button if available on page
+ */
+const $scrollTopButton = $('.to-top-button');
+
+if ($scrollTopButton.length) {
+	// Show or hide the button based on scroll position
+	$(window).scroll(function() {
+		if ($(this).scrollTop() > 300) {
+			$scrollTopButton.fadeIn(); // Fade in the button
+		} else {
+			$scrollTopButton.fadeOut(); // Fade out the button
+		}
+	});
+
+	// Scroll smoothly to the top when the button is clicked
+	$scrollTopButton.click(function(e) {
+		e.preventDefault(); // Prevent the default anchor link behavior
+		$('html, body').animate({ scrollTop: 0 }, 500); // Smooth scroll to top
+	});
+}
+
 /**
 * Automatically resize textarea
 */
diff --git a/phpBB/styles/prosilver/template/avatar.html b/phpBB/styles/prosilver/template/avatar.html
new file mode 100644
index 00000000000..902799b0625
--- /dev/null
+++ b/phpBB/styles/prosilver/template/avatar.html
@@ -0,0 +1,17 @@
+{% if avatar_data.src %}
+	{% if avatar_link %}
+		<a href="{{ avatar_link }}" class="avatar">{{ avatar(avatar_data, lang('USER_AVATAR')) }}</a>
+	{% else %}
+		<span class="avatar">{{ avatar(avatar_data, lang('USER_AVATAR')) }}</span>
+	{% endif %}
+{% elseif avatar_data.id %}
+	{% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %}
+	{% set color_class = not(avatar_data.id starts with 'g') ? color_classes[avatar_data.id % 5] : 'avatar-color-default' %}
+	{% if avatar_link %}<a href="{{ avatar_link }}" class="avatar">{% endif %}
+	<div class="avatar-placeholder {{ color_class }}">
+		{% set username = username ?: avatar_data.username %}
+		{% set initials = username|striptags|trim(' -+_[]', 'left')|slice(0, 1)|upper %}
+		<div class="avatar-initials">{% if initials %}{{ initials }}{% else %}{{ Icon('font', 'user', '', true) }}{% endif %}</div>
+	</div>
+	{% if avatar_link %}</a>{% endif %}
+{% endif %}
diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html
index 583b764b2c2..f055e4acf1f 100644
--- a/phpBB/styles/prosilver/template/bbcode.html
+++ b/phpBB/styles/prosilver/template/bbcode.html
@@ -38,11 +38,11 @@
 				<xsl:value-of select="$L_COLON"/>
 				<xsl:if test="@post_url">
 					<xsl:text> </xsl:text>
-					<a href="{@post_url}" data-post-id="{@post_id}" onclick="if(document.getElementById(hash.substr(1)))href=hash">&#8593;</a>
+					<a href="{@post_url}" aria-label="{L_VIEW_QUOTED_POST}" data-post-id="{@post_id}" onclick="if(document.getElementById(hash.substr(1)))href=hash"><i class="icon fa-arrow-circle-up fa-fw fas" aria-hidden="true"></i></a>
 				</xsl:if>
 				<xsl:if test="@msg_url">
 					<xsl:text> </xsl:text>
-					<a href="{@msg_url}" data-msg-id="{@msg_id}">&#8593;</a>
+					<a href="{@msg_url}" aria-label="{L_VIEW_QUOTED_POST}" data-msg-id="{@msg_id}"><i class="icon fa-arrow-circle-up fa-fw fas" aria-hidden="true"></i></a>
 				</xsl:if>
 				<xsl:if test="@date">
 					<span class="responsive-hide"><xsl:value-of select="@date"/></span>
diff --git a/phpBB/styles/prosilver/template/breadcrumbs.html b/phpBB/styles/prosilver/template/breadcrumbs.html
new file mode 100644
index 00000000000..f71f6e73ff2
--- /dev/null
+++ b/phpBB/styles/prosilver/template/breadcrumbs.html
@@ -0,0 +1,53 @@
+<ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar">
+	{% set MICRODATA = 'itemtype="https://schema.org/ListItem" itemprop="itemListElement" itemscope' %}
+	{% set navlink_position = 1 %}
+
+	{% EVENT overall_header_breadcrumbs_before %}
+
+	<li class="breadcrumbs" itemscope itemtype="https://schema.org/BreadcrumbList">
+		{% if U_SITE_HOME %}
+		<span class="crumb" {{ MICRODATA }}>
+						{% apply spaceless %}
+						<a itemprop="item" href="{{ U_SITE_HOME }}" data-navbar-reference="home">
+							{{ Icon('font', 'home', '', true, 'fas o-icon-baseline') }}
+							<span itemprop="name">{{ L_SITE_HOME }}</span>
+						</a>
+						{% endapply %}
+						<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
+					</span>
+		{% endif %}
+
+		{% EVENT overall_header_breadcrumb_prepend %}
+
+		<span class="crumb" {{ MICRODATA }}>
+					{% apply spaceless %}
+					<a itemprop="item" href="{{ U_INDEX }}" accesskey="h" data-navbar-reference="index">
+						{% if not U_SITE_HOME %}{{ Icon('font', 'home', '', true, 'fas o-icon-baseline') }}{% endif %}
+						<span itemprop="name">{{ L_INDEX }}</span>
+					</a>
+					{% endapply %}
+					<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
+				</span>
+
+		{% for navlink in navlinks %}
+		{% set NAVLINK_NAME = navlink.BREADCRUMB_NAME | default(navlink.FORUM_NAME) %}
+		{% set NAVLINK_LINK = navlink.U_BREADCRUMB | default(navlink.U_VIEW_FORUM) %}
+
+		{% EVENT overall_header_navlink_prepend %}
+		<span class="crumb" {{ MICRODATA }}{% if navlink.MICRODATA %} {{ navlink.MICRODATA }}{% endif %}>
+						{% apply spaceless %}
+						<a itemprop="item" href="{{ NAVLINK_LINK }}">
+							<span itemprop="name">{{ NAVLINK_NAME }}</span>
+						</a>
+						{% endapply %}
+						<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
+					</span>
+		{% EVENT overall_header_navlink_append %}
+		{% endfor %}
+
+		{% EVENT overall_header_breadcrumb_append %}
+
+	</li>
+
+	{% EVENT overall_header_breadcrumbs_after %}
+</ul>
diff --git a/phpBB/styles/prosilver/template/captcha_incomplete.html b/phpBB/styles/prosilver/template/captcha_incomplete.html
new file mode 100644
index 00000000000..6a9078a37bc
--- /dev/null
+++ b/phpBB/styles/prosilver/template/captcha_incomplete.html
@@ -0,0 +1,7 @@
+<div class="panel captcha-panel">
+	<div class="inner">
+
+	<h3 class="captcha-title">{{ lang('CONFIRM_CODE') }}</h3>
+	<p class="error">{{ lang(CONFIRM_LANG, '<a href="' ~ CONTACT_LINK ~ '">', '</a>') }}</p>
+	</div>
+</div>
diff --git a/phpBB/styles/prosilver/template/captcha_turnstile.html b/phpBB/styles/prosilver/template/captcha_turnstile.html
new file mode 100644
index 00000000000..1cf4f4c7923
--- /dev/null
+++ b/phpBB/styles/prosilver/template/captcha_turnstile.html
@@ -0,0 +1,23 @@
+{% if CONFIRM_TYPE_REGISTRATION %}
+<div class="panel captcha-panel">
+	<div class="inner">
+		<h3 class="captcha-title">{{ lang('CONFIRMATION') }}</h3>
+		<fieldset class="fields2">
+{% endif %}
+{% if S_TURNSTILE_AVAILABLE %}
+			<noscript>
+				<div>{{ lang('CAPTCHA_TURNSTILE_NOSCRIPT') }}</div>
+			</noscript>
+
+			<script src="{{ U_TURNSTILE_SCRIPT }}" async defer></script>
+
+			{# The cf-turnstile class is used in JavaScript #}
+			<div class="cf-turnstile" data-language="{{ lang('TURNSTILE_LANG') }}" data-sitekey="{{ TURNSTILE_SITEKEY }}"{% if TURNSTILE_THEME %} data-theme="{{ TURNSTILE_THEME }}"{% endif %}></div>
+{% else %}
+	{{ lang('CAPTCHA_TURNSTILE_NOT_AVAILABLE') }}
+{% endif %}
+{% if CONFIRM_TYPE_REGISTRATION %}
+		</fieldset>
+	</div>
+</div>
+{% endif %}
diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html
index 4f925fa6a22..2a1c2dfd925 100644
--- a/phpBB/styles/prosilver/template/faq_body.html
+++ b/phpBB/styles/prosilver/template/faq_body.html
@@ -35,9 +35,6 @@ <h2 class="faq-title">{faq_block.BLOCK_TITLE}</h2>
 					<dt id="f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}"><strong>{faq_block.faq_row.FAQ_QUESTION}</strong></dt>
 					<dd>{faq_block.faq_row.FAQ_ANSWER}</dd>
 				</dl>
-				<a href="#faqlinks" class="top">
-					{{ Icon('font', 'circle-chevron-up', lang('BACK_TO_TOP'), false) }}
-				</a>
 				<!-- IF not faq_block.faq_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
 			<!-- END faq_row -->
 		</div>
@@ -46,5 +43,11 @@ <h2 class="faq-title">{faq_block.BLOCK_TITLE}</h2>
 	</div>
 <!-- END faq_block -->
 
+<div class="to-top-button">
+	<a href="#faqlinks" title="{{ lang('BACK_TO_TOP') }}">
+		{{ Icon('font', 'chevron-up', '', false) }}
+	</a>
+</div>
+
 <!-- INCLUDE jumpbox.html -->
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 5a9eabc239e..6cf87a62340 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -1,7 +1,10 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-unused-vars: 0 */
+/* eslint no-var:0 */
 
 /**
-* phpBB3 forum functions
+* phpBB forum functions
 */
 
 /**
@@ -103,14 +106,14 @@ jQuery(function($) {
 	$('.sub-panels').each(function() {
 
 		var $childNodes = $('a[data-subpanel]', this),
-			panels = $childNodes.map(function () {
+			panels = $childNodes.map(function() {
 				return this.getAttribute('data-subpanel');
 			}),
 			showPanel = this.getAttribute('data-show-panel');
 
 		if (panels.length) {
 			activateSubPanel(showPanel, panels);
-			$childNodes.click(function () {
+			$childNodes.click(function() {
 				activateSubPanel(this.getAttribute('data-subpanel'), panels);
 				return false;
 			});
@@ -232,7 +235,7 @@ function phpbbCheckKey(event) {
 jQuery(function($) {
 	'use strict';
 
-	$('form input[type=text], form input[type=password]').on('keypress', function (e) {
+	$('form input[type=text], form input[type=password]').on('keypress', function(e) {
 		var defaultButton = $(this).parents('form').find('input[type=submit].default-submit-action');
 
 		if (!defaultButton || defaultButton.length <= 0) {
@@ -369,7 +372,7 @@ function parseDocument($container) {
 		var $this = $(this),
 			$links = $this.find('.crumb'),
 			length = $links.length,
-			classes = ['wrapped-max', 'wrapped-wide', 'wrapped-medium', 'wrapped-small', 'wrapped-tiny'],
+			classes = [ 'wrapped-max', 'wrapped-wide', 'wrapped-medium', 'wrapped-small', 'wrapped-tiny' ],
 			classesLength = classes.length,
 			maxHeight = 0,
 			lastWidth = false,
@@ -476,7 +479,7 @@ function parseDocument($container) {
 				html = $children.html();
 			}
 
-			$block.append((first ? '' : '<br />') + html);
+			$block.append((first ? '' : '<br>') + html);
 
 			first = false;
 		});
@@ -496,7 +499,7 @@ function parseDocument($container) {
 
 		// Find all headers, get contents
 		$list.prev('.topiclist').find('li.header dd').not('.mark').each(function() {
-			headers.push($(this).text());
+			headers.push($('<div>').text($(this).text()).html());
 			headersLength++;
 		});
 
@@ -533,7 +536,7 @@ function parseDocument($container) {
 					html = headers[i] + ': <strong>' + html + '</strong>';
 				}
 
-				$block.append((first ? '' : '<br />') + html);
+				$block.append((first ? '' : '<br>') + html);
 
 				first = false;
 			});
@@ -599,7 +602,9 @@ function parseDocument($container) {
 				}
 
 				if ((text.length && text !== '-') || cell.children().length) {
-					cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
+					if (headers[column].length) {
+						cell.prepend($('<dfn>').css('display', 'none').text(headers[column]));
+					}
 				} else {
 					cell.addClass('empty');
 				}
@@ -685,7 +690,7 @@ function parseDocument($container) {
 
 		var $tabLink = $item.find('a.responsive-tab-link');
 		phpbb.registerDropdown($tabLink, $item.find('.dropdown'), {
-			visibleClass: 'activetab'
+			visibleClass: 'activetab',
 		});
 
 		check(true);
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index f9232d6dc40..6208b302d9e 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -44,7 +44,7 @@
 					<div class="list-inner">
 						<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED -->
 							<!--
-								<a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}">
+								<a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{{ path('phpbb_feed_forum', { forum_id : forumrow.FORUM_ID } ) }}">
 									{{ Icon('font', 'square-rss', '', true, 'fas c-feed-icon') }}<span class="sr-only">{L_FEED} - {forumrow.FORUM_NAME}</span>
 								</a>
 							-->
diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index c2102faddd3..978c5dd2f30 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -1,15 +1,8 @@
 <!-- INCLUDE overall_header.html -->
 
-<p class="{S_CONTENT_FLOW_END} responsive-center time<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p>
-<!-- IF S_USER_LOGGED_IN --><p class="responsive-center time">{CURRENT_TIME}</p><!-- ENDIF -->
-
 <!-- EVENT index_body_markforums_before -->
-<!-- IF U_MARK_FORUMS -->
-	<div class="action-bar compact">
-		<a href="{U_MARK_FORUMS}" class="mark-read rightside" accesskey="m" data-ajax="mark_forums_read">{L_MARK_FORUMS_READ}</a>
-	</div>
-<!-- ENDIF -->
 <!-- EVENT index_body_markforums_after -->
+<!-- EVENT index_body_forumlist_body_before -->
 
 <!-- INCLUDE forumlist_body.html -->
 
diff --git a/phpBB/styles/prosilver/template/login_body_oauth.html b/phpBB/styles/prosilver/template/login_body_oauth.html
index e15a60793c8..0597018e898 100644
--- a/phpBB/styles/prosilver/template/login_body_oauth.html
+++ b/phpBB/styles/prosilver/template/login_body_oauth.html
@@ -1,6 +1,6 @@
 <br>
 <div class="content">
 	{% for oauth in oauth %}
-		<a href="{{ oauth.REDIRECT_URL }}" class="button1 button button-form-bold">{{ oauth.SERVICE_NAME }}</a>
+		<a href="{{ oauth.LOGIN_URL }}" class="button1 button button-form-bold">{{ oauth.SERVICE_NAME }}</a>
 	{% endfor %}
 </div>
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index cff04e89bcc..786c09c5317 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -40,9 +40,9 @@ <h2><a href="{U_VIEW_FORUM}">{L_FORUM}{L_COLON} {FORUM_NAME}</a></h2>
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_VIEW_TOPIC}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 						{{ Icon('svg', {
-							'info-variant' : topicrow.S_POST_GLOBAL,
-							'info-variant' : topicrow.S_POST_ANNOUNCE,
-							'star' : topicrow.S_POST_STICKY,
+							'globe' : topicrow.S_POST_GLOBAL,
+							'bullhorn' : topicrow.S_POST_ANNOUNCE,
+							'thumbtack' : topicrow.S_POST_STICKY,
 							'lock' : topicrow.S_TOPIC_LOCKED,
 							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
 							'fire' : topicrow.S_TOPIC_HOT,
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index 98f56cbb600..c4682e09754 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -11,7 +11,7 @@ <h3>{USERNAME_FULL}</h3>
 
 	<div>
 		<div class="column1">
-			<!-- IF AVATAR_HTML --><div>{AVATAR_HTML}</div><!-- ENDIF -->
+			{% include 'avatar.html' with {'avatar_data': USER_AVATAR} only %}
 		</div>
 
 		<div class="column2">
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index 92059d53b5b..45c6088f768 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -78,6 +78,7 @@ <h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3>
 		<p class="author"><span>{{ Icon('font', 'file', MINI_POST, true, 'fas c-topic-icon') }}</span> {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} &raquo; {POST_DATE}</p>
 		<!-- ENDIF -->
 
+		{% if S_CAN_APPROVE %}
 		<!-- IF S_POST_UNAPPROVED -->
 			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
 
@@ -101,6 +102,7 @@ <h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3>
 			</p>
 			</form>
 		<!-- ENDIF -->
+		{% endif %}
 
 		{% if S_POST_REPORTED and not S_MCP_REPORT %}
 			<p class="post-notice reported">
diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html
index 231a80fcc0e..2928170b1b5 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_post.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_post.html
@@ -11,7 +11,7 @@ <h3><!-- IF USER_COLOR --><span style="color: #{USER_COLOR}">{USERNAME}</span><!
 
 	<div>
 		<div class="column1">
-			<!-- IF AVATAR_HTML --><div>{AVATAR_HTML}</div><!-- ENDIF -->
+			{% include 'avatar.html' with {'avatar_data': USER_AVATAR} only %}
 		</div>
 
 		<div class="column2">
diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html
index 64a940de7ee..68fa78b0d35 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_user.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_user.html
@@ -11,7 +11,7 @@ <h3>{USERNAME_FULL}</h3>
 
 	<div>
 		<div class="column1">
-			<!-- IF AVATAR_HTML --><div>{AVATAR_HTML}</div><!-- ENDIF -->
+			{% include 'avatar.html' with {'avatar_data': USER_AVATAR} only %}
 		</div>
 
 		<div class="column2">
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index f908852ee3f..c749a457d96 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -26,7 +26,7 @@ <h2 class="group-title"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!--
 		{% EVENT memberlist_body_group_desc_after %}
 
 		<p>
-			<!-- IF AVATAR_HTML -->{AVATAR_HTML}<!-- ENDIF -->
+			{% include 'avatar.html' with {'avatar_data': AVATAR} only %}
 			{% EVENT memberlist_body_group_rank_before %}
 			{% if RANK_IMG %}<span class="rank-img">{{ RANK_IMG }}</span>{% endif %}
 			{% if GROUP_RANK %}
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
deleted file mode 100644
index f91454aacb7..00000000000
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<h2>{L_SEND_IM}</h2>
-
-<form method="post" action="{S_IM_ACTION}">
-
-<div class="panel bg2">
-	<div class="inner">
-
-	<p>{L_SEND_IM_EXPLAIN}</p>
-
-	<!-- IF S_SENT_JABBER -->
-		<p>{L_IM_SENT_JABBER}</p>
-	<!-- ENDIF -->
-
-	<fieldset>
-	<dl class="fields2">
-		<dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt>
-		<dd><strong>{USERNAME}</strong><!-- IF S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
-	</dl>
-
-	<!-- IF S_SEND_JABBER -->
-		<dl class="fields2">
-			<dt><label for="message">{L_IM_MESSAGE}{L_COLON}</label></dt>
-			<dd><textarea class="inputbox autowidth" name="message" id="message" rows="5" cols="45"></textarea></dd>
-		</dl>
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><input class="button1 button button-form" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
-		</dl>
-	<!-- ELSE IF S_NO_SEND_JABBER -->
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd>{L_IM_NO_JABBER}</dd>
-		</dl>
-	<!-- ENDIF -->
-	{S_FORM_TOKEN}
-	</fieldset>
-
-	</div>
-</div>
-</form>
-
-<a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
-
-<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 3d9e0dec2b7..a5644cc0c06 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -29,12 +29,6 @@ <h2 class="solo">{L_FIND_USERNAME}</h2>
 		<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>
 		<dd><input type="text" name="email" id="email" value="{EMAIL}" class="inputbox" /></dd>
 	</dl>
-<!-- ENDIF -->
-<!-- IF S_JABBER_ENABLED -->
-	<dl>
-		<dt><label for="jabber">{L_JABBER}{L_COLON}</label></dt>
-		<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd>
-	</dl>
 <!-- ENDIF -->
 	<dl>
 		<dt><label for="search_group_id">{L_GROUP}{L_COLON}</label></dt>
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 6914778623a..14fb6736eff 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -7,15 +7,12 @@ <h2 class="memberlist-title">{PAGE_TITLE}</h2>
 <form method="post" action="{S_PROFILE_ACTION}" id="viewprofile">
 <div class="panel bg1">
 	<div class="inner">
-
-	<!-- IF AVATAR_HTML -->
-		<dl class="left-box">
-			<dt class="profile-avatar">{AVATAR_HTML}</dt>
-			<!-- EVENT memberlist_view_rank_avatar_before -->
-			<!-- IF RANK_TITLE --><dd class="profile-avatar">{RANK_TITLE}</dd><!-- ENDIF -->
-			<!-- EVENT memberlist_view_rank_avatar_after -->
+		<dl class="left-box avatar-rank-container">
+			<dt class="profile-avatar">{% include 'avatar.html' with {'avatar_data': AVATAR} only %}</dt>
+			{% EVENT memberlist_view_rank_avatar_before %}
+			{% if RANK_TITLE %}<dd class="profile-avatar">{{ RANK_TITLE }}</dd>{% endif %}
+			{% EVENT memberlist_view_rank_avatar_after %}
 		</dl>
-	<!-- ENDIF -->
 
 	<dl class="left-box details profile-details">
 		<dt>
@@ -28,12 +25,6 @@ <h2 class="memberlist-title">{PAGE_TITLE}</h2>
 			<!-- IF U_USER_BAN --> [ <a href="{U_USER_BAN}">{L_USER_BAN}</a> ]<!-- ENDIF -->
 			<!-- IF U_SWITCH_PERMISSIONS --> [ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]<!-- ENDIF -->
 		</dd>
-		<!-- IF not AVATAR_HTML -->
-			<!-- EVENT memberlist_view_rank_no_avatar_before -->
-			<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt> <dd>{RANK_TITLE}</dd><!-- ENDIF -->
-			{% if RANK_IMG %}<dt>{% if RANK_TITLE %}&nbsp;{% else %}{{ lang('RANK') ~ lang('COLON') }}{% endif %}</dt><dd class="rank-img">{{ RANK_IMG }}</dd>{% endif %}
-			<!-- EVENT memberlist_view_rank_no_avatar_after -->
-		<!-- ENDIF -->
 		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
 		<!-- IF AGE !== '' --><dt>{L_AGE}{L_COLON}</dt> <dd>{AGE}</dd><!-- ENDIF -->
 		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}{L_COLON}</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button1 button button-form-bold" /></dd><!-- ENDIF -->
@@ -75,7 +66,6 @@ <h3>{L_CONTACT_USER}</h3>
 		<dl class="details">
 		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER}</a></dd><!-- ENDIF -->
 		<!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF -->
-		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}{L_COLON}</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 750, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}{L_COLON}</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->
 		<!-- EVENT memberlist_view_contact_custom_fields_before -->
 		<!-- BEGIN custom_fields -->
 			<!-- IF custom_fields.S_PROFILE_CONTACT -->
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index cb71e2f4344..bf8cc8ccaf3 100644
--- a/phpBB/styles/prosilver/template/navbar_footer.html
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -35,11 +35,11 @@
 					<li class="in-menu">
 						<a href="{{ U_WATCH_FORUM_LINK }}" title="{{ S_WATCH_FORUM_TITLE }}" data-ajax="toggle_link" data-toggle-text="{{ S_WATCH_FORUM_TOGGLE }}" data-toggle-url="{{ U_WATCH_FORUM_TOGGLE }}">
 							{% if S_WATCHING_FORUM %}
-								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon is-active') }}
-								{{ Icon('font', 'bell', '', true, 'far c-watch-icon') }}
-							{% else %}
 								{{ Icon('font', 'bell', '', true, 'far c-watch-icon is-active') }}
 								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon') }}
+							{% else %}
+								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon is-active') }}
+								{{ Icon('font', 'bell', '', true, 'far c-watch-icon') }}
 							{% endif %}
 							<span>{{ S_WATCH_FORUM_TITLE }}</span>
 						</a>
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index ef6da4ab917..70d2e4bc9af 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -44,6 +44,13 @@
 									{{ Icon('font', 'file-lines', lang('SEARCH_ACTIVE_TOPICS'), false, 'far icon icon-blue') }}
 								</a>
 							</li>
+							{% if U_MARK_FORUMS %}
+							<li>
+								<a href="{{ U_MARK_FORUMS }}" role="menuitem" accesskey="m" data-ajax="mark_forums_read">
+									{{ Icon('font', 'book-open-reader', lang('MARK_FORUMS_READ'), false) }}
+								</a>
+							</li>
+							{% endif %}
 							<li class="separator"></li>
 							<li>
 								<a href="{{ U_SEARCH }}" role="menuitem">
@@ -69,7 +76,6 @@
 								</li>
 							{% endif %}
 						{% endif %}
-						<li class="separator"></li>
 
 						{% EVENT navbar_header_quick_links_after %}
 
@@ -107,13 +113,13 @@
 
 				{% EVENT navbar_header_user_profile_prepend %}
 
-				<li id="username_logged_in" class="rightside {% if CURRENT_USER_AVATAR_HTML %} no-bulletin{% endif %}">
+				<li id="username_logged_in" class="rightside {% if CURRENT_USER_AVATAR %} no-bulletin{% endif %}">
 
 					{% EVENT navbar_header_username_prepend %}
 
 					<div class="header-profile dropdown-container">
 						<a href="{{ U_PROFILE }}" class="header-avatar dropdown-trigger">
-							{% if CURRENT_USER_AVATAR_HTML %}{{ CURRENT_USER_AVATAR_HTML }} {% endif %}
+							{% if CURRENT_USER_AVATAR %}{% include 'avatar.html' with {'avatar_data': CURRENT_USER_AVATAR} only %} {% endif %}
 							{{ CURRENT_USERNAME_SIMPLE }}
 							{{ Icon('font', 'caret-down', '', true, '', {'style': 'color: #' ~ CURRENT_USER_GROUP_COLOR}) }}
 						</a>
@@ -161,7 +167,7 @@
 				{% if S_DISPLAY_PM %}
 					<li class="rightside">
 						<a href="{{ U_PRIVATEMSGS }}" role="menuitem">
-							{{ Icon('font', 'inbox', lang('PRIVATE_MESSAGES'), false) }}<strong class="badge{% if not PRIVATE_MESSAGE_COUNT %} hidden{% endif %}"> {PRIVATE_MESSAGE_COUNT}</strong>
+							{{ Icon('font', 'inbox', lang('PRIVATE_MESSAGES'), true) }}<strong class="badge{% if not PRIVATE_MESSAGE_COUNT %} hidden{% endif %}"> {PRIVATE_MESSAGE_COUNT}</strong>
 						</a>
 					</li>
 				{% endif %}
@@ -169,7 +175,7 @@
 				{% if S_NOTIFICATIONS_DISPLAY %}
 					<li class="dropdown-container dropdown-{S_CONTENT_FLOW_END} rightside">
 						<a href="{{ U_VIEW_ALL_NOTIFICATIONS }}" id="notification-button" class="dropdown-trigger">
-							{{ Icon('font', 'bell', lang('NOTIFICATIONS'), false) }}<strong class="badge{% if not NOTIFICATIONS_COUNT %} hidden{% endif %}">{NOTIFICATIONS_COUNT}</strong>
+							{{ Icon('font', 'bell', lang('NOTIFICATIONS'), true) }}<strong class="badge{% if not NOTIFICATIONS_COUNT %} hidden{% endif %}">{NOTIFICATIONS_COUNT}</strong>
 						</a>
 
 						{% include 'notification_dropdown.html' %}
@@ -197,68 +203,5 @@
 
 			{% endif %}
 		</ul>
-
-		<ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar">
-			{% set MICRODATA = 'itemtype="https://schema.org/ListItem" itemprop="itemListElement" itemscope' %}
-			{% set navlink_position = 1 %}
-
-			{% EVENT overall_header_breadcrumbs_before %}
-
-			<li class="breadcrumbs" itemscope itemtype="https://schema.org/BreadcrumbList">
-				{% if U_SITE_HOME %}
-					<span class="crumb" {{ MICRODATA }}>
-						{% apply spaceless %}
-						<a itemprop="item" href="{{ U_SITE_HOME }}" data-navbar-reference="home">
-							{{ Icon('font', 'home', '', true, 'fas o-icon-baseline') }}
-							<span itemprop="name">{{ L_SITE_HOME }}</span>
-						</a>
-						{% endapply %}
-						<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
-					</span>
-				{% endif %}
-
-				{% EVENT overall_header_breadcrumb_prepend %}
-
-				<span class="crumb" {{ MICRODATA }}>
-					{% apply spaceless %}
-					<a itemprop="item" href="{{ U_INDEX }}" accesskey="h" data-navbar-reference="index">
-						{% if not U_SITE_HOME %}{{ Icon('font', 'home', '', true, 'fas o-icon-baseline') }}{% endif %}
-						<span itemprop="name">{{ L_INDEX }}</span>
-					</a>
-					{% endapply %}
-					<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
-				</span>
-
-				{% for navlink in navlinks %}
-					{% set NAVLINK_NAME = navlink.BREADCRUMB_NAME | default(navlink.FORUM_NAME) %}
-					{% set NAVLINK_LINK = navlink.U_BREADCRUMB | default(navlink.U_VIEW_FORUM) %}
-
-					{% EVENT overall_header_navlink_prepend %}
-					<span class="crumb" {{ MICRODATA }}{% if navlink.MICRODATA %} {{ navlink.MICRODATA }}{% endif %}>
-						{% apply spaceless %}
-						<a itemprop="item" href="{{ NAVLINK_LINK }}">
-							<span itemprop="name">{{ NAVLINK_NAME }}</span>
-						</a>
-						{% endapply %}
-						<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
-					</span>
-					{% EVENT overall_header_navlink_append %}
-				{% endfor %}
-
-				{% EVENT overall_header_breadcrumb_append %}
-
-			</li>
-
-			{% EVENT overall_header_breadcrumbs_after %}
-
-			{% if S_DISPLAY_SEARCH and not S_IN_SEARCH %}
-				<li class="rightside responsive-search">
-					<a href="{{ U_SEARCH }}" title="{{ lang('SEARCH_ADV_EXPLAIN') }}" role="menuitem">
-						{{ Icon('font', 'search', lang('SEARCH'), true) }}
-					</a>
-				</li>
-			{% endif %}
-		</ul>
-
 	</div>
 </div>
diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html
index e4fc984d8a5..24db06e32f8 100644
--- a/phpBB/styles/prosilver/template/notification_dropdown.html
+++ b/phpBB/styles/prosilver/template/notification_dropdown.html
@@ -22,7 +22,7 @@
 					<!-- IF notifications.URL -->
 						<a class="notification-block" href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}" data-real-url="{notifications.URL}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->">
 					<!-- ENDIF -->
-						<!-- IF notifications.AVATAR -->{notifications.AVATAR_HTML}<!-- ELSE --><img class="avatar notification-avatar" src="{{ NO_AVATAR_SOURCE }}" alt="" /><!-- ENDIF -->
+						{% include 'avatar.html' with {'avatar_data': notifications.AVATAR} only %}
 						<div class="notification-text">
 							<p class="notification-title">{notifications.FORMATTED_TITLE}</p>
 							<!-- IF notifications.REFERENCE --><p class="notification-reference">{notifications.REFERENCE}</p><!-- ENDIF -->
@@ -40,8 +40,17 @@
 			<!-- END notifications -->
 		</ul>
 
+		{% EVENT notification_dropdown_footer_before %}
 		<div class="footer">
 			<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
 		</div>
+		{% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %}
+			<div class="footer webpush-subscribe">
+				<span class="ellipsis-text">{{ lang('NOTIFY_WEB_PUSH_ENABLE') ~ lang('COLON') }}</span>
+				<button id="subscribe_webpush" name="subscribe_webpush" class="notification-subscribe-toggle" data-l-err="{{ lang('INFORMATION')|e('html_attr') }}" data-l-msg="{{ lang('NOTIFY_WEB_PUSH_DENIED')|e('html_attr') }}" data-disabled-msg="{{ lang('NOTIFY_WEB_PUSH_DISABLED')|e('html_attr') }}">{{ Icon('svg', 'toggle-off', lang('NOTIFY_WEB_PUSH_SUBSCRIBE'), true, 'push-subscribe-toggle-icon toggle-off') }}</button>
+				<button id="unsubscribe_webpush" name="unsubscribe_webpush" class="notification-subscribe-toggle hidden">{{ Icon('svg', 'toggle-on', lang('NOTIFY_WEB_PUSH_SUBSCRIBED'), true, 'push-subscribe-toggle-icon toggle-on') }}</button>
+			</div>
+		{% endif %}
+		{% EVENT notification_dropdown_footer_after %}
 	</div>
 </div>
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 08d88592978..237620bd612 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -72,7 +72,7 @@ <h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
 </div>
 
 <script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.6.0.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.7.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS forum_fn.js -->
 <!-- INCLUDEJS ajax.js -->
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index b88de2aaa87..cb94e8b11d3 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -4,6 +4,9 @@
 <meta charset="utf-8" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-title" content="{{ SITE_SHORTNAME }}">
+<meta name="mobile-web-app-capable" content="yes">
 {META}
 <title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
 
@@ -24,7 +27,7 @@
 
 <!--
 	phpBB style name: prosilver
-	Based on style:   prosilver (this is the default phpBB3 style)
+	Based on style:   prosilver (this is the default phpBB style)
 	Original author:  Tom Beddard ( http://www.subBlue.com/ )
 	Modified by:
 -->
@@ -57,12 +60,18 @@
 	<link href="{T_ASSETS_PATH}/cookieconsent/cookieconsent.min.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet">
 <!-- ENDIF -->
 
+<link rel="manifest" href="{{ U_MANIFEST }}" crossorigin="use-credentials">
+
 <!-- EVENT overall_header_head_append -->
 
 {$STYLESHEETS}
 
 <!-- EVENT overall_header_stylesheets_after -->
 
+{% if NOTIFICATIONS_WEBPUSH_ENABLE %}
+	{% include 'ucp_notifications_webpush.html' %}
+{% endif %}
+
 </head>
 <body id="phpbb" class="nojs notouch section-{SCRIPT_NAME} {S_CONTENT_DIRECTION} {BODY_CLASS}">
 
@@ -71,7 +80,11 @@
 <div id="wrap" class="wrap">
 	<a id="top" class="top-anchor" accesskey="t"></a>
 	<div id="page-header">
+		<!-- EVENT overall_header_navbar_before -->
+
 		<div class="headerbar" role="banner">
+
+			{% include 'navbar_header.html' %}
 		<!-- EVENT overall_header_headerbar_before -->
 			<div class="inner">
 
@@ -109,10 +122,10 @@ <h1 class="c-hero-heading">
 			</div>
 			<!-- EVENT overall_header_headerbar_after -->
 		</div>
-		<!-- EVENT overall_header_navbar_before -->
-		<!-- INCLUDE navbar_header.html -->
 	</div>
 
+	{% include 'breadcrumbs.html' %}
+
 	<!-- EVENT overall_header_page_body_before -->
 
 	<a id="start_here" class="anchor"></a>
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 096dbbe8fac..682d389cf4a 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -10,6 +10,8 @@
 	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
 	var imageTag = false;
 
+	var mention_no_match_found = '<li>{{ lang('MENTION_NO_MATCH_FOUND')|e('js') }}</li>';
+
 	function change_palette()
 	{
 		phpbb.toggleDisplay('colour_palette');
@@ -41,7 +43,7 @@
 </div>
 
 <!-- EVENT posting_editor_buttons_before -->
-<div id="format-buttons" class="format-buttons"<!-- IF S_ALLOW_MENTIONS --> data-mention-url="{U_MENTION_URL}" data-mention-names-limit="{S_MENTION_NAMES_LIMIT}" data-topic-id="{S_TOPIC_ID}" data-user-id="{S_USER_ID}"<!-- ENDIF -->>
+<div id="format-buttons" class="format-buttons"<!-- IF S_ALLOW_MENTIONS --> data-mention-url="{U_MENTION_URL}" data-mention-names-limit="{S_MENTION_NAMES_LIMIT}" data-forum-id="{S_FORUM_ID}" data-topic-id="{S_TOPIC_ID}" data-user-id="{S_USER_ID}"<!-- ENDIF -->>
 	<button type="button" class="button button-icon-only bbcode-b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}">
 		{{ Icon('font', 'bold', '', true, 'fas c-button-icon') }}
 	</button>
@@ -81,7 +83,7 @@
 	<button type="button" class="button button-icon-only bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}">
 		{{ Icon('font', 'droplet', '', true, 'fas c-button-icon') }}
 	</button>
-	<select name="addbbcode20" class="bbcode-size" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
+	<select name="addbbcode18" class="bbcode-size" onchange="bbfontstyle('[size=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/size]');this.form.addbbcode18.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
 		<option value="50">{L_FONT_TINY}</option>
 		<option value="85">{L_FONT_SMALL}</option>
 		<option value="100" selected="selected">{L_FONT_NORMAL}</option>
@@ -97,7 +99,11 @@
 
 	<!-- BEGIN custom_tags -->
 	<button type="button" class="button button-secondary bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{{ custom_tags.BBCODE_HELPLINE }}">
-		{custom_tags.BBCODE_TAG}
+		{% if custom_tags.BBCODE_FONT_ICON != '' %}
+			{{ Icon('font', custom_tags.BBCODE_FONT_ICON, '', false, custom_tags.BBCODE_TAG_CLEAN) }}
+		{% else %}
+			{{ custom_tags.BBCODE_TAG }}
+		{% endif %}
 	</button>
 	<!-- END custom_tags -->
 </div>
diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html
index c9333caeed8..2569e1583a6 100644
--- a/phpBB/styles/prosilver/template/posting_pm_header.html
+++ b/phpBB/styles/prosilver/template/posting_pm_header.html
@@ -34,7 +34,9 @@
 								{% for recipient in to_recipient %}
 									<li>
 										{% if not S_EDIT_POST %}
-											<input type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]" value="x" class="button1 button button-form-bold">
+											<button type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]">
+												{{ Icon('font', 'xmark', lang('REMOVE'), true, 'c-warning-icon') }}
+											</button>
 										{% endif %}
 										{% if recipient.IS_GROUP %}
 											<a href="{{ recipient.U_VIEW }}" style="color: {{ recipient.COLOUR }}"><strong>{{ recipient.NAME }}</strong></a>
@@ -57,7 +59,9 @@
 								{% for recipient in bcc_recipient %}
 									<li>
 										{% if not S_EDIT_POST %}
-											<input type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]" value="x" class="button1 button button-form-bold">
+											<button type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]">
+												{{ Icon('font', 'xmark', lang('REMOVE'), true, 'c-warning-icon') }}
+											</button>
 										{% endif %}
 										{% if recipient.IS_GROUP %}
 											<a href="{{ recipient.U_VIEW }}" style="color: {{ recipient.COLOUR }}"><strong>{{ recipient.NAME }}</strong></a>
@@ -90,14 +94,16 @@
 							<ul class="recipients">
 								{% for recipient in to_recipient %}
 									<li>
+										{% if not S_EDIT_POST %}
+											<button type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]">
+												{{ Icon('font', 'xmark', lang('REMOVE'), true, 'c-warning-icon') }}
+											</button>
+										{% endif %}
 										{% if recipient.IS_GROUP %}
 											<a href="{{ recipient.U_VIEW }}"><strong>{{ recipient.NAME }}</strong></a>
 										{% else %}
 											{{ recipient.NAME_FULL }}
 										{% endif %}
-										{% if not S_EDIT_POST %}
-											&nbsp;<input type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]" value="x" class="button1 button button-form-bold">
-										{% endif %}
 									</li>
 								{% endfor %}
 							</ul>
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 8ea1bd05182..9e8a3c3e9bd 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -80,17 +80,36 @@ <h2 class="searchresults-title"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE
 			<li class="row<!-- IF searchresults.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 				<dl class="row-item">
 					<dt>
-						<a class="row-item-link{% if searchresults.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{searchresults.U_NEWEST_POST}" title="{searchresults.TOPIC_FOLDER_IMG_ALT}">
-							{{ Icon('svg', {
-								'info-variant' : searchresults.S_POST_GLOBAL,
-								'info-variant' : searchresults.S_POST_ANNOUNCE,
-								'star' : searchresults.S_POST_STICKY,
+						{% if searchresults.U_NEWEST_POST and searchresults.S_UNREAD_TOPIC and not S_IS_BOT %}
+							{% set U_ITEM_LINK = searchresults.U_NEWEST_POST %}
+						{% elseif searchresults.U_VIEW_TOPIC %}
+							{% set U_ITEM_LINK = searchresults.U_VIEW_TOPIC %}
+						{% endif %}
+						{% if U_ITEM_LINK is defined %}
+							<a class="row-item-link{% if searchresults.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{{ U_ITEM_LINK }}" title="{searchresults.TOPIC_FOLDER_IMG_ALT}">
+								{{ Icon('svg', {
+									'globe' : searchresults.S_POST_GLOBAL,
+									'bullhorn' : searchresults.S_POST_ANNOUNCE,
+									'thumbtack' : searchresults.S_POST_STICKY,
+									'lock' : searchresults.S_TOPIC_LOCKED,
+									'arrow-right-bold' : searchresults.S_TOPIC_MOVED,
+									'fire' : searchresults.S_TOPIC_HOT,
+									'file-document-outline' : true,
+								}, '', true, 'c-forum-row-icon') }}
+							</a>
+						{% else %}
+							<span class="row-item-link{% if searchresults.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" title="{searchresults.TOPIC_FOLDER_IMG_ALT}">
+								{{ Icon('svg', {
+								'globe' : searchresults.S_POST_GLOBAL,
+								'bullhorn' : searchresults.S_POST_ANNOUNCE,
+								'thumbtack' : searchresults.S_POST_STICKY,
 								'lock' : searchresults.S_TOPIC_LOCKED,
 								'arrow-right-bold' : searchresults.S_TOPIC_MOVED,
 								'fire' : searchresults.S_TOPIC_HOT,
 								'file-document-outline' : true,
-							}, '', true, 'c-forum-row-icon') }}
-						</a>
+								}, '', true, 'c-forum-row-icon') }}
+							</span>
+						{% endif %}
 						{% if lang(searchresults.TOPIC_AUTHOR) == S_USERNAME %}
 							<span class="row-item-link-mine"></span>
 						{% endif%}
@@ -99,10 +118,12 @@ <h2 class="searchresults-title"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE
 						{% endif %}
 						<div class="list-inner">
 							<!-- EVENT topiclist_row_prepend -->
-							{% if searchresults.S_UNREAD_TOPIC and not S_IS_BOT %}
+							{% if searchresults.U_NEWEST_POST and searchresults.S_UNREAD_TOPIC and not S_IS_BOT %}
 								<a href="{{ searchresults.U_NEWEST_POST }}" class="topictitle unread">{{ searchresults.TOPIC_TITLE }}</a>
-							{% else %}
+							{% elseif searchresults.U_VIEW_TOPIC %}
 								<a href="{{ searchresults.U_VIEW_TOPIC }}" class="topictitle">{{ searchresults.TOPIC_TITLE }}</a>
+							{% else %}
+								<span class="topictitle">{{ searchresults.TOPIC_TITLE }}</span>
 							{% endif %}
 							<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED -->
 								<a href="{searchresults.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
@@ -161,11 +182,11 @@ <h2 class="searchresults-title"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE
 					<dd class="views">{searchresults.TOPIC_VIEWS} <dfn>{L_VIEWS}</dfn></dd>
 					<dd class="lastpost">
 						<span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} <!-- EVENT search_results_last_post_author_username_prepend -->{searchresults.LAST_POST_AUTHOR_FULL}<!-- EVENT search_results_last_post_author_username_append -->
-							<!-- IF not S_IS_BOT -->
+							{% if not S_IS_BOT and searchresults.U_LAST_POST %}
 								<a href="{searchresults.U_LAST_POST}" title="{L_GOTO_LAST_POST}">
 									{{ Icon('font', 'arrow-up-right-from-square', VIEW_LATEST_POST, true, 'fas c-last-post-icon') }}
 								</a>
-							<!-- ENDIF -->
+							{% endif %}
 							<br /><time datetime="{searchresults.LAST_POST_TIME_RFC3339}">{searchresults.LAST_POST_TIME}</time>
 						</span>
 					</dd>
@@ -241,7 +262,7 @@ <h3><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></h3>
 <!-- ENDIF -->
 
 <div class="action-bar bottom">
-	<!-- IF .searchresults and (S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY) -->
+	<!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY -->
 	<form method="post" action="{S_SEARCH_ACTION}">
 		<!-- INCLUDE display_options.html -->
 	</form>
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index 8a19af68829..b5f7894581c 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -42,7 +42,7 @@ <h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
 </div>
 
 <script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.6.0.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.7.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS forum_fn.js -->
 <!-- INCLUDEJS ajax.js -->
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 941a22ab451..45edbf964b5 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -8,7 +8,7 @@
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
 			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-			<dd class="c-avatar-box"><!-- IF AVATAR -->{AVATAR_HTML}<!-- ELSE --><img src="{{ NO_AVATAR_SOURCE }}" alt="" /><!-- ENDIF --></dd>
+			<dd class="c-avatar-box">{% include 'avatar.html' with {'avatar_data': AVATAR} only %}</dd>
 			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
 		</dl>
 	</fieldset>
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index c2607a1297d..c593ea94dc2 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -52,6 +52,7 @@ <h3>{L_GROUP_DETAILS}</h3>
 	<h3>{L_GROUP_SETTINGS_SAVE}</h3>
 
 	<fieldset>
+	<!-- EVENT ucp_group_settings_before -->
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
 		<dd>
@@ -65,6 +66,7 @@ <h3>{L_GROUP_SETTINGS_SAVE}</h3>
 		<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>
 		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
 	</dl>
+	<!-- EVENT ucp_group_settings_after -->
 	</fieldset>
 
 	</div>
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index 98616732f91..6d0fd6933c7 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -38,9 +38,9 @@ <h2>{L_TITLE}</h2>
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 						{{ Icon('svg', {
-							'info-variant' : topicrow.S_POST_GLOBAL,
-							'info-variant' : topicrow.S_POST_ANNOUNCE,
-							'star' : topicrow.S_POST_STICKY,
+							'globe' : topicrow.S_POST_GLOBAL,
+							'bullhorn' : topicrow.S_POST_ANNOUNCE,
+							'thumbtack' : topicrow.S_POST_STICKY,
 							'lock' : topicrow.S_TOPIC_LOCKED,
 							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
 							'fire' : topicrow.S_TOPIC_HOT,
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
index c8b5093e81f..1276b387385 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -17,9 +17,9 @@ <h3>{L_IMPORTANT_NEWS}</h3>
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 						{{ Icon('svg', {
-							'info-variant' : topicrow.S_POST_GLOBAL,
-							'info-variant' : topicrow.S_POST_ANNOUNCE,
-							'star' : topicrow.S_POST_STICKY,
+							'globe' : topicrow.S_POST_GLOBAL,
+							'bullhorn' : topicrow.S_POST_ANNOUNCE,
+							'thumbtack' : topicrow.S_POST_STICKY,
 							'lock' : topicrow.S_TOPIC_LOCKED,
 							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
 							'fire' : topicrow.S_TOPIC_HOT,
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index 6f365bfd9eb..b91a70048e3 100644
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -88,9 +88,9 @@ <h2>{L_TITLE}</h2>
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 						{{ Icon('svg', {
-							'info-variant' : topicrow.S_POST_GLOBAL,
-							'info-variant' : topicrow.S_POST_ANNOUNCE,
-							'star' : topicrow.S_POST_STICKY,
+							'globe' : topicrow.S_POST_GLOBAL,
+							'bullhorn' : topicrow.S_POST_ANNOUNCE,
+							'thumbtack' : topicrow.S_POST_STICKY,
 							'lock' : topicrow.S_TOPIC_LOCKED,
 							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
 							'fire' : topicrow.S_TOPIC_HOT,
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index d7019dee1c6..d1cf04ec213 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -12,38 +12,6 @@ <h2 class="cp-title">{TITLE}</h2>
 	<div class="inner">
 
 		<p class="cp-desc">{TITLE_EXPLAIN}</p>
-
-		<!-- IF MODE == 'notification_options' -->
-			<table class="table1">
-				<thead>
-					<tr>
-						<th>{L_NOTIFICATION_TYPE}</th>
-						<!-- BEGIN notification_methods -->
-							<th class="mark">{notification_methods.NAME}</th>
-						<!-- END notification_methods -->
-					</tr>
-				</thead>
-				<tbody>
-				<!-- BEGIN notification_types -->
-					<!-- IF notification_types.GROUP_NAME -->
-						<tr class="bg3">
-							<td colspan="{NOTIFICATION_TYPES_COLS}">{notification_types.GROUP_NAME}</td>
-						</tr>
-					<!-- ELSE -->
-						<tr class="<!-- IF notification_types.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-							<td>
-								{notification_types.NAME}
-								<!-- IF notification_types.EXPLAIN --><br />&nbsp; &nbsp;{notification_types.EXPLAIN}<!-- ENDIF -->
-							</td>
-							<!-- BEGIN notification_methods -->
-								<td class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_types.notification_methods.METHOD}"<!-- IF notification_types.notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --><!-- IF not notification_types.notification_methods.AVAILABLE --> disabled="disabled"<!-- ENDIF --> /></td>
-							<!-- END notification_methods -->
-						</tr>
-					<!-- ENDIF -->
-				<!-- END notification_types -->
-				</tbody>
-			</table>
-		<!-- ELSE -->
 			<!-- IF .notification_list -->
 				<div class="action-bar bar-top">
 					<div class="pagination">
@@ -72,7 +40,7 @@ <h2 class="cp-title">{TITLE}</h2>
 							<dl>
 								<dt>
 									<div class="list-inner notification-item">
-										<!-- IF notification_list.AVATAR -->{notification_list.AVATAR_HTML}<!-- ELSE --><img class="avatar notification-avatar" src="{{ NO_AVATAR_SOURCE }}" alt="" /><!-- ENDIF -->
+										{% include 'avatar.html' with {'avatar_data': notification_list.AVATAR} only %}
 										<div class="notification-text">
 											<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
 												<p class="notification-title">{notification_list.FORMATTED_TITLE}<!-- IF notification_list.REFERENCE --> {notification_list.REFERENCE}<!-- ENDIF --></p>
@@ -105,8 +73,6 @@ <h2 class="cp-title">{TITLE}</h2>
 			<!-- ELSE -->
 				<p><strong>{L_NO_NOTIFICATIONS}</strong></p>
 			<!-- ENDIF -->
-
-		<!-- ENDIF -->
 	</div>
 </div>
 
diff --git a/phpBB/styles/prosilver/template/ucp_notifications_options.html b/phpBB/styles/prosilver/template/ucp_notifications_options.html
new file mode 100644
index 00000000000..cfc12e2bdea
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html
@@ -0,0 +1,72 @@
+{% include('ucp_header.html') %}
+
+<form id="ucp" method="post" action="{{ S_UCP_ACTION }}"{{ S_FORM_ENCTYPE }}>
+
+	<h2 class="cp-title">{{ TITLE }}</h2>
+	{% if NOTIFICATIONS_WEBPUSH_ENABLE %}
+		<div class="panel">
+			<div class="inner">
+				<fieldset>
+					<dl>
+						<dt><label for="subscribe_webpush">{{ lang('NOTIFY_WEBPUSH_ENABLE') ~ lang('COLON') }}</label><br><span>{{ lang('NOTIFY_WEBPUSH_ENABLE_EXPLAIN') }}</span></dt>
+						<dd>
+							<input id="subscribe_webpush" type="submit" name="subscribe_webpush" value="{{ lang('NOTIFY_WEBPUSH_SUBSCRIBE') }}" class="button1 button button-form" data-l-err="{{ lang('INFORMATION')|e('html_attr') }}" data-l-msg="{{ lang('NOTIFY_WEB_PUSH_DENIED')|e('html_attr') }}" data-disabled-msg="{{ lang('NOTIFY_WEB_PUSH_DISABLED')|e('html_attr') }}">
+							<input id="unsubscribe_webpush" type="submit" name="unsubscribe_webpush" value="{{ lang('NOTIFY_WEBPUSH_UNSUBSCRIBE') }}" class="button1 button button-form hidden">
+						</dd>
+					</dl>
+				</fieldset>
+			</div>
+		</div>
+	{% endif %}
+	<div class="panel">
+		<div class="inner">
+			<p class="cp-desc">{{ TITLE_EXPLAIN }}</p>
+
+			<table class="table1">
+				<thead>
+					<tr>
+						<th>{{ lang('NOTIFICATION_TYPE') }}</th>
+						{% for method in notification_methods %}
+							<th class="mark">{{ method.NAME }}</th>
+						{% endfor %}
+					</tr>
+				</thead>
+				<tbody>
+				{% for notification_type in notification_types %}
+					{% if notification_type.GROUP_NAME %}
+						<tr class="bg3">
+							<td colspan="{{ NOTIFICATION_TYPES_COLS }}">{{ notification_type.GROUP_NAME }}</td>
+						</tr>
+					{% else %}
+						<tr class="{% if loop.index is even %}bg1{% else %}bg2{% endif %}">
+							<td>
+								{{ notification_type.NAME }}
+								{% if notification_type.EXPLAIN %}<br>&nbsp; &nbsp;{{ notification_type.EXPLAIN }}{% endif %}
+							</td>
+							{% for notification_method in notification_type.notification_methods %}
+								{% apply spaceless %}
+									<td class="mark">
+										<input type="checkbox" name="{{ notification_type.TYPE }}_{{ notification_method.METHOD }}"{% if notification_method.SUBSCRIBED %} checked="checked"{% endif %}{% if not notification_method.AVAILABLE %} disabled="disabled"{% endif %}/></td>
+								{% endapply %}
+							{% endfor %}
+						</tr>
+					{% endif %}
+				{% endfor %}
+				</tbody>
+			</table>
+		</div>
+	</div>
+
+	{% if notification_types or notification_list %}
+		<fieldset class="display-actions">
+			<input type="hidden" name="form_time" value="{{ FORM_TIME }}" />
+			{{ S_HIDDEN_FIELDS }}
+			<input type="submit" name="submit" value="{% if MODE == 'notification_options' %}{{ lang('SUBMIT') }}{% else %}{{ lang('MARK_READ') }}{% endif %}" class="button1 button button-form" />
+			<div><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{{ lang('MARK_ALL') }}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{{ lang('UNMARK_ALL') }}</a></div>
+			{{ S_FORM_TOKEN }}
+		</fieldset>
+	{% endif %}
+
+</form>
+
+{% include('ucp_footer.html') %}
diff --git a/phpBB/styles/prosilver/template/ucp_notifications_webpush.html b/phpBB/styles/prosilver/template/ucp_notifications_webpush.html
new file mode 100644
index 00000000000..f96b19a9898
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_notifications_webpush.html
@@ -0,0 +1,21 @@
+<script>
+	phpbbWebpushOptions = {
+		serviceWorkerUrl: '{{ U_WEBPUSH_WORKER_URL }}',
+		subscribeUrl: '{{ U_WEBPUSH_SUBSCRIBE }}',
+		unsubscribeUrl: '{{ U_WEBPUSH_UNSUBSCRIBE }}',
+		ajaxErrorTitle: '{{ lang_js('AJAX_ERROR_TITLE') }}',
+		vapidPublicKey: '{{ VAPID_PUBLIC_KEY }}',
+		formTokens: {
+			creationTime: '{{ WEBPUSH_FORM_TOKENS.creation_time }}',
+			formToken: '{{ WEBPUSH_FORM_TOKENS.form_token }}',
+		},
+		subscriptions: [
+		{% for sub in SUBSCRIPTIONS %}
+			{endpoint: '{{ sub.endpoint }}', expiration: '{{ sub.expiration }}' },
+		{% endfor %}
+		],
+	}
+</script>
+
+{% INCLUDEJS(T_ASSETS_PATH ~ '/javascript/webpush.js') %}
+
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 37b2a1c0b10..d0c4c6961b3 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -22,14 +22,14 @@
 <!-- ENDIF -->
 
 
-<div id="post-{MESSAGE_ID}" class="post pm has-profile<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF -->">
+<div id="post-{MESSAGE_ID}" class="post pm has-profile">
 	<div class="inner">
 
 		<dl class="postprofile" id="profile{MESSAGE_ID}">
-			<dt class="<!-- IF RANK_TITLE or RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF --> <!-- IF AUTHOR_AVATAR_HTML -->has-avatar<!-- ELSE -->no-avatar<!-- ENDIF -->">
+			<dt class="<!-- IF RANK_TITLE or RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF --> has-avatar">
 				<div class="avatar-container">
 					<!-- EVENT ucp_pm_viewmessage_avatar_before -->
-					<!-- IF AUTHOR_AVATAR_HTML --><a href="{U_MESSAGE_AUTHOR}" class="avatar">{AUTHOR_AVATAR_HTML}</a><!-- ENDIF -->
+					{% include 'avatar.html' with {'avatar_data': AUTHOR_AVATAR} only %}
 					<!-- EVENT ucp_pm_viewmessage_avatar_after -->
 				</div>
 				{% apply spaceless %}
@@ -70,7 +70,7 @@
 									<!-- IF REMAINDER eq 0 -->
 										<div>
 									<!-- ENDIF -->
-										<a href="<!-- IF contact.U_CONTACT -->{contact.U_CONTACT}<!-- ELSE -->{contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
+										<a href="<!-- IF contact.U_CONTACT -->{contact.U_CONTACT}<!-- ELSE -->{contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF -->>
 											{% if contact.ID == 'pm' %}
 												{{ Icon('font', 'message', '', true, 'far contact-icon') }}
 											{% elseif contact.ID == 'email' %}
@@ -149,6 +149,7 @@ <h3 class="first">{SUBJECT}</h3>
 				<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}"<!-- IF bcc_recipient.COLOUR --> style="color:{bcc_recipient.COLOUR};"<!-- ENDIF -->><strong>{bcc_recipient.NAME}</strong></a><!-- ENDIF -->&nbsp;<!-- END bcc_recipient --><!-- ENDIF -->
 			</p>
 
+			{% EVENT ucp_pm_viewmessage_message_content_before %}
 
 			<div class="content">{MESSAGE}</div>
 
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index 4e81b78fb36..82d2274c2f5 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -40,16 +40,6 @@ <h2>{L_TITLE}</h2>
 			</dd>
 		</dl>
 	<!-- ENDIF -->
-	<!-- IF S_SELECT_NOTIFY -->
-		<dl>
-			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}{L_COLON}</label></dt>
-			<dd>
-				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
-				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
-				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label>
-			</dd>
-		</dl>
-	<!-- ENDIF -->
 	<!-- IF S_MORE_LANGUAGES -->
 		<dl>
 			<dt><label for="{{ LANG_OPTIONS.id }}">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>
@@ -61,7 +51,9 @@ <h2>{L_TITLE}</h2>
 	<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->
 		<dl>
 			<dt><label for="user_style">{L_BOARD_STYLE}{L_COLON}</label></dt>
-			<dd><select name="user_style" id="user_style">{S_STYLE_OPTIONS}</select></dd>
+			<dd>
+				{{ FormsSelect(S_STYLE_OPTIONS) }}
+			</dd>
 		</dl>
 	<!-- ENDIF -->
 	<!-- INCLUDE timezone_option.html -->
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_post.html b/phpBB/styles/prosilver/template/ucp_prefs_post.html
index 4213e2ebd21..f7c681b85f6 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_post.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_post.html
@@ -23,6 +23,7 @@ <h2>{L_TITLE}</h2>
 			<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
+	{% if S_SIG_ALLOWED %}
 	<dl>
 		<dt><label for="sig1">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt>
 		<dd>
@@ -30,6 +31,7 @@ <h2>{L_TITLE}</h2>
 			<label for="sig0"><input type="radio" name="sig" id="sig0" value="0"<!-- IF not S_SIG --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
+	{% endif %}
 	<dl>
 		<dt><label for="notify1">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt>
 		<dd>
diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
index 0f0acc6f99a..0dd54ee85fa 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
@@ -21,12 +21,6 @@ <h2>{L_TITLE} <span class="small">[ <a href="{U_USER_PROFILE}" title="{L_VIEW_PR
 			</dd>
 		</dl>
 	<!-- ENDIF -->
-	<!-- IF S_JABBER_ENABLED -->
-		<dl>
-			<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
-			<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd>
-		</dl>
-	<!-- ENDIF -->
 	<!-- BEGIN profile_fields -->
 		<dl>
 			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 024be04a2bb..63750e32186 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -158,17 +158,36 @@ <h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --
 			<!-- EVENT viewforum_body_topic_row_prepend -->
 			<dl class="row-item">
 				<dt>
-					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
-						{{ Icon('svg', {
-							'info-variant' : topicrow.S_POST_GLOBAL,
-							'info-variant' : topicrow.S_POST_ANNOUNCE,
-							'star' : topicrow.S_POST_STICKY,
+					{% if topicrow.U_NEWEST_POST and topicrow.S_UNREAD_TOPIC and not S_IS_BOT %}
+						{% set U_ITEM_LINK = topicrow.U_NEWEST_POST %}
+					{% elseif topicrow.U_VIEW_TOPIC %}
+						{% set U_ITEM_LINK = topicrow.U_VIEW_TOPIC %}
+					{% endif %}
+					{% if U_ITEM_LINK is defined %}
+						<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{{ U_ITEM_LINK }}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
+							{{ Icon('svg', {
+								'globe' : topicrow.S_POST_GLOBAL,
+								'bullhorn' : topicrow.S_POST_ANNOUNCE,
+								'thumbtack' : topicrow.S_POST_STICKY,
+								'lock' : topicrow.S_TOPIC_LOCKED,
+								'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
+								'fire' : topicrow.S_TOPIC_HOT,
+								'file-document-outline' : true,
+							}, '', true, 'c-forum-row-icon') }}
+						</a>
+					{% else %}
+						<span class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
+							{{ Icon('svg', {
+							'globe' : topicrow.S_POST_GLOBAL,
+							'bullhorn' : topicrow.S_POST_ANNOUNCE,
+							'thumbtack' : topicrow.S_POST_STICKY,
 							'lock' : topicrow.S_TOPIC_LOCKED,
 							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
 							'fire' : topicrow.S_TOPIC_HOT,
 							'file-document-outline' : true,
-						}, '', true, 'c-forum-row-icon') }}
-					</a>
+							}, '', true, 'c-forum-row-icon') }}
+						</span>
+					{% endif %}
 					{% if lang(topicrow.TOPIC_AUTHOR) == S_USERNAME %}
 						<span class="row-item-link-mine"></span>
 					{% endif%}
@@ -177,7 +196,7 @@ <h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --
 					{% endif %}
 					<div class="list-inner">
 						<!-- EVENT topiclist_row_prepend -->
-						{% if topicrow.S_UNREAD_TOPIC and not S_IS_BOT %}
+						{% if topicrow.U_NEWEST_POST and  topicrow.S_UNREAD_TOPIC and not S_IS_BOT %}
 							<a href="{{ topicrow.U_NEWEST_POST }}" class="topictitle unread">{{ topicrow.TOPIC_TITLE }}</a>
 						{% elseif topicrow.U_VIEW_TOPIC %}
 							<a href="{{ topicrow.U_VIEW_TOPIC }}" class="topictitle">{{ topicrow.TOPIC_TITLE }}</a>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index b8342382c6c..d974ef334bb 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -140,12 +140,13 @@ <h2 class="poll-title"><!-- EVENT viewtopic_body_poll_question_prepend -->{POLL_
 		<div class="inner">
 
 		<dl class="postprofile" id="profile{postrow.POST_ID}"<!-- IF postrow.S_POST_HIDDEN --> style="display: none;"<!-- ENDIF -->>
-			<dt class="<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF --> <!-- IF postrow.POSTER_AVATAR_HTML -->has-avatar<!-- ELSE -->no-avatar<!-- ENDIF -->">
+			<dt class="<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF --> has-avatar">
 				<div class="avatar-container">
 					<!-- EVENT viewtopic_body_avatar_before -->
-					<!-- IF postrow.POSTER_AVATAR_HTML -->
-						<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}" class="avatar">{postrow.POSTER_AVATAR_HTML}</a><!-- ELSE --><span class="avatar">{postrow.POSTER_AVATAR}</span><!-- ENDIF -->
-					<!-- ENDIF -->
+					{% include 'avatar.html' with {
+						'avatar_data': postrow.POSTER_AVATAR,
+						'avatar_link': postrow.U_POST_AUTHOR
+					} only %}
 					<!-- EVENT viewtopic_body_avatar_after -->
 				</div>
 				<!-- EVENT viewtopic_body_post_author_before -->
@@ -191,7 +192,7 @@ <h2 class="poll-title"><!-- EVENT viewtopic_body_poll_question_prepend -->{POLL_
 								<!-- IF REMAINDER eq 0 -->
 									<div>
 								<!-- ENDIF -->
-									<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
+									<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF -->>
 										{% EVENT viewtopic_body_contact_icon_prepend %}
 										{% if postrow.contact.ID == 'pm' %}
 											{{ Icon('font', 'message', '', true, 'far contact-icon') }}
@@ -423,9 +424,6 @@ <h3 {% if postrow.S_FIRST_ROW %}class="first"{% endif %}>
 		<!-- EVENT viewtopic_body_postrow_back2top_before -->
 		<div class="back2top">
 			<!-- EVENT viewtopic_body_postrow_back2top_prepend -->
-			<a href="#top" class="top" title="{L_BACK_TO_TOP}">
-				{{ Icon('font', 'circle-chevron-up', lang('BACK_TO_TOP'), false, 'fas c-top-icon') }}
-			</a>
 			<!-- EVENT viewtopic_body_postrow_back2top_append -->
 		</div>
 		<!-- EVENT viewtopic_body_postrow_back2top_after -->
@@ -496,6 +494,12 @@ <h3 {% if postrow.S_FIRST_ROW %}class="first"{% endif %}>
 	<!-- ENDIF -->
 </div>
 
+<div class="to-top-button">
+	<a href="#top" title="{{ lang('BACK_TO_TOP') }}">
+		{{ Icon('font', 'chevron-up', '', false) }}
+	</a>
+</div>
+
 <!-- EVENT viewtopic_body_footer_before -->
 <!-- INCLUDE jumpbox.html -->
 
@@ -508,4 +512,6 @@ <h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3>
 	</div>
 <!-- ENDIF -->
 
+{% EVENT viewtopic_body_online_list_after %}
+
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
index 55acdabd887..1e665bd4b9b 100644
--- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
@@ -8,20 +8,20 @@
 			<div class="pointer"><div class="pointer-inner"></div></div>
 			<ul class="dropdown-contents">
 				<!-- EVENT viewtopic_topic_tools_before -->
-				<!-- IF U_WATCH_TOPIC -->
+				{% if U_WATCH_TOPIC %}
 					<li>
-						<a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link">
+						<a href="{{ U_WATCH_TOPIC }}" class="watch-topic-link" title="{{ S_WATCH_TOPIC_TITLE }}" data-ajax="toggle_link" data-toggle-text="{{ S_WATCH_TOPIC_TOGGLE }}" data-toggle-url="{{ U_WATCH_TOPIC_TOGGLE }}" data-update-all=".watch-topic-link">
 							{% if S_WATCHING_TOPIC %}
-								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon is-active') }}
-								{{ Icon('font', 'bell', '', true, 'far c-watch-icon') }}
-							{% else %}
 								{{ Icon('font', 'bell', '', true, 'far c-watch-icon is-active') }}
 								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon') }}
+							{% else %}
+								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon is-active') }}
+								{{ Icon('font', 'bell', '', true, 'far c-watch-icon') }}
 							{% endif %}
 							<span>{S_WATCH_TOPIC_TITLE}</span>
 						</a>
 					</li>
-				<!-- ENDIF -->
+				{% endif %}
 				<!-- IF U_BOOKMARK_TOPIC -->
 					<li>
 						<a href="{U_BOOKMARK_TOPIC}" class="bookmark-link" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}" data-update-all=".bookmark-link">
diff --git a/phpBB/styles/prosilver/theme/base.css b/phpBB/styles/prosilver/theme/base.css
index f4daeee1e50..42a1aef5564 100644
--- a/phpBB/styles/prosilver/theme/base.css
+++ b/phpBB/styles/prosilver/theme/base.css
@@ -21,9 +21,26 @@
  *    line-heights want to be a multiple of this number in order to maintain
  *    vertical rhythm.)
 */
+:root {
+	/* Base font size */
+	--ps-font-base: 16px;								/* [1] */
+	--ps-line-height: 1.5rem;							/* [2] */
+
+	/* Headings */
+	--ps-font-h1: 1.5rem;								/* 24px */
+	--ps-font-h2: 1.5rem;								/* 24px */
+	--ps-font-h3: 1.25rem;								/* 20px */
+	--ps-font-h4: 1.125rem;								/* 18px */
+
+	/* Text and Paragraphs */
+	--ps-font-normal: 1rem;								/* 16px */
+	--ps-font-small: 0.875rem;							/* 14px */
+	--ps-font-tiny: 0.75rem;							/* 12px */
+}
+
 html {
-	font-size: 16px; /* [1] */
-	line-height: 1.5; /* [2] */
+	font-size: var(--ps-font-base);
+	line-height: var(--ps-line-height);
 	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 27a4923fb2c..201140156c4 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -143,6 +143,12 @@
 	margin-left: 5px;
 }
 
+.rtl .notification-block .avatar-placeholder,
+.rtl .notification-list .topiclist .notification-item .avatar-placeholder,
+.rtl .notification-list .topiclist .notification-item .avatar {
+	float: right;
+}
+
 .rtl .notification-menu .notifications {
 	margin-right: 50px;
 	margin-left: 0;
@@ -441,11 +447,6 @@
 	float: right;
 }
 
-.rtl ul.topiclist dfn {
-	right: -999px;
-	left: auto;
-}
-
 .rtl ul.topiclist li.row dt a.subforum {
 	background-position: right;
 	position: static;
@@ -512,7 +513,7 @@
 
 .rtl .postbody,
 .rtl .postbody h3 {
-	float: right;
+	float: right !important;
 }
 
 .rtl .has-profile .postbody h3 {
@@ -656,7 +657,7 @@
 }
 
 .rtl .postprofile .avatar {
-	float: right;
+	float: left;
 }
 
 .rtl dl.pmlist dd {
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 4656128ab90..b0991d054c5 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -4,7 +4,7 @@
 
 .button {
 	font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica;
-	font-size: 13px;
+	font-size: var(--ps-font-normal);
 	font-weight: 600;
 	line-height: 1.4;
 	text-align: center;
@@ -16,7 +16,7 @@
 	justify-content: center;
 	align-items: center;
 	box-sizing: border-box;
-	height: 24px;
+	height: calc(var(--ps-font-normal) * 1.875);
 	padding: 2px 8px;
 	cursor: pointer;
 	touch-action: manipulation;
@@ -32,6 +32,20 @@
 	outline: none;
 }
 
+.button[disabled],
+.button[disabled]:hover,
+.button.disabled,
+.button.disabled:hover {
+	background: #eeeeee;
+	border-color: #aaaaaa;
+	color: #aaaaaa;
+	cursor: default;
+}
+
+.button.hidden {
+	display: none;
+}
+
 .caret {
 	border-left: 1px solid;
 	position: relative;
@@ -171,11 +185,11 @@
 
 /* Responsive buttons in post body */
 .post-buttons .dropdown {
-	top: 18px;
+	top: calc(var(--ps-font-normal) * 1.875);
 }
 
 .post-buttons .dropdown a {
-	font-size: 13px;
+	font-size: var(--ps-font-normal);
 	text-align: right;
 	display: block;
 	justify-content: start;
@@ -206,3 +220,9 @@ button::-moz-focus-inner {
 .avatar-cropper-buttons > .button-group {
 	margin: 4px;
 }
+
+/* Notification buttons
+--------------------------------------------- */
+.notification-subscribe-toggle:disabled {
+	opacity: 0.7;
+}
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 7bdd5f4b87f..711963f54ff 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -83,6 +83,15 @@ th a:hover {
 	color: #9e9e9e;
 }
 
+.to-top-button {
+	background-color: #0f4d8a;
+	opacity: 0.7;
+}
+
+.to-top-button a {
+	color: #e6f7ff;
+}
+
 /* arrow links  */
 .arrow-left:hover,
 .arrow-right:hover {
@@ -90,22 +99,19 @@ th a:hover {
 }
 
 /* round cornered boxes and backgrounds */
-.headerbar {
-	color: #ffffff;
+.headerbar,
+.headerbar h1 {
+	color: #eaf8ff;
 }
 
 .headerbar,
 .forumbg {
-	background-color: #13a4ec;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#80d5ff), color-stop(0.1%, #0077b3), color-stop(30%, #13a4ec), to(#13a4ec));
-	background-image: linear-gradient(to bottom, #80d5ff 0%, #0077b3 0.1%, #13a4ec 30%, #13a4ec 100%);
+	background-color: #4688ce;
 	background-repeat: repeat-x;
 }
 
 .forabg {
-	background-color: #0077b3;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#80d5ff), color-stop(0.1%, #13a4ec), color-stop(30%, #0077b3), to(#0077b3));
-	background-image: linear-gradient(to bottom, #80d5ff 0%, #13a4ec 0.1%, #0077b3 30%, #0077b3 100%);
+	background-color: #4688ce;
 	background-repeat: repeat-x;
 }
 
@@ -113,6 +119,18 @@ th a:hover {
 	background-color: #c9dee8;
 }
 
+.headerbar .navbar a {
+	color: #eaf8ff;
+}
+
+.headerbar .navbar .dropdown a {
+	color: #0f4d8a;
+}
+
+.header-profile {
+	text-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.5);
+}
+
 .panel {
 	background-color: #f0f3f5;
 	color: #29303d;
@@ -298,6 +316,14 @@ a:hover .icon.icon-black, /* DEPRECATED 4.0 */
 	color: inherit;
 }
 
+.push-subscribe-toggle-icon.toggle-on {
+	color: #0059b3;
+}
+
+.push-subscribe-toggle-icon.toggle-off {
+	color: #9e9e9e;
+}
+
 /* jumpbox */
 .jumpbox .dropdown li {
 	border-top-color: #dedede;
@@ -405,9 +431,7 @@ p.post-notice {
 
 /*	colours and backgrounds for content.css */
 ul.forums {
-	background-color: #edf4f7;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#b8d3e0), to(#edf4f7));
-	background-image: linear-gradient(to bottom, #b8d3e0 0%, #edf4f7 100%);
+	background-color: #d2e4ec;
 }
 
 ul.topiclist > li {
@@ -433,7 +457,7 @@ li.row strong {
 }
 
 li.row:hover {
-	background-color: #fffbcc;
+	background-color: #cde9f5;
 }
 
 li.row:hover dd {
@@ -803,6 +827,10 @@ dd.profile-warnings {
 /*  icon images */
 .site_logo { background-image: url("./images/site_logo.svg"); }
 
+.c-hero-logo-img g {
+	fill: #eaf8ff;
+}
+
 /*	colours and backgrounds for cp.css */
 
 /* main cp box */
@@ -854,11 +882,7 @@ ul.cplist {
 .tabs .activetab > a,
 .tabs .activetab > a:hover {
 	background-color: #c9dee8;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#e6f7ff), to(#c9dee8));
-	background-image: linear-gradient(to bottom, #e6f7ff 0%, #c9dee8 100%);
 	border-color: #c9dee8;
-	-webkit-box-shadow: 0 1px 1px #e6f7ff inset;
-	box-shadow: 0 1px 1px #e6f7ff inset;
 	color: #212121;
 }
 
@@ -877,9 +901,7 @@ ul.cplist {
 
 /* link styles for the sub-section links */
 .navigation a {
-	background: #c0d3dd;
-	background-image: -webkit-gradient(linear, left top, right top, color-stop(50%, #aab9c0), to(#c0d3dd));
-	background-image: linear-gradient(to right, #aab9c0 50%, #c0d3dd 100%);
+	background: #b5c6cf;
 	color: #212121;
 }
 
@@ -969,6 +991,18 @@ dl.mini dt {
 	background-color: #ededed;
 }
 
+/* avatar placeholder colours */
+.avatar-color-default { background-color: hsl(207, 15%, 80%); }
+.avatar-color-0 { background-color: #d32f2f; }
+.avatar-color-1 { background-color: #c2185b; }
+.avatar-color-2 { background-color: #7b1fa2; }
+.avatar-color-3 { background-color: #512da8; }
+.avatar-color-4 { background-color: #303f9f; }
+
+.avatar-initials {
+	color: #ffffff;
+}
+
 /*	colours and backgrounds for forms.css */
 
 /* general form styles */
@@ -1104,6 +1138,7 @@ input.disabled {
 
 .dropdown-extended .dropdown-extended-item {
 	border-top-color: #bdbdbd;
+	color: #47536b;
 }
 
 .dropdown-extended .dropdown-extended-item:hover {
@@ -1179,3 +1214,11 @@ input.disabled {
 	background-color: #d41142;
 	color: #ffffff;
 }
+
+.dropdown-extended .webpush-subscribe {
+	color: #536482;
+}
+
+.notification-subscribe-toggle {
+	color: #47536b;
+}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index d99eeaebcfc..2d5dd2601af 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -5,26 +5,24 @@
 /* stylelint-disable selector-no-qualifying-type */
 
 html {
-	font-size: 100%;
-
 	/* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */
 	height: 101%;
 }
 
 body {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 16px;
+	font-size: var(--ps-font-normal);
 	line-height: normal;
 	word-wrap: break-word;
 	margin: 0;
-	padding: 12px 0;
+	padding: 0 0 12px;
 	-webkit-print-color-adjust: exact;
 }
 
 h1 {
 	/* Forum name */
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size: 20px;
+	font-size: var(--ps-font-h1);
 	font-weight: bold;
 	margin-top: 15px;
 	margin-right: 200px;
@@ -33,7 +31,7 @@ h1 {
 h2 {
 	/* Forum header titles */
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size: 20px;
+	font-size: var(--ps-font-h2);
 	font-weight: normal;
 	margin: 0.8em 0 0.2em;
 }
@@ -45,7 +43,7 @@ h2.solo {
 h3 {
 	/* Sub-headers (also used as post headers, but defined later) */
 	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
+	font-size: var(--ps-font-normal);
 	font-weight: bold;
 	text-transform: uppercase;
 	border-bottom: 1px solid transparent;
@@ -57,13 +55,13 @@ h3 {
 h4 {
 	/* Forum and topic list titles */
 	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 13px;
+	font-size: var(--ps-font-h4);
 }
 
 p {
-	font-size: 11px;
-	line-height: 14px;
-	margin-bottom: 16px;
+	font-size: var(--ps-font-small);
+	line-height: calc(var(--ps-line-height) * 0.75);
+	margin-bottom: calc(var(--ps-line-height) / 1.2);
 }
 
 img {
@@ -151,17 +149,18 @@ a:hover {
 /* Main blocks
 ---------------------------------------- */
 .wrap {
-	border: 1px solid transparent;
-	border-radius: 8px;
-	min-width: 625px;
+	border: solid transparent;
+	border-width: 0 1px 1px;
+	border-radius: 0 0 8px 8px;
+	min-width: 320px;
 	max-width: 1152px;
 	margin: 0 auto;
-	padding: 15px;
+	padding: 0 15px 15px;
 }
 
 .page-body {
 	clear: both;
-	margin: 4px 0;
+	margin: 0.4rem 0;
 }
 
 .page-footer {
@@ -200,10 +199,10 @@ a:hover {
 /* Round cornered boxes and backgrounds
 ---------------------------------------- */
 .headerbar {
-	border-radius: 7px;
+	border-radius: 0 0 7px 7px;
 	display: flex;
 	flex-direction: column;
-	margin-bottom: 4px;
+	margin-bottom: 0.5rem;
 	padding: 5px;
 }
 
@@ -212,23 +211,28 @@ a:hover {
 	padding: 3px 10px;
 }
 
+.headerbar .navbar {
+	background: none;
+	padding: calc(var(--ps-line-height) * 0.25) 5px calc(var(--ps-line-height) * 0.5);
+}
+
 .forabg {
 	border-radius: 7px;
 	clear: both;
-	margin-bottom: 4px;
+	margin-bottom: 0.5rem;
 	padding: 5px;
 }
 
 .forumbg {
 	border-radius: 7px;
 	clear: both;
-	margin-bottom: 4px;
+	margin-bottom: 0.5rem;
 	padding: 5px;
 }
 
 .panel {
 	border-radius: 7px;
-	margin-bottom: 4px;
+	margin-bottom: calc(var(--ps-font-base) * 0.5);
 	padding: 5px 10px;
 }
 
@@ -262,8 +266,8 @@ ul.linklist {
 }
 
 ul.linklist > li {
-	font-size: 11px;
-	line-height: 24px;
+	font-size: var(--ps-font-small);
+	line-height: calc(var(--ps-line-height) * 1.25);
 	float: left;
 	width: auto;
 	margin-right: 7px;
@@ -314,6 +318,10 @@ ul.linklist li.responsive-menu {
 	margin: 0 5px 0 0;
 }
 
+.nav-footer .responsive-menu {
+	display: none;
+}
+
 .hasjs ul.linklist.leftside,
 .hasjs ul.linklist.rightside {
 	max-width: 48%;
@@ -340,6 +348,10 @@ ul.linklist .dropdown-up .dropdown {
 	bottom: 18px;
 }
 
+ul.nav-breadcrumbs {
+	margin: calc(var(--ps-line-height) * 0.75) 0;
+}
+
 /* Bulletin icons for list items
 ---------------------------------------- */
 ul.linklist.bulletin > li:before {
@@ -374,13 +386,20 @@ a.header-avatar:hover {
 	text-decoration: none;
 }
 
-a.header-avatar img {
+a.header-avatar img,
+a.header-avatar .avatar-placeholder {
 	vertical-align: middle;
 	width: auto;
 	max-height: 20px;
 	margin-bottom: 2px;
 }
 
+a.header-avatar .avatar-placeholder {
+	font-size: var(--ps-font-tiny);
+	display: inline-flex;
+	width: 20px;
+}
+
 /* Dropdown menu
 ---------------------------------------- */
 .dropdown-container {
@@ -434,12 +453,12 @@ a.header-avatar img {
 }
 
 .dropdown-button-control .dropdown {
-	top: 24px;
+	top: calc(var(--ps-line-height) * 1.25);
 }
 
 .dropdown-button-control.dropdown-up .dropdown {
 	top: auto;
-	bottom: 24px;
+	bottom: calc(var(--ps-line-height) * 1.25);
 }
 
 .dropdown .pointer,
@@ -556,11 +575,11 @@ a.header-avatar img {
 }
 
 .dropdown li {
-	font-size: 11px !important;
+	font-size: var(--ps-font-small) !important;
 	line-height: normal !important;
 	text-align: left;
 	white-space: nowrap;
-	border-top: 1px dotted transparent;
+	border-top: 1px solid transparent;
 	display: list-item;
 	float: none !important;
 	margin: 0;
@@ -615,12 +634,12 @@ a.header-avatar img {
 .breadcrumbs .crumb {
 	font-weight: bold;
 	word-wrap: normal;
-	float: left;
+	display: inline-block;
 }
 
 .breadcrumbs .crumb:before {
 	font-weight: bold;
-	padding: 0 0.5em;
+	padding: 0 0.1em;
 	content: "\203A";
 }
 
@@ -678,9 +697,9 @@ table.table1 {
 }
 
 table.table1 thead th {
-	font-size: 10px;
+	font-size: var(--ps-font-tiny);
 	font-weight: normal;
-	line-height: 13px;
+	line-height: calc(var(--ps-line-height) / 1.5);
 	text-transform: uppercase;
 	padding: 0 0 4px 3px;
 }
@@ -694,7 +713,7 @@ table.table1 tbody tr {
 }
 
 table.table1 td {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 }
 
 table.table1 tbody td {
@@ -814,6 +833,10 @@ table.info tbody th {
 	max-width: 100%;
 }
 
+.avatar-rank-container {
+	max-width: 20%;
+}
+
 .left-box.profile-details {
 	width: 80%;
 }
@@ -827,7 +850,7 @@ table.info tbody th {
 
 dl.details {
 	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 }
 
 dl.details dt {
@@ -867,12 +890,6 @@ fieldset.fields1 dd.recipients {
 	margin-left: 11px;
 }
 
-fieldset.fields1 ul.recipients input.button2 {
-	font-size: 12px;
-	margin-right: 0;
-	padding: 0;
-}
-
 fieldset.fields1 dl.pmlist > dt {
 	width: auto !important;
 }
@@ -884,7 +901,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
 /* Action-bars (container for post/reply buttons, pagination, etc.)
 ---------------------------------------- */
 .action-bar {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 	margin: 4px 0;
 }
 
@@ -940,7 +957,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
 
 .pagination li.active span {
 	font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica;
-	font-size: 13px;
+	font-size: var(--ps-font-normal);
 	font-weight: normal;
 	line-height: 1.4;
 	text-align: center;
@@ -964,7 +981,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
 }
 
 .pagination li.page-jump a i {
-	font-size: 16px;
+	font-size: var(--ps-font-h3);
 }
 
 .pagination .arrow a {
@@ -984,10 +1001,10 @@ fieldset.fields1 dl.pmlist dd.recipients {
 
 .row .pagination li a,
 .row .pagination li span {
-	font-size: 9px;
+	font-size: var(--ps-font-tiny);
 	border-radius: 2px;
-	width: 14px;
-	height: 17px;
+	width: calc(var(--ps-font-tiny) + 6px);
+	height: calc(var(--ps-font-normal) + 6px);
 	padding: 1px 3px;
 }
 
@@ -1028,7 +1045,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
 .phpbb_alert div.alert_text > select,
 .phpbb_alert div.alert_text > textarea,
 .phpbb_alert div.alert_text > input {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 }
 
 .darkenwrapper {
@@ -1143,13 +1160,13 @@ fieldset.fields1 dl.pmlist dd.recipients {
 /* Miscellaneous styles
 ---------------------------------------- */
 .copyright {
-	font-size: 10px;
+	font-size: var(--ps-font-tiny);
 	text-align: center;
 	padding: 10px;
 }
 
 .footer-row {
-	font-size: 10px;
+	font-size: var(--ps-font-tiny);
 	line-height: 1.8;
 	margin: 0;
 }
@@ -1167,12 +1184,12 @@ fieldset.fields1 dl.pmlist dd.recipients {
 }
 
 .error {
-	font-size: 10px;
+	font-size: 12px;
 	font-weight: bold;
 }
 
 div.rules {
-	font-size: 11px;
+	font-size: var(--ps-font-h4);
 	border-radius: 7px;
 	margin: 10px 0;
 	padding: 5px 10px;
@@ -1226,14 +1243,9 @@ ul.linklist:after,
 	content: "";
 }
 
-/* stylelint-disable declaration-property-unit-allowed-list */
 .emoji {
-	width: 1em;
-	min-width: 18px;
-	height: 1em;
-	min-height: 18px;
+	font-size: 17px;
 }
-/* stylelint-enable declaration-property-unit-allowed-list */
 
 .smilies {
 	vertical-align: text-bottom;
@@ -1250,7 +1262,7 @@ ul.linklist:after,
 }
 
 .member-search strong {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 }
 
 .dropdown-extended {
@@ -1326,7 +1338,7 @@ ul.linklist:after,
 }
 
 .dropdown-extended .footer {
-	font-size: 12px;
+	font-size: var(--ps-font-normal);
 	text-align: center;
 }
 
@@ -1346,6 +1358,15 @@ ul.linklist:after,
 	display: block;
 }
 
+.dropdown-extended .webpush-subscribe {
+	white-space: nowrap;
+	display: flex;
+	flex-wrap: nowrap;
+	justify-content: space-between;
+	padding: 5px 10px;
+	gap: 20px;
+}
+
 .notification-avatar,
 .notification-menu .notification-list .notification-item .avatar,
 .notification-menu .notification-list .notification-item .gravatar {
@@ -1370,7 +1391,7 @@ ul.linklist:after,
 }
 
 .notification-time {
-	font-size: 10px;
+	font-size: var(--ps-font-tiny);
 	text-align: right;
 	margin: 0;
 }
@@ -1386,7 +1407,7 @@ ul.linklist:after,
 
 .notifications-title {
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size: 13px !important;
+	font-size: var(--ps-font-normal) !important;
 }
 
 .notifications-title strong {
@@ -1394,7 +1415,7 @@ ul.linklist:after,
 }
 
 .notifications-time {
-	font-size: 10px !important;
+	font-size: 12px !important;
 }
 
 .notification-text {
@@ -1402,16 +1423,16 @@ ul.linklist:after,
 }
 
 .badge {
-	font-size: 10px;
+	font-size: var(--ps-font-tiny);
 	line-height: 1;
 	text-align: center;
 	white-space: nowrap;
 	border-radius: 10px;
 	opacity: 0.8;
 	position: relative;
-	top: 3px;
+	top: 5px;
 	float: right;
-	margin-left: 3px;
+	margin-left: 5px;
 	padding: 4px 6px;
 }
 
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index d942e08b377..444f2484eef 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -37,7 +37,7 @@ ul.topiclist dd {
 }
 
 ul.topiclist dt {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 	width: 100%;
 	margin-right: -440px;
 }
@@ -55,7 +55,7 @@ ul.topiclist.two-columns dt {
 }
 
 ul.topiclist dt .list-inner {
-	line-height: 16px;
+	line-height: calc(var(--ps-line-height) / 1.2);
 	margin-right: 440px;
 	padding-right: 5px;
 	padding-left: 5px;
@@ -87,9 +87,14 @@ ul.topiclist li.row dd {
 
 ul.topiclist dfn {
 	/* Labels for post/view counts */
+	border: 0;
 	position: absolute;
-	left: -999px;
-	width: 990px;
+	overflow: hidden;
+	clip: rect(0, 0, 0, 0);
+	width: 1px;
+	height: 1px;
+	margin: -1px;
+	padding: 0;
 }
 
 .forum-image {
@@ -140,8 +145,8 @@ li.row strong {
 li.header dt,
 li.header dd {
 	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	line-height: 16px;
+	font-size: var(--ps-font-tiny);
+	line-height: 1.6;
 	text-transform: uppercase;
 	border-left-width: 0;
 	margin: 2px 0 4px;
@@ -193,7 +198,7 @@ dl.row-item dt {
 }
 
 dl.row-item dt .list-inner {
-	padding-left: 52px;			/* Space for folder icon */
+	padding-left: 54px;			/* Space for folder icon */
 }
 
 dl.row-item dt,
@@ -207,8 +212,8 @@ dd.topics,
 dd.views,
 dd.extra,
 dd.mark {
-	font-size: 12px;
-	line-height: 26px;
+	font-size: var(--ps-font-normal);
+	line-height: 2;
 	text-align: center;
 	width: 80px;
 }
@@ -236,16 +241,16 @@ dd.redirect,
 dd.moderation,
 dd.time,
 dd.info {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 	width: 250px;
 }
 
 dd.redirect {
-	line-height: 26px;
+	line-height: calc(var(--ps-line-height) / 0.75);
 }
 
 dd.time {
-	line-height: 22px;
+	line-height: calc(var(--ps-line-height) * 1.1);
 }
 
 dd.lastpost > span,
@@ -258,17 +263,17 @@ dd.moderation > span {
 }
 
 dd.lastpost > span {
-	line-height: 16px;
+	line-height: calc(var(--ps-line-height) / 1.2);
 }
 
 dd.extra,
 dd.mark {
-	line-height: 24px;
+	line-height: var(--ps-line-height);
 }
 
 dd.option {
-	font-size: 11px;
-	line-height: 22px;
+	font-size: var(--ps-font-small);
+	line-height: 1.75;
 	text-align: center;
 	width: 125px;
 }
@@ -276,7 +281,7 @@ dd.option {
 /* Post body styles
 ---------------------------------------- */
 .postbody {
-	line-height: 16px;
+	line-height: var(--ps-line-height);
 	position: relative;
 	float: left;
 	width: 76%;
@@ -284,18 +289,18 @@ dd.option {
 }
 
 .postbody .ignore {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 }
 
 .postbody h3.first {
 	/* The first post on the page uses this */
-	font-size: 17px;
+	font-size: var(--ps-font-h3);
 }
 
 .postbody h3 {
 	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 15px;
-	line-height: 19px;
+	font-size: var(--ps-font-h4);
+	line-height: calc(var(--ps-font-h4) + 4px);
 	text-transform: none;
 	border: none;
 
@@ -317,7 +322,7 @@ dd.option {
 }
 
 .postbody .content {
-	font-size: 13px;
+	font-size: var(--ps-font-normal);
 	overflow-x: auto;
 }
 
@@ -374,17 +379,17 @@ dd.option {
 ---------------------------------------- */
 .content {
 	font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 13px;
-	line-height: 18px;
+	font-size: var(--ps-font-normal);
+	line-height: var(--ps-line-height);
 	clear: both;
 	overflow: hidden;
-	min-height: 30px;
+	min-height: calc(var(--ps-line-height) * 1.5);
 	padding-bottom: 1px;
 }
 
 .content h2,
 .panel h2 {
-	font-size: 16px;
+	font-size: var(--ps-font-h3);
 	font-weight: normal;
 	border-bottom: 1px solid transparent;
 	margin-top: 8px;
@@ -397,9 +402,9 @@ dd.option {
 }
 
 .panel p {
-	font-size: 12px;
-	line-height: 16px;
-	margin-bottom: 12px;
+	font-size: var(--ps-font-normal);
+	line-height: 1.25;
+	margin-bottom: var(--ps-font-normal);
 }
 
 .content p {
@@ -407,22 +412,22 @@ dd.option {
 }
 
 .agreement {
-	font-size: 12px;
-	line-height: 17px;
-	margin-bottom: 10px;
+	font-size: var(--ps-font-normal);
+	line-height: 1.25;
+	margin-bottom: var(--ps-font-small);
 }
 
 .agreement-text {
-	line-height: 17px;
-	margin-bottom: 10px;
+	line-height: calc(var(--ps-font-normal) * 1.25);
+	margin-bottom: var(--ps-font-small);
 }
 
 dl.faq {
 	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 11px;
-	line-height: 15px;
-	margin-top: 11px;
-	margin-bottom: 22px;
+	font-size: var(--ps-font-small);
+	line-height: 1.4;
+	margin-top: var(--ps-font-small);
+	margin-bottom: calc(var(--ps-font-small) * 2);
 }
 
 dl.faq dt {
@@ -430,8 +435,8 @@ dl.faq dt {
 }
 
 .content dl.faq {
-	font-size: 12px;
-	margin-bottom: 6px;
+	font-size: var(--ps-font-normal);
+	margin-bottom: calc(var(--ps-font-normal) / 2);
 }
 
 .content li {
@@ -450,22 +455,22 @@ dl.faq dt {
 /* Post author */
 p.author {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 10px;
-	line-height: 12px;
+	font-size: var(--ps-font-tiny);
+	line-height: 1.2;
 	clear: both;
-	margin-bottom: 8px;
+	margin-bottom: calc(var(--ps-font-tiny) / 1.2);
 	padding: 0 0 5px;
 }
 
 /* Post signature */
 .signature {
-	font-size: 11px;
-	line-height: 16px;
+	font-size: var(--ps-font-small);
+	line-height: 1.4;
 	border-top: 1px solid transparent;
 	clear: left;
 	overflow: hidden;
 	width: 100%;
-	margin-top: 16px;
+	margin: calc(var(--ps-font-small) * 1.4) 0;
 	padding-top: 2px;
 }
 
@@ -493,18 +498,18 @@ dd .signature {
 /* Post noticies */
 .notice {
 	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 10px;
-	line-height: 13px;
+	font-size: var(--ps-font-tiny);
+	line-height: 1.3;
 	border-top: 1px dashed transparent;
 	clear: left;
 	width: auto;
-	margin-top: 15px;
+	margin-top: calc(var(--ps-font-tiny) * 1.3 + 2px);
 	padding-top: 2px;
 }
 
 /* Jump to post link for now */
 ul.searchresults {
-	font-size: 12px;
+	font-size: var(--ps-font-normal);
 	text-align: right;
 	clear: both;
 	list-style: none;
@@ -551,20 +556,20 @@ blockquote cite > span {
 
 /* Code block */
 .codebox {
-	font-size: 13px;
+	font-size: var(--ps-font-normal);
 	word-wrap: normal;
 	border: 1px solid transparent;
-	margin: 13px 0 16px;
+	margin: var(--ps-font-normal) 0 calc(var(--ps-font-normal) + 2px);
 }
 
 .codebox p {
-	font-size: 10px !important;
+	font-size: var(--ps-font-tiny) !important;
 	font-weight: bold;
 	text-transform: uppercase;
 	border-bottom: 1px solid transparent;
 	display: block;
 	margin-bottom: 0;
-	padding: 3px;
+	padding: calc(var(--ps-font-tiny) / 3);
 }
 
 blockquote .codebox {
@@ -584,7 +589,7 @@ blockquote .codebox {
 /* Attachments
 ---------------------------------------- */
 .attachbox {
-	font-size: 13px;
+	font-size: var(--ps-font-normal);
 	border: 1px dashed transparent;
 	float: left;
 	clear: left;
@@ -715,7 +720,7 @@ fieldset.polls dl.voted {
 }
 
 fieldset.polls dt {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 	text-align: left;
 	border-right: none;
 	display: block;
@@ -726,7 +731,7 @@ fieldset.polls dt {
 }
 
 fieldset.polls dd {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 	border-left: none;
 	float: left;
 	width: 10%;
@@ -761,7 +766,7 @@ fieldset.polls dd div {
 }
 
 .vote-submitted {
-	font-size: 12px;
+	font-size: var(--ps-font-normal);
 	font-weight: bold;
 	text-align: center;
 }
@@ -769,7 +774,7 @@ fieldset.polls dd div {
 /* Poster profile block
 ---------------------------------------- */
 .postprofile {
-	line-height: 16px;
+	line-height: calc(var(--ps-font-small) * 1.5);
 	border: 1px solid transparent;
 	border-width: 0 0 0 1px;
 	float: right;
@@ -780,8 +785,8 @@ fieldset.polls dd div {
 
 .postprofile dd,
 .postprofile dt {
-	font-size: 10px;
-	line-height: 16px;
+	font-size: var(--ps-font-small);
+	line-height: 1.6;
 	margin-left: 8px;
 }
 
@@ -805,7 +810,7 @@ fieldset.polls dd div {
 }
 
 /* Post-profile avatars */
-.postprofile .has-avatar .avatar-container {
+.postprofile .avatar-container {
 	overflow: hidden;
 	margin-bottom: 3px;
 }
@@ -822,6 +827,37 @@ fieldset.polls dd div {
 	height: auto !important;
 }
 
+.avatar-placeholder {
+	font-size: 36px;
+	font-weight: bold;
+	border-radius: 50%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 80px;
+	height: 80px;
+}
+
+.avatar-initials {
+	line-height: 1;
+}
+
+.avatar-initials .o-icon {
+	font-size: 36px;
+	vertical-align: baseline !important;
+	width: auto;
+	height: auto;
+}
+
+.notification-block .avatar-placeholder,
+.notification-list .topiclist .notification-item .avatar,
+.notification-list .topiclist .notification-item .avatar-placeholder {
+	font-size: 22px;
+	float: left;
+	width: 50px;
+	height: 50px;
+}
+
 .postprofile .profile-posts a {
 	font-weight: normal;
 }
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index 7daaccb08e9..02581046676 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -24,12 +24,12 @@
 }
 
 .panel-container .panel p {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 }
 
 .panel-container .panel ol {
-	font-size: 11px;
-	margin-left: 22px;
+	font-size: var(--ps-font-small);
+	margin-left: calc(var(--ps-font-small) * 2);
 }
 
 .panel-container .panel li.row {
@@ -80,7 +80,7 @@ ul.cplist {
 }
 
 .panel-container .postbody p.author {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 }
 
 .cp-main .buttons {
@@ -118,9 +118,9 @@ ul.cplist {
 
 .tabs .tab,
 .minitabs .tab {
-	font-size: 10px;
+	font-size: var(--ps-font-tiny);
 	font-weight: bold;
-	line-height: 14px;
+	line-height: 1.4;
 	display: block;
 	float: left;
 }
@@ -144,7 +144,7 @@ ul.cplist {
 .tabs .tab > a {
 	border: 1px solid transparent;
 	border-radius: 4px 4px 0 0;
-	margin: 1px 1px 0 0;
+	margin: 1px 1px -1px 0;
 }
 
 .tabs .activetab > a {
@@ -180,12 +180,12 @@ ul.cplist {
 }
 
 .responsive-tab > a.responsive-tab-link {
-	font-size: 16px;
-	line-height: 14px;
+	font-size: var(--ps-font-h3);
+	line-height: 0.875;
 	text-decoration: none;
 	position: relative;
 	display: block;
-	width: 16px;
+	width: var(--ps-font-h3);
 }
 
 .responsive-tab .responsive-tab-link:before {
@@ -201,7 +201,7 @@ ul.cplist {
 
 .tabs .dropdown,
 .minitabs .dropdown {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 	font-weight: normal;
 	top: 20px;
 	margin-right: -2px;
@@ -248,8 +248,10 @@ ul.cplist {
 
 /* Link styles for the sub-section links */
 .navigation a {
-	font-size: 10px;
+	font-size: var(--ps-font-tiny);
 	text-decoration: none;
+	border: 1px solid transparent;
+	border-radius: 4px 0 0 4px;
 	display: block;
 	margin: 1px 0;
 	padding: 5px;
@@ -269,12 +271,12 @@ ul.cplist {
 
 /* Friends list */
 .cp-mini {
-	font-size: 10px;
+	font-size: var(--ps-font-tiny);
 	border-radius: 7px;
 	overflow-y: auto;
 	max-height: 200px;
-	margin: 10px 15px 10px 5px;
-	padding: 5px 10px;
+	margin: var(--ps-font-tiny) 15px var(--ps-font-tiny) 5px;
+	padding: 5px var(--ps-font-tiny);
 }
 
 dl.mini dt {
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 4f67fae1dc8..25ecb496d8a 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -9,13 +9,13 @@
 ---------------------------------------- */
 fieldset {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 	border-width: 0;
 }
 
 input {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 	font-weight: normal;
 	vertical-align: middle;
 	padding: 0 3px;
@@ -23,7 +23,7 @@ input {
 
 select {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 	font-weight: normal;
 	vertical-align: middle;
 	border: 1px solid transparent;
@@ -36,18 +36,18 @@ select:focus {
 }
 
 option {
-	padding-right: 11px;
+	padding-right: var(--ps-font-small);
 }
 
 select optgroup option {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	padding-right: 11px;
+	padding-right: var(--ps-font-small);
 }
 
 textarea {
 	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 11px;
-	line-height: 18px;
+	font-size: var(--ps-font-small);
+	line-height: 1.5;
 	width: 60%;
 	padding: 2px;
 }
@@ -184,7 +184,7 @@ fieldset.display-options a {
 }
 
 .dropdown fieldset.display-options {
-	font-size: 11px;
+	font-size: var(--ps-font-small);
 	margin: 0;
 	padding: 0;
 }
@@ -203,10 +203,10 @@ fieldset.display-options a {
 
 /* Display actions for ucp and mcp pages */
 fieldset.display-actions {
-	line-height: 22px;
+	line-height: 2;
 	text-align: right;
 	white-space: nowrap;
-	padding-right: 11px;
+	padding-right: var(--ps-font-small);
 }
 
 fieldset.display-actions label {
@@ -216,7 +216,7 @@ fieldset.display-actions label {
 
 /* Not used anywhere */
 fieldset.sort-options {
-	line-height: 22px;
+	line-height: 2;
 }
 
 /* MCP forum selection */
@@ -262,7 +262,7 @@ fieldset.submit-buttons input {
 
 .message-box textarea {
 	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 13px;
+	font-size: var(--ps-font-normal);
 	outline: 3px dashed transparent;
 	outline-offset: -4px;
 	-webkit-box-sizing: border-box;
@@ -369,7 +369,7 @@ input.disabled {
 	float: left;
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
-	height: 24px;
+	height: calc(var(--ps-line-height) * 1.25);
 	padding: 3px;
 }
 
diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css
index a6ad36d22a4..153a7558816 100644
--- a/phpBB/styles/prosilver/theme/icons.css
+++ b/phpBB/styles/prosilver/theme/icons.css
@@ -12,14 +12,14 @@ svg {
 
 .o-icon {
 	vertical-align: middle !important;
-	width: 14px;
-	height: 14px;
+	width: var(--ps-font-h4);
+	height: var(--ps-font-h4);
 }
 
 .o-icon-src-mdi,
 .o-icon-src-ic {
-	width: 18px;
-	height: 18px;
+	width: calc(var(--ps-font-h4) + 4px); /* icon + 2 * 2px padding */
+	height: calc(var(--ps-font-h4) + 4px); /* icon + 2 * 2px padding */
 }
 
 .o-icon-src-fa {
@@ -28,7 +28,7 @@ svg {
 
 .o-icon-font {
 	font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands";
-	font-size: 14px;
+	font-size: var(--ps-font-h4);
 	font-style: normal;
 	font-variant: normal;
 	-webkit-font-smoothing: antialiased;
@@ -57,7 +57,7 @@ span + .o-icon {
 
 blockquote cite:before,
 .uncited:before {
-	font-size: 36px;
+	font-size: calc(var(--ps-font-normal) * 2.5);
 	vertical-align: bottom;
 	display: inline-block;
 	margin-top: 8px;
@@ -72,9 +72,9 @@ blockquote cite:before,
 
 .c-forum-row-icon,
 .c-notification-check-icon {
-	font-size: 20px;
-	width: 20px;
-	height: 20px;
+	font-size: var(--ps-font-h1);
+	width: var(--ps-font-h1);
+	height: var(--ps-font-h1);
 	margin-top: 0;
 }
 
@@ -86,8 +86,8 @@ blockquote cite:before,
 	display: inline-flex;
 	justify-content: center;
 	align-items: center;
-	width: 32px;
-	height: 32px;
+	width: calc(var(--ps-font-normal) * 2.25);
+	height: calc(var(--ps-font-normal) * 2.25);
 	margin-top: -17px;
 	margin-left: 9px;
 }
@@ -123,6 +123,12 @@ blockquote cite:before,
 	height: 18px;
 }
 
+.push-subscribe-toggle-icon {
+	width: 20px;
+	height: 20px;
+	cursor: pointer;
+}
+
 /* Contact icons
 ---------------------------------------- */
 .contact-icon {
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 8405ba42248..11cffbf73b2 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -69,7 +69,7 @@ a.forumtitle,
 a.topictitle,
 span.topictitle {
 	font-family: "Trebuchet MS", Helvetica, Arial, sans-serif;
-	font-size: 13px;
+	font-size: var(--ps-font-normal);
 	text-decoration: none;
 }
 
@@ -140,6 +140,10 @@ a.lastsubject:hover {
 	text-decoration: underline;
 }
 
+.postprofile a.avatar:hover {
+	text-decoration: none;
+}
+
 /* Profile searchresults */
 .search .postprofile a {
 	font-weight: normal;
@@ -151,9 +155,24 @@ a.lastsubject:hover {
 }
 
 .top {
-	font-size: 12px;
+	font-size: var(--ps-font-small);
 	text-decoration: none;
-	margin-top: 10px;
+	margin-top: calc(var(--ps-font-small) - 2px);
+}
+
+.to-top-button {
+	border-radius: 50%;
+	position: fixed;
+	right: var(--ps-line-height);
+	bottom: var(--ps-line-height);
+	display: none;
+	block-size: calc(var(--ps-line-height) * 2);
+	inline-size: calc(var(--ps-line-height) * 2);
+}
+
+.to-top-button .o-icon {
+	font-size: calc(var(--ps-font-normal) * 2);
+	padding: calc(var(--ps-font-normal) / 2);
 }
 
 /* Back to top of page */
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index 5deb7224a68..a5f2ff207a7 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -18,6 +18,10 @@
 	.dropdown-extended .dropdown-contents {
 		width: auto;
 	}
+
+	.dropdown-extended .dropdown-contents .webpush-subscribe .notification-subscribe-toggle > span {
+		display: none;
+	}
 }
 
 @media (max-width: 430px) {
@@ -148,7 +152,7 @@
 	}
 }
 
-@media (max-width: 700px) {
+@media (max-width: 750px) {
 	.responsive-hide {
 		display: none !important;
 	}
@@ -178,8 +182,7 @@
 	.wrap {
 		border: none;
 		border-radius: 0;
-		min-width: 290px;
-		margin: 0;
+		box-sizing: border-box;
 		padding: 0 5px;
 	}
 
@@ -324,7 +327,6 @@
 		vertical-align: bottom;
 		text-overflow: ellipsis;
 		overflow: hidden;
-		max-width: 100px;
 	}
 
 	/* Pagination
@@ -494,6 +496,10 @@
 		width: auto;
 	}
 
+	.avatar-rank-container {
+		max-width: 100%;
+	}
+
 	/* Polls
 	---------------------------------------------------------------- */
 	fieldset.polls dt {
@@ -568,6 +574,12 @@
 		max-height: 32px;
 	}
 
+	.postprofile .avatar-placeholder {
+		font-size: 1rem;
+		width: 32px;
+		height: 32px;
+	}
+
 	.has-profile .postbody h3 {
 		margin-right: 0 !important;
 		margin-left: 0 !important;
@@ -774,7 +786,6 @@
 		display: block !important;
 	}
 
-	.nav-footer.linklist .responsive-menu,
 	.nav-main.linklist .responsive-menu .in-menu {
 		display: none !important;
 	}
@@ -856,7 +867,7 @@
 	}
 }
 
-@media (max-width: 1220px) {
+@media (min-width: 751px) and (max-width: 1200px) {
 	.wrap {
 		margin: 0 12px;
 	}
diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css
index 3a5142e4b59..ffbb2ce8601 100644
--- a/phpBB/styles/prosilver/theme/stylesheet.css
+++ b/phpBB/styles/prosilver/theme/stylesheet.css
@@ -1,6 +1,6 @@
-/*  phpBB3 Style Sheet
+/*  phpBB Style Sheet
     --------------------------------------------------------------
-	Style name:			prosilver (the default phpBB 3.3.x style)
+	Style name:			prosilver (the default phpBB style)
 	Based on style:
 	Original author:	Tom Beddard ( http://www.subblue.com/ )
 	Modified by:		phpBB Limited ( https://www.phpbb.com/ )
@@ -8,16 +8,16 @@
 */
 
 @import url("normalize.css?hash=e6c08715");
-@import url("base.css?hash=9b6738c8");
+@import url("base.css?hash=e4336923");
 @import url("utilities.css?hash=b95e1ad4");
-@import url("icons.css?hash=2abef5d2");
-@import url("common.css?hash=658f990b");
-@import url("buttons.css?hash=eb16911f");
-@import url("links.css?hash=5fec3654");
+@import url("icons.css?hash=cf9a9308");
+@import url("common.css?hash=3e946b8c");
+@import url("buttons.css?hash=be0468e7");
+@import url("links.css?hash=20df6b95");
 @import url("mentions.css?hash=308fbc69");
-@import url("content.css?hash=f87d22a8");
-@import url("cp.css?hash=73c6f37d");
-@import url("forms.css?hash=5e06dbba");
-@import url("colours.css?hash=f8757b6c");
-@import url("responsive.css?hash=78159a5e");
-@import url("bidi.css?hash=95928a4f");
+@import url("content.css?hash=cab73962");
+@import url("cp.css?hash=9ed1a111");
+@import url("forms.css?hash=e6a667ba");
+@import url("colours.css?hash=fae5c302");
+@import url("responsive.css?hash=62adf6f6");
+@import url("bidi.css?hash=2e917914");
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 240d9f07414..9a5f8765ee0 100644
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -47,6 +47,9 @@
 $module = new p_master();
 $default = false;
 
+/** @var \phpbb\controller\helper $controller_helper */
+$controller_helper = $phpbb_container->get('controller.helper');
+
 // Basic "global" modes
 switch ($mode)
 {
@@ -54,7 +57,7 @@
 		$module->load('ucp', 'activate');
 		$module->display($user->lang['UCP_ACTIVATE']);
 
-		redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+		redirect($controller_helper->route('phpbb_index_controller'));
 	break;
 
 	case 'resend_act':
@@ -63,16 +66,13 @@
 	break;
 
 	case 'sendpassword':
-		/** @var \phpbb\controller\helper $controller_helper */
-		$controller_helper = $phpbb_container->get('controller.helper');
-
 		redirect($controller_helper->route('phpbb_ucp_forgot_password_controller'));
 	break;
 
 	case 'register':
 		if ($user->data['is_registered'] || isset($_REQUEST['not_agreed']))
 		{
-			redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+			redirect($controller_helper->route('phpbb_index_controller'));
 		}
 
 		$module->load('ucp', 'register');
@@ -86,7 +86,7 @@
 	case 'login':
 		if ($user->data['is_registered'])
 		{
-			redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+			redirect($controller_helper->route('phpbb_index_controller'));
 		}
 
 		login_box($request->variable('redirect', "index.$phpEx"));
@@ -95,11 +95,11 @@
 	case 'login_link':
 		if ($user->data['is_registered'])
 		{
-			redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+			redirect($controller_helper->route('phpbb_index_controller'));
 		}
 
-		$module->load('ucp', 'login_link');
-		$module->display($user->lang['UCP_LOGIN_LINK']);
+		$get_params_array = $request->get_super_global(\phpbb\request\request_interface::GET);
+		phpbb_redirect_to_controller('phpbb_ucp_oauth_link_account_controller', $get_params_array);
 	break;
 
 	case 'logout':
@@ -109,13 +109,13 @@
 		}
 		else if ($user->data['user_id'] != ANONYMOUS)
 		{
-			meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
+			meta_refresh(3, $controller_helper->route('phpbb_index_controller'));
 
-			$message = $user->lang['LOGOUT_FAILED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a> ');
+			$message = $user->lang['LOGOUT_FAILED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . $controller_helper->route('phpbb_index_controller') . '">', '</a> ');
 			trigger_error($message);
 		}
 
-		redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+		redirect($controller_helper->route('phpbb_index_controller'));
 	break;
 
 	case 'terms':
@@ -128,7 +128,7 @@
 		{
 			if ($user->data['is_registered'])
 			{
-				redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+				redirect($controller_helper->route('phpbb_index_controller'));
 			}
 
 			login_box();
@@ -154,72 +154,11 @@
 	break;
 
 	case 'delete_cookies':
-
-		// Delete Cookies with dynamic names (do NOT delete poll cookies)
-		if (confirm_box(true))
-		{
-			$set_time = time() - 31536000;
-
-			foreach ($request->variable_names(\phpbb\request\request_interface::COOKIE) as $cookie_name)
-			{
-				$cookie_data = $request->variable($cookie_name, '', true, \phpbb\request\request_interface::COOKIE);
-
-				// Only delete board cookies, no other ones...
-				if (strpos($cookie_name, $config['cookie_name'] . '_') !== 0)
-				{
-					continue;
-				}
-
-				$cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name);
-
-				/**
-				* Event to save custom cookies from deletion
-				*
-				* @event core.ucp_delete_cookies
-				* @var	string	cookie_name		Cookie name to checking
-				* @var	bool	retain_cookie	Do we retain our cookie or not, true if retain
-				* @since 3.1.3-RC1
-				*/
-				$retain_cookie = false;
-				$vars = array('cookie_name', 'retain_cookie');
-				extract($phpbb_dispatcher->trigger_event('core.ucp_delete_cookies', compact($vars)));
-				if ($retain_cookie)
-				{
-					continue;
-				}
-
-				// Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_
-				if (strpos($cookie_name, 'poll_') !== 0)
-				{
-					$user->set_cookie($cookie_name, '', $set_time);
-				}
-			}
-
-			$user->set_cookie('track', '', $set_time);
-			$user->set_cookie('u', '', $set_time);
-			$user->set_cookie('k', '', $set_time);
-			$user->set_cookie('sid', '', $set_time);
-
-			// We destroy the session here, the user will be logged out nevertheless
-			$user->session_kill();
-			$user->session_begin();
-
-			meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
-
-			$message = $user->lang['COOKIES_DELETED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
-			trigger_error($message);
-		}
-		else
-		{
-			confirm_box(false, 'DELETE_COOKIES', '');
-		}
-
-		redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
-
+		// Redirect to controller
+		redirect($controller_helper->route('phpbb_ucp_delete_cookies_controller'));
 	break;
 
 	case 'switch_perm':
-
 		$user_id = $request->variable('u', 0);
 
 		$sql = 'SELECT *
@@ -231,7 +170,7 @@
 
 		if (!$auth->acl_get('a_switchperm') || !$user_row || $user_id == $user->data['user_id'] || !check_link_hash($request->variable('hash', ''), 'switchperm'))
 		{
-			redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+			redirect($controller_helper->route('phpbb_index_controller'));
 		}
 
 		include($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
@@ -239,12 +178,12 @@
 		$auth_admin = new auth_admin();
 		if (!$auth_admin->ghost_permissions($user_id, $user->data['user_id']))
 		{
-			redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+			redirect($controller_helper->route('phpbb_index_controller'));
 		}
 
 		$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ACL_TRANSFER_PERMISSIONS', false, array($user_row['username']));
 
-		$message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+		$message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . $controller_helper->route('phpbb_index_controller') . '">', '</a>');
 
 		/**
 		* Event to run code after permissions are switched
@@ -263,10 +202,9 @@
 	break;
 
 	case 'restore_perm':
-
 		if (!$user->data['user_perm_from'] || !$auth->acl_get('a_switchperm'))
 		{
-			redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+			redirect($controller_helper->route('phpbb_index_controller'));
 		}
 
 		$auth->acl_cache($user->data);
@@ -280,7 +218,7 @@
 
 		$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ACL_RESTORE_PERMISSIONS', false, array($username));
 
-		$message = $user->lang['PERMISSIONS_RESTORED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+		$message = $user->lang['PERMISSIONS_RESTORED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . $controller_helper->route('phpbb_index_controller') . '">', '</a>');
 
 		/**
 		* Event to run code after permissions are restored
@@ -313,7 +251,7 @@
 {
 	if ($user->data['is_bot'])
 	{
-		redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+		redirect($controller_helper->route('phpbb_index_controller'));
 	}
 
 	if ($id == 'pm' && $mode == 'view' && isset($_GET['p']))
diff --git a/phpBB/vendor-ext/.htaccess b/phpBB/vendor-ext/.htaccess
new file mode 100644
index 00000000000..92e78ba1a7f
--- /dev/null
+++ b/phpBB/vendor-ext/.htaccess
@@ -0,0 +1,25 @@
+# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
+# module mod_authz_host to a new module called mod_access_compat (which may be
+# disabled) and a new "Require" syntax has been introduced to mod_authz_core.
+# We could just conditionally provide both versions, but unfortunately Apache
+# does not explicitly tell us its version if the module mod_version is not
+# available. In this case, we check for the availability of module
+# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
+<IfModule mod_version.c>
+	<IfVersion < 2.4>
+		Order Allow,Deny
+		Deny from All
+	</IfVersion>
+	<IfVersion >= 2.4>
+		Require all denied
+	</IfVersion>
+</IfModule>
+<IfModule !mod_version.c>
+	<IfModule !mod_authz_core.c>
+		Order Allow,Deny
+		Deny from All
+	</IfModule>
+	<IfModule mod_authz_core.c>
+		Require all denied
+	</IfModule>
+</IfModule>
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index f662fbd3da7..94f967be7b6 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -47,27 +47,45 @@
 	trigger_error('NO_FORUM');
 }
 
-$sql_from = FORUMS_TABLE . ' f';
+$sql_ary = [
+	'SELECT'	=> 'f.*',
+	'FROM'		=> [
+		FORUMS_TABLE		=> 'f',
+	],
+	'WHERE'		=> 'f.forum_id = ' . $forum_id,
+];
+
 $lastread_select = '';
 
 // Grab appropriate forum data
 if ($config['load_db_lastread'] && $user->data['is_registered'])
 {
-	$sql_from .= ' LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . '
-		AND ft.forum_id = f.forum_id)';
-	$lastread_select .= ', ft.mark_time';
+	$sql_ary['LEFT_JOIN'][] = [
+		'FROM' => [FORUMS_TRACK_TABLE => 'ft'],
+		'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id',
+	];
+	$sql_ary['SELECT'] .= ', ft.mark_time';
 }
 
 if ($user->data['is_registered'])
 {
-	$sql_from .= ' LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'] . ')';
-	$lastread_select .= ', fw.notify_status';
+	$sql_ary['LEFT_JOIN'][] = [
+		'FROM' => [FORUMS_WATCH_TABLE => 'fw'],
+		'ON' => 'fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'],
+	];
+	$sql_ary['SELECT'] .= ', fw.notify_status';
 }
 
-$sql = "SELECT f.* $lastread_select
-	FROM $sql_from
-	WHERE f.forum_id = $forum_id";
-$result = $db->sql_query($sql);
+/**
+ * You can use this event to modify the sql that selects the forum on the viewforum page.
+ *
+ * @event core.viewforum_modify_sql
+ * @var array	sql_ary		The SQL array to get the data for a forum
+ * @since 3.3.14-RC1
+ */
+$vars = ['sql_ary'];
+extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_sql', compact($vars)));
+$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
 $forum_data = $db->sql_fetchrow($result);
 $db->sql_freeresult($result);
 
@@ -366,7 +384,18 @@
 // Display active topics?
 $s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false;
 
-$s_search_hidden_fields = array('fid' => array($forum_id));
+// Send the forum id... and maybe some other fields, depending on permissions
+$s_search_hidden_fields = [
+	'fid' => [$forum_id],
+];
+
+if ($auth->acl_get('f_list_topics', $forum_id) && !$auth->acl_get('f_read', $forum_id))
+{
+	// If the user has list access but not read access, then force the search to only be a topic title search
+	$s_search_hidden_fields['sr'] = 'topics';
+	$s_search_hidden_fields['sf'] = 'titleonly';
+}
+
 if ($_SID)
 {
 	$s_search_hidden_fields['sid'] = $_SID;
@@ -1000,7 +1029,7 @@
 			'S_TOPIC_HOT'			=> $config['hot_threshold'] && ($replies + 1) >= $config['hot_threshold'] && $row['topic_status'] != ITEM_LOCKED,
 
 			'U_NEWEST_POST'			=> $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&amp;view=unread') . '#unread' : false,
-			'U_LAST_POST'			=> $auth->acl_get('f_read', $forum_id)  ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'] : false,
+			'U_LAST_POST'			=> $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'] : false,
 			'U_LAST_POST_AUTHOR'	=> get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
 			'U_TOPIC_AUTHOR'		=> get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
 			'U_VIEW_TOPIC'			=> $view_topic_url,
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index f80d105ff2c..de237e9e612 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -11,6 +11,8 @@
 *
 */
 
+use Symfony\Component\HttpFoundation\RedirectResponse;
+
 /**
 * @ignore
 */
@@ -25,464 +27,38 @@
 $user->setup('memberlist');
 
 // Get and set some variables
-$mode		= $request->variable('mode', '');
-$session_id	= $request->variable('s', '');
-$start		= $request->variable('start', 0);
-$sort_key	= $request->variable('sk', 'b');
-$sort_dir	= $request->variable('sd', 'd');
-$show_guests	= ($config['load_online_guests']) ? $request->variable('sg', 0) : 0;
-
-// Can this user view profiles/memberlist?
-if (!$auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'))
-{
-	if ($user->data['user_id'] != ANONYMOUS)
-	{
-		send_status_line(403, 'Forbidden');
-		trigger_error('NO_VIEW_USERS');
-	}
-
-	login_box('', $user->lang['LOGIN_EXPLAIN_VIEWONLINE']);
-}
-
-/* @var $pagination \phpbb\pagination */
-$pagination = $phpbb_container->get('pagination');
+$mode		= $request->variable('mode', null);
+$session_id	= $request->variable('s', null);
+$start		= $request->variable('start', null);
+$sort_key	= $request->variable('sk', null);
+$sort_dir	= $request->variable('sd', null);
+$show_guests	= ($config['load_online_guests']) ? $request->variable('sg', null) : null;
 
-/* @var $viewonline_helper \phpbb\viewonline_helper */
-$viewonline_helper = $phpbb_container->get('viewonline_helper');
 
-$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_JOINED'], 'c' => $user->lang['SORT_LOCATION']);
-$sort_key_sql = array('a' => 'u.username_clean', 'b' => 's.session_time', 'c' => 's.session_page');
-
-// Sorting and order
-if (!isset($sort_key_text[$sort_key]))
-{
-	$sort_key = 'b';
-}
-
-$order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
+/** @var \phpbb\controller\helper $controller_helper */
+$controller_helper = $phpbb_container->get('controller.helper');
 
-// Whois requested
-if ($mode == 'whois' && $auth->acl_get('a_') && $session_id)
+if ($mode == 'whois')
 {
-	if (!function_exists('user_get_id_name'))
-	{
-		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-	}
-
-	$sql = 'SELECT u.user_id, u.username, u.user_type, s.session_ip
-		FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . " s
-		WHERE s.session_id = '" . $db->sql_escape($session_id) . "'
-			AND	u.user_id = s.session_user_id";
-	$result = $db->sql_query($sql);
-
-	if ($row = $db->sql_fetchrow($result))
-	{
-		$template->assign_var('WHOIS', user_ipwhois($row['session_ip']));
-	}
-	$db->sql_freeresult($result);
-
-	// Output the page
-	page_header($user->lang['WHO_IS_ONLINE']);
-
-	$template->set_filenames(array(
-		'body' => 'viewonline_whois.html')
+	$response = new RedirectResponse(
+		$controller_helper->route('phpbb_members_online_whois', array(
+			's'	=> $session_id,
+		), false),
+		301
 	);
-	make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"));
-
-	page_footer();
 }
-
-$user->update_session_infos();
-
-// Forum info
-$sql_ary = array(
-	'SELECT'	=> 'f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id',
-	'FROM'		=> array(
-		FORUMS_TABLE	=> 'f',
-	),
-	'ORDER_BY'	=> 'f.left_id ASC',
-);
-
-/**
-* Modify the forum data SQL query for getting additional fields if needed
-*
-* @event core.viewonline_modify_forum_data_sql
-* @var	array	sql_ary			The SQL array
-* @since 3.1.5-RC1
-*/
-$vars = array('sql_ary');
-extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_forum_data_sql', compact($vars)));
-
-$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary), 600);
-unset($sql_ary);
-
-$forum_data = array();
-while ($row = $db->sql_fetchrow($result))
-{
-	$forum_data[$row['forum_id']] = $row;
-}
-$db->sql_freeresult($result);
-
-$guest_counter = 0;
-
-// Get number of online guests (if we do not display them)
-if (!$show_guests)
+else
 {
-	switch ($db->get_sql_layer())
-	{
-		case 'sqlite3':
-			$sql = 'SELECT COUNT(session_ip) as num_guests
-				FROM (
-					SELECT DISTINCT session_ip
-						FROM ' . SESSIONS_TABLE . '
-						WHERE session_user_id = ' . ANONYMOUS . '
-							AND session_time >= ' . (time() - ($config['load_online_time'] * 60)) .
-				')';
-		break;
-
-		default:
-			$sql = 'SELECT COUNT(DISTINCT session_ip) as num_guests
-				FROM ' . SESSIONS_TABLE . '
-				WHERE session_user_id = ' . ANONYMOUS . '
-					AND session_time >= ' . (time() - ($config['load_online_time'] * 60));
-		break;
-	}
-	$result = $db->sql_query($sql);
-	$guest_counter = (int) $db->sql_fetchfield('num_guests');
-	$db->sql_freeresult($result);
-}
-
-// Get user list
-$sql_ary = array(
-	'SELECT'	=> 'u.user_id, u.username, u.username_clean, u.user_type, u.user_colour, s.session_id, s.session_time, s.session_page, s.session_ip, s.session_browser, s.session_viewonline, s.session_forum_id',
-	'FROM'		=> array(
-		USERS_TABLE		=> 'u',
-		SESSIONS_TABLE	=> 's',
-	),
-	'WHERE'		=> 'u.user_id = s.session_user_id
-		AND s.session_time >= ' . (time() - ($config['load_online_time'] * 60)) .
-		((!$show_guests) ? ' AND s.session_user_id <> ' . ANONYMOUS : ''),
-	'ORDER_BY'	=> $order_by,
-);
-
-/**
-* Modify the SQL query for getting the user data to display viewonline list
-*
-* @event core.viewonline_modify_sql
-* @var	array	sql_ary			The SQL array
-* @var	bool	show_guests		Do we display guests in the list
-* @var	int		guest_counter	Number of guests displayed
-* @var	array	forum_data		Array with forum data
-* @since 3.1.0-a1
-* @changed 3.1.0-a2 Added vars guest_counter and forum_data
-*/
-$vars = array('sql_ary', 'show_guests', 'guest_counter', 'forum_data');
-extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_sql', compact($vars)));
-
-$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
-$session_data_rowset = $db->sql_fetchrowset($result);
-$db->sql_freeresult($result);
-
-$prev_id = $prev_ip = $user_list = array();
-$logged_visible_online = $logged_hidden_online = $counter = 0;
-
-/** @var \phpbb\controller\helper $controller_helper */
-$controller_helper = $phpbb_container->get('controller.helper');
-
-/** @var \phpbb\group\helper $group_helper */
-$group_helper = $phpbb_container->get('group_helper');
-
-// Get forum IDs for session pages which have only 't' parameter
-$viewonline_helper->get_forum_ids($session_data_rowset);
-
-foreach ($session_data_rowset as $row)
-{
-	if ($row['user_id'] != ANONYMOUS && !isset($prev_id[$row['user_id']]))
-	{
-		$view_online = $s_user_hidden = false;
-		$user_colour = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : '';
-
-		$username_full = ($row['user_type'] != USER_IGNORE) ? get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) : '<span' . $user_colour . '>' . $row['username'] . '</span>';
-
-		if (!$row['session_viewonline'])
-		{
-			$view_online = ($auth->acl_get('u_viewonline') || $row['user_id'] === $user->data['user_id']) ? true : false;
-			$logged_hidden_online++;
-
-			$username_full = '<em>' . $username_full . '</em>';
-			$s_user_hidden = true;
-		}
-		else
-		{
-			$view_online = true;
-			$logged_visible_online++;
-		}
-
-		$prev_id[$row['user_id']] = 1;
-
-		if ($view_online)
-		{
-			$counter++;
-		}
-
-		if (!$view_online || $counter > $start + $config['topics_per_page'] || $counter <= $start)
-		{
-			continue;
-		}
-	}
-	else if ($show_guests && $row['user_id'] == ANONYMOUS && !isset($prev_ip[$row['session_ip']]))
-	{
-		$prev_ip[$row['session_ip']] = 1;
-		$guest_counter++;
-		$counter++;
-
-		if ($counter > $start + $config['topics_per_page'] || $counter <= $start)
-		{
-			continue;
-		}
-
-		$s_user_hidden = false;
-		$username_full = get_username_string('full', $row['user_id'], $user->lang['GUEST']);
-	}
-	else
-	{
-		continue;
-	}
-
-	$on_page = $viewonline_helper->get_user_page($row['session_page']);
-
-	switch ($on_page[1])
-	{
-		case 'index':
-			$location = $user->lang['INDEX'];
-			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
-		break;
-
-		case $phpbb_adm_relative_path . 'index':
-			$location = $user->lang['ACP'];
-			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
-		break;
-
-		case 'posting':
-		case 'viewforum':
-		case 'viewtopic':
-			$forum_id = $row['session_forum_id'];
-
-			if ($forum_id && $auth->acl_get('f_list', $forum_id))
-			{
-				$location = '';
-				$location_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id);
-
-				if ($forum_data[$forum_id]['forum_type'] == FORUM_LINK)
-				{
-					$location = sprintf($user->lang['READING_LINK'], $forum_data[$forum_id]['forum_name']);
-					break;
-				}
-
-				switch ($on_page[1])
-				{
-					case 'posting':
-						preg_match('#mode=([a-z]+)#', $row['session_page'], $on_page);
-						$posting_mode = (!empty($on_page[1])) ? $on_page[1] : '';
-
-						switch ($posting_mode)
-						{
-							case 'reply':
-							case 'quote':
-								$location = sprintf($user->lang['REPLYING_MESSAGE'], $forum_data[$forum_id]['forum_name']);
-							break;
-
-							default:
-								$location = sprintf($user->lang['POSTING_MESSAGE'], $forum_data[$forum_id]['forum_name']);
-							break;
-						}
-					break;
-
-					case 'viewtopic':
-						$location = sprintf($user->lang['READING_TOPIC'], $forum_data[$forum_id]['forum_name']);
-					break;
-
-					case 'viewforum':
-						$location = sprintf($user->lang['READING_FORUM'], $forum_data[$forum_id]['forum_name']);
-					break;
-				}
-			}
-			else
-			{
-				$location = $user->lang['INDEX'];
-				$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
-			}
-		break;
-
-		case 'search':
-			$location = $user->lang['SEARCHING_FORUMS'];
-			$location_url = append_sid("{$phpbb_root_path}search.$phpEx");
-		break;
-
-		case 'viewonline':
-			$location = $user->lang['VIEWING_ONLINE'];
-			$location_url = append_sid("{$phpbb_root_path}viewonline.$phpEx");
-		break;
-
-		case 'memberlist':
-			$location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx");
-
-			if (strpos($row['session_page'], 'mode=viewprofile') !== false)
-			{
-				$location = $user->lang['VIEWING_MEMBER_PROFILE'];
-			}
-			else if (strpos($row['session_page'], 'mode=contactadmin') !== false)
-			{
-				$location = $user->lang['VIEWING_CONTACT_ADMIN'];
-				$location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin');
-			}
-			else
-			{
-				$location = $user->lang['VIEWING_MEMBERS'];
-			}
-		break;
-
-		case 'mcp':
-			$location = $user->lang['VIEWING_MCP'];
-			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
-		break;
-
-		case 'ucp':
-			$location = $user->lang['VIEWING_UCP'];
-
-			// Grab some common modules
-			$url_params = array(
-				'mode=register'		=> 'VIEWING_REGISTER',
-				'i=pm&mode=compose'	=> 'POSTING_PRIVATE_MESSAGE',
-				'i=pm&'				=> 'VIEWING_PRIVATE_MESSAGES',
-				'i=profile&'		=> 'CHANGING_PROFILE',
-				'i=prefs&'			=> 'CHANGING_PREFERENCES',
-			);
-
-			foreach ($url_params as $param => $lang)
-			{
-				if (strpos($row['session_page'], $param) !== false)
-				{
-					$location = $user->lang[$lang];
-					break;
-				}
-			}
-
-			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
-		break;
-
-		case 'download/file':
-			$location = $user->lang['DOWNLOADING_FILE'];
-			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
-		break;
-
-		case 'report':
-			$location = $user->lang['REPORTING_POST'];
-			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
-		break;
-
-		default:
-			$location = $user->lang['INDEX'];
-			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
-
-			if ($row['session_page'] === 'app.' . $phpEx . '/help/faq' ||
-				$row['session_page'] === 'app.' . $phpEx . '/help/bbcode')
-			{
-				$location = $user->lang['VIEWING_FAQ'];
-				$location_url = $controller_helper->route('phpbb_help_faq_controller');
-			}
-		break;
-	}
-
-	/**
-	* Overwrite the location's name and URL, which are displayed in the list
-	*
-	* @event core.viewonline_overwrite_location
-	* @var	array	on_page			File name and query string
-	* @var	array	row				Array with the users sql row
-	* @var	string	location		Page name to displayed in the list
-	* @var	string	location_url	Page url to displayed in the list
-	* @var	array	forum_data		Array with forum data
-	* @since 3.1.0-a1
-	* @changed 3.1.0-a2 Added var forum_data
-	*/
-	$vars = array('on_page', 'row', 'location', 'location_url', 'forum_data');
-	extract($phpbb_dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars)));
-
-	$template_row = array(
-		'USERNAME' 			=> $row['username'],
-		'USERNAME_COLOUR'	=> $row['user_colour'],
-		'USERNAME_FULL'		=> $username_full,
-		'LASTUPDATE'		=> $user->format_date($row['session_time']),
-		'FORUM_LOCATION'	=> $location,
-		'USER_IP'			=> ($auth->acl_get('a_')) ? (($mode == 'lookup' && $session_id == $row['session_id']) ? gethostbyaddr($row['session_ip']) : $row['session_ip']) : '',
-		'USER_BROWSER'		=> ($auth->acl_get('a_user')) ? $row['session_browser'] : '',
-
-		'U_USER_PROFILE'	=> ($row['user_type'] != USER_IGNORE) ? get_username_string('profile', $row['user_id'], '') : '',
-		'U_USER_IP'			=> append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=lookup' . (($mode != 'lookup' || $row['session_id'] != $session_id) ? '&amp;s=' . $row['session_id'] : '') . "&amp;sg=$show_guests&amp;start=$start&amp;sk=$sort_key&amp;sd=$sort_dir"),
-		'U_WHOIS'			=> append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=whois&amp;s=' . $row['session_id']),
-		'U_FORUM_LOCATION'	=> $location_url,
-
-		'S_USER_HIDDEN'		=> $s_user_hidden,
-		'S_GUEST'			=> ($row['user_id'] == ANONYMOUS) ? true : false,
-		'S_USER_TYPE'		=> $row['user_type'],
+	$response = new RedirectResponse(
+		$controller_helper->route('phpbb_members_online', array(
+			'mode' => $mode,
+			's' => $session_id,
+			'start' => $start,
+			'sk' => $sort_key,
+			'sd' => $sort_dir,
+			'sg' => $show_guests,
+		), false),
+		301
 	);
-
-	/**
-	* Modify viewonline template data before it is displayed in the list
-	*
-	* @event core.viewonline_modify_user_row
-	* @var	array	on_page			File name and query string
-	* @var	array	row				Array with the users sql row
-	* @var	array	forum_data		Array with forum data
-	* @var	array	template_row	Array with template variables for the user row
-	* @since 3.1.0-RC4
-	*/
-	$vars = array('on_page', 'row', 'forum_data', 'template_row');
-	extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_user_row', compact($vars)));
-
-	$template->assign_block_vars('user_row', $template_row);
 }
-unset($prev_id, $prev_ip);
-
-$group_helper->display_legend($db, $template);
-
-// Refreshing the page every 60 seconds...
-meta_refresh(60, append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&amp;sk=$sort_key&amp;sd=$sort_dir&amp;start=$start"));
-
-$start = $pagination->validate_start($start, $config['topics_per_page'], $counter);
-$base_url = append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&amp;sk=$sort_key&amp;sd=$sort_dir");
-$pagination->generate_template_pagination($base_url, 'pagination', 'start', $counter, $config['topics_per_page'], $start);
-
-$template->assign_block_vars('navlinks', array(
-	'BREADCRUMB_NAME'	=> $user->lang('WHO_IS_ONLINE'),
-	'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}viewonline.$phpEx"),
-));
-
-// Send data to template
-$template->assign_vars(array(
-	'TOTAL_REGISTERED_USERS_ONLINE'	=> $user->lang('REG_USERS_ONLINE', (int) $logged_visible_online, $user->lang('HIDDEN_USERS_ONLINE', (int) $logged_hidden_online)),
-	'TOTAL_GUEST_USERS_ONLINE'		=> $user->lang('GUEST_USERS_ONLINE', (int) $guest_counter),
-
-	'U_SORT_USERNAME'		=> append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=a&amp;sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a') . '&amp;sg=' . ((int) $show_guests)),
-	'U_SORT_UPDATED'		=> append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=b&amp;sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a') . '&amp;sg=' . ((int) $show_guests)),
-	'U_SORT_LOCATION'		=> append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=c&amp;sd=' . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a') . '&amp;sg=' . ((int) $show_guests)),
-
-	'U_SWITCH_GUEST_DISPLAY'	=> append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sg=' . ((int) !$show_guests)),
-	'L_SWITCH_GUEST_DISPLAY'	=> ($show_guests) ? $user->lang['HIDE_GUESTS'] : $user->lang['DISPLAY_GUESTS'],
-	'S_SWITCH_GUEST_DISPLAY'	=> ($config['load_online_guests']) ? true : false,
-	'S_VIEWONLINE'				=> true,
-));
-
-// We do not need to load the who is online box here. ;)
-$config['load_online'] = false;
-
-// Output the page
-page_header($user->lang['WHO_IS_ONLINE']);
-
-$template->set_filenames(array(
-	'body' => 'viewonline_body.html')
-);
-make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"));
-
-page_footer();
+$response->send();
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index f14cb5b6d8b..52e1a2a6232 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -802,7 +802,6 @@
 	'SEARCH_IMG' 		=> $user->img('icon_user_search', 'SEARCH_USER_POSTS'),
 	'PM_IMG' 			=> $user->img('icon_contact_pm', 'SEND_PRIVATE_MESSAGE'),
 	'EMAIL_IMG' 		=> $user->img('icon_contact_email', 'SEND_EMAIL'),
-	'JABBER_IMG'		=> $user->img('icon_contact_jabber', 'JABBER') ,
 	'REPORT_IMG'		=> $user->img('icon_post_report', 'REPORT_POST'),
 	'REPORTED_IMG'		=> $user->img('icon_topic_reported', 'POST_REPORTED'),
 	'UNAPPROVED_IMG'	=> $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
@@ -1423,7 +1422,6 @@
 				'rank_image_src'	=> '',
 				'pm'				=> '',
 				'email'				=> '',
-				'jabber'			=> '',
 				'search'			=> '',
 				'age'				=> '',
 
@@ -1493,7 +1491,6 @@
 				'contact_user' 		=> $user->lang('CONTACT_USER', get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['username'])),
 
 				'online'		=> false,
-				'jabber'		=> ($config['jab_enable'] && $row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',
 				'search'		=> ($config['load_search'] && $auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&amp;sr=posts") : '',
 
 				'author_full'		=> get_username_string('full', $poster_id, $row['username'], $row['user_colour']),
@@ -1928,6 +1925,7 @@
 	}
 
 	$force_edit_allowed = $force_delete_allowed = $force_softdelete_allowed = false;
+	$warn_allowed = true;
 
 	$s_cannot_edit = !$auth->acl_get('f_edit', $forum_id) || $user->data['user_id'] != $poster_id;
 	$s_cannot_edit_time = $config['edit_time'] && $row['post_time'] <= time() - ($config['edit_time'] * 60);
@@ -1958,8 +1956,10 @@
 	* @var	bool	s_cannot_delete_locked		User can not delete the post because it's locked
 	* @var	bool	s_cannot_delete_time		User can not delete the post because edit_time has passed
 	* @var	bool	force_softdelete_allowed	Allow the user to ыoftdelete the post (all permissions and conditions are ignored)
+	* @var	bool	warn_allowed				Controls whether warning is allowed (default: true)
 	* @since 3.1.0-b4
 	* @changed 3.1.11-RC1 Added force_softdelete_allowed var
+	* @changed 3.3.16-RC1 Added warn_allowed var
 	*/
 	$vars = array(
 		'row',
@@ -1974,6 +1974,7 @@
 		's_cannot_delete_locked',
 		's_cannot_delete_time',
 		'force_softdelete_allowed',
+		'warn_allowed',
 	);
 	extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_post_action_conditions', compact($vars)));
 
@@ -2068,9 +2069,8 @@
 		'U_SEARCH'		=> $user_cache[$poster_id]['search'],
 		'U_PM'			=> $u_pm,
 		'U_EMAIL'		=> $user_cache[$poster_id]['email'],
-		'U_JABBER'		=> $user_cache[$poster_id]['jabber'],
 
-		'U_APPROVE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&amp;p={$row['post_id']}&amp;redirect=" . urlencode(str_replace('&amp;', '&', $viewtopic_url . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']))),
+		'U_APPROVE_ACTION'	=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&amp;p={$row['post_id']}&amp;f={$row['forum_id']}&amp;redirect=" . urlencode(str_replace('&amp;', '&', $viewtopic_url . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']))),
 		'U_REPORT'			=> ($auth->acl_get('f_report', $forum_id)) ? $phpbb_container->get('controller.helper')->route('phpbb_report_post_controller', array('id' => $row['post_id'])) : '',
 		'U_MCP_REPORT'		=> ($auth->acl_get('m_report', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&amp;mode=report_details&amp;p=' . $row['post_id']) : '',
 		'U_MCP_APPROVE'		=> ($auth->acl_get('m_approve', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=approve_details&amp;p=' . $row['post_id']) : '',
@@ -2080,7 +2080,7 @@
 		'U_NEXT_POST_ID'	=> ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '',
 		'U_PREV_POST_ID'	=> $prev_post_id,
 		'U_NOTES'			=> ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&amp;mode=user_notes&amp;u=' . $poster_id) : '',
-		'U_WARN'			=> ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&amp;mode=warn_post&amp;p=' . $row['post_id']) : '',
+		'U_WARN'			=> ($warn_allowed && $auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&amp;mode=warn_post&amp;p=' . $row['post_id']) : '',
 
 		'POST_ID'			=> $row['post_id'],
 		'POST_NUMBER'		=> $i + $start + 1,
@@ -2179,11 +2179,6 @@
 			'NAME'		=> $user->lang['SEND_EMAIL'],
 			'U_CONTACT'	=> $user_cache[$poster_id]['email'],
 		),
-		array(
-			'ID'		=> 'jabber',
-			'NAME'		=> $user->lang['JABBER'],
-			'U_CONTACT'	=> $user_cache[$poster_id]['jabber'],
-		),
 	);
 
 	foreach ($contact_fields as $field)
diff --git a/phpBB/web.config b/phpBB/web.config
index d0a3cb33fe3..529e92c8a7f 100644
--- a/phpBB/web.config
+++ b/phpBB/web.config
@@ -9,7 +9,7 @@
 						<add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />
 						<add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
 					</conditions>
-					<action type="Rewrite" url="app.php" appendQueryString="true" />
+					<action type="Rewrite" url="index.php" appendQueryString="true" />
 				</rule>
 			</rules>
 		</rewrite>
@@ -28,6 +28,33 @@
 			</requestFiltering>
 		</security>
 	</system.webServer>
+	<location path="config">
+		<system.webServer>
+			<security>
+				<requestFiltering>
+					<hiddenSegments>
+						<add segment="default" />
+						<add segment="development" />
+						<add segment="installer" />
+						<add segment="production" />
+						<add segment="test" />
+						<add segment=".htaccess" />
+					</hiddenSegments>
+				</requestFiltering>
+			</security>
+		</system.webServer>
+	</location>
+	<location path="ext">
+		<system.webServer>
+			<security>
+				<requestFiltering>
+					<hiddenSegments>
+						<remove segment="phpbb" />
+					</hiddenSegments>
+				</requestFiltering>
+			</security>
+		</system.webServer>
+	</location>
 	<location path="images/avatars">
 		<system.webServer>
 			<security>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 722d67774ad..6240baa3208 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-         backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="tests/bootstrap.php"
->
-  <coverage>
-    <include>
-      <directory suffix=".php">./phpBB/includes/</directory>
-      <directory suffix=".php">./phpBB/phpbb/</directory>
-    </include>
-  </coverage>
+		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+		backupGlobals="true"
+		colors="true"
+		processIsolation="false"
+		stopOnFailure="false"
+		bootstrap="tests/bootstrap.php"
+		cacheDirectory=".phpunit.cache"
+		backupStaticProperties="false">
   <testsuites>
     <testsuite name="phpBB Test Suite">
       <directory suffix="_test.php">./tests</directory>
@@ -35,4 +26,16 @@
       <group>slow</group>
     </exclude>
   </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">./phpBB/</directory>
+      <directory suffix=".php">./tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./phpBB/vendor/</directory>
+      <directory suffix=".php">./phpBB/cache/</directory>
+      <directory suffix=".php">./phpBB/develop/</directory>
+      <directory suffix=".php">./phpBB/store/</directory>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
index 03c227ded84..2bb877d330b 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="5"
-    phpVersion="8.1"
+    phpVersion="8.2"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
+	ensureOverrideAttribute="false"
     autoloader="build/psalm_bootstrap.php"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
@@ -11,15 +12,15 @@
 >
     <projectFiles>
         <directory name="phpBB/phpbb"/>
+		<ignoreFiles>
+			<directory name="phpBB/vendor"/>
+		</ignoreFiles>
     </projectFiles>
 
     <issueHandlers>
         <InvalidGlobal errorLevel="suppress" />
-        <UndefinedDocblockClass>
-            <errorLevel type="suppress">
-                <referencedClass name="UnitEnum" />
-            </errorLevel>
-        </UndefinedDocblockClass>
+		<UndefinedThisPropertyAssignment errorLevel="suppress"/>
+		<UndefinedThisPropertyFetch errorLevel="suppress"/>
         <UnsupportedPropertyReferenceUsage errorLevel="suppress" />
         <MissingTemplateParam errorLevel="suppress" />
     </issueHandlers>
diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md
index 81d7516c0bd..d6406b506d3 100644
--- a/tests/RUNNING_TESTS.md
+++ b/tests/RUNNING_TESTS.md
@@ -165,7 +165,7 @@ phpBB allows you to write such tests.
 Running
 -------
 
-Running the tests requires your phpBB3 repository to be accessible through a
+Running the tests requires your phpBB repository to be accessible through a
 local web server. You will need to supply the URL to the webserver in
 the 'tests/test_config.php' file. This is as simple as defining the
 '$phpbb_functional_url' variable, which contains the URL for the directory containing
@@ -173,7 +173,7 @@ the board. Make sure you include the trailing slash. Note that without extensive
 changes to the test framework, you cannot use a board outside of the repository
 on which to run tests.
 
-    $phpbb_functional_url = 'http://localhost/phpBB3/';
+    $phpbb_functional_url = 'http://localhost/phpBB/';
 
 Functional tests are automatically run, if '$phpbb_functional_url' is configured.
 If you only want the functional tests, run:
@@ -183,6 +183,22 @@ If you only want the functional tests, run:
 This will change your board's config.php file, but it makes a backup at
 config_dev.php, so you can restore it after the test run is complete.
 
+Running on SSL
+--------------
+
+If your local server uses an SSL certificate with HTTPS, you may need to specify the
+path to your security certificate for functional tests to run successfully. Set
+`$path_to_ssl_cert` to the location of your certificate file (.pem or .crt).
+If you can’t locate your certificate, or it still isn’t working, you can disable 
+SSL verification by setting this value to `false` (though this is less secure).
+Note: You must ensure `$phpbb_functional_url` is using `https://`.
+
+	$path_to_ssl_cert = '/path/to/your/certificate.pem';
+
+Or via environment variables as follows:
+
+    $ PHPBB_TEST_SSL_CERT_PATH=/path/to/your/certificate.pem phpunit
+
 UI tests
 ========
 
diff --git a/tests/acp_board/select_auth_method_test.php b/tests/acp_board/select_auth_method_test.php
index e06b5f845d8..a9efdbc0adf 100644
--- a/tests/acp_board/select_auth_method_test.php
+++ b/tests/acp_board/select_auth_method_test.php
@@ -22,8 +22,36 @@ class phpbb_acp_board_select_auth_method_test extends phpbb_test_case
 	public static function select_auth_method_data()
 	{
 		return [
-			['acp_board_valid', '<option value="acp_board_valid" selected="selected" data-toggle-setting="#auth_acp_board_valid_settings">Acp_board_valid</option>'],
-			['acp_board_invalid', '<option value="acp_board_valid" data-toggle-setting="#auth_acp_board_valid_settings">Acp_board_valid</option>'],
+			[
+				'acp_board_valid',
+				[
+					'options' => [
+						0 => [
+							'value'		=> 'acp_board_valid',
+							'label'		=> 'Acp_board_valid',
+							'selected'	=> true,
+							'data' 		=> [
+								'toggle-setting' => '#auth_acp_board_valid_settings',
+							],
+						]
+					],
+				]
+			],
+			[
+				'acp_board_invalid',
+				[
+					'options' => [
+						0 => [
+							'value'		=> 'acp_board_valid',
+							'label'		=> 'Acp_board_valid',
+							'selected'	=> false,
+							'data' 		=> [
+								'toggle-setting' => '#auth_acp_board_valid_settings',
+							],
+						]	
+					],
+				]
+			],
 		];
 	}
 
diff --git a/tests/attachment/delete_test.php b/tests/attachment/delete_test.php
index faf2f960e63..73b7d755396 100644
--- a/tests/attachment/delete_test.php
+++ b/tests/attachment/delete_test.php
@@ -53,7 +53,7 @@ protected function setUp(): void
 		$this->attachment_delete = new \phpbb\attachment\delete($this->config, $this->db, $this->dispatcher, $this->resync, $this->storage);
 	}
 
-	public function data_attachment_delete()
+	public static function data_attachment_delete()
 	{
 		return array(
 			array('attach', '', false, false),
@@ -83,32 +83,31 @@ public function test_attachment_delete($mode, $ids, $resync, $expected)
 		$this->assertSame($expected, $this->attachment_delete->delete($mode, $ids, $resync));
 	}
 
-	public function data_attachment_unlink()
+	public static function data_attachment_unlink()
 	{
 		return array(
-			array(true, true, true),
-			array(true, false, false),
-			array(true, true, false, true),
+			array(true, true),
+			array(false, false),
+			array(true, false, true),
 		);
 	}
 
 	/**
 	 * @dataProvider data_attachment_unlink
 	 */
-	public function test_attachment_delete_success($remove_success, $exists_success, $expected, $throw_exception = false)
+	public function test_attachment_delete_success($exists_success, $expected, $throw_exception = false)
 	{
 		$this->storage = $this->createMock('\phpbb\storage\storage');
 		if ($throw_exception)
 		{
 			$this->storage->expects($this->any())
 				->method('delete')
-				->willThrowException(new \phpbb\storage\exception\exception);
+				->willThrowException(new \phpbb\storage\exception\storage_exception);
 		}
 		else
 		{
 			$this->storage->expects($this->any())
-				->method('delete')
-				->willReturn($remove_success);
+				->method('delete');
 		}
 		$this->storage->expects($this->any())
 			->method('exists')
diff --git a/tests/attachment/manager_test.php b/tests/attachment/manager_test.php
index 8fcea043eb4..88e39ed6710 100644
--- a/tests/attachment/manager_test.php
+++ b/tests/attachment/manager_test.php
@@ -21,15 +21,15 @@ protected function setUp(): void
 	{
 		$this->delete = $this->getMockBuilder('\phpbb\attachment\delete')
 			->disableOriginalConstructor()
-			->setMethods(['delete', 'unlink_attachment'])
+			->onlyMethods(['delete', 'unlink_attachment'])
 			->getMock();
 		$this->resync = $this->getMockBuilder('\phpbb\attachment\resync')
 			->disableOriginalConstructor()
-			->setMethods(['resync'])
+			->onlyMethods(['resync'])
 			->getMock();
 		$this->upload = $this->getMockBuilder('\phpbb\attachment\upload')
 			->disableOriginalConstructor()
-			->setMethods(['upload'])
+			->onlyMethods(['upload'])
 			->getMock();
 	}
 
@@ -38,7 +38,7 @@ protected function get_manager()
 		return new \phpbb\attachment\manager($this->delete, $this->resync, $this->upload);
 	}
 
-	public function data_manager()
+	public static function data_manager()
 	{
 		return array(
 			array(
diff --git a/tests/attachment/resync_test.php b/tests/attachment/resync_test.php
index 9cadbea047f..2168d68cf4b 100644
--- a/tests/attachment/resync_test.php
+++ b/tests/attachment/resync_test.php
@@ -32,7 +32,7 @@ protected function setUp(): void
 		$this->resync = new \phpbb\attachment\resync($this->db);
 	}
 
-	public function data_resync()
+	public static function data_resync()
 	{
 		return array(
 			array('', array(1), 'post_id', POSTS_TABLE, array('post_attachment' => '1'), array('post_attachment' => '1')),
diff --git a/tests/attachment/upload_test.php b/tests/attachment/upload_test.php
index 609ee995360..76237021ec9 100644
--- a/tests/attachment/upload_test.php
+++ b/tests/attachment/upload_test.php
@@ -165,7 +165,7 @@ protected function setUp(): void
 		);
 	}
 
-	public function data_upload()
+	public static function data_upload()
 	{
 		return array(
 			array('foobar', 1, false,
@@ -280,7 +280,7 @@ public function test_init_error()
 		), $filedata);
 	}
 
-	public function data_image_upload()
+	public static function data_image_upload()
 	{
 		return array(
 			array(false, false, array(),
@@ -365,7 +365,7 @@ public function data_image_upload()
 	public function test_image_upload($is_image, $plupload_active, $config_data, $expected)
 	{
 		$filespec = $this->getMockBuilder('\phpbb\files\filespec_storage')
-			->setMethods(array(
+			->onlyMethods(array(
 				'init_error',
 				'is_image',
 				'move_file',
diff --git a/tests/auth/fixtures/oauth_tokens.xml b/tests/auth/fixtures/oauth_tokens.xml
index 6c82e94e627..d6fe5498a07 100644
--- a/tests/auth/fixtures/oauth_tokens.xml
+++ b/tests/auth/fixtures/oauth_tokens.xml
@@ -12,5 +12,11 @@
 			<value>{"token_class":"phpbb_not_a_token","accessToken":"error","refreshToken":0,"endOfLife":null,"extraParams":null}</value>
 		</row>
 	</table>
+	<table name="phpbb_oauth_states">
+		<column>user_id</column>
+		<column>session_id</column>
+		<column>provider</column>
+		<column>oauth_state</column>
+	</table>
 </dataset>
 
diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php
index e5bfdbf8583..2094205bfe1 100644
--- a/tests/auth/provider_apache_test.php
+++ b/tests/auth/provider_apache_test.php
@@ -33,7 +33,7 @@ protected function setUp(): void
 		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
 		$lang = new \phpbb\language\language($lang_loader);
 		$this->request = $this->createMock('\phpbb\request\request');
-		$this->user = new \phpbb\user($lang, '\phpbb\datetime');;
+		$this->user = new \phpbb\user($lang, '\phpbb\datetime');
 
 		$this->provider = new \phpbb\auth\provider\apache($config, $db, $lang, $this->request, $this->user, $phpbb_root_path, $phpEx);
 	}
@@ -74,8 +74,10 @@ public function test_login()
 			->will($this->returnValue(true));
 		$this->request->expects($this->exactly(2))
 			->method('server')
-			->withConsecutive(['PHP_AUTH_USER'], ['PHP_AUTH_PW'])
-			->will($this->onConsecutiveCalls($this->returnValue('foobar'), $this->returnValue('example')));
+			->willReturnMap([
+				['PHP_AUTH_USER', 'foobar'],
+				['PHP_AUTH_PW', 'example']
+			]);
 
 		$expected = array(
 			'status'		=> LOGIN_SUCCESS,
@@ -102,8 +104,10 @@ public function test_autologin()
 			->will($this->returnValue(true));
 		$this->request->expects($this->exactly(2))
 			->method('server')
-			->withConsecutive(['PHP_AUTH_USER'], ['PHP_AUTH_PW'])
-			->will($this->onConsecutiveCalls($this->returnValue('foobar'), $this->returnValue('example')));
+			->willReturnCallback(fn(string $arg) => match(true) {
+				$arg === 'PHP_AUTH_USER' => 'foobar',
+				$arg === 'PHP_AUTH_PW' => 'example',
+			});
 
 		$expected = array(
 			'user_id' => 1,
@@ -120,6 +124,7 @@ public function test_autologin()
 			'user_email' => 'example@example.com',
 			'user_birthday' => '',
 			'user_lastvisit' => 0,
+			'user_last_active' => 0,
 			'user_lastmark' => 0,
 			'user_lastpost_time' => 0,
 			'user_lastpage' => '',
@@ -151,7 +156,6 @@ public function test_autologin()
 			'user_post_sortby_dir' => 'a',
 			'user_notify' => 0,
 			'user_notify_pm' => 1,
-			'user_notify_type' => 0,
 			'user_allow_pm' => 1,
 			'user_allow_viewonline' => 1,
 			'user_allow_viewemail' => 1,
@@ -164,8 +168,8 @@ public function test_autologin()
 			'user_sig' => '',
 			'user_sig_bbcode_uid' => '',
 			'user_sig_bbcode_bitfield' => '',
-			'user_jabber' => '',
 			'user_actkey' => '',
+			'user_actkey_expiration' => 0,
 			'user_newpasswd' => '',
 			'user_form_salt' => '',
 			'user_new' => 1,
diff --git a/tests/auth/provider_db_test.php b/tests/auth/provider_db_test.php
index c3a0743e144..145e3c47cda 100644
--- a/tests/auth/provider_db_test.php
+++ b/tests/auth/provider_db_test.php
@@ -45,14 +45,14 @@ public function test_login()
 
 		$phpbb_container = new phpbb_mock_container_builder();
 		$plugins = new \phpbb\di\service_collection($phpbb_container);
-		$plugins->add('core.captcha.plugins.nogd');
+		$plugins->add('core.captcha.plugins.qa');
 		$phpbb_container->set(
 			'captcha.factory',
 			new \phpbb\captcha\factory($phpbb_container, $plugins)
 		);
 		$phpbb_container->set(
-			'core.captcha.plugins.nogd',
-			new \phpbb\captcha\plugins\nogd()
+			'core.captcha.plugins.qa',
+			new \phpbb\captcha\plugins\qa('', '', '')
 		);
 		/** @var \phpbb\captcha\factory $captcha_factory */
 		$captcha_factory = $phpbb_container->get('captcha.factory');
diff --git a/tests/auth/provider_oauth_token_storage_test.php b/tests/auth/provider_oauth_token_storage_test.php
index 7e29bd08bf3..08b9454ad35 100644
--- a/tests/auth/provider_oauth_token_storage_test.php
+++ b/tests/auth/provider_oauth_token_storage_test.php
@@ -11,7 +11,9 @@
 *
 */
 
+use OAuth\Common\Consumer\Credentials;
 use OAuth\OAuth2\Token\StdOAuth2Token;
+use phpbb\auth\provider\oauth\token_storage;
 
 require_once __DIR__ . '/phpbb_not_a_token.php';
 
@@ -48,7 +50,7 @@ protected function setUp(): void
 		// Set the user id to anonymous
 		$this->user->data['user_id'] = ANONYMOUS;
 
-		$this->token_storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user, $this->token_storage_table, $this->state_table);
+		$this->token_storage = new token_storage($this->db, $this->user, $this->token_storage_table, $this->state_table);
 	}
 
 	public function getDataSet()
@@ -105,7 +107,7 @@ public function test_retrieveAccessToken_from_db()
 		$expected_token = new StdOAuth2Token('access', 'refresh', StdOAuth2Token::EOL_NEVER_EXPIRES);
 
 		// Store a token in the database
-		$temp_storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user, $this->token_storage_table, $this->state_table);
+		$temp_storage = new token_storage($this->db, $this->user, $this->token_storage_table, $this->state_table);
 		$temp_storage->storeAccessToken($this->service_name, $expected_token);
 		unset($temp_storage);
 
@@ -139,7 +141,7 @@ public function test_retrieve_access_token_by_session_from_db()
 		$expected_token = new StdOAuth2Token('access', 'refresh', StdOAuth2Token::EOL_NEVER_EXPIRES);
 
 		// Store a token in the database
-		$temp_storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user,  $this->token_storage_table, $this->state_table);
+		$temp_storage = new token_storage($this->db, $this->user,  $this->token_storage_table, $this->state_table);
 		$temp_storage->storeAccessToken($this->service_name, $expected_token);
 		unset($temp_storage);
 
@@ -238,4 +240,89 @@ protected function get_token_row_by_session_id($session_id)
 
 		return $row;
 	}
+
+	public function test_store_and_retrieve_cached_state()
+	{
+		$expected_state = 'abc123_securestate';
+
+		$this->token_storage->storeAuthorizationState($this->service_name, $expected_state);
+		$this->assertTrue($this->token_storage->hasAuthorizationState($this->service_name));
+		$retrieved_state = $this->token_storage->retrieveAuthorizationState($this->service_name);
+
+		$this->assertIsString($retrieved_state);
+		$this->assertSame($expected_state, $retrieved_state);
+	}
+
+	public function test_store_and_retrieve_db_state()
+	{
+		$expected_state = 'abc123_securestate';
+
+		$this->token_storage->storeAuthorizationState($this->service_name, $expected_state);
+
+		$fresh_storage = new token_storage(
+			$this->db,
+			$this->user,
+			$this->token_storage_table,
+			$this->state_table
+		);
+
+		$retrieved_state = $fresh_storage->retrieveAuthorizationState($this->service_name);
+
+		$this->assertIsString($retrieved_state);
+		$this->assertSame($expected_state, $retrieved_state);
+	}
+
+	public function test_clear_db_state()
+	{
+		$expected_state = 'abc123_securestate';
+
+		$this->token_storage->storeAuthorizationState($this->service_name, $expected_state);
+
+		$fresh_storage = new token_storage(
+			$this->db,
+			$this->user,
+			$this->token_storage_table,
+			$this->state_table
+		);
+
+		$retrieved_state = $fresh_storage->retrieveAuthorizationState($this->service_name);
+
+		$this->assertIsString($retrieved_state);
+		$this->assertSame($expected_state, $retrieved_state);
+
+		$this->token_storage->clearAuthorizationState($this->service_name);
+		$this->assertFalse($this->token_storage->hasAuthorizationState($this->service_name));
+		$this->assertEmpty($this->token_storage->retrieveAuthorizationState($this->service_name));
+	}
+
+	public function test_retrieve_not_stored_state()
+	{
+		$result = $this->token_storage->retrieveAuthorizationState($this->service_name);
+		$this->assertEmpty($result);
+	}
+
+	public function test_validate_authorization_state_invalid()
+	{
+		$credentials = new Credentials(
+			'my_key',
+			'my_secret',
+			'http://example.com/callback'
+		);
+		$google_service = new \OAuth\OAuth2\Service\Google(
+			$credentials,
+			$this->createMock(\OAuth\Common\Http\Client\ClientInterface::class),
+			$this->token_storage
+		);
+		$google_reflection = new \ReflectionClass($google_service);
+		$storage = $google_reflection->getProperty('storage');
+		$storage->setAccessible(true);
+		$storage->setValue($google_service, $this->token_storage);
+
+		$expected_state = 'abc123_securestate';
+		$this->token_storage->storeAuthorizationState(\OAuth\OAuth2\Service\Google::class, $expected_state);
+
+		$this->expectException(\OAuth\OAuth2\Service\Exception\InvalidAuthorizationStateException::class);
+
+		$google_service->requestAccessToken('does_not_matter', 'foobar');
+	}
 }
diff --git a/tests/avatar/driver_gravatar_test.php b/tests/avatar/driver_gravatar_test.php
new file mode 100644
index 00000000000..bc84f356102
--- /dev/null
+++ b/tests/avatar/driver_gravatar_test.php
@@ -0,0 +1,213 @@
+<?php
+
+use phpbb\avatar\driver\gravatar;
+use phpbb\request\request;
+use phpbb\request\request_interface;
+
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case
+{
+
+	/** @var \phpbb\config\config */
+	private $config;
+
+	/** @var gravatar */
+	private $gravatar;
+
+	/** @var request_interface */
+	private $request;
+
+	/** @var \phpbb\template\template */
+	private $template;
+
+	/** @var \phpbb\user */
+	private $user;
+
+	private $template_data = [];
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(__DIR__ . '/fixtures/users.xml');
+	}
+
+	protected function setUp(): void
+	{
+		global $phpbb_root_path, $phpEx;
+
+		$this->config = new \phpbb\config\config(array());
+		$this->request = $this->getMockBuilder(request::class)
+			->disableOriginalConstructor()
+			->onlyMethods(['get_super_global'])
+			->getMock();
+		$this->request->method('get_super_global')
+			->willReturn([]);
+		$this->template = $this->getMockBuilder(\phpbb\template\twig\twig::class)
+			->disableOriginalConstructor()
+			->onlyMethods(['assign_vars'])
+			->getMock();
+		$this->template->method('assign_vars')
+			->will($this->returnCallback([$this, 'template_assign_vars']));
+		$this->user = $this->getMockBuilder(\phpbb\user::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$imagesize = new \FastImageSize\FastImageSize();
+		$cache = $this->createMock('\phpbb\cache\driver\driver_interface');
+		$path_helper =  new \phpbb\path_helper(
+			new \phpbb\symfony_request(
+				$this->request
+			),
+			$this->request,
+			$phpbb_root_path,
+			$phpEx
+		);
+
+		global $phpbb_dispatcher;
+		$phpbb_dispatcher = $this->getMockBuilder(\phpbb\event\dispatcher::class)
+			->disableOriginalConstructor()
+			->onlyMethods(['trigger_event'])
+			->getMock();
+		$phpbb_dispatcher->method('trigger_event')
+			->willReturnArgument(1);
+
+		$this->gravatar = new gravatar($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache);
+		$this->gravatar->set_name('avatar.driver.gravatar');
+	}
+
+	public function template_assign_vars($data)
+	{
+		$this->template_data = array_merge($this->template_data, $data);
+	}
+
+	public static function data_prepare_form(): array
+	{
+		return [
+			[
+				// Only default empty values, no request data
+				[
+					'AVATAR_GRAVATAR_WIDTH'		=> '',
+					'AVATAR_GRAVATAR_HEIGHT'	=> '',
+					'AVATAR_GRAVATAR_EMAIL'		=> '',
+				],
+				[],
+				[
+					'avatar_type'			=> '',
+					'avatar_width'			=> '',
+					'avatar_height'			=> '',
+				]
+			],
+			[
+				// Only default empty values, request data set
+				[
+					'AVATAR_GRAVATAR_WIDTH'		=> '80',
+					'AVATAR_GRAVATAR_HEIGHT'	=> '90',
+					'AVATAR_GRAVATAR_EMAIL'		=> '',
+				],
+				[
+					request_interface::POST => [
+						'avatar_type'				=> 'avatar.driver.gravatar',
+						'avatar_gravatar_width'		=> '80',
+						'avatar_gravatar_height'	=> '90',
+					],
+				],
+				[
+					'avatar_type'			=> '',
+					'avatar_width'			=> '80',
+					'avatar_height'			=> '90',
+				]
+			],
+			[
+				// Only default empty values, request data set
+				[
+					'AVATAR_GRAVATAR_WIDTH'		=> '70',
+					'AVATAR_GRAVATAR_HEIGHT'	=> '60',
+					'AVATAR_GRAVATAR_EMAIL'		=> 'bar@foo.com',
+				],
+				[
+					request_interface::POST => [
+						'avatar_type'				=> 'avatar.driver.gravatar',
+						'avatar_gravatar_width'		=> '80',
+						'avatar_gravatar_height'	=> '90',
+					],
+				],
+				[
+					'avatar_type'			=> 'avatar.driver.gravatar',
+					'avatar'				=> 'bar@foo.com',
+					'avatar_width'			=> '70',
+					'avatar_height'			=> '60',
+				]
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider data_prepare_form
+	 */
+	public function test_prepare_form($expected_vars, $request_data, $row)
+	{
+		$error = [];
+		$this->template_data = [];
+
+		$request = $this->getMockBuilder(request::class)
+			->disableOriginalConstructor()
+			->onlyMethods(['get_super_global'])
+			->getMock();
+		$request->method('get_super_global')
+			->willReturn([]);
+
+		$requestInputReflection = new \ReflectionProperty($request, 'input');
+		$request_data[request_interface::GET] = $request_data[request_interface::GET] ?? [];
+		$request_data[request_interface::POST] = $request_data[request_interface::POST] ?? [];
+		$request_data[request_interface::REQUEST] = $request_data[request_interface::GET] + $request_data[request_interface::POST];
+		$requestInputReflection->setValue($request, $request_data);
+		$requestTypeCastHelperReflection = new \ReflectionProperty($request, 'type_cast_helper');
+		$requestTypeCastHelperReflection->setValue($request, new \phpbb\request\type_cast_helper());
+
+		$this->gravatar->prepare_form($request, $this->template, $this->user, $row, $error);
+
+		// Error not touched by gravatar
+		$this->assertEquals([], $error);
+
+		$this->assertEquals($expected_vars, $this->template_data);
+	}
+
+	public function test_gravatar_misc(): void
+	{
+		$this->assertEquals('ucp_avatar_options_gravatar.html', $this->gravatar->get_template_name());
+		$this->assertEquals('acp_avatar_options_gravatar.html', $this->gravatar->get_acp_template_name());
+
+		$row = [
+			'avatar_type'			=> 'avatar.driver.gravatar',
+			'avatar'				=> 'bar@foo.com',
+			'avatar_width'			=> '70',
+			'avatar_height'			=> '60',
+		];
+		$this->assertEquals('<img class="gravatar" src="//gravatar.com/avatar/e0ee9d02824d4320a999507150c5b8a371c635c41f645ba3a7205f36384dc199?s=70" width="70" height="60" alt="" />', $this->gravatar->get_custom_html($this->user, $row));
+	}
+
+	public function test_get_data(): void
+	{
+		$row = [
+			'avatar_type'			=> 'avatar.driver.gravatar',
+			'avatar'				=> 'bar@foo.com',
+			'avatar_width'			=> '70',
+			'avatar_height'			=> '60',
+		];
+
+		$this->assertEquals([
+			'src'		=> '//gravatar.com/avatar/e0ee9d02824d4320a999507150c5b8a371c635c41f645ba3a7205f36384dc199?s=70',
+			'width'		=> '70',
+			'height'	=> '60',
+		], $this->gravatar->get_data($row));
+	}
+}
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index 19b7797eb4f..66cba2e8900 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -12,6 +12,7 @@
 */
 
 require_once __DIR__ . '/driver/foobar.php';
+require_once __DIR__ . '/driver/barfoo.php';
 
 class phpbb_avatar_manager_test extends \phpbb_database_test_case
 {
@@ -52,24 +53,29 @@ protected function setUp(): void
 			$phpEx
 		);
 
-		$imagesize = new \FastImageSize\FastImageSize();
+		$imagesize = $this->getMockBuilder('\FastImageSize\FastImageSize')
+			->onlyMethods(['getImageSize'])
+			->getMock();
+		$imagesize->method('getImageSize')
+			->willReturn(['width' => 80, 'height' => 80, 'mime' => 'image/jpeg']);
 
 		$dispatcher = new phpbb_mock_event_dispatcher();
 		$phpbb_dispatcher = $dispatcher;
 
 		$controller_helper = $this->createMock('\phpbb\controller\helper');
+		$routing_helper = $this->createMock('\phpbb\routing\helper');
 
 		// $this->avatar_foobar will be needed later on
 		$this->avatar_foobar = $this->getMockBuilder('\phpbb\avatar\driver\foobar')
-			->setMethods(array('get_name'))
+			->onlyMethods(array('get_name'))
 			->setConstructorArgs(array($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache))
 			->getMock();
 		$this->avatar_foobar->expects($this->any())
 			->method('get_name')
 			->will($this->returnValue('avatar.driver.foobar'));
-		// barfoo driver can't be mocked with constructor arguments
 		$this->avatar_barfoo = $this->getMockBuilder('\phpbb\avatar\driver\barfoo')
-			->setMethods(array('get_name', 'get_config_name'))
+			->onlyMethods(array('get_name', 'get_config_name'))
+			->setConstructorArgs(array($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache))
 			->getMock();
 		$this->avatar_barfoo->expects($this->any())
 			->method('get_name')
@@ -88,15 +94,15 @@ protected function setUp(): void
 			if ($driver !== 'upload')
 			{
 				$cur_avatar = $this->getMockBuilder('\phpbb\avatar\driver\\' . $driver)
-					->setMethods(array('get_name'))
+					->onlyMethods(array('get_name'))
 					->setConstructorArgs(array($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache))
 					->getMock();
 			}
 			else
 			{
 				$cur_avatar = $this->getMockBuilder('\phpbb\avatar\driver\\' . $driver)
-				->setMethods(array('get_name'))
-				->setConstructorArgs(array($this->config, $controller_helper, $phpbb_root_path, $phpEx, $storage, $path_helper, $dispatcher, $files_factory, $php_ini))
+				->onlyMethods(array('get_name'))
+				->setConstructorArgs(array($this->config, $phpbb_root_path, $phpEx, $storage, $path_helper, $routing_helper, $dispatcher, $files_factory, $php_ini))
 				->getMock();
 			}
 			$cur_avatar->expects($this->any())
@@ -146,7 +152,7 @@ public function test_get_enabled_drivers()
 		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
 	}
 
-	public function get_driver_data_enabled()
+	public static function get_driver_data_enabled()
 	{
 		return array(
 			array('avatar.driver.foobar', 'avatar.driver.foobar'),
@@ -167,7 +173,7 @@ public function test_get_driver_enabled($driver_name, $expected)
 		$this->assertEquals($expected, ($driver === null) ? null : $driver->get_name());
 	}
 
-	public function get_driver_data_all()
+	public static function get_driver_data_all()
 	{
 		return array(
 			array('avatar.driver.foobar', 'avatar.driver.foobar'),
@@ -191,14 +197,19 @@ public function test_get_avatar_settings()
 	{
 		$avatar_settings = $this->manager->get_avatar_settings($this->avatar_foobar);
 
-		$expected_settings = array(
-			'allow_avatar_' . get_class($this->avatar_foobar)	=> array('lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
-		);
+		$expected_settings = [
+			'allow_avatar_' . get_class($this->avatar_foobar)	=> [
+				'lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)),
+				'validate' => 'bool',
+				'type' => 'radio:yes_no',
+				'explain' => true
+			],
+		];
 
 		$this->assertEquals($expected_settings, $avatar_settings);
 	}
 
-	public function database_row_data()
+	public static function database_row_data()
 	{
 		return array(
 			array(
@@ -209,13 +220,7 @@ public function database_row_data()
 					'user_avatar_height'	=> '',
 					'group_avatar'		=> '',
 				),
-				array(
-					'user_avatar'		=> '',
-					'user_avatar_type'	=> '',
-					'user_avatar_width'	=> '',
-					'user_avatar_height'	=> '',
-					'group_avatar'		=> '',
-				),
+				array(),
 				'foobar',
 			),
 			array(
@@ -234,7 +239,6 @@ public function database_row_data()
 					'group_id'	=> 4,
 				),
 				array(
-					'user_avatar'	=> '',
 					'user_id'	=> 5,
 					'group_id'	=> 4,
 				),
@@ -279,6 +283,11 @@ public function test_clean_row(array $input, array $output, $prefix = '')
 			$this->assertArrayHasKey($key, $cleaned_row);
 			$this->assertEquals($cleaned_row[$key], $value);
 		}
+
+		if (empty($output))
+		{
+			$this->assertEquals($output, $cleaned_row);
+		}
 	}
 
 	public function test_clean_driver_name()
@@ -296,7 +305,7 @@ public function test_localize_errors()
 		global $phpbb_root_path, $phpEx;
 
 		$user = $this->getMockBuilder('\phpbb\user')
-			->setMethods(array())
+			->onlyMethods(['lang'])
 			->setConstructorArgs(array(new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), '\phpbb\datetime'))
 			->getMock();
 		$lang_array = array(
@@ -320,7 +329,7 @@ public function test_localize_errors()
 		)));
 	}
 
-	public function data_handle_avatar_delete()
+	public static function data_handle_avatar_delete()
 	{
 		return array(
 			array(
diff --git a/tests/ban/ban_manager_test.php b/tests/ban/ban_manager_test.php
index 2eb49686d6d..34a0acdaa35 100644
--- a/tests/ban/ban_manager_test.php
+++ b/tests/ban/ban_manager_test.php
@@ -55,7 +55,7 @@ public function setUp(): void
 		$this->phpbb_container = $phpbb_container;
 	}
 
-	public function data_check_ban(): array
+	public static function data_check_ban(): array
 	{
 		return [
 			[
@@ -170,7 +170,7 @@ public function test_check_ban($user_data, $expected)
 		$this->assertEquals($expected, $this->ban_manager->check($user_data));
 	}
 
-	public function data_get_bans(): array
+	public static function data_get_bans(): array
 	{
 		return [
 			[
@@ -298,7 +298,7 @@ public function test_get_bans($ban_type, $expected, $expected_exception = false)
 		$this->assertEquals($expected, $actual);
 	}
 
-	public function data_get_ban_end(): array
+	public static function data_get_ban_end(): array
 	{
 		return [
 			[
@@ -411,7 +411,6 @@ public function test_get_banned_users_own_method()
 
 		$ban_type_ip_reflection = new \ReflectionClass($ban_type_ip);
 		$get_excluded_reflection = $ban_type_ip_reflection->getMethod('get_excluded');
-		$get_excluded_reflection->setAccessible(true);
 		$this->assertFalse($get_excluded_reflection->invoke($ban_type_ip));
 	}
 
@@ -457,7 +456,7 @@ public function test_ban_empty_ban_items()
 		));
 	}
 
-	public function data_test_ban(): array
+	public static function data_test_ban(): array
 	{
 		return [
 			[
@@ -629,7 +628,7 @@ public function test_ban_actual()
 		);
 	}
 
-	public function data_test_unban(): array
+	public static function data_test_unban(): array
 	{
 		return [
 			[
@@ -700,7 +699,7 @@ public function test_base_type_methods()
 		$this->assertFalse($check->invoke($ban_type_ip, [], []));
 	}
 
-	public function data_get_ban_message(): array
+	public static function data_get_ban_message(): array
 	{
 		return [
 			[
diff --git a/tests/bbcode/parser_test.php b/tests/bbcode/parser_test.php
index f5f11ae9007..1786fabc5fc 100644
--- a/tests/bbcode/parser_test.php
+++ b/tests/bbcode/parser_test.php
@@ -16,7 +16,7 @@
 
 class phpbb_bbcode_parser_test extends \phpbb_test_case
 {
-	public function bbcode_firstpass_data()
+	public static function bbcode_firstpass_data()
 	{
 		return array(
 			// Default bbcodes from in their simplest way
@@ -249,10 +249,18 @@ public function test_bbcode_firstpass($description, $message, $expected, $incomp
 			$this->markTestIncomplete($incomplete);
 		}
 
-		global $user, $request, $symfony_request;
+		global $user, $request, $symfony_request, $phpbb_dispatcher, $config, $phpEx;
+		$phpEx = 'php';
+		$config = new \phpbb\config\config([
+			'max_post_font_size' => 0,
+			'force_server_vars' => 0,
+			'server_name' => 'testhost',
+		]);
 		$user = new phpbb_mock_user;
+		$user->lang['UNAUTHORISED_BBCODE'] = 'UNAUTHORISED_BBCODE';
 		$request = new phpbb_mock_request;
 		$symfony_request = new \phpbb\symfony_request($request);
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 
 		$bbcode = new bbcode_firstpass();
 		$bbcode->mode = 'post';
diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php
index 2dfed41b95d..5f42f1d4bb4 100644
--- a/tests/bbcode/url_bbcode_test.php
+++ b/tests/bbcode/url_bbcode_test.php
@@ -16,7 +16,7 @@
 
 class phpbb_url_bbcode_test extends phpbb_test_case
 {
-	public function url_bbcode_test_data()
+	public static function url_bbcode_test_data()
 	{
 		return array(
 			array(
@@ -52,10 +52,18 @@ public function url_bbcode_test_data()
 	*/
 	public function test_url($description, $message, $expected)
 	{
-		global $user, $request, $symfony_request;
+		global $user, $request, $symfony_request, $phpbb_dispatcher, $config, $phpEx;
+		$phpEx = 'php';
+		$config = new \phpbb\config\config([
+			'max_post_font_size' => 0,
+			'force_server_vars' => 0,
+			'server_name' => 'testhost',
+		]);
 		$user = new phpbb_mock_user;
+		$user->lang['UNAUTHORISED_BBCODE'] = 'UNAUTHORISED_BBCODE';
 		$request = new phpbb_mock_request;
 		$symfony_request = new \phpbb\symfony_request($request);
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 
 		$bbcode = new bbcode_firstpass();
 		$bbcode->message = $message;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 7556dd8c906..9efef937a4a 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -14,13 +14,14 @@
 define('IN_PHPBB', true);
 define('PHPBB_ENVIRONMENT', 'test');
 
+global $phpbb_class_loader, $phpbb_class_loader_mock, $phpbb_class_loader_ext, $phpbb_class_loader_tests;
+global $phpbb_root_path, $phpEx, $table_prefix;
+
 $phpbb_root_path = 'phpBB/';
 $phpEx = 'php';
+$table_prefix = 'phpbb_';
 
-global $table_prefix;
 require_once $phpbb_root_path . 'includes/startup.php';
-
-$table_prefix = 'phpbb_';
 require_once $phpbb_root_path . 'includes/constants.php';
 require_once $phpbb_root_path . 'phpbb/class_loader.' . $phpEx;
 require_once $phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx;
diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php
index 10c9aec1824..f615cea3b01 100644
--- a/tests/cache/file_driver_test.php
+++ b/tests/cache/file_driver_test.php
@@ -17,6 +17,9 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case
 {
 	private $cache_dir;
 
+	/** @var \phpbb\cache\driver\file */
+	private  $cache_file;
+
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
@@ -36,7 +39,8 @@ protected function setUp(): void
 		}
 		$this->create_cache_dir();
 
-		$this->driver = new \phpbb\cache\driver\file($this->cache_dir);
+		$this->cache_file = new \phpbb\cache\driver\file($this->cache_dir);
+		$this->driver = $this->cache_file;
 	}
 
 	protected function tearDown(): void
@@ -49,6 +53,141 @@ protected function tearDown(): void
 		parent::tearDown();
 	}
 
+	public function test_read_not_readable()
+	{
+		if (strtolower(substr(PHP_OS, 0, 3)) === 'win')
+		{
+			$this->markTestSkipped('Unable to test unreadable files on Windows');
+		}
+
+		global $phpEx;
+
+		// Create file that is not readable
+		$this->assertTrue($this->cache_file->_write('unreadable', 'foo', time() + 86400));
+
+		$filename = "{$this->cache_dir}unreadable.$phpEx";
+		@chmod($filename, 0000);
+		$readReflection = new \ReflectionMethod($this->cache_file, '_read');
+		$this->assertFalse($readReflection->invoke($this->cache_file, 'unreadable'));
+		@chmod($filename, 0600);
+		$this->assertNotFalse($readReflection->invoke($this->cache_file, 'unreadable'));
+	}
+
+	public function test_read_data_global_invalid()
+	{
+		global $phpEx;
+
+		$reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars');
+		$reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']);
+
+		$reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires');
+		$reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]);
+
+		// Create file in invalid format
+		$this->assertTrue($this->cache_file->_write('data_global'));
+		$filename = "{$this->cache_dir}data_global.$phpEx";
+		$cache_data = file_get_contents($filename);
+		// Force negative read when retrieving data_global
+		$cache_data = str_replace("\n13\n", "\n1\n", $cache_data);
+		file_put_contents($filename, $cache_data);
+
+		$readReflection = new \ReflectionMethod($this->cache_file, '_read');
+		$this->assertFalse($readReflection->invoke($this->cache_file, 'data_global'));
+	}
+
+	public function test_read_data_global_zero_bytes()
+	{
+		global $phpEx;
+
+		$reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars');
+		$reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']);
+
+		$reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires');
+		$reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]);
+
+		// Create file in invalid format
+		$this->assertTrue($this->cache_file->_write('data_global'));
+		$filename = "{$this->cache_dir}data_global.$phpEx";
+		$cache_data = file_get_contents($filename);
+		// Force negative read when retrieving data_global
+		$cache_data = str_replace("\n13\n", "\n0\n", $cache_data);
+		file_put_contents($filename, $cache_data);
+
+		$readReflection = new \ReflectionMethod($this->cache_file, '_read');
+		$this->assertFalse($readReflection->invoke($this->cache_file, 'data_global'));
+	}
+
+	public function test_read_data_global_hex_bytes()
+	{
+		global $phpEx;
+
+		$reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars');
+		$reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']);
+
+		$reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires');
+		$reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]);
+
+		// Create file in invalid format
+		$this->assertTrue($this->cache_file->_write('data_global'));
+		$filename = "{$this->cache_dir}data_global.$phpEx";
+		$cache_data = file_get_contents($filename);
+		// Force negative read when retrieving data_global
+		$cache_data = str_replace("\n13\n", "\nA\n", $cache_data);
+		file_put_contents($filename, $cache_data);
+
+		$readReflection = new \ReflectionMethod($this->cache_file, '_read');
+		$this->assertFalse($readReflection->invoke($this->cache_file, 'data_global'));
+	}
+
+	public function test_read_data_global_expired()
+	{
+		$reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars');
+		$reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']);
+
+		$reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires');
+		$reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() - 86400]);
+
+		// Create file in invalid format
+		$this->assertTrue($this->cache_file->_write('data_global'));
+
+		// Clear data
+		$reflectionCacheVars->setValue($this->cache_file, []);
+		$reflectionCacheVarExpires->setValue($this->cache_file, []);
+
+		$readReflection = new \ReflectionMethod($this->cache_file, '_read');
+		$this->assertTrue($readReflection->invoke($this->cache_file, 'data_global'));
+
+		// Check data, should be empty
+		$this->assertEquals([], $reflectionCacheVars->getValue($this->cache_file));
+	}
+
+	public function test_read_data_global()
+	{
+		$reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars');
+		$expectedVars = ['foo' => 'bar'];
+		$reflectionCacheVars->setValue($this->cache_file, $expectedVars);
+
+		$reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires');
+		$expectedVarExpires = ['foo' => time() + 86400];
+		$reflectionCacheVarExpires->setValue($this->cache_file, $expectedVarExpires);
+
+		// Create file in invalid format
+		$this->assertTrue($this->cache_file->_write('data_global'));
+
+		// Clear data
+		$reflectionCacheVars->setValue($this->cache_file, []);
+		$reflectionCacheVarExpires->setValue($this->cache_file, []);
+		$this->assertEquals([], $reflectionCacheVars->getValue($this->cache_file));
+		$this->assertEquals([], $reflectionCacheVarExpires->getValue($this->cache_file));
+
+		$readReflection = new \ReflectionMethod($this->cache_file, '_read');
+		$this->assertTrue($readReflection->invoke($this->cache_file, 'data_global'));
+
+		// Check data, should be empty
+		$this->assertEquals($expectedVars, $reflectionCacheVars->getValue($this->cache_file));
+		$this->assertEquals($expectedVarExpires, $reflectionCacheVarExpires->getValue($this->cache_file));
+	}
+
 	private function create_cache_dir()
 	{
 		$this->get_test_case_helpers()->makedirs($this->cache_dir);
diff --git a/tests/cache/memcached_test.php b/tests/cache/memcached_driver_test.php
similarity index 100%
rename from tests/cache/memcached_test.php
rename to tests/cache/memcached_driver_test.php
diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php
index ec9de385a16..49f748526b2 100644
--- a/tests/cache/redis_driver_test.php
+++ b/tests/cache/redis_driver_test.php
@@ -32,7 +32,7 @@ static public function setUpBeforeClass(): void
 		$config = phpbb_test_case_helpers::get_test_config();
 		if (isset($config['redis_host']) || isset($config['redis_port']))
 		{
-			$host = isset($config['redis_host']) ? $config['redis_host'] : 'localhost';
+			$host = isset($config['redis_host']) ? $config['redis_host'] : '0.0.0.0';
 			$port = isset($config['redis_port']) ? $config['redis_port'] : 6379;
 			self::$config = array('host' => $host, 'port' => $port);
 		}
@@ -46,12 +46,14 @@ static public function setUpBeforeClass(): void
 
 	protected function setUp(): void
 	{
-		global $phpbb_root_path, $phpbb_container;
+		global $phpbb_root_path, $phpbb_container, $dbname, $table_prefix;
 
 		parent::setUp();
 
 		$phpbb_container = new phpbb_mock_container_builder();
 		$phpbb_container->setParameter('core.cache_dir', $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/');
+		$config = phpbb_test_case_helpers::get_test_config();
+		$dbname = $config['dbname'];
 		$this->driver = new \phpbb\cache\driver\redis(self::$config['host'], self::$config['port']);
 		$this->driver->purge();
 	}
diff --git a/tests/captcha/incomplete_test.php b/tests/captcha/incomplete_test.php
new file mode 100644
index 00000000000..4c5e7c6b279
--- /dev/null
+++ b/tests/captcha/incomplete_test.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\captcha\plugins\confirm_type;
+use phpbb\captcha\plugins\incomplete;
+use phpbb\config\config;
+use phpbb\language\language;
+use phpbb\request\request;
+use phpbb\template\template;
+use phpbb\user;
+
+class phpbb_captcha_incomplete_test extends phpbb_database_test_case
+{
+	protected config $config;
+
+	protected template $template;
+
+
+	/** @var incomplete */
+	protected incomplete $incomplete_captcha;
+
+	protected array $assigned_vars = [];
+
+	public function assign_vars(array $vars): void
+	{
+		$this->assigned_vars = array_merge($this->assigned_vars, $vars);
+	}
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml');
+	}
+
+	protected function setUp(): void
+	{
+		global $phpbb_root_path, $phpEx;
+
+		$this->config = new config([]);
+		$this->template = $this->getMockBuilder('\phpbb\template\twig\twig')
+			->onlyMethods(['assign_vars'])
+			->disableOriginalConstructor()
+			->getMock();
+		$this->template->method('assign_vars')
+			->willReturnCallback([$this, 'assign_vars']);
+		$db = $this->new_dbal();
+		$language = $this->createMock(language::class);
+		$request = $this->createMock(request::class);
+		$user = $this->createMock(user::class);
+
+		$this->incomplete_captcha = new incomplete(
+			$this->config,
+			$db,
+			$language,
+			$request,
+			$this->template,
+			$user,
+			$phpbb_root_path,
+			$phpEx
+		);
+	}
+
+	public function test_miscellaneous_incomplete(): void
+	{
+		$this->assertTrue($this->incomplete_captcha->is_available());
+		$this->assertFalse($this->incomplete_captcha->is_solved());
+		$this->assertFalse($this->incomplete_captcha->validate());
+		$this->assertFalse($this->incomplete_captcha->has_config());
+		$this->incomplete_captcha->set_name('foo');
+		$this->assertSame('CAPTCHA_INCOMPLETE', $this->incomplete_captcha->get_name());
+		$this->incomplete_captcha->init(confirm_type::UNDEFINED);
+		$this->assertEmpty($this->assigned_vars);
+		$this->assertEmpty($this->incomplete_captcha->get_demo_template(0));
+		$this->assertEmpty($this->incomplete_captcha->get_error());
+		$this->assertSame(0, $this->incomplete_captcha->get_attempt_count());
+	}
+
+	public function test_get_tempate(): void
+	{
+		$this->incomplete_captcha->init(confirm_type::REGISTRATION);
+		$this->assertSame('captcha_incomplete.html', $this->incomplete_captcha->get_template());
+		$this->assertEquals('CONFIRM_INCOMPLETE', $this->assigned_vars['CONFIRM_LANG']);
+
+		$this->assigned_vars = [];
+
+		$this->incomplete_captcha->init(confirm_type::POST);
+		$this->assertSame('captcha_incomplete.html', $this->incomplete_captcha->get_template());
+		$this->assertEquals('CONFIRM_INCOMPLETE', $this->assigned_vars['CONFIRM_LANG']);
+	}
+}
diff --git a/tests/captcha/legacy_wrapper_test.php b/tests/captcha/legacy_wrapper_test.php
new file mode 100644
index 00000000000..873012bd6a1
--- /dev/null
+++ b/tests/captcha/legacy_wrapper_test.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\captcha\plugins\confirm_type;
+use phpbb\captcha\plugins\legacy_wrapper;
+
+class phpbb_captcha_legacy_wrapper_test extends phpbb_test_case
+{
+	private $legacy_captcha;
+	private $legacy_wrapper;
+
+	public function setUp(): void
+	{
+		$this->legacy_captcha = $this->createMock(stdClass::class);
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+	}
+
+	public function test_is_available_with_method_exists(): void
+	{
+		// Simulate is_available method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['is_available'])
+			->getMock();
+		$this->legacy_captcha->method('is_available')->willReturn(true);
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+
+		$this->assertTrue($this->legacy_wrapper->is_available());
+	}
+
+	public function test_is_available_without_method_exists(): void
+	{
+		// Simulate is_available method does not exist in the legacy captcha
+		$this->assertFalse($this->legacy_wrapper->is_available());
+	}
+
+	public function test_has_config_with_method_exists(): void
+	{
+		// Simulate has_config method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['has_config'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->method('has_config')->willReturn(true);
+
+		$this->assertTrue($this->legacy_wrapper->has_config());
+	}
+
+	public function test_has_config_without_method_exists(): void
+	{
+		// Simulate has_config method does not exist in the legacy captcha
+		$this->assertFalse($this->legacy_wrapper->has_config());
+	}
+
+	public function test_get_name_with_method_exists(): void
+	{
+		// Simulate get_name method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['get_name'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->method('get_name')->willReturn('LegacyCaptchaName');
+
+		$this->assertSame('LegacyCaptchaName', $this->legacy_wrapper->get_name());
+	}
+
+	public function test_get_name_without_method_exists(): void
+	{
+		// Simulate get_name method does not exist in the legacy captcha
+		$this->assertSame('', $this->legacy_wrapper->get_name());
+	}
+
+	public function test_set_name_with_method_exists(): void
+	{
+		// Simulate set_name method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['set_name'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->expects($this->once())->method('set_name')->with('NewName');
+
+		$this->legacy_wrapper->set_name('NewName');
+	}
+
+	public function test_init_with_method_exists(): void
+	{
+		// Simulate init method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['init'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->expects($this->once())->method('init')->with(confirm_type::REGISTRATION->value);
+
+		$this->legacy_wrapper->init(confirm_type::REGISTRATION);
+	}
+
+	public function test_get_hidden_fields_with_method_exists(): void
+	{
+		// Simulate get_hidden_fields method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['get_hidden_fields'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->method('get_hidden_fields')->willReturn(['field1' => 'value1']);
+
+		$this->assertSame(['field1' => 'value1'], $this->legacy_wrapper->get_hidden_fields());
+	}
+
+	public function test_get_hidden_fields_without_method_exists(): void
+	{
+		// Simulate get_hidden_fields method does not exist in the legacy captcha
+		$this->assertSame([], $this->legacy_wrapper->get_hidden_fields());
+	}
+
+	public function test_validate_with_error(): void
+	{
+		// Simulate validate method returns an error
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['validate'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->method('validate')->willReturn('Captcha Error');
+
+		$this->assertFalse($this->legacy_wrapper->validate());
+		$this->assertSame('Captcha Error', $this->legacy_wrapper->get_error());
+	}
+
+	public function test_validate_without_method_exists(): void
+	{
+		$this->assertFalse($this->legacy_wrapper->validate());
+	}
+
+	public function test_validate_without_error(): void
+	{
+		// Simulate validate method does not return an error
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['validate'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->method('validate')->willReturn(null);
+
+		$this->assertTrue($this->legacy_wrapper->validate());
+	}
+
+	public function test_is_solved_with_method_exists(): void
+	{
+		// Simulate is_solved method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['is_solved'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->method('is_solved')->willReturn(true);
+
+		$this->assertTrue($this->legacy_wrapper->is_solved());
+	}
+
+	public function test_is_solved_without_method_exists(): void
+	{
+		// Simulate is_solved method does not exist in the legacy captcha
+		$this->assertFalse($this->legacy_wrapper->is_solved());
+	}
+
+	public function test_reset_with_method_exists(): void
+	{
+		// Simulate reset method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['reset'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->expects($this->once())->method('reset');
+
+		$this->legacy_wrapper->reset();
+	}
+
+	public function test_get_attempt_count_with_method_exists(): void
+	{
+		// Simulate get_attempt_count method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['get_attempt_count'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->method('get_attempt_count')->willReturn(5);
+
+		$this->assertSame(5, $this->legacy_wrapper->get_attempt_count());
+	}
+
+	public function test_get_attempt_count_without_method_exists(): void
+	{
+		// Simulate get_attempt_count method does not exist in the legacy captcha
+		$this->assertSame(PHP_INT_MAX, $this->legacy_wrapper->get_attempt_count());
+	}
+
+	public function test_get_template_with_method_exists(): void
+	{
+		// Simulate get_template method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['get_template'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->method('get_template')->willReturn('template_content');
+
+		$this->assertSame('template_content', $this->legacy_wrapper->get_template());
+	}
+
+	public function test_get_template_without_method_exists(): void
+	{
+		// Simulate get_template method does not exist in the legacy captcha
+		$this->assertSame('', $this->legacy_wrapper->get_template());
+	}
+
+	public function test_get_demo_template_with_method_exists(): void
+	{
+		// Simulate get_demo_template method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['get_demo_template'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->method('get_demo_template')->willReturn('demo_template_content');
+
+		$this->assertSame('demo_template_content', $this->legacy_wrapper->get_demo_template());
+	}
+
+	public function test_get_demo_template_without_method_exists(): void
+	{
+		// Simulate get_demo_template method does not exist in the legacy captcha
+		$this->assertSame('', $this->legacy_wrapper->get_demo_template());
+	}
+
+	public function test_garbage_collect_with_method_exists(): void
+	{
+		// Simulate garbage_collect method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['garbage_collect'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->expects($this->once())->method('garbage_collect')->with(confirm_type::REGISTRATION->value);
+
+		$this->legacy_wrapper->garbage_collect(confirm_type::REGISTRATION);
+	}
+
+	public function test_acp_page_with_method_exists(): void
+	{
+		// Simulate acp_page method exists in the legacy captcha
+		$this->legacy_captcha = $this->getMockBuilder(stdClass::class)
+			->addMethods(['acp_page'])
+			->getMock();
+		$this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha);
+		$this->legacy_captcha->expects($this->once())->method('acp_page')->with(1, 'module');
+
+		$this->legacy_wrapper->acp_page(1, 'module');
+	}
+}
diff --git a/tests/captcha/qa_test.php b/tests/captcha/qa_test.php
index d4293361045..b91db97d6e3 100644
--- a/tests/captcha/qa_test.php
+++ b/tests/captcha/qa_test.php
@@ -41,10 +41,6 @@ protected function setUp(): void
 
 	public function test_is_installed()
 	{
-		$this->assertFalse($this->qa->is_installed());
-
-		$this->qa->install();
-
 		$this->assertTrue($this->qa->is_installed());
 	}
 
@@ -55,7 +51,7 @@ public function test_set_get_name()
 		$this->assertSame('foobar', $this->qa->get_service_name());
 	}
 
-	public function data_acp_get_question_input()
+	public static function data_acp_get_question_input()
 	{
 		return array(
 			array("foobar\ntest\nyes", array(
diff --git a/tests/captcha/turnstile_test.php b/tests/captcha/turnstile_test.php
new file mode 100644
index 00000000000..c95e3225d2e
--- /dev/null
+++ b/tests/captcha/turnstile_test.php
@@ -0,0 +1,541 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\captcha\plugins\confirm_type;
+use phpbb\captcha\plugins\turnstile;
+use phpbb\config\config;
+use phpbb\db\driver\driver_interface;
+use phpbb\form\form_helper;
+use phpbb\language\language;
+use phpbb\log\log_interface;
+use phpbb\request\request;
+use phpbb\request\request_interface;
+use phpbb\template\template;
+use phpbb\user;
+use GuzzleHttp\Client;
+use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Utils;
+
+require_once __DIR__ . '/../../phpBB/includes/functions_acp.php';
+
+class phpbb_captcha_turnstile_test extends \phpbb_database_test_case
+{
+	/** @var turnstile */
+	protected $turnstile;
+
+	/** @var PHPUnit\Framework\MockObject\MockObject */
+	protected $config;
+
+	/** @var PHPUnit\Framework\MockObject\MockObject */
+	protected $db;
+
+	/** @var PHPUnit\Framework\MockObject\MockObject */
+	protected $language;
+
+	/** @var PHPUnit\Framework\MockObject\MockObject */
+	protected $log;
+
+	/** @var PHPUnit\Framework\MockObject\MockObject */
+	protected $request;
+
+	/** @var PHPUnit\Framework\MockObject\MockObject */
+	protected $template;
+
+	/** @var PHPUnit\Framework\MockObject\MockObject */
+	protected $user;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml');
+	}
+
+	protected function setUp(): void
+	{
+		// Mock the dependencies
+		$this->config = $this->createMock(config::class);
+		$this->db = $this->new_dbal();
+		$this->language = $this->createMock(language::class);
+		$this->log = $this->createMock(log_interface::class);
+		$this->request = $this->createMock(request::class);
+		$this->template = $this->createMock(template::class);
+		$this->user = $this->createMock(user::class);
+
+		$this->language->method('lang')->willReturnArgument(0);
+
+		// Instantiate the turnstile class with the mocked dependencies
+		$this->turnstile = new turnstile(
+			$this->config,
+			$this->db,
+			$this->language,
+			$this->log,
+			$this->request,
+			$this->template,
+			$this->user
+		);
+	}
+
+	public function test_is_available(): void
+	{
+		// Test when both sitekey and secret are present
+		$this->config->method('offsetGet')->willReturnMap([
+			['captcha_turnstile_sitekey', 'sitekey_value'],
+			['captcha_turnstile_secret', 'secret_value'],
+		]);
+
+		$this->request->method('variable')->willReturnMap([
+			['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'],
+			['confirm_code', '', false, request_interface::REQUEST, 'confirm_code']
+		]);
+
+		$this->assertTrue($this->turnstile->is_available());
+
+		$this->assertEquals(0, $this->turnstile->get_attempt_count());
+	}
+
+	public function test_attempt_count_increase(): void
+	{
+		// Test when both sitekey and secret are present
+		$this->config->method('offsetGet')->willReturnMap([
+			['captcha_turnstile_sitekey', 'sitekey_value'],
+			['captcha_turnstile_secret', 'secret_value'],
+		]);
+
+		$this->request->method('variable')->willReturnMap([
+			['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'],
+			['confirm_code', '', false, request_interface::REQUEST, 'confirm_code']
+		]);
+
+		$this->turnstile->init(confirm_type::REGISTRATION);
+		$this->assertFalse($this->turnstile->validate());
+
+		$confirm_id_reflection = new \ReflectionProperty($this->turnstile, 'confirm_id');
+		$confirm_id = $confirm_id_reflection->getValue($this->turnstile);
+
+		$this->request = $this->createMock(request::class);
+		$this->request->method('variable')->willReturnMap([
+			['confirm_id', '', false, request_interface::REQUEST, $confirm_id],
+			['confirm_code', '', false, request_interface::REQUEST, 'confirm_code']
+		]);
+
+		$this->turnstile = new turnstile(
+			$this->config,
+			$this->db,
+			$this->language,
+			$this->log,
+			$this->request,
+			$this->template,
+			$this->user
+		);
+
+		$this->turnstile->init(confirm_type::REGISTRATION);
+		$this->assertEquals(1, $this->turnstile->get_attempt_count());
+
+		// Run some garbage collection
+		$this->turnstile->garbage_collect(confirm_type::REGISTRATION);
+
+		// Start again at 0 after garbage collection
+		$this->turnstile->init(confirm_type::REGISTRATION);
+		$this->assertEquals(0, $this->turnstile->get_attempt_count());
+	}
+
+	public function test_reset(): void
+	{
+		// Test when both sitekey and secret are present
+		$this->config->method('offsetGet')->willReturnMap([
+			['captcha_turnstile_sitekey', 'sitekey_value'],
+			['captcha_turnstile_secret', 'secret_value'],
+		]);
+
+		$this->request->method('variable')->willReturnMap([
+			['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'],
+			['confirm_code', '', false, request_interface::REQUEST, 'confirm_code']
+		]);
+
+		$this->turnstile->init(confirm_type::REGISTRATION);
+		$this->assertFalse($this->turnstile->validate());
+		$this->turnstile->reset();
+
+		$confirm_id_reflection = new \ReflectionProperty($this->turnstile, 'confirm_id');
+		$confirm_id = $confirm_id_reflection->getValue($this->turnstile);
+
+		$this->request = $this->createMock(request::class);
+		$this->request->method('variable')->willReturnMap([
+			['confirm_id', '', false, request_interface::REQUEST, $confirm_id],
+			['confirm_code', '', false, request_interface::REQUEST, 'confirm_code']
+		]);
+
+		$this->turnstile = new turnstile(
+			$this->config,
+			$this->db,
+			$this->language,
+			$this->log,
+			$this->request,
+			$this->template,
+			$this->user
+		);
+
+		$this->turnstile->init(confirm_type::REGISTRATION);
+		// Should be zero attempts since we reset the captcha
+		$this->assertEquals(0,  $this->turnstile->get_attempt_count());
+	}
+
+	public function test_get_hidden_fields(): void
+	{
+		// Test when both sitekey and secret are present
+		$this->config->method('offsetGet')->willReturnMap([
+			['captcha_turnstile_sitekey', 'sitekey_value'],
+			['captcha_turnstile_secret', 'secret_value'],
+		]);
+
+		$this->request->method('variable')->willReturnMap([
+			['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'],
+			['confirm_code', '', false, request_interface::REQUEST, 'confirm_code']
+		]);
+
+		$this->turnstile->init(confirm_type::REGISTRATION);
+		$this->assertFalse($this->turnstile->validate());
+		$this->turnstile->reset();
+
+		$confirm_id_reflection = new \ReflectionProperty($this->turnstile, 'confirm_id');
+		$confirm_id = $confirm_id_reflection->getValue($this->turnstile);
+
+		$this->assertEquals(
+			[
+				'confirm_id'		=> $confirm_id,
+				'confirm_code'		=> '',
+			],
+			$this->turnstile->get_hidden_fields(),
+		);
+		$this->assertEquals('CONFIRM_CODE_WRONG', $this->turnstile->get_error());
+	}
+
+	public function test_not_available(): void
+	{
+		$this->request->method('variable')->willReturnMap([
+			['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'],
+			['confirm_code', '', false, request_interface::REQUEST, 'confirm_code']
+		]);
+
+		// Test when sitekey or secret is missing
+		$this->config->method('offsetGet')->willReturnMap([
+			['captcha_turnstile_sitekey', ''],
+			['captcha_turnstile_secret', 'secret_value'],
+		]);
+
+		$this->assertFalse($this->turnstile->is_available());
+	}
+
+	public function test_get_name(): void
+	{
+		$this->assertEquals('CAPTCHA_TURNSTILE', $this->turnstile->get_name());
+	}
+
+	public function test_set_Name(): void
+	{
+		$this->turnstile->set_name('custom_service');
+		$service_name_property = new \ReflectionProperty($this->turnstile, 'service_name');
+		$this->assertEquals('custom_service', $service_name_property->getValue($this->turnstile));
+	}
+
+	public function test_validate_without_response(): void
+	{
+		// Test when there is no Turnstile response
+		$this->request->method('variable')->with('cf-turnstile-response')->willReturn('');
+
+		$this->assertFalse($this->turnstile->validate());
+	}
+
+	public function test_validate_with_response_success(): void
+	{
+		// Mock the request and response from the Turnstile API
+		$this->request->method('variable')->with('cf-turnstile-response')->willReturn('valid_response');
+		$this->request->method('header')->with('CF-Connecting-IP')->willReturn('127.0.0.1');
+
+		// Mock the GuzzleHttp client and response
+		$client_mock = $this->createMock(Client::class);
+		$response_mock = $this->createMock(Response::class);
+
+		$client_mock->method('request')->willReturn($response_mock);
+		$response_mock->method('getBody')->willReturn(Utils::streamFor(json_encode(['success' => true])));
+
+		// Mock config values for secret
+		$this->config->method('offsetGet')->willReturn('secret_value');
+
+		// Use reflection to inject the mocked client into the turnstile class
+		$reflection = new \ReflectionClass($this->turnstile);
+		$client_property = $reflection->getProperty('client');
+		$client_property->setValue($this->turnstile, $client_mock);
+
+		// Validate that the CAPTCHA was solved successfully
+		$this->assertTrue($this->turnstile->validate());
+	}
+
+	public function test_validate_with_guzzle_exception(): void
+	{
+		// Mock the request and response from the Turnstile API
+		$this->request->method('variable')->with('cf-turnstile-response')->willReturn('valid_response');
+		$this->request->method('header')->with('CF-Connecting-IP')->willReturn('127.0.0.1');
+
+		// Mock the GuzzleHttp client and response
+		$client_mock = $this->createMock(Client::class);
+
+		$request_mock = $this->createMock(\GuzzleHttp\Psr7\Request::class);
+		$exception = new \GuzzleHttp\Exception\ConnectException('Failed at connecting', $request_mock);
+		$client_mock->method('request')->willThrowException($exception);
+
+		// Mock config values for secret
+		$this->config->method('offsetGet')->willReturn('secret_value');
+
+		// Use reflection to inject the mocked client into the turnstile class
+		$reflection = new \ReflectionClass($this->turnstile);
+		$client_property = $reflection->getProperty('client');
+		$client_property->setValue($this->turnstile, $client_mock);
+
+		// Validatation fails due to guzzle exception
+		$this->assertFalse($this->turnstile->validate());
+	}
+
+	public function test_validate_previous_solve(): void
+	{
+		// Use reflection to inject the mocked client into the turnstile class
+		$reflection = new \ReflectionClass($this->turnstile);
+		$confirm_id = $reflection->getProperty('confirm_id');
+		$confirm_id->setValue($this->turnstile, 'confirm_id');
+		$code_property = $reflection->getProperty('code');
+		$code_property->setValue($this->turnstile, 'test_code');
+		$confirm_code_property = $reflection->getProperty('confirm_code');
+		$confirm_code_property->setValue($this->turnstile, 'test_code');
+
+		// Validate that the CAPTCHA was solved successfully
+		$this->assertTrue($this->turnstile->validate());
+		$this->assertTrue($this->turnstile->is_solved());
+	}
+
+	public function test_has_config(): void
+	{
+		$this->assertTrue($this->turnstile->has_config());
+	}
+
+	public function test_get_client(): void
+	{
+		$turnstile_reflection = new \ReflectionClass($this->turnstile);
+		$get_client_method = $turnstile_reflection->getMethod('get_client');
+		$client_property = $turnstile_reflection->getProperty('client');
+
+		$this->assertFalse($client_property->isInitialized($this->turnstile));
+		$client = $get_client_method->invoke($this->turnstile);
+		$this->assertNotNull($client);
+		$this->assertInstanceOf(\GuzzleHttp\Client::class, $client);
+		$this->assertTrue($client === $get_client_method->invoke($this->turnstile));
+	}
+
+	public function test_validate_with_response_failure(): void
+	{
+		// Mock the request and response from the Turnstile API
+		$this->request->method('variable')->with('cf-turnstile-response')->willReturn('valid_response');
+		$this->request->method('header')->with('CF-Connecting-IP')->willReturn('127.0.0.1');
+
+		// Mock the GuzzleHttp client and response
+		$client_mock = $this->createMock(Client::class);
+		$response_mock = $this->createMock(Response::class);
+
+		$client_mock->method('request')->willReturn($response_mock);
+		$response_mock->method('getBody')->willReturn(Utils::streamFor(json_encode(['success' => false])));
+
+		// Mock config values for secret
+		$this->config->method('offsetGet')->willReturn('secret_value');
+
+		// Use reflection to inject the mocked client into the turnstile class
+		$reflection = new \ReflectionClass($this->turnstile);
+		$client_property = $reflection->getProperty('client');
+		$client_property->setValue($this->turnstile, $client_mock);
+
+		// Validate that the CAPTCHA was not solved
+		$this->assertFalse($this->turnstile->validate());
+	}
+
+	public function test_get_template(): void
+	{
+		// Mock is_solved to return false
+		$is_solved_property = new \ReflectionProperty($this->turnstile, 'solved');
+		$is_solved_property->setValue($this->turnstile, false);
+
+		// Mock the template assignments
+		$this->config->method('offsetGet')->willReturnMap([
+			['captcha_turnstile_sitekey', 'sitekey_value'],
+			['captcha_turnstile_theme', 'light'],
+		]);
+
+		$this->request->method('variable')->willReturnMap([
+			['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'],
+			['confirm_code', '', false, request_interface::REQUEST, 'confirm_code']
+		]);
+
+		$this->template->expects($this->once())->method('assign_vars')->with([
+			'S_TURNSTILE_AVAILABLE' => $this->turnstile->is_available(),
+			'TURNSTILE_SITEKEY' => 'sitekey_value',
+			'TURNSTILE_THEME' => 'light',
+			'U_TURNSTILE_SCRIPT' => 'https://challenges.cloudflare.com/turnstile/v0/api.js',
+			'CONFIRM_TYPE_REGISTRATION' => confirm_type::UNDEFINED->value,
+		]);
+
+		$this->assertEquals('captcha_turnstile.html', $this->turnstile->get_template());
+
+		$is_solved_property->setValue($this->turnstile, true);
+		$this->assertEquals('', $this->turnstile->get_template());
+	}
+
+	public function test_get_demo_template(): void
+	{
+		// Mock the config assignments
+		$this->config->method('offsetGet')->willReturn('light');
+
+		$this->template->expects($this->once())->method('assign_vars')->with([
+			'TURNSTILE_THEME' => 'light',
+			'U_TURNSTILE_SCRIPT' => 'https://challenges.cloudflare.com/turnstile/v0/api.js',
+		]);
+
+		$this->assertEquals('captcha_turnstile_acp_demo.html', $this->turnstile->get_demo_template());
+	}
+
+	public function test_acp_page_display(): void
+	{
+		global $phpbb_container, $phpbb_dispatcher, $template;
+
+		$phpbb_container = new phpbb_mock_container_builder();
+		$form_helper = new form_helper($this->config, $this->request, $this->user);
+		$phpbb_container->set('form_helper', $form_helper);
+		$this->user->data['user_id'] = ANONYMOUS;
+		$this->user->data['user_form_salt'] = 'foobar';
+
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$template = $this->template;
+
+		// Mock the template assignments
+		$this->config->method('offsetGet')->willReturnMap([
+			['captcha_turnstile_sitekey', 'sitekey_value'],
+			['captcha_turnstile_theme', 'light'],
+		]);
+
+		$this->request->method('variable')->willReturn('');
+
+		$expected = [
+			1 => [
+				'TURNSTILE_THEME' => 'light',
+				'U_TURNSTILE_SCRIPT' => 'https://challenges.cloudflare.com/turnstile/v0/api.js',
+			],
+			2 => [
+				'CAPTCHA_PREVIEW'				=> 'captcha_turnstile_acp_demo.html',
+				'CAPTCHA_NAME'					=> '',
+				'CAPTCHA_TURNSTILE_THEME'		=> 'light',
+				'CAPTCHA_TURNSTILE_THEMES'		=> ['light', 'dark', 'auto'],
+				'U_ACTION'						=> 'test_u_action',
+			],
+		];
+		$matcher = $this->exactly(count($expected));
+		$this->template
+			->expects($matcher)
+			->method('assign_vars')
+			->willReturnCallback(function ($template_data) use ($matcher, $expected) {
+				$callNr = $matcher->numberOfInvocations();
+				$this->assertEquals($expected[$callNr], $template_data);
+			});
+
+		$module_mock = new ModuleMock();
+
+		$this->turnstile->acp_page('', $module_mock);
+	}
+
+	public function test_acp_page_submit_without_form(): void
+	{
+		global $language, $phpbb_container, $phpbb_dispatcher, $template;
+
+		$language = $this->language;
+		$phpbb_container = new phpbb_mock_container_builder();
+		$form_helper = new form_helper($this->config, $this->request, $this->user);
+		$phpbb_container->set('form_helper', $form_helper);
+		$this->user->data['user_id'] = ANONYMOUS;
+		$this->user->data['user_form_salt'] = 'foobar';
+
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$template = $this->template;
+
+		// Mock the template assignments
+		$this->config->method('offsetGet')->willReturnMap([
+			['captcha_turnstile_sitekey', 'sitekey_value'],
+			['captcha_turnstile_theme', 'light'],
+		]);
+
+		$this->request->method('is_set_post')->willReturnMap([
+			['creation_time', ''],
+			['submit', true]
+		]);
+
+		$this->setExpectedTriggerError(E_USER_NOTICE, 'FORM_INVALID');
+
+		$module_mock = new ModuleMock();
+
+		$this->turnstile->acp_page('', $module_mock);
+	}
+
+	public function test_acp_page_submit_valid(): void
+	{
+		global $language, $phpbb_container, $phpbb_dispatcher, $template;
+
+		$language = $this->language;
+		$phpbb_container = new phpbb_mock_container_builder();
+		$form_helper = new form_helper($this->config, $this->request, $this->user);
+		$phpbb_container->set('form_helper', $form_helper);
+		$this->user->data['user_id'] = ANONYMOUS;
+		$this->user->data['user_form_salt'] = 'foobar';
+
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$template = $this->template;
+
+		$form_tokens = $form_helper->get_form_tokens('acp_captcha');
+
+		// Mock the template assignments
+		$this->config->method('offsetGet')->willReturnMap([
+			['captcha_turnstile_sitekey', 'sitekey_value'],
+			['captcha_turnstile_theme', 'light'],
+		]);
+		$this->config['form_token_lifetime'] = 3600;
+
+		$this->request->method('is_set_post')->willReturnMap([
+			['creation_time', true],
+			['form_token', true],
+			['submit', true]
+		]);
+
+		$this->request->method('variable')->willReturnMap([
+			['creation_time', 0, false, request_interface::REQUEST, $form_tokens['creation_time']],
+			['form_token', '', false, request_interface::REQUEST, $form_tokens['form_token']],
+			['captcha_turnstile_sitekey', '', false, request_interface::REQUEST, 'newsitekey'],
+			['captcha_turnstile_theme', 'light', false, request_interface::REQUEST, 'auto'],
+		]);
+
+		$this->setExpectedTriggerError(E_USER_NOTICE, 'CONFIG_UPDATED');
+
+		$module_mock = new ModuleMock();
+		sleep(1); // sleep for a second to ensure form token validation succeeds
+
+		$this->turnstile->acp_page('', $module_mock);
+	}
+}
+
+class ModuleMock
+{
+	public string $tpl_name = '';
+	public string $page_title = '';
+	public string $u_action = 'test_u_action';
+}
diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
index 4d1f1fb018f..7e77dc0349b 100644
--- a/tests/compress/compress_test.php
+++ b/tests/compress/compress_test.php
@@ -120,7 +120,7 @@ protected function valid_extraction($extra = array())
 		}
 	}
 
-	public function tar_archive_list()
+	public static function tar_archive_list()
 	{
 		return array(
 			array('archive.tar', '.tar', array()),
diff --git a/tests/config/db_test.php b/tests/config/db_test.php
index 11c99435f83..5bed8d405d3 100644
--- a/tests/config/db_test.php
+++ b/tests/config/db_test.php
@@ -136,7 +136,7 @@ public function test_increment()
 	public function test_increment_new()
 	{
 		$this->config->increment('foobar', 3);
-		$this->assertEquals(3, $this->config['foobar']);;
+		$this->assertEquals(3, $this->config['foobar']);
 	}
 
 	public function test_delete()
diff --git a/tests/console/cache/purge_test.php b/tests/console/cache/purge_test.php
index 5a3e075b94d..1e245f88aea 100644
--- a/tests/console/cache/purge_test.php
+++ b/tests/console/cache/purge_test.php
@@ -21,9 +21,10 @@ class phpbb_console_command_cache_purge_test extends phpbb_test_case
 {
 	protected $cache_dir;
 	protected $cache;
+	protected $config;
 	protected $db;
 	protected $db_tools;
-	protected $config;
+	protected $language;
 	protected $user;
 
 	protected function setUp(): void
diff --git a/tests/console/cron/cron_list_test.php b/tests/console/cron/cron_list_test.php
index cdda4fb886d..25e8efd74ee 100644
--- a/tests/console/cron/cron_list_test.php
+++ b/tests/console/cron/cron_list_test.php
@@ -76,11 +76,9 @@ public function get_cron_manager(array $tasks)
 		));
 
 		$mock_router = $this->getMockBuilder('\phpbb\routing\router')
-			->setMethods(array('setContext', 'generate'))
+			->onlyMethods(array('setContext', 'generate'))
 			->disableOriginalConstructor()
 			->getMock();
-		$mock_router->method('setContext')
-			->willReturn(true);
 		$mock_router->method('generate')
 			->willReturn('foobar');
 
diff --git a/tests/console/cron/run_test.php b/tests/console/cron/run_test.php
index 90fa2a9fd07..7cf1407466c 100644
--- a/tests/console/cron/run_test.php
+++ b/tests/console/cron/run_test.php
@@ -53,11 +53,9 @@ protected function setUp(): void
 		));
 
 		$mock_router = $this->getMockBuilder('\phpbb\routing\router')
-			->setMethods(array('setContext', 'generate'))
+			->onlyMethods(array('setContext', 'generate'))
 			->disableOriginalConstructor()
 			->getMock();
-		$mock_router->method('setContext')
-			->willReturn(true);
 		$mock_router->method('generate')
 			->willReturn('foobar');
 
@@ -132,11 +130,9 @@ public function test_no_task()
 		));
 
 		$mock_router = $this->getMockBuilder('\phpbb\routing\router')
-			->setMethods(array('setContext', 'generate'))
+			->onlyMethods(array('setContext', 'generate'))
 			->disableOriginalConstructor()
 			->getMock();
-		$mock_router->method('setContext')
-			->willReturn(true);
 		$mock_router->method('generate')
 			->willReturn('foobar');
 
@@ -180,11 +176,9 @@ public function test_no_task_verbose()
 		));
 
 		$mock_router = $this->getMockBuilder('\phpbb\routing\router')
-			->setMethods(array('setContext', 'generate'))
+			->onlyMethods(array('setContext', 'generate'))
 			->disableOriginalConstructor()
 			->getMock();
-		$mock_router->method('setContext')
-			->willReturn(true);
 		$mock_router->method('generate')
 			->willReturn('foobar');
 
diff --git a/tests/console/thumbnail_test.php b/tests/console/thumbnail_test.php
index 3a08e4b1ac1..68d46517572 100644
--- a/tests/console/thumbnail_test.php
+++ b/tests/console/thumbnail_test.php
@@ -23,7 +23,10 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case
 	protected $db;
 	protected $config;
 	protected $cache;
+	protected $language;
 	protected $user;
+	protected $storage;
+	protected $temp;
 	protected $phpEx;
 	protected $phpbb_root_path;
 	protected $application;
@@ -46,11 +49,10 @@ protected function setUp(): void
 
 		$config = $this->config = new \phpbb\config\config(array(
 			'img_min_thumb_filesize' => 2,
-			'img_max_thumb_width' => 2,
-			'upload_path' => 'files',
+			'img_max_thumb_width' => 2
 		));
 
-		$this->db = $this->db = $this->new_dbal();
+		$this->db  = $this->new_dbal();
 		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 		$this->user = new \phpbb\user($this->language, '\phpbb\datetime');
 		$this->phpbb_root_path = $phpbb_root_path;
@@ -62,13 +64,29 @@ protected function setUp(): void
 			'txt' => array('display_cat' => attachment_category::NONE),
 		)));
 
-		$this->application = new Application();
-		$this->application->add(new generate($config, $this->user, $this->db, $this->cache, $this->phpbb_root_path, $this->phpEx));
-		$this->application->add(new delete($config, $this->user, $this->db, $this->phpbb_root_path));
-		$this->application->add(new recreate($this->user));
-
 		$phpbb_filesystem = new \phpbb\filesystem\filesystem();
 
+		$this->storage = $this->createMock('\phpbb\storage\storage');
+		$this->storage->method('write')->willReturnCallback(function ($path, $data) use ($phpbb_root_path) {
+			file_put_contents($phpbb_root_path . 'files/' . $path, $data);
+		});
+		$this->storage->method('read')->willReturnCallback(function ($path) use ($phpbb_root_path) {
+			return fopen($phpbb_root_path . 'files/' . $path, 'rb');
+		});
+		$this->storage->method('delete')->willReturnCallback(function ($path) use ($phpbb_root_path) {
+			unlink($phpbb_root_path . 'files/' . $path);
+		});
+
+		$this->temp = $this->createMock('\phpbb\filesystem\temp');
+		$this->temp->method('get_dir')->willReturnCallback(function () {
+			return sys_get_temp_dir();
+		});
+
+		$this->application = new Application();
+		$this->application->add(new generate($this->user, $this->db, $this->cache, $this->language, $this->storage, $this->temp, $this->phpbb_root_path, $this->phpEx));
+		$this->application->add(new delete($this->user, $this->db, $this->language, $this->storage));
+		$this->application->add(new recreate($this->user, $this->language));
+
 		copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_1');
 		copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_2');
 		copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/thumb_test_png_2');
@@ -79,11 +97,21 @@ protected function tearDown(): void
 	{
 		parent::tearDown();
 
-		unlink($this->phpbb_root_path . 'files/test_png_1');
-		unlink($this->phpbb_root_path . 'files/test_png_2');
-		unlink($this->phpbb_root_path . 'files/test_txt');
-		unlink($this->phpbb_root_path . 'files/thumb_test_png_1');
-		unlink($this->phpbb_root_path . 'files/thumb_test_png_2');
+		$delete_files = [
+			$this->phpbb_root_path . 'files/test_png_1',
+			$this->phpbb_root_path . 'files/test_png_2',
+			$this->phpbb_root_path . 'files/test_txt',
+			$this->phpbb_root_path . 'files/thumb_test_png_1',
+			$this->phpbb_root_path . 'files/thumb_test_png_2'
+		];
+
+		foreach ($delete_files as $file)
+		{
+			if (file_exists($file))
+			{
+				unlink($file);
+			}
+		}
 	}
 
 	public function test_thumbnails()
diff --git a/tests/console/update/check_test.php b/tests/console/update/check_test.php
index 5eb7c1ea583..450ec933385 100644
--- a/tests/console/update/check_test.php
+++ b/tests/console/update/check_test.php
@@ -89,7 +89,33 @@ public function get_command_tester($current_version)
 			->getMock();
 
 		$config = new \phpbb\config\config(array('version' => $current_version));
-		$this->version_helper = new \phpbb\version_helper($cache, $config, new \phpbb\file_downloader());
+		$this->version_helper = $this->getMockBuilder('\phpbb\version_helper')
+			->setConstructorArgs([$cache, $config, new \phpbb\file_downloader()])
+			->onlyMethods(['get_suggested_updates'])
+			->getMock();
+		$this->version_helper->method('get_suggested_updates')
+			->willReturnCallback(function($force_update = false, $force_cache = false) use ($config)
+			{
+				if ($config['version'] === '100000')
+				{
+					return [];
+				}
+				else if ($config['version'] === '0')
+				{
+					return [
+						[
+							'current'		=> '100000',
+							'announcement'	=> 'https://www.phpbb.com/downloads/',
+							'eol'			=> null,
+							'security'		=> false,
+						],
+					];
+				}
+				else
+				{
+					throw new \phpbb\exception\runtime_exception('VERSIONCHECK_FAIL');
+				}
+			});
 
 		$container = new phpbb_mock_container_builder;
 		$container->set('version_helper', $this->version_helper);
diff --git a/tests/console/user/activate_test.php b/tests/console/user/activate_test.php
index 8eaaa4e4fcd..0f5830ee6b8 100644
--- a/tests/console/user/activate_test.php
+++ b/tests/console/user/activate_test.php
@@ -38,6 +38,7 @@ public function get_command_tester()
 			$this->config,
 			$this->language,
 			$this->log,
+			$this->email,
 			$this->notifications,
 			$this->user_loader,
 			$this->phpbb_root_path,
@@ -49,7 +50,7 @@ public function get_command_tester()
 		return new CommandTester($command);
 	}
 
-	public function activate_test_data()
+	public static function activate_test_data()
 	{
 		return array(
 			// Test an inactive user
diff --git a/tests/console/user/add_test.php b/tests/console/user/add_test.php
index 67f1c84e72b..0a3aab5422b 100644
--- a/tests/console/user/add_test.php
+++ b/tests/console/user/add_test.php
@@ -30,6 +30,7 @@ public function get_command_tester($question_answers = [])
 			$this->db,
 			$this->config,
 			$this->language,
+			$this->email,
 			$this->passwords_manager,
 			$this->phpbb_root_path,
 			$this->php_ext
@@ -61,7 +62,7 @@ public function get_command_tester($question_answers = [])
 				return $response;
 			};
 			$helper = $this->getMockBuilder('\Symfony\Component\Console\Helper\QuestionHelper')
-				->setMethods(['ask'])
+				->onlyMethods(['ask'])
 				->disableOriginalConstructor()
 				->getMock();
 			$helper->expects($this->any())
diff --git a/tests/console/user/base.php b/tests/console/user/base.php
index 008ac23d05b..3e26d5ad5a7 100644
--- a/tests/console/user/base.php
+++ b/tests/console/user/base.php
@@ -15,12 +15,14 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 {
 	protected $db;
 	protected $config;
+	protected $email;
 	protected $user;
 	protected $language;
 	protected $log;
 	protected $passwords_manager;
 	/** @var Symfony\Component\Console\Helper\QuestionHelper */
 	protected $question;
+	protected $command_name;
 	protected $user_loader;
 	protected $phpbb_root_path;
 	protected $php_ext;
@@ -34,7 +36,7 @@ protected function setUp(): void
 	{
 		global $auth, $db, $cache, $config, $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpEx;
 
-		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$phpbb_dispatcher = new \phpbb\event\dispatcher();
 		$phpbb_container = new phpbb_mock_container_builder();
 		$phpbb_container->set('cache.driver', new phpbb_mock_cache());
 		$phpbb_container->set('notification_manager', new phpbb_mock_notification_manager());
@@ -62,10 +64,7 @@ protected function setUp(): void
 			->method('lang')
 			->will($this->returnArgument(0));
 
-		$user = $this->user = $this->createMock('\phpbb\user', array(), array(
-			$this->language,
-			'\phpbb\datetime'
-		));
+		$user = $this->user = $this->createMock('\phpbb\user');
 		$user->data['user_email'] = '';
 
 		$avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper')
@@ -105,6 +104,120 @@ protected function setUp(): void
 
 		$phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications');
 
+		$assets_bag = new \phpbb\template\assets_bag();
+		$phpbb_container->set('assets.bag', $assets_bag);
+
+		$phpbb_container->set('dispatcher', $phpbb_dispatcher);
+
+		$core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/';
+		$phpbb_container->setParameter('core.cache_dir', $core_cache_dir);
+
+		$core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx;
+		$phpbb_container->setParameter('core.messenger_queue_file', $core_messenger_queue_file);
+
+		$messenger_method_collection = new \phpbb\di\service_collection($phpbb_container);
+		$messenger_method_collection->add('messenger.method.email');
+		$phpbb_container->set('messenger.method_collection', $messenger_method_collection);
+
+		$messenger_queue = new \phpbb\messenger\queue($config, $phpbb_dispatcher, $messenger_method_collection, $core_messenger_queue_file);
+		$phpbb_container->set('messenger.queue', $messenger_queue);
+
+		$request = new phpbb_mock_request;
+		$phpbb_container->set('request', $request);
+
+		$symfony_request = new \phpbb\symfony_request(
+			$request
+		);
+
+		$phpbb_path_helper = new \phpbb\path_helper(
+			$symfony_request,
+			$request,
+			$phpbb_root_path,
+			$phpEx
+		);
+		$phpbb_container->set('path_helper', $phpbb_path_helper);
+
+		$factory = new \phpbb\db\tools\factory();
+		$db_doctrine = $this->new_doctrine_dbal();
+		$db_tools = $factory->get($db_doctrine);
+		$migrator = new \phpbb\db\migrator(
+			$phpbb_container,
+			$config,
+			$db,
+			$db_tools,
+			'phpbb_migrations',
+			$phpbb_root_path,
+			$this->php_ext,
+			'phpbb_',
+			self::get_core_tables(),
+			[],
+			new \phpbb\db\migration\helper()
+		);
+		$phpbb_container->set('migrator', $migrator);
+
+		$finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $this->php_ext);
+		$extension_manager = new \phpbb\extension\manager(
+			$phpbb_container,
+			$db,
+			$config,
+			$finder_factory,
+			'phpbb_ext',
+			__DIR__ . '/',
+			new \phpbb\cache\service(new phpbb_mock_cache(), $config, $db, $phpbb_dispatcher, $phpbb_root_path, $this->php_ext)
+		);
+		$phpbb_container->set('ext.manager', $extension_manager);
+
+		$context = new \phpbb\template\context();
+		$cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig';
+		$phpbb_container->setParameter('core.template.cache_path', $cache_path);
+		$filesystem = new \phpbb\filesystem\filesystem();
+		$phpbb_container->set('filesystem', $filesystem);
+
+		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
+			$this->config,
+			$filesystem,
+			$phpbb_path_helper,
+			$cache_path,
+			null,
+			new \phpbb\template\twig\loader(''),
+			$phpbb_dispatcher,
+			[
+				'cache'			=> false,
+				'debug'			=> false,
+				'auto_reload'	=> true,
+				'autoescape'	=> false,
+			]
+		);
+		$twig_extension = new \phpbb\template\twig\extension($context, $twig, $this->language);
+		$phpbb_container->set('template.twig.extensions.phpbb', $twig_extension);
+
+		$twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container);
+		$twig_extensions_collection->add('template.twig.extensions.phpbb');
+		$phpbb_container->set('template.twig.extensions.collection', $twig_extensions_collection);
+
+		$twig->addExtension($twig_extension);
+		$twig_lexer = new \phpbb\template\twig\lexer($twig);
+		$phpbb_container->set('template.twig.lexer', $twig_lexer);
+
+		$this->email = new \phpbb\messenger\method\email(
+			$assets_bag,
+			$this->config,
+			$phpbb_dispatcher,
+			$this->language,
+			$messenger_queue,
+			$phpbb_path_helper,
+			$request,
+			$twig_extensions_collection,
+			$twig_lexer,
+			$user,
+			$phpbb_root_path,
+			$cache_path,
+			$extension_manager,
+			$this->log
+		);
+		$phpbb_container->set('messenger.method.email', $this->email);
+
 		parent::setUp();
 	}
 
diff --git a/tests/console/user/delete_ids_test.php b/tests/console/user/delete_ids_test.php
new file mode 100644
index 00000000000..fb5b60ba0ed
--- /dev/null
+++ b/tests/console/user/delete_ids_test.php
@@ -0,0 +1,129 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use phpbb\console\command\user\delete_id;
+
+require_once __DIR__ . '/base.php';
+
+class phpbb_console_user_delete_ids_test extends phpbb_console_user_base
+{
+	public function get_command_tester()
+	{
+		$application = new Application();
+		$application->add(new delete_id(
+			$this->db,
+			$this->language,
+			$this->log,
+			$this->user,
+			$this->user_loader,
+			BOTS_TABLE,
+			USER_GROUP_TABLE,
+			USERS_TABLE,
+			$this->phpbb_root_path,
+			$this->php_ext
+		));
+
+		$command = $application->find('user:delete_id');
+		$this->command_name = $command->getName();
+		$this->question = $command->getHelper('question');
+
+		return new CommandTester($command);
+	}
+
+	public function test_delete()
+	{
+		$command_tester = $this->get_command_tester();
+
+		$command_tester->setInputs(['yes', '']);
+
+		$command_tester->execute(array(
+			'command'			=> $this->command_name,
+			'user_ids'			=> [3, 4],
+			'--delete-posts'	=> false,
+		));
+
+		$this->assertNull($this->get_user_id('Test'));
+		$this->assertNull($this->get_user_id('Test 2'));
+		$this->assertStringContainsString('CLI_USER_DELETE_ID_SUCCESS', $command_tester->getDisplay());
+	}
+
+	public function test_delete_one()
+	{
+		$command_tester = $this->get_command_tester();
+
+		$command_tester->setInputs(['yes', '']);
+
+		$command_tester->execute(array(
+			'command'			=> $this->command_name,
+			'user_ids'			=> [3],
+			'--delete-posts'	=> false,
+		));
+
+		$this->assertNull($this->get_user_id('Test'));
+		$this->assertNotNull($this->get_user_id('Test 2'));
+		$this->assertStringContainsString('CLI_USER_DELETE_ID_SUCCESS', $command_tester->getDisplay());
+	}
+
+	public function test_delete_bot()
+	{
+		$command_tester = $this->get_command_tester();
+
+		$this->assertNotNull($this->get_user_id('Test Bot'));
+
+		$command_tester->setInputs(['yes', '']);
+
+		$command_tester->execute(array(
+			'command'			=> $this->command_name,
+			'user_ids'			=> [6],
+			'--delete-posts'	=> false,
+		));
+
+		$this->assertNull($this->get_user_id('Test Bot'));
+		$this->assertStringContainsString('CLI_USER_DELETE_ID_SUCCESS', $command_tester->getDisplay());
+	}
+
+	public function test_delete_non_user()
+	{
+		$command_tester = $this->get_command_tester();
+
+		$command_tester->setInputs(['yes', '']);
+
+		$command_tester->execute(array(
+			'command'			=> $this->command_name,
+			'user_ids'			=> [999],
+			'--delete-posts'	=> false,
+		));
+
+		$this->assertStringContainsString('CLI_USER_DELETE_NONE', $command_tester->getDisplay());
+	}
+
+	public function test_delete_cancel()
+	{
+		$command_tester = $this->get_command_tester();
+
+		$this->assertEquals(3, $this->get_user_id('Test'));
+
+		$command_tester->setInputs(['no', '']);
+
+		$command_tester->execute(array(
+			'command'			=> $this->command_name,
+			'user_ids'			=> [3, 4],
+			'--delete-posts'	=> false,
+		));
+
+		$this->assertNotNull($this->get_user_id('Test'));
+		$this->assertNotNull($this->get_user_id('Test 2'));
+	}
+}
diff --git a/tests/console/user/fixtures/config.xml b/tests/console/user/fixtures/config.xml
index a988ba463f6..eba2eba6374 100644
--- a/tests/console/user/fixtures/config.xml
+++ b/tests/console/user/fixtures/config.xml
@@ -47,6 +47,14 @@
 			<value></value>
 			<value>0</value>
 		</row>
+		<row>
+			<value>6</value>
+			<value></value>
+			<value>Test Bot</value>
+			<value>Test Bot</value>
+			<value></value>
+			<value>2</value>
+		</row>
 	</table>
 	<table name="phpbb_groups">
 		<column>group_id</column>
@@ -59,5 +67,23 @@
 			<value>3</value>
 			<value>foobar</value>
 		</row>
+		<row>
+			<value>6</value>
+			<value>BOTS</value>
+			<value>3</value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_user_group">
+		<column>group_id</column>
+		<column>user_id</column>
+		<column>group_leader</column>
+		<column>user_pending</column>
+		<row>
+			<value>6</value>
+			<value>6</value>
+			<value>0</value>
+			<value>0</value>
+		</row>
 	</table>
 </dataset>
diff --git a/tests/content_visibility/delete_post_test.php b/tests/content_visibility/delete_post_test.php
index b880c8f08f8..2d9f32fa3f0 100644
--- a/tests/content_visibility/delete_post_test.php
+++ b/tests/content_visibility/delete_post_test.php
@@ -21,7 +21,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/delete_post.xml');
 	}
 
-	public function delete_post_data()
+	public static function delete_post_data()
 	{
 		$info_data = array(
 			'topic_first_post_id'	=> 1,
diff --git a/tests/content_visibility/get_forums_visibility_sql_test.php b/tests/content_visibility/get_forums_visibility_sql_test.php
index f698e88033d..1ae4c5ae8e1 100644
--- a/tests/content_visibility/get_forums_visibility_sql_test.php
+++ b/tests/content_visibility/get_forums_visibility_sql_test.php
@@ -18,7 +18,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/get_forums_visibility_sql.xml');
 	}
 
-	public function get_forums_visibility_sql_data()
+	public static function get_forums_visibility_sql_data()
 	{
 		return array(
 			array(
diff --git a/tests/content_visibility/get_global_visibility_sql_test.php b/tests/content_visibility/get_global_visibility_sql_test.php
index 897bcad3e67..198556132fb 100644
--- a/tests/content_visibility/get_global_visibility_sql_test.php
+++ b/tests/content_visibility/get_global_visibility_sql_test.php
@@ -18,7 +18,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/get_forums_visibility_sql.xml');
 	}
 
-	public function get_global_visibility_sql_data()
+	public static function get_global_visibility_sql_data()
 	{
 		return array(
 			array(
diff --git a/tests/content_visibility/get_visibility_sql_test.php b/tests/content_visibility/get_visibility_sql_test.php
index 8dafc522aa5..42f36a3c4df 100644
--- a/tests/content_visibility/get_visibility_sql_test.php
+++ b/tests/content_visibility/get_visibility_sql_test.php
@@ -18,7 +18,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/get_visibility_sql.xml');
 	}
 
-	public function get_visibility_sql_data()
+	public static function get_visibility_sql_data()
 	{
 		return array(
 			// data set 0: display_unapproved_posts=false, moderator, can see all posts
diff --git a/tests/content_visibility/set_post_visibility_test.php b/tests/content_visibility/set_post_visibility_test.php
index e3fc946fbd8..4191402de73 100644
--- a/tests/content_visibility/set_post_visibility_test.php
+++ b/tests/content_visibility/set_post_visibility_test.php
@@ -21,7 +21,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/set_post_visibility.xml');
 	}
 
-	public function set_post_visibility_data()
+	public static function set_post_visibility_data()
 	{
 		return array(
 			array(
@@ -155,7 +155,7 @@ public function test_set_post_visibility($visibility, $post_id, $topic_id, $foru
 		}
 	}
 
-	public function set_post_soft_deleted_data()
+	public static function set_post_soft_deleted_data()
 	{
 		return array(
 			array(
diff --git a/tests/content_visibility/set_topic_visibility_test.php b/tests/content_visibility/set_topic_visibility_test.php
index 447ae9e1d8d..491901cde08 100644
--- a/tests/content_visibility/set_topic_visibility_test.php
+++ b/tests/content_visibility/set_topic_visibility_test.php
@@ -21,7 +21,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/set_topic_visibility.xml');
 	}
 
-	public function set_topic_visibility_data()
+	public static function set_topic_visibility_data()
 	{
 		return array(
 			array(
diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php
index 45e03861956..371d85c294e 100644
--- a/tests/controller/common_helper_route.php
+++ b/tests/controller/common_helper_route.php
@@ -66,7 +66,7 @@ protected function get_phpbb_root_path()
 
 	protected function get_uri()
 	{
-		return '/app.php';
+		return '/index.php';
 	}
 
 	protected function get_base_uri()
@@ -76,10 +76,10 @@ protected function get_base_uri()
 
 	protected function get_script_name()
 	{
-		return 'app.php';
+		return 'index.php';
 	}
 
-	protected function path_to_app()
+	protected static function path_to_app()
 	{
 		return '';
 	}
@@ -111,7 +111,7 @@ protected function generate_route_objects()
 		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0'));
 		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
 		$lang = new \phpbb\language\language($lang_loader);
-		$this->user = new \phpbb\user($lang, '\phpbb\datetime');;
+		$this->user = new \phpbb\user($lang, '\phpbb\datetime');
 
 		$container = new phpbb_mock_container_builder();
 		$container->setParameter('core.environment', PHPBB_ENVIRONMENT);
@@ -166,36 +166,36 @@ protected function generate_route_objects()
 		$this->root_path = $this->get_phpbb_root_path();
 	}
 
-	public function helper_url_data_no_rewrite()
+	public static function helper_url_data_no_rewrite()
 	{
 		return array(
-			array('controller2', array('t' => 1, 'f' => 2), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller2', array('t' => 1, 'f' => 2), false, false, '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
 
 			// Custom sid parameter
-			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
 
 			// Testing anchors
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
 
 			// Anchors and custom sid
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
 
 			// Empty parameters should not append the &amp; or ?
-			array('controller2', array(), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'),
-			array('controller2', array(), false, false, '/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'),
-			array('controller3', array('p' => 3), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'),
+			array('controller2', array(), true, false, '/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'),
+			array('controller2', array(), false, false, '/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'),
+			array('controller3', array('p' => 3), true, false, '/' . static::path_to_app() . 'index.php/foo/bar/p-3', 'no params using empty array'),
 
 			// Resolves DI parameters
-			array('controller4', array(), true, false, '/' . $this->path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
+			array('controller4', array(), true, false, '/' . static::path_to_app() . 'index.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
 		);
 	}
 
@@ -229,36 +229,36 @@ public function test_helper_url_no_rewrite($route, $params, $is_amp, $session_id
 		static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id), $description);
 	}
 
-	public function helper_url_data_with_rewrite()
+	public static function helper_url_data_with_rewrite()
 	{
 		return array(
-			array('controller2', array('t' => 1, 'f' => 2), true, false, '/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller2', array('t' => 1, 'f' => 2), false, false, '/' . $this->path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
 
 			// Custom sid parameter
-			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
 
 			// Testing anchors
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '/' . $this->path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '/' . static::path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
 
 			// Anchors and custom sid
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
 
 			// Empty parameters should not append the &amp; or ?
-			array('controller2', array(), true, false, '/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'),
-			array('controller2', array(), false, false, '/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'),
-			array('controller3', array('p' => 3), true, false, '/' . $this->path_to_app() . 'foo/bar/p-3', 'no params using empty array'),
+			array('controller2', array(), true, false, '/' . static::path_to_app() . 'foo/bar', 'no params using empty array'),
+			array('controller2', array(), false, false, '/' . static::path_to_app() . 'foo/bar', 'no params using empty array'),
+			array('controller3', array('p' => 3), true, false, '/' . static::path_to_app() . 'foo/bar/p-3', 'no params using empty array'),
 
 			// Resolves DI parameters
-			array('controller4', array(), true, false, '/' . $this->path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
+			array('controller4', array(), true, false, '/' . static::path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
 		);
 	}
 
@@ -292,36 +292,36 @@ public function test_helper_url_with_rewrite($route, $params, $is_amp, $session_
 		static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id), $description);
 	}
 
-	public function helper_url_data_absolute()
+	public static function helper_url_data_absolute()
 	{
 		return array(
-			array('controller2', array('t' => 1, 'f' => 2), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller2', array('t' => 1, 'f' => 2), false, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
 
 			// Custom sid parameter
-			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
 
 			// Testing anchors
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
 
 			// Anchors and custom sid
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
 
 			// Empty parameters should not append the &amp; or ?
-			array('controller2', array(), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'),
-			array('controller2', array(), false, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'),
-			array('controller3', array('p' => 3), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'),
+			array('controller2', array(), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'),
+			array('controller2', array(), false, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'),
+			array('controller3', array('p' => 3), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3', 'no params using empty array'),
 
 			// Resolves DI parameters
-			array('controller4', array(), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
+			array('controller4', array(), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
 		);
 	}
 
@@ -355,36 +355,36 @@ public function test_helper_url_absolute($route, $params, $is_amp, $session_id,
 		static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::ABSOLUTE_URL), $description);
 	}
 
-	public function helper_url_data_relative_path()
+	public static function helper_url_data_relative_path()
 	{
 		return array(
-			array('controller2', array('t' => 1, 'f' => 2), true, false, 'app.php/foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller2', array('t' => 1, 'f' => 2), false, false, 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'app.php/foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), true, false, 'index.php/foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), false, false, 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'index.php/foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
 
 			// Custom sid parameter
-			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'app.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'app.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'index.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'index.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
 
 			// Testing anchors
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'app.php/foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'app.php/foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'index.php/foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'index.php/foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
 
 			// Anchors and custom sid
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'app.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'app.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'index.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'index.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
 
 			// Empty parameters should not append the &amp; or ?
-			array('controller2', array(), true, false, 'app.php/foo/bar', 'no params using empty array'),
-			array('controller2', array(), false, false, 'app.php/foo/bar', 'no params using empty array'),
-			array('controller3', array('p' => 3), true, false, 'app.php/foo/bar/p-3', 'no params using empty array'),
+			array('controller2', array(), true, false, 'index.php/foo/bar', 'no params using empty array'),
+			array('controller2', array(), false, false, 'index.php/foo/bar', 'no params using empty array'),
+			array('controller3', array('p' => 3), true, false, 'index.php/foo/bar/p-3', 'no params using empty array'),
 
 			// Resolves DI parameters
-			array('controller4', array(), true, false,  'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
+			array('controller4', array(), true, false,  'index.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
 		);
 	}
 
@@ -418,36 +418,36 @@ public function test_helper_url_relative_path($route, $params, $is_amp, $session
 		static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::RELATIVE_PATH), $description);
 	}
 
-	public function helper_url_data_network()
+	public static function helper_url_data_network()
 	{
 		return array(
-			array('controller2', array('t' => 1, 'f' => 2), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller2', array('t' => 1, 'f' => 2), false, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
 
 			// Custom sid parameter
-			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
 
 			// Testing anchors
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
 
 			// Anchors and custom sid
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
 
 			// Empty parameters should not append the &amp; or ?
-			array('controller2', array(), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'),
-			array('controller2', array(), false, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'),
-			array('controller3', array('p' => 3), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'),
+			array('controller2', array(), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'),
+			array('controller2', array(), false, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'),
+			array('controller3', array('p' => 3), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3', 'no params using empty array'),
 
 			// Resolves DI parameters
-			array('controller4', array(), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
+			array('controller4', array(), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
 		);
 	}
 
@@ -481,36 +481,36 @@ public function test_helper_url_network($route, $params, $is_amp, $session_id, $
 		static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::NETWORK_PATH), $description);
 	}
 
-	public function helper_url_data_absolute_with_rewrite()
+	public static function helper_url_data_absolute_with_rewrite()
 	{
 		return array(
-			array('controller2', array('t' => 1, 'f' => 2), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller2', array('t' => 1, 'f' => 2), false, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
 
 			// Custom sid parameter
-			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
 
 			// Testing anchors
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
 
 			// Anchors and custom sid
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
 
 			// Empty parameters should not append the &amp; or ?
-			array('controller2', array(), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'),
-			array('controller2', array(), false, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'),
-			array('controller3', array('p' => 3), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3', 'no params using empty array'),
+			array('controller2', array(), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar', 'no params using empty array'),
+			array('controller2', array(), false, false, 'http://localhost/' . static::path_to_app() . 'foo/bar', 'no params using empty array'),
+			array('controller3', array('p' => 3), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3', 'no params using empty array'),
 
 			// Resolves DI parameters
-			array('controller4', array(), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
+			array('controller4', array(), true, false, 'http://localhost/' . static::path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
 		);
 	}
 
@@ -544,7 +544,7 @@ public function test_helper_url_absolute_with_rewrite($route, $params, $is_amp,
 		static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::ABSOLUTE_URL), $description);
 	}
 
-	public function helper_url_data_relative_path_with_rewrite()
+	public static function helper_url_data_relative_path_with_rewrite()
 	{
 		return array(
 			array('controller2', array('t' => 1, 'f' => 2), true, false, 'foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
@@ -604,36 +604,36 @@ public function test_helper_url_relative_path_with_rewrite($route, $params, $is_
 		static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::RELATIVE_PATH), $description);
 	}
 
-	public function helper_url_data_network_with_rewrite()
+	public static function helper_url_data_network_with_rewrite()
 	{
 		return array(
-			array('controller2', array('t' => 1, 'f' => 2), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller2', array('t' => 1, 'f' => 2), false, false, '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '//localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller2', array('t' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2', 'parameters in params-argument as array'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'),
 
 			// Custom sid parameter
-			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid', 'params-argument (array) using session_id'),
 
 			// Testing anchors
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
 
 			// Anchors and custom sid
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
-			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+			array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
 
 			// Empty parameters should not append the &amp; or ?
-			array('controller2', array(), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'),
-			array('controller2', array(), false, false, '//localhost/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'),
-			array('controller3', array('p' => 3), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar/p-3', 'no params using empty array'),
+			array('controller2', array(), true, false, '//localhost/' . static::path_to_app() . 'foo/bar', 'no params using empty array'),
+			array('controller2', array(), false, false, '//localhost/' . static::path_to_app() . 'foo/bar', 'no params using empty array'),
+			array('controller3', array('p' => 3), true, false, '//localhost/' . static::path_to_app() . 'foo/bar/p-3', 'no params using empty array'),
 
 			// Resolves DI parameters
-			array('controller4', array(), true, false, '//localhost/' . $this->path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
+			array('controller4', array(), true, false, '//localhost/' . static::path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'),
 		);
 	}
 
@@ -667,16 +667,16 @@ public function test_helper_url_network_with_rewrite($route, $params, $is_amp, $
 		static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::NETWORK_PATH), $description);
 	}
 
-	public function helper_url_data_force_server_vars()
+	public static function helper_url_data_force_server_vars()
 	{
 		return array(
-			array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_URL, 'http://my_server:443/my/board/app.php/foo'),
+			array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_URL, 'http://my_server:443/my/board/index.php/foo'),
 			array(true, true, 'my_server', 444, '/my/board', 'https://', UrlGeneratorInterface::ABSOLUTE_URL, 'https://my_server:444/my/board/foo'),
-			array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::NETWORK_PATH, '//my_server:443/my/board/app.php/foo'),
+			array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::NETWORK_PATH, '//my_server:443/my/board/index.php/foo'),
 			array(true, true, 'my_server', 444, '/my/board', 'https://', UrlGeneratorInterface::NETWORK_PATH, '//my_server:444/my/board/foo'),
-			array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_PATH, '/my/board/app.php/foo'),
+			array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_PATH, '/my/board/index.php/foo'),
 			array(true, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_PATH, '/my/board/foo'),
-			array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::RELATIVE_PATH, 'app.php/foo'),
+			array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::RELATIVE_PATH, 'index.php/foo'),
 			array(true, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::RELATIVE_PATH, 'foo'),		);
 	}
 
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index 03d8e89d87f..58e1566a04a 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -102,7 +102,7 @@ public function test_controller_resolver()
 		$this->assertEquals(array(), $resolver->getArguments($symfony_request, $resolver->getController($symfony_request)));
 	}
 
-	public function data_get_arguments()
+	public static function data_get_arguments()
 	{
 		return array(
 			array(array(new foo\controller(), 'handle2'), array('foo', 0)),
diff --git a/tests/controller/helper_route_other_app.php b/tests/controller/helper_route_other_app.php
index 2ee291efcf9..27c2dba284f 100644
--- a/tests/controller/helper_route_other_app.php
+++ b/tests/controller/helper_route_other_app.php
@@ -22,15 +22,15 @@ protected function get_phpbb_root_path()
 
 	protected function get_uri()
 	{
-		return '/foo/app.php';
+		return '/foo/index.php';
 	}
 
 	protected function get_script_name()
 	{
-		return 'app.php';
+		return 'index.php';
 	}
 
-	protected function path_to_app()
+	protected static function path_to_app()
 	{
 		return 'foo/';
 	}
diff --git a/tests/controller/helper_route_root_test.php b/tests/controller/helper_route_root_test.php
index 496027961e2..e79e58c8d30 100644
--- a/tests/controller/helper_route_root_test.php
+++ b/tests/controller/helper_route_root_test.php
@@ -13,7 +13,7 @@
 
 require_once __DIR__ . '/common_helper_route.php';
 
-class phpbb_controller_helper_route_test extends phpbb_controller_common_helper_route
+class phpbb_controller_helper_route_root_test extends phpbb_controller_common_helper_route
 {
 	protected function get_phpbb_root_path()
 	{
@@ -22,11 +22,11 @@ protected function get_phpbb_root_path()
 
 	protected function get_uri()
 	{
-		return '/app.php';
+		return '/index.php';
 	}
 
 	protected function get_script_name()
 	{
-		return 'app.php';
+		return 'index.php';
 	}
 }
diff --git a/tests/controller/helper_route_slash_test.php b/tests/controller/helper_route_slash_test.php
index 3b3d66bb9ee..84d1c04b2c1 100644
--- a/tests/controller/helper_route_slash_test.php
+++ b/tests/controller/helper_route_slash_test.php
@@ -22,21 +22,21 @@ protected function get_phpbb_root_path()
 
 	protected function get_uri()
 	{
-		return '/phpBB3/app.php';
+		return '/phpBB/index.php';
 	}
 
 	protected function get_base_uri()
 	{
-		return '/phpBB3/';
+		return '/phpBB/';
 	}
 
 	protected function get_script_name()
 	{
-		return 'app.php';
+		return 'index.php';
 	}
 
-	protected function path_to_app()
+	protected static function path_to_app()
 	{
-		return 'phpBB3/';
+		return 'phpBB/';
 	}
 }
diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php
index 45736e82fe2..593d0d1d0c4 100644
--- a/tests/cron/manager_test.php
+++ b/tests/cron/manager_test.php
@@ -84,11 +84,9 @@ private function create_cron_manager($tasks)
 		));
 
 		$mock_router = $this->getMockBuilder('\phpbb\routing\router')
-			->setMethods(array('setContext', 'generate'))
+			->onlyMethods(array('setContext', 'generate'))
 			->disableOriginalConstructor()
 			->getMock();
-		$mock_router->method('setContext')
-			->willReturn(true);
 		$mock_router->method('generate')
 			->willReturn('foobar');
 
diff --git a/tests/cron/wrapper_test.php b/tests/cron/wrapper_test.php
new file mode 100644
index 00000000000..4b55ebb8f53
--- /dev/null
+++ b/tests/cron/wrapper_test.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+require_once __DIR__ . '/../template/template_test_case.php';
+
+class phpbb_cron_wrapper_test extends phpbb_template_template_test_case
+{
+	private $task;
+	private $routing_helper;
+	private $wrapper;
+
+	protected function setUp(): void
+	{
+		global $phpbb_root_path;
+
+		$this->setup_engine([], $phpbb_root_path . 'styles/all/template');
+
+		global $phpbb_filesystem;
+
+		$phpbb_filesystem = new \phpbb\filesystem\filesystem();
+
+		$this->task = $this->createMock(\phpbb\cron\task\task::class);
+		$this->routing_helper = $this->createMock(\phpbb\routing\helper::class);
+
+		$this->wrapper = new \phpbb\cron\task\wrapper(
+			$this->task,
+			$this->routing_helper,
+			$this->template
+		);
+	}
+
+	public function test_generate_template_pagination()
+	{
+		$this->task = $this->createMock(\phpbb\cron\task\parametrized::class);
+		$this->task->expects($this->any())
+			->method('get_parameters')
+			->willReturn(['f' => '5']);
+		$this->task->expects($this->any())
+			->method('get_name')
+			->willReturn('test_task');
+		$this->routing_helper = $this->createMock(\phpbb\routing\helper::class);
+		$this->routing_helper->expects($this->any())
+			->method('route')
+			->with('phpbb_cron_run', ['cron_type' => 'test_task', 'f' => '5'])
+			->willReturn('index.php/cron/foo?f=5');
+
+		$this->wrapper = new \phpbb\cron\task\wrapper(
+			$this->task,
+			$this->routing_helper,
+			$this->template
+		);
+
+		$this->assertEquals('<img class="sr-only" aria-hidden="true" src="index.php&#x2F;cron&#x2F;foo&#x3F;f&#x3D;5" width="1" height="1" alt="">', str_replace(["\n", "\t"], '', $this->wrapper->get_html_tag()));
+	}
+
+	public function test_is_parametrized_false()
+	{
+		$this->assertFalse($this->wrapper->is_parametrized());
+	}
+
+	public function test_is_ready()
+	{
+		$this->task->method('is_runnable')->willReturn(true);
+		$this->task->method('should_run')->willReturn(true);
+
+		$this->assertTrue($this->wrapper->is_ready());
+	}
+
+	public function test_get_url_non_parametrized()
+	{
+		$this->task->method('get_name')->willReturn('test_task');
+		$this->routing_helper->expects($this->once())
+			->method('route')
+			->with('phpbb_cron_run', ['cron_type' => 'test_task'])
+			->willReturn('/cron/url');
+
+		$this->assertEquals('/cron/url', $this->wrapper->get_url());
+	}
+
+	public function test_get_html_tag()
+	{
+		$this->template = $this->createMock(\phpbb\template\template::class);
+		$this->wrapper = new \phpbb\cron\task\wrapper(
+			$this->task,
+			$this->routing_helper,
+			$this->template
+		);
+
+		$this->template->expects($this->once())
+			->method('set_filenames');
+		$this->template->expects($this->once())
+			->method('assign_var');
+		$this->template->expects($this->once())
+			->method('assign_display')
+			->willReturn('<img src="cron">');
+
+		$this->assertEquals('<img src="cron">', $this->wrapper->get_html_tag());
+	}
+
+	public function test_call_forwards_to_task()
+	{
+		$this->task = $this->getMockBuilder(\phpbb\cron\task\task::class)
+			->disableOriginalConstructor()
+			->onlyMethods(['get_name', 'run', 'is_runnable', 'should_run'])
+			->addMethods(['some_method'])
+			->getMock();
+		$this->routing_helper = $this->createMock(\phpbb\routing\helper::class);
+
+		$this->wrapper = new \phpbb\cron\task\wrapper(
+			$this->task,
+			$this->routing_helper,
+			$this->template
+		);
+		$this->task->expects($this->once())
+			->method('some_method')
+			->with('arg1', 'arg2')
+			->willReturn('result');
+
+		$result = $this->wrapper->some_method('arg1', 'arg2');
+		$this->assertEquals('result', $result);
+	}
+}
diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php
index 500f90a3fbc..4d327a5c5b2 100644
--- a/tests/datetime/from_format_test.php
+++ b/tests/datetime/from_format_test.php
@@ -15,21 +15,58 @@
 
 class phpbb_datetime_from_format_test extends phpbb_test_case
 {
-	public function from_format_data()
+	/** @var \phpbb\language\language */
+	protected $lang;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	protected function setUp(): void
+	{
+		global $phpbb_dispatcher, $phpbb_root_path, $phpEx;
+
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$this->lang = new \phpbb\language\language($lang_loader);
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+
+		// Set up language data for testing
+		$reflection_class = new ReflectionClass('\phpbb\language\language');
+		// Set default language files loaded flag to true
+		$common_language_files_loaded_flag = $reflection_class->getProperty('common_language_files_loaded');
+		$common_language_files_loaded_flag->setValue($this->lang, true);
+		// Set up test language data
+		$lang_array = $reflection_class->getProperty('lang');
+		$lang_array->setValue($this->lang, [
+			'datetime' => [
+				'TODAY'		=> 'Today',
+				'TOMORROW'	=> 'Tomorrow',
+				'YESTERDAY'	=> 'Yesterday',
+				'AGO'		=> [
+					0		=> 'less than a minute ago',
+					1		=> '%d minute ago',
+					2		=> '%d minutes ago',
+				],
+			],
+		]);
+
+		$this->user = new \phpbb\user($this->lang, '\phpbb\datetime');
+	}
+
+	public static function from_format_data()
 	{
-		return array(
-			array(
+		return [
+			[
 				'UTC',
 				'Y-m-d',
 				'2012-06-08',
-			),
+			],
 
-			array(
+			[
 				'Europe/Berlin',
 				'Y-m-d H:i:s',
 				'2012-06-08 14:01:02',
-			),
-		);
+			],
+		];
 	}
 
 	/**
@@ -37,86 +74,66 @@ public function from_format_data()
 	*/
 	public function test_from_format($timezone, $format, $expected)
 	{
-		global $phpbb_root_path, $phpEx;
-
-		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
-		$lang = new \phpbb\language\language($lang_loader);
-		$user = new \phpbb\user($lang, '\phpbb\datetime');
-		$user->timezone = new DateTimeZone($timezone);
-		$user->lang['datetime'] = array(
-			'TODAY'		=> 'Today',
-			'TOMORROW'	=> 'Tomorrow',
-			'YESTERDAY'	=> 'Yesterday',
-			'AGO'		=> array(
-				0		=> 'less than a minute ago',
-				1		=> '%d minute ago',
-				2		=> '%d minutes ago',
-			),
-		);
-
-		$timestamp = $user->get_timestamp_from_format($format, $expected, new DateTimeZone($timezone));
-		$this->assertEquals($expected, $user->format_date($timestamp, $format, true));
+		$this->user->timezone = new DateTimeZone($timezone);
+		$timestamp = $this->user->get_timestamp_from_format($format, $expected, new DateTimeZone($timezone));
+		$this->assertEquals($expected, $this->user->format_date($timestamp, $format, true));
 	}
 
-	public function relative_format_date_data()
+	public static function relative_format_date_data()
 	{
 		// If the current time is too close to the testing time,
 		// the relative time will use "x minutes ago" instead of "today ..."
 		// So we use 18:01 in the morning and 06:01 in the afternoon.
 		$testing_time = gmdate('H') <= 12 ? '18:01' : '06:01';
 
-		return array(
-			array(
-				gmdate('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time, false,
-				gmdate('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time,
-			),
-
-			array(
-				gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time, false,
+		return [
+			[
+				gmdate('Y-m-d', strtotime('+2day')) . ' ' . $testing_time, false,
+				gmdate('Y-m-d', strtotime('+2day')) . ' ' . $testing_time,
+			],
+			[
+				gmdate('Y-m-d', strtotime('+1day')) . ' ' . $testing_time, false,
 				'Tomorrow ' . $testing_time,
-			),
-			array(
-				gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time, true,
-				gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time,
-			),
-
-			array(
+			],
+			[
+				gmdate('Y-m-d', strtotime('+1day')) . ' ' . $testing_time, true,
+				gmdate('Y-m-d', strtotime('+1day')) . ' ' . $testing_time,
+			],
+			[
 				gmdate('Y-m-d') . ' ' . $testing_time, false,
 				'Today ' . $testing_time,
-			),
-			array(
+			],
+			[
 				gmdate('Y-m-d') . ' ' . $testing_time, true,
 				gmdate('Y-m-d') . ' ' . $testing_time,
-			),
-
-			array(
-				gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time, false,
+			],
+			[
+				gmdate('Y-m-d', strtotime('-1day')) . ' ' . $testing_time, false,
 				'Yesterday ' . $testing_time,
-			),
-			array(
-				gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time, true,
-				gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time,
-			),
-
-			array(
-				gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time, false,
-				gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time,
-			),
+			],
+			[
+				gmdate('Y-m-d', strtotime('-1day')) . ' ' . $testing_time, true,
+				gmdate('Y-m-d', strtotime('-1day')) . ' ' . $testing_time,
+			],
+			[
+				gmdate('Y-m-d', strtotime('-2day')) . ' ' . $testing_time, false,
+				gmdate('Y-m-d', strtotime('-2day')) . ' ' . $testing_time,
+			],
 
 			// Test edge cases: Yesterday 00:00, Today 00:00, Tomorrow 00:00
-			array(
-				gmdate('Y-m-d', strtotime('yesterday')) . ' 00:00', false,
+			[
+				gmdate('Y-m-d', strtotime('-1day')) . ' 00:00', false,
 				'Yesterday 00:00',
-			),
-			array(
-				gmdate('Y-m-d', strtotime('today')) . ' 00:00', false,
+			],
+			[
+				gmdate('Y-m-d', strtotime('now')) . ' 00:00', false,
 				'Today 00:00',
-			),
-			array(
-				gmdate('Y-m-d', strtotime('tomorrow')) . ' 00:00', false,
+			],
+			[
+				gmdate('Y-m-d', strtotime('+1day')) . ' 00:00', false,
 				'Tomorrow 00:00',
-			),
-		);
+			],
+		];
 	}
 
 	/**
@@ -124,24 +141,8 @@ public function relative_format_date_data()
 	 */
 	public function test_relative_format_date($timestamp, $forcedate, $expected)
 	{
-		global $phpbb_root_path, $phpEx;
-
-		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
-		$lang = new \phpbb\language\language($lang_loader);
-		$user = new \phpbb\user($lang, '\phpbb\datetime');
-		$user->timezone = new DateTimeZone('UTC');
-		$user->lang['datetime'] = array(
-			'TODAY'		=> 'Today',
-			'TOMORROW'	=> 'Tomorrow',
-			'YESTERDAY'	=> 'Yesterday',
-			'AGO'		=> array(
-				0		=> 'less than a minute ago',
-				1		=> '%d minute ago',
-				2		=> '%d minutes ago',
-			),
-		);
-
-		$timestamp = $user->get_timestamp_from_format('Y-m-d H:i', $timestamp, new DateTimeZone('UTC'));
+		$this->user->timezone = new DateTimeZone('UTC');
+		$timestamp = $this->user->get_timestamp_from_format('Y-m-d H:i', $timestamp, new DateTimeZone('UTC'));
 
 		/* This code is equal to the one from \phpbb\datetime function format()
 		 * If the delta is less than or equal to 1 hour
@@ -156,9 +157,9 @@ public function test_relative_format_date($timestamp, $forcedate, $expected)
 			($delta >= -5 || (($now_ts/ 60) % 60) == (($timestamp / 60) % 60))
 		)
 		{
-			$expected = $user->lang(['datetime', 'AGO'], max(0, (int) floor($delta / 60)));
+			$expected = $this->lang->lang(['datetime', 'AGO'], max(0, (int) floor($delta / 60)));
 		}
 
-		$this->assertEquals($expected, $user->format_date($timestamp, '|Y-m-d| H:i', $forcedate));
+		$this->assertEquals($expected, $this->user->format_date($timestamp, '|Y-m-d| H:i', $forcedate));
 	}
 }
diff --git a/tests/dbal/auto_increment_test.php b/tests/dbal/auto_increment_test.php
index e238859afce..74c34c934ff 100644
--- a/tests/dbal/auto_increment_test.php
+++ b/tests/dbal/auto_increment_test.php
@@ -28,10 +28,12 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
+		$table_prefix = 'prefix_';
 		$this->db = $this->new_dbal();
 		$this->db_doctrine = $this->new_doctrine_dbal();
 		$factory = new \phpbb\db\tools\factory();
 		$this->tools = $factory->get($this->db_doctrine);
+		$this->tools->set_table_prefix($table_prefix);
 
 		$this->table_data = array(
 			'COLUMNS'		=> array(
diff --git a/tests/dbal/connect_test.php b/tests/dbal/connect_test.php
index 9e53954d86b..5216312d091 100644
--- a/tests/dbal/connect_test.php
+++ b/tests/dbal/connect_test.php
@@ -31,15 +31,21 @@ public function test_failing_connect()
 		// Failure to connect results in a trigger_error call in dbal.
 		// phpunit converts triggered errors to exceptions.
 		// In particular there should be no fatals here.
-		try
+		if ($db->get_sql_layer() === 'mysqli')
 		{
-			$db->sql_connect($config['dbhost'], 'phpbbogus', 'phpbbogus', 'phpbbogus', $config['dbport']);
-			$this->assertFalse(true);
+			$this->setExpectedTriggerError(E_WARNING);
 		}
-		catch (Exception $e)
+		else if ($db->get_sql_layer() !== 'sqlite3')
 		{
-			// should have a legitimate message
-			$this->assertNotEmpty($e->getMessage());
+			$this->setExpectedTriggerError(E_USER_ERROR);
+		}
+
+		// For SQLite3, connection will be successful anyway as phpBB driver uses SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE flags
+		$result = $db->sql_connect($config['dbhost'], 'phpbbogus', 'phpbbogus', 'phpbbogus', $config['dbport']);
+
+		if ($db->get_sql_layer() === 'sqlite3')
+		{
+			$this->assertTrue($result);
 		}
 	}
 }
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index 73543ed97df..90fa0eca09c 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -35,12 +35,15 @@ public function getDataSet()
 
 	protected function setUp(): void
 	{
+
 		parent::setUp();
 
+		$table_prefix = 'prefix_';
 		$this->db = $this->new_dbal();
 		$this->doctrine_db = $this->new_doctrine_dbal();
 		$factory = new \phpbb\db\tools\factory();
 		$this->tools = $factory->get($this->doctrine_db);
+		$this->tools->set_table_prefix($table_prefix);
 
 		$this->table_data = array(
 			'COLUMNS'		=> array(
@@ -232,23 +235,25 @@ public function test_column_exists()
 
 	public function test_column_change_with_index()
 	{
+		$short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname('table_name');
+
 		// Create column
 		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012'));
 		$this->assertTrue($this->tools->sql_column_add('prefix_table_name', 'c_bug_12012', array('DECIMAL', 0)));
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012'));
 
 		// Create index over the column
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012'));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012'));
 		$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'i_bug_12012', array('c_bug_12012', 'c_bool')));
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012'));
 
 		// Change type from int to string
 		$this->assertTrue($this->tools->sql_column_change('prefix_table_name', 'c_bug_12012', array('VCHAR:100', '')));
 
 		// Remove the index
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012'));
 		$this->assertTrue($this->tools->sql_index_drop('prefix_table_name', 'i_bug_12012'));
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012'));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012'));
 
 		// Remove the column
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012'));
@@ -301,19 +306,21 @@ public function test_column_remove_similar_name()
 
 	public function test_column_remove_with_index()
 	{
+		$short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname('table_name');
+
 		// Create column
 		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2'));
 		$this->assertTrue($this->tools->sql_column_add('prefix_table_name', 'c_bug_12012_2', array('UINT', 4)));
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2'));
 
 		// Create index over the column
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_2'));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_2'));
 		$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'bug_12012_2', array('c_bug_12012_2', 'c_bool')));
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_2'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_2'));
 
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_3'));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_3'));
 		$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'bug_12012_3', array('c_bug_12012_2')));
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_3'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_3'));
 
 		// Remove the column
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2'));
@@ -397,11 +404,19 @@ public function test_perform_schema_changes_drop_tables()
 			->will($this->returnValue(true));
 
 		// drop tables
-		$db_tools->expects($this->exactly(2))->method('schema_drop_table')
-			->withConsecutive(
-				[$this->isInstanceOf(Schema::class), 'dropped_table_1', true],
-				[$this->isInstanceOf(Schema::class), 'dropped_table_2', true]
-			);
+		$matcher = $this->exactly(2);
+		$db_tools->expects($matcher)->method('schema_drop_table')
+			->willReturnCallback(function() use ($matcher) {
+				$args = func_get_args();
+				$schema = array_shift($args);
+				$this->assertInstanceOf(\Doctrine\DBAL\Schema\Schema::class, $schema);
+				match($matcher->numberOfInvocations())
+				{
+					1 => $this->assertEquals($args, ['dropped_table_1', true]),
+					2 => $this->assertEquals($args, ['dropped_table_2', true]),
+				};
+			}
+		);
 
 		$db_tools->perform_schema_changes(array(
 			'drop_tables' => array(
@@ -425,11 +440,18 @@ public function test_perform_schema_changes_drop_columns()
 			->will($this->returnValue(true));
 
 		// drop columns
-		$db_tools->expects($this->exactly(2))->method('schema_column_remove')
-			->withConsecutive(
-				[$this->isInstanceOf(Schema::class), 'existing_table', 'dropped_column_1', true],
-				[$this->isInstanceOf(Schema::class), 'existing_table', 'dropped_column_2', true]
-			);
+		$matcher = $this->exactly(2);
+		$db_tools->expects($matcher)->method('schema_column_remove')
+			->willReturnCallback(function() use ($matcher) {
+				$args = func_get_args();
+				$schema = array_shift($args);
+				$this->assertInstanceOf(\Doctrine\DBAL\Schema\Schema::class, $schema);
+				match($matcher->numberOfInvocations()) {
+					1 => $this->assertEquals($args, ['existing_table', 'dropped_column_1', true]),
+					2 => $this->assertEquals($args, ['existing_table', 'dropped_column_2', true]),
+				};
+			}
+		);
 
 		$db_tools->perform_schema_changes(array(
 			'drop_columns' => array(
@@ -443,24 +465,24 @@ public function test_perform_schema_changes_drop_columns()
 
 	public function test_index_exists()
 	{
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_simple'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_i_simple'));
 	}
 
 	public function test_unique_index_exists()
 	{
-		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', 'i_uniq'));
+		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_i_uniq'));
 	}
 
 	public function test_create_index_against_index_exists()
 	{
 		$this->tools->sql_create_index('prefix_table_name', 'fookey', array('c_timestamp', 'c_decimal'));
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'fookey'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_fookey'));
 	}
 
 	public function test_create_unique_index_against_unique_index_exists()
 	{
 		$this->tools->sql_create_unique_index('prefix_table_name', 'i_uniq_ts_id', array('c_timestamp', 'c_id'));
-		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', 'i_uniq_ts_id'));
+		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_i_uniq_ts_id'));
 	}
 
 	public function test_create_int_default_null()
@@ -487,33 +509,33 @@ public function test_create_index_with_long_name()
 		if ($this->tools instanceof \phpbb\db\tools\mssql)
 		{
 			$max_length_method = new ReflectionMethod('\phpbb\db\tools\mssql', 'get_max_index_name_length');
-			$max_length_method->setAccessible(true);
 			$max_index_length = $max_length_method->invoke($this->tools);
 		}
 
 		$table_suffix = str_repeat('a', 25 - strlen($table_prefix));
 		$table_name = $table_prefix . $table_suffix;
+		$short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname($table_suffix);
 
 		$this->tools->sql_create_table($table_name, $this->table_data);
 
 		// Index name and table suffix and table prefix have > maximum index length chars in total.
 		// Index name and table suffix have <= maximum index length chars in total.
 		$long_index_name = str_repeat('i', $max_index_length - strlen($table_suffix));
-		$this->assertFalse($this->tools->sql_index_exists($table_name, $long_index_name));
+		$this->assertFalse($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $long_index_name));
 		$this->assertTrue($this->tools->sql_create_index($table_name, $long_index_name, array('c_timestamp')));
-		$this->assertTrue($this->tools->sql_index_exists($table_name, $long_index_name));
+		$this->assertTrue($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $long_index_name));
 
 		// Index name and table suffix have > maximum index length chars in total.
 		$very_long_index_name = str_repeat('i', $max_index_length);
-		$this->assertFalse($this->tools->sql_index_exists($table_name, $very_long_index_name));
+		$this->assertFalse($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $very_long_index_name));
 		$this->assertTrue($this->tools->sql_create_index($table_name, $very_long_index_name, array('c_timestamp')));
-		$this->assertTrue($this->tools->sql_index_exists($table_name, $very_long_index_name));
+		$this->assertTrue($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $very_long_index_name));
 
 		$this->tools->sql_table_drop($table_name);
 
 		// Index name has > maximum index length chars - that should not be possible.
 		$too_long_index_name = str_repeat('i', $max_index_length + 1);
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $too_long_index_name));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_' . $too_long_index_name));
 		$this->setExpectedTriggerError(E_USER_ERROR); // TODO: Do we want to keep this limitation, if yes reimplement the user check
 		/* https://github.com/phpbb/phpbb/blob/aee5e373bca6cd20d44b99585d3b758276a2d7e6/phpBB/phpbb/db/tools/tools.php#L1488-L1517 */
 		$this->tools->sql_create_index('prefix_table_name', $too_long_index_name, array('c_timestamp'));
diff --git a/tests/dbal/migration/schema.php b/tests/dbal/migration/schema.php
index 38663bcc16b..04c20c46cb5 100644
--- a/tests/dbal/migration/schema.php
+++ b/tests/dbal/migration/schema.php
@@ -22,12 +22,22 @@ function update_schema()
 				),
 			),
 			'add_tables' => array(
-				$this->table_prefix . 'foobar' => array(
-					'COLUMNS' => array(
-						'module_id' => array('UINT:3', NULL, 'auto_increment'),
-					),
+				$this->table_prefix . 'foobar' => [
+					'COLUMNS' => [
+						'module_id'			=> ['UINT:3', NULL, 'auto_increment'],
+						'user_id'			=> ['ULINT', 0],
+						'endpoint'			=> ['VCHAR:220', ''],
+						'expiration_time'	=> ['TIMESTAMP', 0],
+						'p256dh'			=> ['VCHAR:200', ''],
+						'auth'				=> ['VCHAR:100', ''],
+					],
 					'PRIMARY_KEY'	=> 'module_id',
-				),
+					'KEYS'			=> [
+						'i_simple'	=> ['INDEX', ['user_id', 'endpoint:191']],
+						'i_uniq'	=> ['UNIQUE', ['expiration_time', 'p256dh(100)']],
+						'i_auth'	=> ['INDEX', 'auth'],
+					],
+				],
 			),
 		);
 	}
diff --git a/tests/dbal/migration/schema_add_autoincrement.php b/tests/dbal/migration/schema_add_autoincrement.php
new file mode 100644
index 00000000000..4e3ecff1838
--- /dev/null
+++ b/tests/dbal/migration/schema_add_autoincrement.php
@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+class schema_add_autoincrement extends \phpbb\db\migration\migration
+{
+	function update_schema()
+	{
+		return [
+			'add_tables' => [
+				$this->table_prefix . 'noid' => [
+					'COLUMNS' => [
+						'text' => ['VCHAR:50', ''],
+					],
+				],
+			],
+
+			'add_columns' => [
+				$this->table_prefix . 'noid' => [
+					'id' => ['UINT:3', null, 'auto_increment'],
+				],
+			],
+		];
+	}
+
+	function revert_schema()
+	{
+		return [
+			'drop_tables'	=> [
+				$this->table_prefix . 'noid',
+			],
+		];
+	}
+}
diff --git a/tests/dbal/migration/schema_index.php b/tests/dbal/migration/schema_index.php
new file mode 100644
index 00000000000..1ea8eb7c784
--- /dev/null
+++ b/tests/dbal/migration/schema_index.php
@@ -0,0 +1,65 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+class phpbb_dbal_migration_schema_index extends \phpbb\db\migration\migration
+{
+	function update_schema()
+	{
+		return [
+			'add_tables' => [
+				$this->table_prefix . 'foobar1' => [
+					'COLUMNS' => [
+						'user_id' => ['UINT', 0],
+						'username' => ['VCHAR:50', 0],
+					],
+					'KEYS'	=> [
+						'tstidx_user_id' => ['UNIQUE', 'user_id'],
+						'tstidx_username' => ['INDEX', 'username'],
+					],
+				],
+				$this->table_prefix . 'foobar2' => [
+					'COLUMNS' => [
+						'ban_userid'		=> ['ULINT', 0],
+						'ban_ip'			=> ['VCHAR:40', ''],
+						'ban_reason'		=> ['VCHAR:100', ''],
+					],
+					'KEYS'	=> [
+						'tstidx_ban_userid' => ['UNIQUE', 'ban_userid'],
+						'tstidxban_data' => ['INDEX', ['ban_ip', 'ban_reason']],
+					],
+				],
+			],
+
+			'rename_index' => [
+				$this->table_prefix . 'foobar1' => [
+					'tstidx_user_id' => 'fbr1_user_id',
+					'tstidx_username' => 'fbr1_username',
+				],
+				$this->table_prefix . 'foobar2' => [
+					'tstidx_ban_userid' => 'fbr2_ban_userid',
+					'tstidxban_data' => 'fbr2_ban_data',
+				],
+			],
+		];
+	}
+
+	function revert_schema()
+	{
+		return [
+			'drop_tables'	=> [
+				$this->table_prefix . 'foobar1',
+				$this->table_prefix . 'foobar2',
+			],
+		];
+	}
+}
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 5d16fa63eee..89e158541a9 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -24,6 +24,8 @@
 require_once __DIR__ . '/migration/fail.php';
 require_once __DIR__ . '/migration/installed.php';
 require_once __DIR__ . '/migration/schema.php';
+require_once __DIR__ . '/migration/schema_index.php';
+require_once __DIR__ . '/migration/schema_add_autoincrement.php';
 
 class phpbb_dbal_migrator_test extends phpbb_database_test_case
 {
@@ -45,6 +47,9 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 	/** @var \phpbb\extension\manager */
 	protected $extension_manager;
 
+	/** @var string */
+	protected $table_prefix;
+
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(__DIR__.'/fixtures/migrator.xml');
@@ -52,12 +57,16 @@ public function getDataSet()
 
 	protected function setUp(): void
 	{
+		global $table_prefix;
+
 		parent::setUp();
 
+		$this->table_prefix = $table_prefix;
 		$this->db = $this->new_dbal();
 		$this->doctrine_db = $this->new_doctrine_dbal();
 		$factory = new \phpbb\db\tools\factory();
 		$this->db_tools = $factory->get($this->doctrine_db);
+		$this->db_tools->set_table_prefix($this->table_prefix);
 
 		$this->config = new \phpbb\config\db($this->db, new phpbb_mock_cache, 'phpbb_config');
 
@@ -408,6 +417,64 @@ public function test_schema()
 		$this->assertTrue($this->db_tools->sql_column_exists('phpbb_config', 'test_column1'));
 		$this->assertTrue($this->db_tools->sql_table_exists('phpbb_foobar'));
 
+		$short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname('foobar');
+		$index_data_row = $this->db_tools->sql_get_table_index_data('phpbb_foobar');
+		$this->assertEquals(4, count($index_data_row));
+		$this->assertTrue(isset($index_data_row[$short_table_name . '_i_simple']));
+		$this->assertTrue(isset($index_data_row[$short_table_name . '_i_uniq']));
+		$this->assertTrue(isset($index_data_row[$short_table_name . '_i_auth']));
+
+		$is_mysql = $this->db->get_sql_layer() === 'mysqli'; // Key 'lengths' option only applies to MySQL indexes
+
+		// MSSQL primary index key has 'clustered' flag, 'nonclustered' otherwise
+		// See https://learn.microsoft.com/en-us/sql/relational-databases/indexes/clustered-and-nonclustered-indexes-described?view=sql-server-ver17#indexes-and-constraints 
+		$is_mssql = in_array($this->db->get_sql_layer(), ['mssqlnative', 'mssql_odbc']);
+
+		foreach ($index_data_row as $index_name => $index_data)
+		{
+			switch ($index_name)
+			{
+				case $short_table_name . '_i_simple':
+					$this->assertEquals(['user_id', 'endpoint'], $index_data['columns']);
+					$this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']);
+					$this->assertFalse($index_data['is_primary']);
+					$this->assertFalse($index_data['is_unique']);
+					$this->assertTrue($index_data['is_simple']);
+					$this->assertEquals(2, count($index_data['options']['lengths']));
+					$this->assertEmpty($index_data['options']['lengths'][0]);
+					$this->assertEquals($is_mysql ? 191 : null, $index_data['options']['lengths'][1]);
+				break;
+				case $short_table_name . '_i_uniq':
+					$this->assertEquals(['expiration_time', 'p256dh'], $index_data['columns']);
+					$this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']);
+					$this->assertFalse($index_data['is_primary']);
+					$this->assertTrue($index_data['is_unique']);
+					$this->assertFalse($index_data['is_simple']);
+					$this->assertEquals(2, count($index_data['options']['lengths']));
+					$this->assertEmpty($index_data['options']['lengths'][0]);
+					$this->assertEquals($is_mysql ? 100 : null, $index_data['options']['lengths'][1]);
+				break;
+				case $short_table_name . '_i_auth':
+					$this->assertEquals(['auth'], $index_data['columns']);
+					$this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']);
+					$this->assertFalse($index_data['is_primary']);
+					$this->assertFalse($index_data['is_unique']);
+					$this->assertTrue($index_data['is_simple']);
+					$this->assertEquals(1, count($index_data['options']['lengths']));
+					$this->assertEmpty($index_data['options']['lengths'][0]);
+				break;
+				default: // Primary key
+					$this->assertEquals(['module_id'], $index_data['columns']);
+					$this->assertEquals($is_mssql ? ['clustered'] : [], $index_data['flags']);
+					$this->assertTrue($index_data['is_primary']);
+					$this->assertTrue($index_data['is_unique']);
+					$this->assertFalse($index_data['is_simple']);
+					$this->assertEquals(1, count($index_data['options']['lengths']));
+					$this->assertEmpty($index_data['options']['lengths'][0]);
+				break;
+			}
+		}
+
 		while ($this->migrator->migration_state('phpbb_dbal_migration_schema'))
 		{
 			$this->migrator->revert('phpbb_dbal_migration_schema');
@@ -416,4 +483,106 @@ public function test_schema()
 		$this->assertFalse($this->db_tools->sql_column_exists('phpbb_config', 'test_column1'));
 		$this->assertFalse($this->db_tools->sql_table_exists('phpbb_foobar'));
 	}
+
+	public function test_rename_index()
+	{
+		$this->migrator->set_migrations(array('phpbb_dbal_migration_schema_index'));
+
+		while (!$this->migrator->finished())
+		{
+			$this->migrator->update();
+		}
+
+		$this->assertTrue($this->db_tools->sql_unique_index_exists('phpbb_foobar1', 'fbr1_user_id'));
+		$this->assertTrue($this->db_tools->sql_index_exists('phpbb_foobar1', 'fbr1_username'));
+		$this->assertTrue($this->db_tools->sql_unique_index_exists('phpbb_foobar2', 'fbr2_ban_userid'));
+		$this->assertTrue($this->db_tools->sql_index_exists('phpbb_foobar2', 'fbr2_ban_data'));
+
+		while ($this->migrator->migration_state('phpbb_dbal_migration_schema_index'))
+		{
+			$this->migrator->revert('phpbb_dbal_migration_schema_index');
+		}
+
+		$this->assertFalse($this->db_tools->sql_table_exists('phpbb_foobar1'));
+		$this->assertFalse($this->db_tools->sql_table_exists('phpbb_foobar2'));
+	}
+
+	public function test_schema_generator(): array
+	{
+		global $phpbb_root_path, $phpEx;
+
+		$finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $phpEx);
+		$finder = $finder_factory->get();
+		$migrator_classes = $finder->core_path('phpbb/db/migration/data/')->get_classes();
+
+		$schema_generator = new \phpbb\db\migration\schema_generator(
+			$migrator_classes,
+			$this->config,
+			$this->db,
+			$this->db_tools,
+			$phpbb_root_path,
+			$phpEx,
+			'phpbb_',
+			self::get_core_tables()
+		);
+		$db_table_schema = $schema_generator->get_schema();
+
+		$this->assertNotEmpty($db_table_schema);
+
+		return $db_table_schema;
+	}
+
+    /**
+     * @depends test_schema_generator
+     */
+	public function test_table_indexes(array $db_table_schema)
+	{
+		$table_keys = [];
+		foreach ($db_table_schema as $table_name => $table_data)
+		{
+			if (isset($table_data['KEYS']))
+			{
+				foreach ($table_data['KEYS'] as $key_name => $key_data)
+				{
+					$table_keys[$table_name][] = $key_name;
+				}
+			}
+		}
+
+		$this->assertNotEmpty($table_keys);
+
+		$table_names = array_merge(array_keys($db_table_schema), ['phpbb_custom_table']);
+		$short_table_names = \phpbb\db\doctrine\table_helper::map_short_table_names($table_names, 'phpbb_');
+		$this->assertEquals('phpbb_custom_table', array_search(\phpbb\db\doctrine\table_helper::generate_shortname('custom_table'), $short_table_names));
+		$this->assertEquals($short_table_names['phpbb_custom_table'], \phpbb\db\doctrine\table_helper::generate_shortname('custom_table'));
+
+		foreach ($table_keys as $table_name => $key_names)
+		{
+			$index_prefix = $short_table_names[$table_name] . '_';
+			foreach ($key_names as $key_name)
+			{
+				$this->assertEquals(0, strpos($key_name, $index_prefix), "$key_name does not contain $index_prefix");
+			}
+		}
+	}
+
+	public function test_add_autoincrement_column()
+	{
+		$this->migrator->set_migrations(['schema_add_autoincrement']);
+
+		while (!$this->migrator->finished())
+		{
+			$this->migrator->update();
+		}
+
+		$this->assertTrue($this->db_tools->sql_table_exists('phpbb_noid'));
+		$this->assertTrue($this->db_tools->sql_column_exists('phpbb_noid', 'id'));
+
+		while ($this->migrator->migration_state('schema_add_autoincrement'))
+		{
+			$this->migrator->revert('schema_add_autoincrement');
+		}
+
+		$this->assertFalse($this->db_tools->sql_table_exists('phpbb_noid'));
+	}
 }
diff --git a/tests/dbal/migrator_tool_config_text_test.php b/tests/dbal/migrator_tool_config_text_test.php
index f1b009b5cd9..d680b963d72 100644
--- a/tests/dbal/migrator_tool_config_text_test.php
+++ b/tests/dbal/migrator_tool_config_text_test.php
@@ -13,6 +13,10 @@
 
 class phpbb_dbal_migrator_tool_config_text_test extends phpbb_database_test_case
 {
+	protected $db;
+	protected $config_text;
+	protected $tool;
+
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(__DIR__.'/fixtures/migrator_config_text.xml');
diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php
index 2d5daa298c2..db63394b945 100644
--- a/tests/dbal/migrator_tool_module_test.php
+++ b/tests/dbal/migrator_tool_module_test.php
@@ -16,6 +16,11 @@
 
 class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 {
+	protected $db;
+	protected $cache;
+	protected $user;
+	protected $tool;
+
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(__DIR__.'/fixtures/migrator_module.xml');
@@ -51,7 +56,7 @@ protected function setUp(): void
 		$this->tool = new \phpbb\db\migration\tool\module($this->db, $this->user, $module_manager, 'phpbb_modules');
 	}
 
-	public function exists_data_acp()
+	public static function exists_data_acp()
 	{
 		return array(
 			// Test the existing category
@@ -184,7 +189,7 @@ public function test_exists_acp($parent, $module, $lazy, $expected)
 		$this->assertEquals($expected, $this->tool->exists('acp', $parent, $module, $lazy));
 	}
 
-	public function exists_data_ucp()
+	public static function exists_data_ucp()
 	{
 		return array(
 			// Test the existing category
diff --git a/tests/dbal/migrator_tool_permission_role_test.php b/tests/dbal/migrator_tool_permission_role_test.php
index 55bda8c0ce0..3bebfe238d3 100644
--- a/tests/dbal/migrator_tool_permission_role_test.php
+++ b/tests/dbal/migrator_tool_permission_role_test.php
@@ -22,12 +22,24 @@ class phpbb_dbal_migrator_tool_permission_role_test extends phpbb_database_test_
 	/** @var \phpbb\db\migration\tool\permission */
 	protected $tool;
 
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\cache\service */
+	protected $cache;
+
 	public $group_ids = [
 		'REGISTERED' => 2,
 		'GLOBAL_MODERATORS' => 4,
 		'ADMINISTRATORS' => 5,
 	];
 
+	public $role_ids = [
+		'ROLE_ADMIN_STANDARD' => 1,
+		'ROLE_USER_FULL' => 5,
+		'ROLE_MOD_FULL' => 10,
+	];
+
 	public $new_roles = [
 		[
 			'ROLE_ADMIN_NEW',
@@ -96,7 +108,7 @@ public function new_roles_add()
 		$this->auth_admin = new \auth_admin();
 	}
 
-	public function data_test_new_role_exists()
+	public static function data_test_new_role_exists()
 	{
 		return [
 			['ROLE_ADMIN_NEW', true],
@@ -113,7 +125,7 @@ public function test_permission_new_role_exists($role_name, $expected)
 		$this->assertEquals($expected, (bool) $this->tool->role_exists($role_name));
 	}
 
-	public function data_test_permission_assign_new_roles()
+	public static function data_test_permission_assign_new_roles()
 	{
 		return [
 			[
@@ -196,4 +208,32 @@ public function test_permission_new_role_remove($ug_type, $forum_id, $group_name
 		$this->assertFalse($this->db->sql_fetchfield('auth_role_id'));
 		$this->db->sql_freeresult($result);
 	}
+
+	public function test_copied_permission_set()
+	{
+		$sql = 'SELECT rdt.auth_setting
+			FROM ' . ACL_OPTIONS_TABLE. ' ot, ' . ACL_ROLES_DATA_TABLE . ' rdt
+			WHERE rdt.role_id = ' . $this->role_ids['ROLE_ADMIN_STANDARD'] . "
+				AND auth_option = 'u_copied_permission'
+				AND ot.auth_option_id = rdt.auth_option_id";
+
+		// Add new local 'u_copied_permission' copied from 'u_test'
+		// It should be added to the ROLE_ADMIN_STANDARD role automatically similar to 'u_test' permission
+		$this->tool->add('u_copied_permission', false, 'u_test');
+		$this->assertEquals(true, $this->tool->exists('u_copied_permission', false));
+
+		// Copied permission setting should be equal to what it was copied from
+		$result = $this->db->sql_query($sql);
+		$this->assertEquals(0, $this->db->sql_fetchfield('auth_setting')); 
+		$this->db->sql_freeresult($result);
+
+		// Set new permission for copied auth option for the role
+		$this->tool->permission_set('ROLE_ADMIN_STANDARD', 'u_copied_permission', 'role', true);
+
+		// Copied permission setting should be updated
+		$result = $this->db->sql_query($sql);
+		$this->assertEquals(1, $this->db->sql_fetchfield('auth_setting'));
+		$this->db->sql_freeresult($result);
+	}
+
 }
diff --git a/tests/dbal/migrator_tool_permission_test.php b/tests/dbal/migrator_tool_permission_test.php
index e1ea2e7b514..c4e74f23d47 100644
--- a/tests/dbal/migrator_tool_permission_test.php
+++ b/tests/dbal/migrator_tool_permission_test.php
@@ -16,6 +16,12 @@ class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case
 	/** @var \phpbb\auth\auth */
 	protected $auth;
 
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\cache\service */
+	protected $cache;
+
 	/** @var \phpbb\db\migration\tool\permission */
 	protected $tool;
 
@@ -45,7 +51,7 @@ protected function setUp(): void
 		$this->tool = new \phpbb\db\migration\tool\permission($this->db, $this->cache, $this->auth, $phpbb_root_path, $phpEx);
 	}
 
-	public function exists_data()
+	public static function exists_data()
 	{
 		return array(
 			array(
@@ -170,7 +176,7 @@ public function test_reverse()
 		$this->assertFalse($this->tool->exists('global_test', true));
 	}
 
-	public function data_test_permission_set()
+	public static function data_test_permission_set()
 	{
 		return array(
 			array(
@@ -226,7 +232,7 @@ public function test_permission_set($group_name, $auth_option, $type, $has_permi
 		}
 	}
 
-	public function data_test_permission_role_exists()
+	public static function data_test_permission_role_exists()
 	{
 		return array(
 			array('ROLE_MOD_FULL', true),
diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 141ee03a14d..2318a549116 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -18,7 +18,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__.'/fixtures/three_users.xml');
 	}
 
-	public function return_on_error_select_data()
+	public static function return_on_error_select_data()
 	{
 		return array(
 			array('phpbb_users', "username_clean = 'bertie'", array(array('username_clean' => 'bertie'))),
@@ -45,7 +45,7 @@ public function test_return_on_error_select($table, $where, $expected)
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public function fetchrow_data()
+	public static function fetchrow_data()
 	{
 		return array(
 			array('', array(array('username_clean' => 'barfoo'),
@@ -96,7 +96,7 @@ public function test_fetchrowset($where, $expected)
 		$db->sql_freeresult($result);
 	}
 
-	public function fetchfield_data()
+	public static function fetchfield_data()
 	{
 		return array(
 			array('', array('barfoo', 'foobar', 'bertie')),
@@ -126,7 +126,7 @@ public function test_fetchfield($where, $expected)
 		$this->assertEquals($expected, $ary);
 	}
 
-	static public function fetchfield_seek_data()
+	public static function fetchfield_seek_data()
 	{
 		return array(
 			array(1, 'foobar'),
@@ -152,7 +152,7 @@ public function test_fetchfield_seek($rownum, $expected)
 		$this->assertEquals($expected, $field);
 	}
 
-	static public function query_limit_data()
+	public static function query_limit_data()
 	{
 		return array(
 			array(0, 0, array(array('username_clean' => 'barfoo'),
@@ -193,7 +193,7 @@ public function test_query_limit($total, $offset, $expected)
 		$this->assertEquals($expected, $ary);
 	}
 
-	public function like_expression_data()
+	public static function like_expression_data()
 	{
 		// * = any_char; # = one_char
 		return array(
@@ -230,7 +230,7 @@ public function test_like_expression($like_expression, $expected)
 		$db->sql_freeresult($result);
 	}
 
-	public function not_like_expression_data()
+	public static function not_like_expression_data()
 	{
 		// * = any_char; # = one_char
 		return array(
@@ -290,7 +290,7 @@ public function test_not_like_expression($like_expression, $expected)
 		$db->sql_freeresult($result);
 	}
 
-	public function in_set_data()
+	public static function in_set_data()
 	{
 		return array(
 			array('user_id', 3, false, false, array(array('username_clean' => 'bertie'))),
@@ -364,7 +364,7 @@ public function test_in_set($field, $array, $negate, $allow_empty_set, $expected
 		$db->sql_freeresult($result);
 	}
 
-	public function build_array_data()
+	public static function build_array_data()
 	{
 		return array(
 			array(array('username_clean' => 'barfoo'), array(array('username_clean' => 'barfoo'))),
diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php
index f0093ff869e..79fbffd1dc8 100644
--- a/tests/dbal/write_test.php
+++ b/tests/dbal/write_test.php
@@ -18,7 +18,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml');
 	}
 
-	public function build_array_insert_data()
+	public static function build_array_insert_data()
 	{
 		return array(
 			array(array(
@@ -73,6 +73,67 @@ public function test_delete()
 		$db->sql_freeresult($result);
 	}
 
+	public function test_delete_rollback()
+	{
+		$db = $this->new_dbal();
+
+		$is_myisam = false;
+		if ($db->get_sql_layer() === 'mysqli')
+		{
+			$table_status = $db->get_table_status('phpbb_config');
+			$is_myisam = isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM';
+		}
+
+		$db->sql_transaction('begin');
+
+		$sql = "DELETE FROM phpbb_config
+			WHERE config_name = 'config1'";
+		$db->sql_query($sql);
+
+		// Rollback and check that nothing was changed
+		$db->sql_transaction('rollback');
+
+		$sql = 'SELECT *
+			FROM phpbb_config';
+		$result = $db->sql_query($sql);
+		$rows = $db->sql_fetchrowset($result);
+		$db->sql_freeresult($result);
+
+		if (!$is_myisam)
+		{
+			$this->assertEquals(2, count($rows));
+			$this->assertEquals('config1', $rows[0]['config_name']);
+		}
+		else
+		{
+			// Rollback does not work on MyISAM
+			$this->assertEquals(1, count($rows));
+			$this->assertEquals('config2', $rows[0]['config_name']);
+
+			// Restore deleted config value on MyISAM
+			$sql = "INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('config1', 'foo', 0)";
+			$db->sql_query($sql);
+		}
+
+		$db->sql_transaction('begin');
+
+		$sql = "DELETE FROM phpbb_config
+			WHERE config_name = 'config1'";
+		$db->sql_query($sql);
+
+		// Commit and check that data was actually changed
+		$db->sql_transaction('commit');
+
+		$sql = 'SELECT *
+			FROM phpbb_config';
+		$result = $db->sql_query($sql);
+		$rows = $db->sql_fetchrowset($result);
+		$db->sql_freeresult($result);
+
+		$this->assertEquals(1, count($rows));
+		$this->assertEquals('config2', $rows[0]['config_name']);
+	}
+
 	public function test_multiple_insert()
 	{
 		$db = $this->new_dbal();
@@ -106,7 +167,7 @@ public function test_multiple_insert()
 		$db->sql_freeresult($result);
 	}
 
-	public function update_data()
+	public static function update_data()
 	{
 		return array(
 			array(
diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php
index 7d8e07560c1..36ff57a43df 100644
--- a/tests/di/create_container_test.php
+++ b/tests/di/create_container_test.php
@@ -15,7 +15,7 @@
 {
 	require_once __DIR__ . '/fixtures/ext/vendor/enabled_4/di/extension.php';
 
-	class phpbb_di_container_test extends \phpbb_test_case
+	class phpbb_di_create_container_test extends \phpbb_test_case
 	{
 		protected $config_php;
 
@@ -73,7 +73,8 @@ public function test_default_container()
 
 			// Checks the construction of a dumped container
 			$container = $this->builder->get_container();
-			$this->assertInstanceOf('phpbb_cache_container', $container);
+			$this->assertEquals('phpbb_cache_container', $container::class);
+			$this->assertInstanceOf('Symfony\Component\DependencyInjection\Container', $container);
 			$this->assertTrue($container->isCompiled());
 		}
 
@@ -100,7 +101,8 @@ public function test_without_cache()
 
 			// Checks the construction of a dumped container
 			$container = $this->builder->get_container();
-			$this->assertNotInstanceOf('phpbb_cache_container', $container);
+			$this->assertNotEquals('phpbb_cache_container', $container::class);
+			$this->assertEquals('Symfony\Component\DependencyInjection\ContainerBuilder', $container::class);
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 			$this->assertTrue($container->isCompiled());
 		}
diff --git a/tests/di/fixtures/config.php b/tests/di/fixtures/config.php
index 1e9207d924d..956001ef589 100644
--- a/tests/di/fixtures/config.php
+++ b/tests/di/fixtures/config.php
@@ -1,7 +1,7 @@
 <?php
 // phpBB 3.1.x auto-generated configuration file
 // Do not change anything in this file!
-$dbms = 'mysql';
+$dbms = ''; // Set this to empty value to avoid failed connection attempt as this will produce unwanted error/exception
 $dbhost = '127.0.0.1';
 $dbport = '';
 $dbname = 'phpbb';
diff --git a/tests/diff/diff_files_test.php b/tests/diff/diff_files_test.php
new file mode 100644
index 00000000000..b7e3a47ca08
--- /dev/null
+++ b/tests/diff/diff_files_test.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+include_once(__DIR__ . '/../../phpBB/includes/diff/diff.php');
+include_once(__DIR__ . '/../../phpBB/includes/diff/engine.php');
+
+class diff_files_test extends phpbb_test_case
+{
+	/**
+	 * @var string
+	 */
+	protected $filename;
+
+	/**
+	 * @var phpbb_mock_container_builder
+	 */
+	protected $old_path;
+
+	/**
+	 * @var \phpbb\install\helper\config
+	 */
+	protected $new_path;
+
+	/**
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * @var array
+	 */
+	protected $update_files = [];
+
+	protected function setUp(): void
+	{
+		$this->filename = 'test_files_diff.php';
+		$this->path = __DIR__ . '/fixtures/';
+		$this->old_path = $this->path . 'install/update/old/';
+		$this->new_path = $this->path . 'install/update/new/';
+		$this->update_files = [
+			$this->filename,
+		];
+	}
+
+	public function test_diff_files()
+	{
+		foreach ($this->update_files as $key => $filename)
+		{
+			$merge_conflicts = $file_contents = [];
+
+			$file_to_diff = $this->old_path . $filename;
+			$file_contents[0] = file_get_contents($file_to_diff);
+			$this->assertNotFalse($file_contents[0], "File $file_to_diff is empty");
+
+			$filenames = [
+				$this->path . $filename,
+				$this->new_path . $filename
+			];
+
+			foreach ($filenames as $file_to_diff)
+			{
+				$file_contents[] = file_get_contents($file_to_diff);
+				$this->assertNotFalse($file_contents[count($file_contents) - 1], "File $file_to_diff is empty");
+			}
+
+			$diff = new \diff3($file_contents[0], $file_contents[1], $file_contents[2]);
+
+			$file_is_merged = $diff->merged_output() === $file_contents[1];
+
+			// Handle conflicts
+			if ($diff->get_num_conflicts() !== 0)
+			{
+				// Check if current file content is merge of new or original file
+				$tmp = [
+					'file1'		=> $file_contents[1],
+					'file2'		=> implode("\n", $diff->merged_new_output()),
+				];
+
+				$diff2 = new \diff($tmp['file1'], $tmp['file2']);
+				$empty = $diff2->is_empty();
+
+				if (!$empty)
+				{
+					unset($tmp, $diff2);
+
+					// We check if the user merged with his output
+					$tmp = [
+						'file1'		=> $file_contents[1],
+						'file2'		=> implode("\n", $diff->merged_orig_output()),
+					];
+
+					$diff2 = new \diff($tmp['file1'], $tmp['file2']);
+					$empty = $diff2->is_empty();
+				}
+
+				unset($diff2);
+
+				if (!$empty && in_array($filename, $merge_conflicts))
+				{
+					$merge_conflicts[] = $filename;
+				}
+				else
+				{
+					$file_is_merged = true;
+				}
+			}
+
+			if ($file_is_merged)
+			{
+				unset($this->update_files[$key]);
+			}
+
+			unset($file_contents);
+			unset($diff);
+		}
+
+		$this->assertEquals([], $this->update_files);
+	}
+}
diff --git a/tests/diff/fixtures/install/update/new/test_files_diff.php b/tests/diff/fixtures/install/update/new/test_files_diff.php
new file mode 100644
index 00000000000..6daabbe92e8
--- /dev/null
+++ b/tests/diff/fixtures/install/update/new/test_files_diff.php
@@ -0,0 +1,3 @@
+<?php
+
+echo 'This is the file to test diff engine. This is to be new updated file.';
diff --git a/tests/diff/fixtures/install/update/old/test_files_diff.php b/tests/diff/fixtures/install/update/old/test_files_diff.php
new file mode 100644
index 00000000000..8686c46f603
--- /dev/null
+++ b/tests/diff/fixtures/install/update/old/test_files_diff.php
@@ -0,0 +1,3 @@
+<?php
+
+echo 'This is the file to test diff engine. This is old file.';
diff --git a/tests/diff/fixtures/test_files_diff.php b/tests/diff/fixtures/test_files_diff.php
new file mode 100644
index 00000000000..134c5d28a56
--- /dev/null
+++ b/tests/diff/fixtures/test_files_diff.php
@@ -0,0 +1,4 @@
+<?php
+
+echo 'This is the file to test diff engine';
+echo 'This line is an edit';
diff --git a/tests/download/download_allowed_test.php b/tests/download/download_allowed_test.php
new file mode 100644
index 00000000000..774b52970f0
--- /dev/null
+++ b/tests/download/download_allowed_test.php
@@ -0,0 +1,460 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\db\driver\driver_interface;
+use phpbb\request\request_interface;
+use phpbb\user;
+
+class phpbb_download_download_allowed_test extends phpbb_test_case
+{
+	/** @var \phpbb\storage\controller\attachment */
+	private $attachment_controller;
+
+	private $config;
+
+	/** @var driver_interface */
+	private $db;
+
+	/** @var request_interface */
+	private $request;
+
+	/** @var user */
+	private $user;
+
+	protected function setUp(): void
+	{
+		$this->request = $this->getMockBuilder('phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->db = $this->getMockBuilder('phpbb\db\driver\driver')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->db->method('sql_query')->willReturn(null);
+		$this->db->method('sql_freeresult')->willReturn(null);
+		$language = $this->getMockBuilder('phpbb\language\language')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->user = new \phpbb\user($language, '\phpbb\datetime');
+	}
+
+	public static function download_allowed_data(): array
+	{
+		$base_config = [
+			'secure_downloads' => 1,
+			'secure_allow_empty_referer' => 0,
+			'secure_allow_deny' => 1,
+			'force_server_vars' => 0,
+			'server_name' => 'example.com',
+		];
+
+		return [
+			'secure_disabled' => [
+				array_merge($base_config, ['secure_downloads' => 0]),
+				'https://other_domain.com/',
+				'example.com',
+				[],
+				true,
+				'secure_downloads disabled must always return true',
+			],
+			'empty_referer_allow_empty_on' => [
+				array_merge($base_config, ['secure_allow_empty_referer' => 1]),
+				'',
+				'example.com',
+				[],
+				true,
+				'empty referer with secure_allow_empty_referer=1 must return true',
+			],
+			'empty_referer_allow_empty_off' => [
+				array_merge($base_config, ['secure_allow_empty_referer' => 0]),
+				'',
+				'example.com',
+				[],
+				false,
+				'empty referer with secure_allow_empty_referer=0 must return false',
+			],
+			'invalid_referer_allow_empty_on' => [
+				array_merge($base_config, ['secure_allow_empty_referer' => 1]),
+				'not_a_proper_referer',
+				'example.com',
+				[],
+				true,
+				'empty referer with secure_allow_empty_referer=1 must return true',
+			],
+			'invalid_referer_allow_empty_off' => [
+				array_merge($base_config, ['secure_allow_empty_referer' => 0]),
+				'not_a_proper_referer',
+				'example.com',
+				[],
+				false,
+				'empty referer with secure_allow_empty_referer=0 must return false',
+			],
+			'same_hostname' => [
+				$base_config,
+				'https://example.com/path',
+				'example.com',
+				[],
+				true,
+				'referer hostname = server_name must be allowed',
+			],
+			'subdomain_of_hostname' => [
+				$base_config,
+				'https://sub.example.com/path',
+				'example.com',
+				[],
+				true,
+				'referer direct subdomain of server_name must be allowed',
+			],
+			'deep_subdomain_of_hostname' => [
+				$base_config,
+				'https://a.b.example.com/',
+				'example.com',
+				[],
+				true,
+				'deep subdomain of server_name must be allowed',
+			],
+			'partial_hostname_match' => [
+				$base_config,
+				'https://otherhostexample.com/path',
+				'example.com',
+				[],
+				false,
+				'otherhostexample.com must NOT be allowed when server_name=example.com (only partial match)',
+			],
+			'partial_subdomain_match' => [
+				$base_config,
+				'https://example.com.otherhostexample.com/path',
+				'example.com',
+				[],
+				false,
+				'example.com.otherhostexample.com must NOT be allowed when server_name=example.com (only partial match)',
+			],
+			'forced_server_vars_hostname' => [
+				array_merge($base_config, [
+					'force_server_vars' => 1,
+					'server_name' => 'forced.example.com',
+				]),
+				'https://forced.example.com/page',
+				'ignored-host.com',
+				[],
+				true,
+				'force_server_vars must use config server_name and allow exact match',
+			],
+			'forced_server_vars_hostname_subdomain' => [
+				array_merge($base_config, [
+					'force_server_vars' => 1,
+					'server_name' => 'forced.example.com',
+				]),
+				'https://sub.forced.example.com/page',
+				'ignored-host.com',
+				[],
+				true,
+				'force_server_vars: subdomain of forced server_name must be allowed',
+			],
+			'forced_server_vars_hostname_partial_subdomain' => [
+				array_merge($base_config, [
+					'force_server_vars' => 1,
+					'server_name' => 'forced.example.com',
+				]),
+				'https://otherforced.example.com/page',
+				'ignored-host.com',
+				[],
+				false,
+				'force_server_vars: hostname that is not an exact/subdomain match must be denied',
+			],
+			'case_insensitive' => [
+				$base_config,
+				'https://EXAMPLE.COM/path',
+				'example.com',
+				[],
+				true,
+				'server_name comparison must be case-insensitive',
+			],
+			'sitelist_allowlist_default_denied' => [
+				$base_config,
+				'https://unknown-site.com/',
+				'example.com',
+				[],
+				false,
+				'allowlist mode with no matching sitelist entries must return false (default deny)',
+			],
+			'sitelist_denylist_default_allowed' => [
+				array_merge($base_config, ['secure_allow_deny' => 0]),
+				'https://unknown-site.com/',
+				'example.com',
+				[],
+				true,
+				'denylist mode with no matching sitelist entries must return true (default allow)',
+			],
+			'sitelist_hostname_in_allowlist' => [
+				$base_config,
+				'https://trusted-site.com/',
+				'example.com',
+				[['site_ip' => '', 'site_hostname' => 'trusted-site.com', 'ip_exclude' => 0]],
+				true,
+				'allowlist: hostname match with ip_exclude=0 must return true',
+			],
+			'sitelist_hostname_in_denylist' => [
+				array_merge($base_config, ['secure_allow_deny' => 0]),
+				'https://untrusted-site.com/',
+				'example.com',
+				[['site_ip' => '', 'site_hostname' => 'untrusted-site.com', 'ip_exclude' => 0]],
+				false,
+				'denylist: hostname match with ip_exclude=0 must return false',
+			],
+			'sitelist_hostname_not_in_allowlist' => [
+				$base_config,
+				'https://unknown-site.com/',
+				'example.com',
+				[['site_ip' => '', 'site_hostname' => 'trusted-site.com', 'ip_exclude' => 0]],
+				false,
+				'allowlist: non-matching hostname must return false',
+			],
+			'sitelist_hostname_not_in_denylist' => [
+				array_merge($base_config, ['secure_allow_deny' => 0]),
+				'https://unknown-site.com/',
+				'example.com',
+				[['site_ip' => '', 'site_hostname' => 'trusted-site.com', 'ip_exclude' => 0]],
+				true,
+				'denylist: non-matching hostname must return true',
+			],
+			'sitelist_hostname_excluded_from_allowlist' => [
+				$base_config,
+				'https://excluded-site.com/',
+				'example.com',
+				[['site_ip' => '', 'site_hostname' => 'excluded-site.com', 'ip_exclude' => 1]],
+				false,
+				'allowlist: hostname match with ip_exclude=1 must return false and stop processing',
+			],
+			'sitelist_hostname_excluded_from_denylist' => [
+				array_merge($base_config, ['secure_allow_deny' => 0]),
+				'https://excluded-site.com/',
+				'example.com',
+				[['site_ip' => '', 'site_hostname' => 'excluded-site.com', 'ip_exclude' => 1]],
+				true,
+				'denylist: hostname match with ip_exclude=1 must return true and stop processing',
+			],
+			'sitelist_hostname_wildcard_in_allowlist' => [
+				$base_config,
+				'https://sub.trusted-domain.com/',
+				'example.com',
+				[['site_ip' => '', 'site_hostname' => '*.trusted-domain.com', 'ip_exclude' => 0]],
+				true,
+				'allowlist: wildcard hostname pattern must match subdomains',
+			],
+			'sitelist_hostname_wildcard_in_denylist' => [
+				array_merge($base_config, ['secure_allow_deny' => 0]),
+				'https://sub.trusted-domain.com/',
+				'example.com',
+				[['site_ip' => '', 'site_hostname' => '*.trusted-domain.com', 'ip_exclude' => 0]],
+				false,
+				'denylist: wildcard hostname pattern must match subdomains and deny',
+			],
+			'sitelist_hostname_wildcard_no_match' => [
+				$base_config,
+				'https://other-domain.com/',
+				'example.com',
+				[['site_ip' => '', 'site_hostname' => '*.trusted-domain.com', 'ip_exclude' => 0]],
+				false,
+				'allowlist: wildcard hostname pattern must not match an unrelated domain',
+			],
+			'sitelist_hostname_wildcard_deny_no_match' => [
+				array_merge($base_config, ['secure_allow_deny' => 0]),
+				'https://other-domain.com/',
+				'example.com',
+				[['site_ip' => '', 'site_hostname' => '*.trusted-domain.com', 'ip_exclude' => 0]],
+				true,
+				'denylist: wildcard hostname pattern must not match an unrelated domain',
+			],
+			'sitelist_hostname_allowed_then_excluded' => [
+				$base_config,
+				'https://overridden-site.com/',
+				'example.com',
+				[
+					['site_ip' => '', 'site_hostname' => 'overridden-site.com', 'ip_exclude' => 0],
+					['site_ip' => '', 'site_hostname' => 'overridden-site.com', 'ip_exclude' => 1],
+				],
+				false,
+				'allowlist: a hostname allowed by one row must be denied when a subsequent row excludes it',
+			],
+			'sitelist_hostname_denied_then_excluded' => [
+				array_merge($base_config, ['secure_allow_deny' => 0]),
+				'https://overridden-site.com/',
+				'example.com',
+				[
+					['site_ip' => '', 'site_hostname' => 'overridden-site.com', 'ip_exclude' => 0],
+					['site_ip' => '', 'site_hostname' => 'overridden-site.com', 'ip_exclude' => 1],
+				],
+				true,
+				'denylist: a hostname denied by one row must be allowed when a subsequent row excludes it',
+			],
+			'sitelist_ip_in_allowlist' => [
+				$base_config,
+				'https://localhost/',
+				'example.com',
+				[['site_ip' => '127.0.0.1', 'site_hostname' => '', 'ip_exclude' => 0]],
+				true,
+				'allowlist: exact IP match with ip_exclude=0 must return true',
+			],
+			'sitelist_ip_in_denylist' => [
+				array_merge($base_config, ['secure_allow_deny' => 0]),
+				'https://localhost/',
+				'example.com',
+				[['site_ip' => '127.0.0.1', 'site_hostname' => '', 'ip_exclude' => 0]],
+				false,
+				'denylist: exact IP match with ip_exclude=0 must return false',
+			],
+			'sitelist_ip_not_in_allowlist' => [
+				$base_config,
+				'https://localhost/',
+				'example.com',
+				[['site_ip' => '10.0.0.1', 'site_hostname' => '', 'ip_exclude' => 0]],
+				false,
+				'allowlist: non-matching IP must return false',
+			],
+			'sitelist_ip_not_in_denylist' => [
+				array_merge($base_config, ['secure_allow_deny' => 0]),
+				'https://localhost/',
+				'example.com',
+				[['site_ip' => '10.0.0.1', 'site_hostname' => '', 'ip_exclude' => 0]],
+				true,
+				'denylist: non-matching IP must return true',
+			],
+			'sitelist_ip_excluded_from_allowlist' => [
+				$base_config,
+				'https://localhost/',
+				'example.com',
+				[['site_ip' => '127.0.0.1', 'site_hostname' => '', 'ip_exclude' => 1]],
+				false,
+				'allowlist: IP match with ip_exclude=1 must return false (break 2)',
+			],
+			'sitelist_ip_excluded_from_denylist' => [
+				array_merge($base_config, ['secure_allow_deny' => 0]),
+				'https://localhost/',
+				'example.com',
+				[['site_ip' => '127.0.0.1', 'site_hostname' => '', 'ip_exclude' => 1]],
+				true,
+				'denylist: IP match with ip_exclude=1 must return true (break 2)',
+			],
+			'sitelist_ip_wildcard_in_allowlist' => [
+				$base_config,
+				'https://localhost/',
+				'example.com',
+				[['site_ip' => '127.0.*', 'site_hostname' => '', 'ip_exclude' => 0]],
+				true,
+				'allowlist: wildcard IP pattern must match localhost address',
+			],
+			'sitelist_ip_wildcard_in_denylist' => [
+				array_merge($base_config, ['secure_allow_deny' => 0]),
+				'https://localhost/',
+				'example.com',
+				[['site_ip' => '127.0.*', 'site_hostname' => '', 'ip_exclude' => 0]],
+				false,
+				'denylist: wildcard IP pattern must match localhost address',
+			],
+			'sitelist_ip_allowed_then_excluded' => [
+				$base_config,
+				'https://localhost/',
+				'example.com',
+				[
+					['site_ip' => '127.0.0.1', 'site_hostname' => '', 'ip_exclude' => 0],
+					['site_ip' => '127.0.0.1', 'site_hostname' => '', 'ip_exclude' => 1],
+				],
+				false,
+				'allowlist: an IP allowed by one row must be denied when a subsequent row excludes it (break 2)',
+			],
+			'sitelist_ip_denied_then_excluded' => [
+				$base_config,
+				'https://localhost/',
+				'example.com',
+				[
+					['site_ip' => '127.0.0.1', 'site_hostname' => '', 'ip_exclude' => 0],
+					['site_ip' => '127.0.0.1', 'site_hostname' => '', 'ip_exclude' => 1],
+				],
+				false,
+				'denylist: an IP denied by one row must be allowed when a subsequent row excludes it (break 2)',
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider download_allowed_data
+	 */
+	public function test_download_allowed(array $config_vars, $referer, $host, array $db_rows, $expected, $message)
+	{
+		// Build the sequence of sql_fetchrow return values: each row followed
+		// by false to terminate the while loop.
+		$fetchrow_sequence = array_merge($db_rows, [false]);
+
+		if (count($fetchrow_sequence) === 1)
+		{
+			// Only the terminating false – no rows at all.
+			$this->db->method('sql_fetchrow')->willReturn(false);
+		}
+		else
+		{
+			$this->db->method('sql_fetchrow')
+				->will($this->onConsecutiveCalls(...$fetchrow_sequence));
+		}
+
+		$this->request->method('header')->willReturnCallback(function ($key) use ($referer) {
+			if ($key === 'Referer')
+			{
+				return $referer;
+			}
+			return null;
+		});
+		$this->user->host = $host;
+
+		$cache_service = $this->getMockBuilder('phpbb\cache\service')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->config = new \phpbb\config\config($config_vars);
+		$content_visibility = $this->getMockBuilder('phpbb\content_visibility')
+			->disableOriginalConstructor()
+			->getMock();
+		$extension_guesser = $this->getMockBuilder('phpbb\mimetype\extension_guesser')
+			->disableOriginalConstructor()
+			->getMock();
+		$storage = $this->getMockBuilder('phpbb\storage\storage')
+			->disableOriginalConstructor()
+			->getMock();
+		$symfony_request = $this->getMockBuilder('phpbb\symfony_request')
+			->disableOriginalConstructor()
+			->getMock();
+		$language = $this->getMockBuilder('phpbb\language\language')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->attachment_controller = new \phpbb\storage\controller\attachment(
+			new \phpbb\auth\auth(),
+			$cache_service,
+			$this->config,
+			$content_visibility,
+			$this->db,
+			new phpbb_mock_event_dispatcher(),
+			$extension_guesser,
+			$language,
+			$this->request,
+			$storage,
+			$symfony_request,
+			$this->user
+		);
+
+		$controller_reflection = new \ReflectionClass($this->attachment_controller);
+		$method_reflection = $controller_reflection->getMethod('download_allowed');
+		$method_reflection->setAccessible(true);
+		$result = $method_reflection->invoke($this->attachment_controller);
+		$this->assertEquals($expected, $result, $message);
+	}
+}
diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php
index a346508624a..10447f363b8 100644
--- a/tests/email/email_parsing_test.php
+++ b/tests/email/email_parsing_test.php
@@ -19,6 +19,9 @@ class phpbb_email_parsing_test extends phpbb_test_case
 	/** @var \ReflectionProperty */
 	protected $reflection_template_property;
 
+	/** @var \phpbb\messenger\method\email */
+	protected $email;
+
 	protected function setUp(): void
 	{
 		global $phpbb_container, $config, $phpbb_root_path, $phpEx, $request, $user;
@@ -70,6 +73,7 @@ protected function setUp(): void
 		$phpbb_container->set('assets.bag', $assets_bag);
 
 		$context = new \phpbb\template\context();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$twig = new \phpbb\template\twig\environment(
 			$assets_bag,
 			$config,
@@ -78,7 +82,7 @@ protected function setUp(): void
 			$cache_path,
 			null,
 			new \phpbb\template\twig\loader(''),
-			new \phpbb\event\dispatcher(),
+			$dispatcher,
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -94,21 +98,57 @@ protected function setUp(): void
 		$phpbb_container->set('template.twig.extensions.collection', $twig_extensions_collection);
 
 		$twig->addExtension($twig_extension);
-		$phpbb_container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
-
-		if (!class_exists('messenger'))
-		{
-			include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-		}
-
-		$this->messenger = new \messenger();
+		$twig_lexer = new \phpbb\template\twig\lexer($twig);
+		$phpbb_container->set('template.twig.lexer', $twig_lexer);
+		$phpbb_container->set('dispatcher', $dispatcher);
+		$phpbb_container->set('language', $lang);
+		$phpbb_container->set('request', $request);
+
+		$db = $this->getMockBuilder('\phpbb\db\driver\mysqli')
+			->disableOriginalConstructor()
+			->getMock();
+		$auth = $this->createMock('\phpbb\auth\auth');
+		$log = new \phpbb\log\log($db, $user, $auth, $dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
+		$phpbb_container->set('log', $log);
+		$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
+		$phpbb_container->setParameter('core.php_ext', $phpEx);
+
+		$core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/';
+		$phpbb_container->setParameter('core.cache_dir', $core_cache_dir);
+
+		$core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx;
+		$phpbb_container->setParameter('core.messenger_queue_file', $core_messenger_queue_file);
+
+		$messenger_method_collection = new \phpbb\di\service_collection($phpbb_container);
+		$messenger_method_collection->add('messenger.method.email');
+		$phpbb_container->set('messenger.method_collection', $messenger_method_collection);
+
+		$messenger_queue = new \phpbb\messenger\queue($config, $dispatcher, $messenger_method_collection, $core_messenger_queue_file);
+		$phpbb_container->set('messenger.queue', $messenger_queue);
+
+		$this->email = new \phpbb\messenger\method\email(
+			$assets_bag,
+			$config,
+			$dispatcher,
+			$lang,
+			$messenger_queue,
+			$phpbb_path_helper,
+			$request,
+			$twig_extensions_collection,
+			$twig_lexer,
+			$user,
+			$phpbb_root_path,
+			$cache_path,
+			$extension_manager,
+			$log
+		);
+		$phpbb_container->set('messenger.method.email', $this->email);
 
-		$reflection = new ReflectionObject($this->messenger);
+		$reflection = new ReflectionObject($this->email);
 		$this->reflection_template_property = $reflection->getProperty('template');
-		$this->reflection_template_property->setAccessible(true);
 	}
 
-	public function email_parsing_data()
+	public static function email_parsing_data()
 	{
 		return array(
 			array('Author username', 'Any forum', 'The topic title', 'Dear user'),
@@ -123,9 +163,9 @@ public function test_email_parsing($author_name, $forum_name, $topic_title, $use
 	{
 		global $config, $phpEx, $user;
 
-		$this->messenger->set_addresses($user->data);
+		$this->email->set_addresses($user->data);
 
-		$this->messenger->assign_vars(array(
+		$this->email->assign_vars(array(
 			'EMAIL_SIG'	=> str_replace('<br />', "\n", "-- \n" . html_entity_decode($config['board_email_sig'], ENT_COMPAT)),
 			'SITENAME'	=> html_entity_decode($config['sitename'], ENT_COMPAT),
 
@@ -137,9 +177,9 @@ public function test_email_parsing($author_name, $forum_name, $topic_title, $use
 			'U_FORUM'					=> generate_board_url() . "/viewforum.{$phpEx}?f=1",
 			'U_STOP_WATCHING_FORUM'		=> generate_board_url() . "/viewforum.{$phpEx}?uid=2&f=1&unwatch=forum",
 		));
-		$this->messenger->template('newtopic_notify', $user->data['user_lang'], '', '');
+		$this->email->template('newtopic_notify', $user->data['user_lang'], '', '');
 
-		$reflection_template = $this->reflection_template_property->getValue($this->messenger);
+		$reflection_template = $this->reflection_template_property->getValue($this->email);
 		$msg = trim($reflection_template->assign_display('body'));
 
 		$this->assertStringContainsString($author_name, $msg);
diff --git a/tests/email/headers_encoding_test.php b/tests/email/headers_encoding_test.php
deleted file mode 100644
index a884a4cc216..00000000000
--- a/tests/email/headers_encoding_test.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-class phpbb_headers_encoding_test extends phpbb_test_case
-{
-	protected function setUp(): void
-	{
-		global $phpbb_root_path, $phpEx;
-
-		if (!function_exists('mail_encode'))
-		{
-			include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-		}
-	}
-
-	public function headers_encoding_data()
-	{
-		return [
-			['test@yourdomain.com <phpBB fake test email>', 'Q', 'US-ASCII'],
-			['test@yourdomain.com <Несуществующий почтовый адрес phpBB>', 'B', 'UTF-8'],
-			["\xE3\x83\x86\xE3\x82\xB9\xE3\x83\x88\xE3\x83\x86\xE3\x82\xB9\xE3\x83\x88", 'B', 'UTF-8'],
-		];
-	}
-
-	/**
-	 * @dataProvider headers_encoding_data
-	 */
-	public function test_headers_encoding($header, $scheme, $encoding)
-	{
-		$encoded_string = mail_encode($header);
-		$this->assertStringStartsWith("=?$encoding?$scheme?", $encoded_string);
-		$this->assertStringEndsWith('?=', $encoded_string);
-
-		// Result of iconv_mime_decode() on decoded header should be equal to initial header
-		$decoded_string = iconv_mime_decode($encoded_string, 0, $encoding);
-		$this->assertEquals(0, strcmp($header, $decoded_string));
-	}
-}
diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php
index 3079ca1ffe8..cb8984a3a1d 100644
--- a/tests/error_collector_test.php
+++ b/tests/error_collector_test.php
@@ -24,7 +24,7 @@ protected function setUp(): void
 
 	public function test_collection()
 	{
-		$collector = new \phpbb\error_collector(E_ALL | E_STRICT); // php set_error_handler() default
+		$collector = new \phpbb\error_collector(E_ALL | E_NOTICE); // php set_error_handler() default
 		$collector->install();
 
 		// Cause a warning
diff --git a/tests/event/exception_listener_test.php b/tests/event/exception_listener_test.php
index f611a132670..b9526e9a5dc 100644
--- a/tests/event/exception_listener_test.php
+++ b/tests/event/exception_listener_test.php
@@ -11,9 +11,9 @@
 *
 */
 
-class exception_listener extends phpbb_test_case
+class exception_listener_test extends phpbb_test_case
 {
-	public function phpbb_exception_data()
+	public static function phpbb_exception_data()
 	{
 		return array(
 			array(
@@ -85,7 +85,7 @@ public function test_phpbb_exception($is_ajax, $exception, $expected)
 
 		$exception_listener = new \phpbb\event\kernel_exception_subscriber($template, $lang, $user);
 
-		$event = new \Symfony\Component\HttpKernel\Event\ExceptionEvent($this->createMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, \Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST, $exception);
+		$event = new \Symfony\Component\HttpKernel\Event\ExceptionEvent($this->createMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, \Symfony\Component\HttpKernel\HttpKernelInterface::MAIN_REQUEST, $exception);
 		$exception_listener->on_kernel_exception($event);
 
 		$response = $event->getResponse();
diff --git a/tests/event/fixtures/normal_events.md.test b/tests/event/fixtures/normal_events.md.test
index 47921c4e572..a045bd42ddf 100644
--- a/tests/event/fixtures/normal_events.md.test
+++ b/tests/event/fixtures/normal_events.md.test
@@ -18,3 +18,19 @@ acp_bbcodes_actions_prepend2
 * Changed: 3.1.0-a5 Moved up
 * Changed: 3.1.0-a6 Moved down
 * Purpose: desc2
+
+acp_bbcodes_actions_prepend2_deprecated
+===
+* Location: adm/style/acp_bbcodes.html
+* Since: 3.1.0-a4
+* Deprecated: 3.1.0-a6
+* Changed: 3.1.0-a5 Moved up
+* Changed: 3.1.0-a6 Moved down
+* Purpose: desc2
+
+acp_bbcodes_actions_prepend_deprecated
+===
+* Location: adm/style/acp_bbcodes.html
+* Since: 3.1.0-a5
+* Deprecated: 3.1.0-a6
+* Purpose: desc2
diff --git a/tests/event/md_exporter_test.php b/tests/event/md_exporter_test.php
index b9c5a531fcc..ee86c2f1612 100644
--- a/tests/event/md_exporter_test.php
+++ b/tests/event/md_exporter_test.php
@@ -24,6 +24,7 @@ static public function crawl_eventsmd_data()
 						'adm' => array('acp_bbcodes.html'),
 					),
 					'since' => '3.1.0-a3',
+					'deprecated' => '',
 					'changed' => array(
 						'3.1.0-a4' => '',
 					),
@@ -36,6 +37,7 @@ static public function crawl_eventsmd_data()
 						'adm' => array('acp_bbcodes.html'),
 					),
 					'since' => '3.1.0-a5',
+					'deprecated' => '',
 					'changed' => array(),
 					'description' => 'desc2' . "\n",
 				),
@@ -46,12 +48,38 @@ static public function crawl_eventsmd_data()
 						'adm' => array('acp_bbcodes.html'),
 					),
 					'since' => '3.1.0-a4',
+					'deprecated' => '',
 					'changed' => array(
 						'3.1.0-a5' => 'Moved up',
 						'3.1.0-a6' => 'Moved down',
 					),
 					'description' => 'desc2' . "\n",
 				),
+				'acp_bbcodes_actions_prepend2_deprecated' => array(
+					'event' => 'acp_bbcodes_actions_prepend2_deprecated',
+					'files' => array(
+						'prosilver' => array(),
+						'adm' => array('acp_bbcodes.html'),
+					),
+					'since' => '3.1.0-a4',
+					'deprecated' => '3.1.0-a6',
+					'changed' => array(
+						'3.1.0-a5' => 'Moved up',
+						'3.1.0-a6' => 'Moved down',
+					),
+					'description' => 'desc2' . "\n",
+				),
+				'acp_bbcodes_actions_prepend_deprecated' => array(
+					'event' => 'acp_bbcodes_actions_prepend_deprecated',
+					'files' => array(
+						'prosilver' => array(),
+						'adm' => array('acp_bbcodes.html'),
+					),
+					'since' => '3.1.0-a5',
+					'deprecated' => '3.1.0-a6',
+					'changed' => array(),
+					'description' => 'desc2' . "\n",
+				),
 			)),
 			array('normal_events.md.test', '3.1.0-a5', '3.1.0-a5', array(
 				'acp_bbcodes_actions_prepend' => array(
@@ -61,6 +89,7 @@ static public function crawl_eventsmd_data()
 						'adm' => array('acp_bbcodes.html'),
 					),
 					'since' => '3.1.0-a5',
+					'deprecated' => '',
 					'changed' => array(),
 					'description' => 'desc2' . "\n",
 				),
@@ -71,12 +100,38 @@ static public function crawl_eventsmd_data()
 						'adm' => array('acp_bbcodes.html'),
 					),
 					'since' => '3.1.0-a4',
+					'deprecated' => '',
 					'changed' => array(
 						'3.1.0-a5' => 'Moved up',
 						'3.1.0-a6' => 'Moved down',
 					),
 					'description' => 'desc2' . "\n",
 				),
+				'acp_bbcodes_actions_prepend2_deprecated' => array(
+					'event' => 'acp_bbcodes_actions_prepend2_deprecated',
+					'files' => array(
+						'prosilver' => array(),
+						'adm' => array('acp_bbcodes.html'),
+					),
+					'since' => '3.1.0-a4',
+					'deprecated' => '3.1.0-a6',
+					'changed' => array(
+						'3.1.0-a5' => 'Moved up',
+						'3.1.0-a6' => 'Moved down',
+					),
+					'description' => 'desc2' . "\n",
+				),
+				'acp_bbcodes_actions_prepend_deprecated' => array(
+					'event' => 'acp_bbcodes_actions_prepend_deprecated',
+					'files' => array(
+						'prosilver' => array(),
+						'adm' => array('acp_bbcodes.html'),
+					),
+					'since' => '3.1.0-a5',
+					'deprecated' => '3.1.0-a6',
+					'changed' => array(),
+					'description' => 'desc2' . "\n",
+				),
 			)),
 		);
 	}
diff --git a/tests/event/php_exporter_test.php b/tests/event/php_exporter_test.php
index 3911f46dddc..f7b244544e9 100644
--- a/tests/event/php_exporter_test.php
+++ b/tests/event/php_exporter_test.php
@@ -352,11 +352,11 @@ static public function get_vars_from_array_data()
 				array(
 					"\t/**",
 					"\t*/",
-					"\t\$vars = array('_Strange123', 'phpBB3_Test');",
+					"\t\$vars = array('_Strange123', 'phpBB_Test');",
 					"\t\$this->dispatcher->dispatch('test');",
 				),
 				3,
-				array('_Strange123', 'phpBB3_Test'),
+				array('_Strange123', 'phpBB_Test'),
 			),
 		);
 	}
diff --git a/tests/extension/extension_base_test.php b/tests/extension/extension_base_test.php
index 3011634c4b4..e0d34fee814 100644
--- a/tests/extension/extension_base_test.php
+++ b/tests/extension/extension_base_test.php
@@ -27,7 +27,6 @@ public static function setUpBeforeClass(): void
 
 		$reflection_class = new ReflectionClass('\phpbb\extension\base');
 		self::$reflection_method_get_migration_file_list = $reflection_class->getMethod('get_migration_file_list');
-		self::$reflection_method_get_migration_file_list->setAccessible(true);
 	}
 
 	protected function setUp(): void
@@ -58,7 +57,7 @@ protected function setUp(): void
 			$container);
 	}
 
-	public function data_test_suffix_get_classes()
+	public static function data_test_suffix_get_classes()
 	{
 		return array(
 			array(
diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php
index bd25b6caf9c..066cc9b84d2 100644
--- a/tests/extension/finder_test.php
+++ b/tests/extension/finder_test.php
@@ -57,7 +57,7 @@ public function test_suffix_get_classes()
 		);
 	}
 
-	public function set_extensions_data()
+	public static function set_extensions_data()
 	{
 		return array(
 			array(
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index 73ac5a51de0..e659d37a515 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -154,6 +154,7 @@ protected function create_extension_manager($with_cache = true)
 	{
 		$phpbb_root_path = __DIR__ . './../../phpBB/';
 		$php_ext = 'php';
+		$table_prefix = 'phpbb_';
 
 		$config = new \phpbb\config\config(array('version' => PHPBB_VERSION));
 		$db = $this->new_dbal();
@@ -162,7 +163,7 @@ protected function create_extension_manager($with_cache = true)
 		$factory = new \phpbb\db\tools\factory();
 		$finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $php_ext);
 		$db_tools = $factory->get($db_doctrine);
-		$table_prefix = 'phpbb_';
+		$db_tools->set_table_prefix($table_prefix);
 
 		$container = new phpbb_mock_container_builder();
 
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 095efd3a693..b1468f3f9d7 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -37,6 +37,7 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
+		$this->table_prefix = 'phpbb_';
 		$this->config = new \phpbb\config\config(array(
 			'version'		=> '3.1.0',
 		));
@@ -45,13 +46,13 @@ protected function setUp(): void
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$factory = new \phpbb\db\tools\factory();
 		$this->db_tools = $factory->get($this->db_doctrine);
+		$this->db_tools->set_table_prefix($this->table_prefix);
 		$finder_factory = $this->createMock('\phpbb\finder\factory');
 		$this->phpbb_root_path = __DIR__ . '/';
 		$this->phpEx = 'php';
 
 		$this->cache =  new \phpbb\cache\service(new phpbb_mock_cache(), $this->config, $this->db, $phpbb_dispatcher, $this->phpbb_root_path, $this->phpEx);
 
-		$this->table_prefix = 'phpbb_';
 
 		$container = new phpbb_mock_container_builder();
 		$cache_path = $this->phpbb_root_path . 'cache/twig';
@@ -162,7 +163,7 @@ public function test_foo()
 		$this->assertEquals($metadata, $json);
 	}
 
-	public function validator_non_existing_data()
+	public static function validator_non_existing_data()
 	{
 		return array(
 			array('name'),
@@ -222,7 +223,7 @@ public function test_validator_non_existing_authors()
 		}
 	}
 
-	public function validator_invalid_data()
+	public static function validator_invalid_data()
 	{
 		return array(
 			array('name', 'asdf'),
@@ -280,7 +281,7 @@ public function test_validator_valid()
 		}
 	}
 
-	public function validator_requirements_data()
+	public static function validator_requirements_data()
 	{
 		return array(
 			array(
diff --git a/tests/extension/modules_test.php b/tests/extension/modules_test.php
index 7d41b975a7e..65e4fcdd333 100644
--- a/tests/extension/modules_test.php
+++ b/tests/extension/modules_test.php
@@ -174,7 +174,7 @@ public function test_get_module_infos()
 			), $acp_modules);
 	}
 
-	public function module_auth_test_data()
+	public static function module_auth_test_data()
 	{
 		return array(
 			// module_auth, expected result
diff --git a/tests/feed/attachments_base_test.php b/tests/feed/attachments_base_test.php
index 33ffde6bcb5..34a577a0f98 100644
--- a/tests/feed/attachments_base_test.php
+++ b/tests/feed/attachments_base_test.php
@@ -76,7 +76,7 @@ protected function setUp(): void
 		);
 	}
 
-	public function data_fetch_attachments()
+	public static function data_fetch_attachments()
 	{
 		return array(
 			array(array(0), array(0)),
diff --git a/tests/feed/http_auth_subscriber_test.php b/tests/feed/http_auth_subscriber_test.php
new file mode 100644
index 00000000000..5e1c11b07c7
--- /dev/null
+++ b/tests/feed/http_auth_subscriber_test.php
@@ -0,0 +1,479 @@
+<?php
+
+use phpbb\config\config;
+use phpbb\feed\event\http_auth_subscriber;
+use phpbb\request\request_interface;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
+{
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\auth\auth */
+	protected $auth;
+
+	/** @var \PHPUnit\Framework\MockObject\MockObject|config */
+	protected $config;
+
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\language\language */
+	protected $language;
+
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\request\request_interface */
+	protected $request;
+
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\user */
+	protected $user;
+
+	/** @var http_auth_subscriber */
+	protected $subscriber;
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->auth = $this->getMockBuilder('\phpbb\auth\auth')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->auth->method('login')
+			->willReturnMap([
+				['valid_user', 'valid_password', false, true, false, ['status' => LOGIN_SUCCESS]],
+				['invalid_user', 'invalid_password', false, true, false, ['status' => LOGIN_ERROR_USERNAME]],
+				['attempts_user', 'valid_password', false, true, false, ['status' => LOGIN_ERROR_ATTEMPTS]],
+			]);
+
+		$this->config = new config(array(
+			'feed_http_auth' => 1,
+			'sitename' => 'Test Site',
+		));
+
+		$this->language = $this->getMockBuilder('\phpbb\language\language')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->language->method('lang')
+			->willReturnMap([
+				['NOT_AUTHORISED', 'NOT_AUTHORISED'],
+				['LOGIN_ERROR_ATTEMPTS', 'LOGIN_ERROR_ATTEMPTS']
+			]);
+
+		$this->request = $this->getMockBuilder('\phpbb\request\request_interface')
+			->getMock();
+
+		$this->user = $this->getMockBuilder('\phpbb\user')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->user->data = array('is_registered' => false);
+
+		$this->subscriber = new http_auth_subscriber(
+			$this->auth,
+			$this->config,
+			$this->language,
+			$this->request,
+			$this->user
+		);
+	}
+
+	public function test_subscriber_events()
+	{
+		$events = http_auth_subscriber::getSubscribedEvents();
+		$this->assertArrayHasKey(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, $events);
+	}
+
+	public function test_non_feed_route_skipped()
+	{
+		$request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes->expects($this->once())
+			->method('get')
+			->with('_route')
+			->willReturn('not_a_feed_route');
+
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
+			->onlyMethods(['getRequest', 'setResponse'])
+			->disableOriginalConstructor()
+			->getMock();
+
+		$event->expects($this->once())
+			->method('getRequest')
+			->willReturn($request);
+
+		$event->expects($this->never())
+			->method('setResponse');
+
+		$this->subscriber->on_kernel_request($event);
+	}
+
+	public function test_insecure_connection_skipped()
+	{
+		$request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes->expects($this->once())
+			->method('get')
+			->with('_route')
+			->willReturn('phpbb_feed_overall');
+
+		$request->expects($this->once())
+			->method('isSecure')
+			->willReturn(false);
+
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$event->expects($this->once())
+			->method('getRequest')
+			->willReturn($request);
+
+		$event->expects($this->never())
+			->method('setResponse');
+
+		$this->subscriber->on_kernel_request($event);
+	}
+
+	public function test_http_auth_disabled()
+	{
+		$this->config['feed_http_auth'] = 0;
+
+		$request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes->expects($this->never())
+			->method('get');
+
+		$request->expects($this->never())
+			->method('isSecure');
+
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$event->expects($this->never())
+			->method('getRequest');
+
+		$event->expects($this->never())
+			->method('setResponse');
+
+		$this->subscriber->on_kernel_request($event);
+	}
+
+	public function test_user_already_logged_in()
+	{
+		$this->user->data = array('is_registered' => true);
+
+		$request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes->expects($this->once())
+			->method('get')
+			->with('_route')
+			->willReturn('phpbb_feed_overall');
+
+		$request->expects($this->once())
+			->method('isSecure')
+			->willReturn(true);
+
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$event->expects($this->once())
+			->method('getRequest')
+			->willReturn($request);
+
+		$event->expects($this->never())
+			->method('setResponse');
+
+		$this->subscriber->on_kernel_request($event);
+	}
+
+	public function test_no_credentials()
+	{
+		$this->user->data = ['is_registered' => false];
+
+		$request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes->expects($this->once())
+			->method('get')
+			->with('_route')
+			->willReturn('phpbb_feed_overall');
+
+		$request->expects($this->once())
+			->method('isSecure')
+			->willReturn(true);
+
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$event->expects($this->once())
+			->method('getRequest')
+			->willReturn($request);
+
+		/** @var Response $response */
+		$response = null;
+		$event->expects($this->once())
+			->method('setResponse')
+			->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response'))
+			->willReturnCallback(function ($newResponse) use (&$response) {
+				$response = $newResponse;
+			});
+
+		$this->subscriber->on_kernel_request($event);
+
+		$this->assertEquals(Response::HTTP_UNAUTHORIZED, $response->getStatusCode());
+		$this->assertEquals('NOT_AUTHORISED', $response->getContent());
+		$this->assertTrue($response->headers->has('WWW-Authenticate'));
+	}
+
+	public function test_valid_credentials()
+	{
+		$this->user->data = ['is_registered' => false];
+
+		$request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes->expects($this->once())
+			->method('get')
+			->with('_route')
+			->willReturn('phpbb_feed_overall');
+
+		$this->request->method('is_set')
+			->willReturnMap([
+				['PHP_AUTH_USER', request_interface::SERVER, true],
+				['PHP_AUTH_PW', request_interface::SERVER, true],
+			]);
+
+		$this->request->method('server')
+			->willReturnMap([
+				['PHP_AUTH_USER', '', 'valid_user'],
+				['PHP_AUTH_PW', '', 'valid_password'],
+			]);
+
+		$request->expects($this->once())
+			->method('isSecure')
+			->willReturn(true);
+
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$event->expects($this->once())
+			->method('getRequest')
+			->willReturn($request);
+
+		/** @var Response $response */
+		$response = null;
+		$event->expects($this->never())
+			->method('setResponse');
+
+		$this->subscriber->on_kernel_request($event);
+
+		$this->assertNull($response);
+	}
+
+	public function test_valid_credentials_base64()
+	{
+		$this->user->data = ['is_registered' => false];
+
+		$request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes->expects($this->once())
+			->method('get')
+			->with('_route')
+			->willReturn('phpbb_feed_overall');
+
+		$this->request->method('is_set')
+			->willReturnMap([
+				['Authorization', request_interface::SERVER, true],
+			]);
+
+		$this->request->method('server')
+			->willReturnMap([
+				['Authorization', '', 'Basic dmFsaWRfdXNlcjp2YWxpZF9wYXNzd29yZA=='],
+			]);
+
+		$request->expects($this->once())
+			->method('isSecure')
+			->willReturn(true);
+
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$event->expects($this->once())
+			->method('getRequest')
+			->willReturn($request);
+
+		/** @var Response $response */
+		$response = null;
+		$event->expects($this->never())
+			->method('setResponse');
+
+		$this->subscriber->on_kernel_request($event);
+
+		$this->assertNull($response);
+	}
+
+	public function test_too_many_attempts()
+	{
+		$this->user->data = ['is_registered' => false];
+
+		$request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes->expects($this->once())
+			->method('get')
+			->with('_route')
+			->willReturn('phpbb_feed_overall');
+
+		$this->request->method('is_set')
+			->willReturnMap([
+				['PHP_AUTH_USER', request_interface::SERVER, true],
+				['PHP_AUTH_PW', request_interface::SERVER, true],
+			]);
+
+		$this->request->method('server')
+			->willReturnMap([
+				['PHP_AUTH_USER', '', 'attempts_user'],
+				['PHP_AUTH_PW', '', 'valid_password'],
+			]);
+
+		$request->expects($this->once())
+			->method('isSecure')
+			->willReturn(true);
+
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$event->expects($this->once())
+			->method('getRequest')
+			->willReturn($request);
+
+		/** @var Response $response */
+		$response = null;
+		$event->expects($this->once())
+			->method('setResponse')
+			->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response'))
+			->willReturnCallback(function ($newResponse) use (&$response) {
+				$response = $newResponse;
+			});
+
+		$this->subscriber->on_kernel_request($event);
+
+		$this->assertEquals(Response::HTTP_UNAUTHORIZED, $response->getStatusCode());
+		$this->assertEquals('LOGIN_ERROR_ATTEMPTS', $response->getContent());
+		$this->assertFalse($response->headers->has('WWW-Authenticate'));
+	}
+
+	public function test_wrong_credentials()
+	{
+		$this->user->data = ['is_registered' => false];
+
+		$request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->attributes->expects($this->once())
+			->method('get')
+			->with('_route')
+			->willReturn('phpbb_feed_overall');
+
+		$this->request->method('is_set')
+			->willReturnMap([
+				['PHP_AUTH_USER', request_interface::SERVER, true],
+				['PHP_AUTH_PW', request_interface::SERVER, true],
+			]);
+
+		$this->request->method('server')
+			->willReturnMap([
+				['PHP_AUTH_USER', '', 'invalid_user'],
+				['PHP_AUTH_PW', '', 'invalid_password'],
+			]);
+
+		$request->expects($this->once())
+			->method('isSecure')
+			->willReturn(true);
+
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$event->expects($this->once())
+			->method('getRequest')
+			->willReturn($request);
+
+		/** @var Response $response */
+		$response = null;
+		$event->expects($this->once())
+			->method('setResponse')
+			->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response'))
+			->willReturnCallback(function ($newResponse) use (&$response) {
+				$response = $newResponse;
+			});
+
+		$this->subscriber->on_kernel_request($event);
+
+		$this->assertEquals(Response::HTTP_UNAUTHORIZED, $response->getStatusCode());
+		$this->assertEquals('NOT_AUTHORISED', $response->getContent());
+		$this->assertTrue($response->headers->has('WWW-Authenticate'));
+	}
+}
diff --git a/tests/files/types_base_test.php b/tests/files/types_base_test.php
index 877c4c98e23..2f18313eb4e 100644
--- a/tests/files/types_base_test.php
+++ b/tests/files/types_base_test.php
@@ -54,7 +54,7 @@ protected function setUp(): void
 		$this->factory = new \phpbb\files\factory($this->container);
 	}
 
-	public function data_check_upload_size()
+	public static function data_check_upload_size()
 	{
 		return array(
 			array('foo', '500KB', array()),
diff --git a/tests/files/types_form_test.php b/tests/files/types_form_test.php
index dd9ad7280c6..f46be3a715f 100644
--- a/tests/files/types_form_test.php
+++ b/tests/files/types_form_test.php
@@ -71,7 +71,7 @@ protected function setUp(): void
 		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
-	public function data_upload_form()
+	public static function data_upload_form()
 	{
 		return array(
 			array(
diff --git a/tests/files/types_local_test.php b/tests/files/types_local_test.php
index e4cfd490648..9cdbb50ced7 100644
--- a/tests/files/types_local_test.php
+++ b/tests/files/types_local_test.php
@@ -96,7 +96,7 @@ public function test_upload_init_error()
 		$this->assertInstanceOf('\phpbb\files\filespec', $file);
 	}
 
-	public function data_upload_form()
+	public static function data_upload_form()
 	{
 		return array(
 			array(
@@ -146,7 +146,6 @@ public function test_upload_form($filename, $upload_ary, $expected)
 				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
 			)));
 		$filespec_local = new ReflectionProperty($filespec, 'local');
-		$filespec_local->setAccessible(true);
 		$filespec_local->setValue($filespec, true);
 		$this->container->set('files.filespec', $filespec);
 		$this->factory = new \phpbb\files\factory($this->container);
diff --git a/tests/files/upload_test.php b/tests/files/upload_test.php
index 1fda63e4535..beee220fd84 100644
--- a/tests/files/upload_test.php
+++ b/tests/files/upload_test.php
@@ -76,7 +76,6 @@ public function test_set_disallowed_content()
 	{
 		$upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request);
 		$disallowed_content = new ReflectionProperty($upload, 'disallowed_content');
-		$disallowed_content->setAccessible(true);
 
 		$upload->set_disallowed_content(array('foo'));
 		$this->assertEquals(array('foo'), $disallowed_content->getValue($upload));
@@ -96,7 +95,7 @@ public function test_is_valid()
 		$this->assertFalse($upload->is_valid('foobar'));
 	}
 
-	public function data_internal_error()
+	public static function data_internal_error()
 	{
 		return array(
 			array(UPLOAD_ERR_INI_SIZE, 'PHP_SIZE_OVERRUN'),
diff --git a/tests/filesystem/clean_path_test.php b/tests/filesystem/clean_path_test.php
index f64d306d90f..8ed5519f31d 100644
--- a/tests/filesystem/clean_path_test.php
+++ b/tests/filesystem/clean_path_test.php
@@ -21,7 +21,7 @@ protected function setUp(): void
 		$this->filesystem = new \phpbb\filesystem\filesystem();
 	}
 
-	public function clean_path_data()
+	public static function clean_path_data()
 	{
 		return array(
 			array('foo', 'foo'),
diff --git a/tests/filesystem/helper_clean_path_test.php b/tests/filesystem/helper_clean_path_test.php
index c0c8783321b..cfaf1df5cb7 100644
--- a/tests/filesystem/helper_clean_path_test.php
+++ b/tests/filesystem/helper_clean_path_test.php
@@ -21,7 +21,7 @@ protected function setUp(): void
 		parent::setUp();
 	}
 
-	public function clean_path_data()
+	public static function clean_path_data()
 	{
 		yield ['foo', 'foo'];
 		yield ['foo/bar', 'foo/bar'];
diff --git a/tests/filesystem/helper_is_absolute_test.php b/tests/filesystem/helper_is_absolute_test.php
index 954cf6a30b1..d3d05921c94 100644
--- a/tests/filesystem/helper_is_absolute_test.php
+++ b/tests/filesystem/helper_is_absolute_test.php
@@ -21,7 +21,7 @@ protected function setUp(): void
 		parent::setUp();
 	}
 
-	static public function is_absolute_data()
+	public static function is_absolute_data()
 	{
 		// Empty
 		yield ['', false];
diff --git a/tests/filesystem/helper_realpath_test.php b/tests/filesystem/helper_realpath_test.php
index 2f28909a82d..448b2665bca 100644
--- a/tests/filesystem/helper_realpath_test.php
+++ b/tests/filesystem/helper_realpath_test.php
@@ -22,7 +22,6 @@ static public function setUpBeforeClass(): void
 		parent::setUpBeforeClass();
 
 		self::$filesystem_helper_phpbb_own_realpath = new ReflectionMethod('\phpbb\filesystem\helper', 'phpbb_own_realpath');
-		self::$filesystem_helper_phpbb_own_realpath->setAccessible(true);
 	}
 
 	protected function setUp(): void
@@ -30,7 +29,7 @@ protected function setUp(): void
 		parent::setUp();
 	}
 
-	public function realpath_resolve_absolute_without_symlinks_data()
+	public static function realpath_resolve_absolute_without_symlinks_data()
 	{
 		// Constant data
 		yield [__DIR__, __DIR__];
@@ -42,7 +41,7 @@ public function realpath_resolve_absolute_without_symlinks_data()
 		yield [__FILE__ . '../', false];
 	}
 
-	public function realpath_resolve_relative_without_symlinks_data()
+	public static function realpath_resolve_relative_without_symlinks_data()
 	{
 		if (!function_exists('getcwd'))
 		{
diff --git a/tests/filesystem/is_absolute_test.php b/tests/filesystem/is_absolute_test.php
index 165130ae85b..684fc386849 100644
--- a/tests/filesystem/is_absolute_test.php
+++ b/tests/filesystem/is_absolute_test.php
@@ -23,7 +23,7 @@ protected function setUp(): void
 		$this->filesystem = new \phpbb\filesystem\filesystem();
 	}
 
-	static public function is_absolute_data()
+	public static function is_absolute_data()
 	{
 		return array(
 			// Empty
diff --git a/tests/filesystem/realpath_test.php b/tests/filesystem/realpath_test.php
index 17281191d05..75e34ea2401 100644
--- a/tests/filesystem/realpath_test.php
+++ b/tests/filesystem/realpath_test.php
@@ -24,7 +24,6 @@ static public function setUpBeforeClass(): void
 
 		$reflection_class = new ReflectionClass('\phpbb\filesystem\filesystem');
 		self::$filesystem_own_realpath = $reflection_class->getMethod('phpbb_own_realpath');
-		self::$filesystem_own_realpath->setAccessible(true);
 	}
 
 	protected function setUp(): void
@@ -34,7 +33,7 @@ protected function setUp(): void
 		$this->filesystem = new \phpbb\filesystem\filesystem();
 	}
 
-	public function realpath_resolve_absolute_without_symlinks_data()
+	public static function realpath_resolve_absolute_without_symlinks_data()
 	{
 		return array(
 			// Constant data
@@ -49,7 +48,7 @@ public function realpath_resolve_absolute_without_symlinks_data()
 		);
 	}
 
-	public function realpath_resolve_relative_without_symlinks_data()
+	public static function realpath_resolve_relative_without_symlinks_data()
 	{
 		if (!function_exists('getcwd'))
 		{
diff --git a/tests/functional/acp_attachments_test.php b/tests/functional/acp_attachments_test.php
index 099a38c3292..b4de2f2beec 100644
--- a/tests/functional/acp_attachments_test.php
+++ b/tests/functional/acp_attachments_test.php
@@ -46,7 +46,7 @@ protected function tearDown(): void
 
 	private function upload_file($filename, $mimetype)
 	{
-		$crawler = self::$client->request(
+		$crawler = self::request(
 			'GET',
 			'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid
 		);
diff --git a/tests/functional/acp_bbcodes_test.php b/tests/functional/acp_bbcodes_test.php
index bdf79206150..07ef3b444c1 100644
--- a/tests/functional/acp_bbcodes_test.php
+++ b/tests/functional/acp_bbcodes_test.php
@@ -24,8 +24,9 @@ public function test_htmlspecialchars()
 		// Create the BBCode
 		$crawler = self::request('GET', 'adm/index.php?i=acp_bbcodes&sid=' . $this->sid . '&mode=bbcodes&action=add');
 		$form = $crawler->selectButton('Submit')->form(array(
-			'bbcode_match' => '[mod="{TEXT1}"]{TEXT2}[/mod]',
-			'bbcode_tpl'   => '<div>{TEXT1}</div><div>{TEXT2}</div>'
+			'bbcode_match'		=> '[mod="{TEXT1}"]{TEXT2}[/mod]',
+			'bbcode_tpl'		=> '<div>{TEXT1}</div><div>{TEXT2}</div>',
+			'bbcode_font_icon'	=> 'user',
 		));
 		self::submit($form);
 
@@ -47,15 +48,16 @@ public function test_htmlspecialchars()
 	/**
 	* @dataProvider get_bbcode_error_tests
 	*/
-	public function test_bbcode_error($match, $tpl, $error)
+	public function test_bbcode_error($match, $tpl, $icon, $error)
 	{
 		$this->login();
 		$this->admin_login();
 
 		$crawler = self::request('GET', 'adm/index.php?i=acp_bbcodes&sid=' . $this->sid . '&mode=bbcodes&action=add');
 		$form = $crawler->selectButton('Submit')->form([
-			'bbcode_match' => $match,
-			'bbcode_tpl'   => $tpl
+			'bbcode_match'		=> $match,
+			'bbcode_tpl'		=> $tpl,
+			'bbcode_font_icon'	=> $icon,
 		]);
 		$crawler = self::submit($form);
 
@@ -63,24 +65,51 @@ public function test_bbcode_error($match, $tpl, $error)
 		$this->assertStringContainsString($error, $text);
 	}
 
-	public function get_bbcode_error_tests()
+	public static function get_bbcode_error_tests()
 	{
 		return [
 			[
 				'XXX',
 				'',
+				'',
 				'BBCode is constructed in an invalid form'
 			],
 			[
 				'[x]{TEXT}[/x]',
 				'<xsl:invalid',
+				'',
 				'template is invalid'
 			],
 			[
 				'[x]{TEXT}[/x]',
 				'<script>{TEXT}</script>',
+				'',
 				'unsafe'
 			],
+			'icon name too long' => [
+				'[mod2="{TEXT1}"]{TEXT2}[/mod2]',
+				'<div>{TEXT1}</div><div>{TEXT2}</div>',
+				str_repeat('a', 65),
+				'is too long',
+			],
+			'icon name invalid' => [
+				'[mod2="{TEXT1}"]{TEXT2}[/mod2]',
+				'<div>{TEXT1}</div><div>{TEXT2}</div>',
+				'Not a valid icon name',
+				'is invalid',
+			],
+			'icon name invalid double dash' => [
+				'[mod2="{TEXT1}"]{TEXT2}[/mod2]',
+				'<div>{TEXT1}</div><div>{TEXT2}</div>',
+				'us--er',
+				'is invalid',
+			],
+			'icon name invalid trailing dash' => [
+				'[mod2="{TEXT1}"]{TEXT2}[/mod2]',
+				'<div>{TEXT1}</div><div>{TEXT2}</div>',
+				'user-',
+				'is invalid',
+			],
 		];
 	}
 }
diff --git a/tests/functional/acp_groups_test.php b/tests/functional/acp_groups_test.php
index 20f12710112..3c6d228e879 100644
--- a/tests/functional/acp_groups_test.php
+++ b/tests/functional/acp_groups_test.php
@@ -25,7 +25,7 @@ protected function get_url()
 		return 'adm/index.php?i=groups&mode=manage&action=edit';
 	}
 
-	public function acp_group_test_data()
+	public static function acp_group_test_data()
 	{
 		return array(
 			'both_yes' => array(
@@ -123,4 +123,20 @@ public function test_acp_groups_teampage($group_id, $tick_legend, $tick_teampage
 			$this->assertEquals((bool) $tick_teampage, (bool) ($this->form_data['group_teampage'] ?? false));
 		}
 	}
+
+	public function test_acp_groups_create_existing_name()
+	{
+		$this->group_manage_login();
+
+		$crawler = self::request('GET', 'adm/index.php?i=groups&mode=manage&sid=' . $this->sid);
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form([
+			'group_name'	=> 'Guests', // 'Guests' is the group name already in use for predefined Guests group
+		]);
+
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$crawler = self::submit($form); // Just submit the form with selected group name
+
+		$this->assertStringContainsString($this->lang('GROUP_NAME_TAKEN'), $crawler->text());
+	}
 }
diff --git a/tests/functional/acp_main_test.php b/tests/functional/acp_main_test.php
index d392102e1a3..2caa3bbae26 100644
--- a/tests/functional/acp_main_test.php
+++ b/tests/functional/acp_main_test.php
@@ -28,4 +28,42 @@ public function test_acp_database_size()
 		$this->assertContainsLang('DATABASE_SIZE', $crawler->filter('tbody > tr')->eq(2)->filter('td[class="tabled"]')->eq(0)->text());
 		$this->assertNotContainsLang('NOT_AVAILABLE', $crawler->filter('tbody > tr')->eq(2)->filter('td[class="tabled"]')->eq(1)->text());
 	}
+
+	public function test_all_acp_module_links()
+	{
+		$this->add_lang('common');
+		$this->login();
+		$this->admin_login();
+
+		// Browse ACP main page
+		$crawler = self::request('GET', 'index.php');
+		$crawler = self::$client->click($crawler->selectLink($this->lang('ACP_SHORT'))->link());
+
+		// Get all ACP module URLs array
+		$acp_modules = $crawler->filter('.tabs a')->each(
+			function ($node, $i)
+			{
+				return $node->link();
+			}
+		);
+
+		// Browse all ACP modules and get their mode URLs array
+		$acp_submodules = [];
+		foreach ($acp_modules as $module)
+		{
+			$crawler = self::$client->click($module);
+			$acp_submodules = array_merge($acp_submodules, $crawler->filter('.menu-block > ul a')->each(
+				function ($node, $i)
+				{
+					return $node->link();
+				}
+			));
+		}
+
+		// Browse all ACP submodules' modes
+		foreach ($acp_submodules as $acp_submodule)
+		{
+			self::$client->click($acp_submodule);
+		}
+	}
 }
diff --git a/tests/functional/acp_permissions_test.php b/tests/functional/acp_permissions_test.php
index ddd519506fe..355dd1a21db 100644
--- a/tests/functional/acp_permissions_test.php
+++ b/tests/functional/acp_permissions_test.php
@@ -48,7 +48,7 @@ public function test_select_user()
 		$this->assertStringContainsString($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text());
 	}
 
-	public function permissions_data()
+	public static function permissions_data()
 	{
 		return array(
 			// description
@@ -98,6 +98,7 @@ public function test_change_permission($description, $permission_type, $permissi
 		// XXX globals for \phpbb\auth\auth, refactor it later
 		global $db, $cache;
 		$db = $this->get_db();
+
 		$cache = new phpbb_mock_null_cache;
 
 		$auth = new \phpbb\auth\auth;
@@ -124,4 +125,51 @@ public function test_change_permission($description, $permission_type, $permissi
 		$auth->acl($user_data);
 		$this->assertEquals(0, $auth->acl_get($permission));
 	}
+
+	public function test_forum_permissions_misc()
+	{
+		// Open forum moderators permissions page
+		$crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=setting_mod_local&sid=" . $this->sid);
+
+		// Select "Your first forum"
+		$form = $crawler->filter('#select_victim')->form(['forum_id' => [2]]);
+		$crawler = self::submit($form);
+
+		// Select "Global moderators"
+		$form = $crawler->filter('#add_groups')->form(['group_id' => [4]]);
+		$crawler = self::submit($form);
+
+		// Check that global permissions are not displayed
+		$this->add_lang('acp/permissions_phpbb');
+		$page_text = $crawler->text();
+		$this->assertNotContainsLang('ACL_M_BAN', $page_text);
+		$this->assertNotContainsLang('ACL_M_PM_REPORT', $page_text);
+		$this->assertNotContainsLang('ACL_M_WARN', $page_text);
+
+		// Check that other permissions exist
+		$this->assertContainsLang('ACL_M_EDIT', $page_text);
+		$this->assertContainsLang('ACL_M_MOVE', $page_text);
+	}
+
+	public function test_tracing_user_based_permissions()
+	{
+		$this->create_user('newlyregistereduser');
+
+		// Open user-based permissions masks page
+		$crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=view_user_global&sid=" . $this->sid);
+
+		// Select newlyregistereduser
+		$form = $crawler->filter('#add_user')->form(['username' => ['newlyregistereduser']]);
+		$crawler = self::submit($form);
+
+		// Test 1st "Yes" permission tracing result match
+		$trace_link_yes = $crawler->filter('td.yes')->eq(0)->siblings()->filter('th > a.trace')->link();
+		$crawler_trace_yes = self::$client->click($trace_link_yes);
+		$this->assertEquals(1, $crawler_trace_yes->filter('tr.row2 > td.yes')->count());
+
+		// Test 1st "Never" permission tracing result match
+		$trace_link_never = $crawler->filter('td.never')->eq(0)->siblings()->filter('th > a.trace')->link();
+		$crawler_trace_never = self::$client->click($trace_link_never);
+		$this->assertEquals(1, $crawler_trace_never->filter('tr.row2 > td.never')->count());
+	}
 }
diff --git a/tests/functional/acp_profile_field_test.php b/tests/functional/acp_profile_field_test.php
index 44755675b46..7413c34980f 100644
--- a/tests/functional/acp_profile_field_test.php
+++ b/tests/functional/acp_profile_field_test.php
@@ -25,7 +25,7 @@ protected function setUp(): void
 		$this->add_lang('acp/profile');
 	}
 
-	public function data_add_profile_field()
+	public static function data_add_profile_field()
 	{
 		return array(
 			array('profilefields.type.bool',
@@ -69,4 +69,32 @@ public function test_add_profile_field($type, $page1_settings)
 
 		$this->assertContainsLang('ADDED_PROFILE_FIELD', $crawler->text());
 	}
+
+	public function test_edit_profile_fields()
+	{
+		// Custom profile fields page
+		$crawler = self::request('GET', 'adm/index.php?i=acp_profile&mode=profile&sid=' . $this->sid);
+
+		// Get all profile fields edit URLs
+		$edits = $crawler->filter('td.actions a')
+			->reduce(
+				function ($node, $i) {
+					$url = $node->attr('href');
+					return ((bool) strpos($url, 'action=edit'));
+			})
+			->each(
+				function ($node, $i) {
+					$url = $node->attr('href');
+					return ($url);
+			});
+
+		foreach ($edits as $edit_url)
+		{
+			$crawler = self::request('GET', 'adm/' . $edit_url . '&sid=' . $this->sid);
+			$form = $crawler->selectButton('Save')->form();
+			$crawler= self::submit($form);
+
+			$this->assertContainsLang('CHANGED_PROFILE_FIELD', $crawler->text());
+		}
+	}
 }
diff --git a/tests/functional/acp_registration_test.php b/tests/functional/acp_registration_test.php
index ef9843679e7..08601f2d2ed 100644
--- a/tests/functional/acp_registration_test.php
+++ b/tests/functional/acp_registration_test.php
@@ -28,9 +28,7 @@ protected function set_email_enable($db, $status)
 
 	public function test_submitting_activation_method()
 	{
-		$db = $this->get_db();
-
-		$this->set_email_enable($db, false);
+		$this->set_email_enable($this->db, false);
 
 		$this->add_lang('acp/board');
 		$this->login();
@@ -50,6 +48,6 @@ public function test_submitting_activation_method()
 		$crawler = self::submit($form);
 		$this->assertNotContainsLang('ACC_ACTIVATION_WARNING', $crawler->filter('div.main')->text());
 
-		$this->set_email_enable($db, true);
+		$this->set_email_enable($this->db, true);
 	}
 }
diff --git a/tests/functional/acp_smilies_test.php b/tests/functional/acp_smilies_test.php
index 955a00b488d..12001c0f0a1 100644
--- a/tests/functional/acp_smilies_test.php
+++ b/tests/functional/acp_smilies_test.php
@@ -24,8 +24,8 @@ public function test_htmlspecialchars()
 		// Create the BBCode
 		$crawler = self::request('GET', 'adm/index.php?i=acp_icons&sid=' . $this->sid . '&mode=smilies&action=edit&id=1');
 		$form = $crawler->selectButton('Submit')->form(array(
-			'code[icon_e_biggrin.gif]'    => '>:D',
-			'emotion[icon_e_biggrin.gif]' => '>:D'
+			'code[icon_e_biggrin.svg]'    => '>:D',
+			'emotion[icon_e_biggrin.svg]' => '>:D'
 		));
 		self::submit($form);
 
@@ -38,6 +38,15 @@ public function test_htmlspecialchars()
 		$crawler = self::submit($form);
 
 		$html = $crawler->filter('#preview')->html();
-		$this->assertMatchesRegularExpression('(<img [^>]+ alt=">:D" title=">:D"[^>]*>)', $html);
+
+		// Native HTML5 parser (PHP 8.4+) will encode entities
+		if (\PHP_VERSION_ID >= 80400)
+		{
+			$this->assertMatchesRegularExpression('(<img [^>]+ alt="&gt;:D" title="&gt;:D"[^>]*>)', $html);
+		}
+		else
+		{
+			$this->assertMatchesRegularExpression('(<img [^>]+ alt=">:D" title=">:D"[^>]*>)', $html);
+		}
 	}
 }
diff --git a/tests/functional/acp_storage_settings_test.php b/tests/functional/acp_storage_settings_test.php
index b99e3e8fa96..f8c1728dcb2 100644
--- a/tests/functional/acp_storage_settings_test.php
+++ b/tests/functional/acp_storage_settings_test.php
@@ -68,9 +68,9 @@ public function test_storage_settings()
 			// Visit ACP Storage settings again - warning should be displayed
 			$crawler = self::request('GET', 'adm/index.php?i=acp_storage&mode=settings&sid=' . $this->sid);
 			$this->assertContainsLang('WARNING', $crawler->filter('div[class="errorbox"] > h3')->text());
-			$this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_ATTACHMENT_TITLE')), $crawler->filter('div[class="errorbox"] > p')->text());
-			$this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_AVATAR_TITLE')), $crawler->filter('div[class="errorbox"] > p')->text());
-			$this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_BACKUP_TITLE')), $crawler->filter('div[class="errorbox"] > p')->text());
+			$this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_ATTACHMENT_TITLE')), $crawler->filter('div[class="errorbox"]')->text());
+			$this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_AVATAR_TITLE')), $crawler->filter('div[class="errorbox"]')->text());
+			$this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_BACKUP_TITLE')), $crawler->filter('div[class="errorbox"]')->text());
 
 			// Restore default state
 			$filesystem->chmod($phpbb_root_path . $attachments_storage_path, 777);
diff --git a/tests/functional/acp_test.php b/tests/functional/acp_test.php
new file mode 100644
index 00000000000..d390d3158bd
--- /dev/null
+++ b/tests/functional/acp_test.php
@@ -0,0 +1,71 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_acp_test extends phpbb_functional_test_case
+{
+	public function test_all_acp_module_links()
+	{
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(['common']);
+
+		// Browse ACP main page
+		$crawler = self::request('GET', 'index.php');
+		$crawler = self::$client->click($crawler->selectLink($this->lang('ACP_SHORT'))->link());
+		self::assert_response_html();
+
+		// Get all ACP module URLs array
+		$acp_modules = $crawler->filter('li.tab a')->each(
+			function ($node, $i)
+			{
+				// Filter out responsive mode links
+				if (empty($node->attr('class')))
+				{
+					return $node->link();
+				}
+			}
+		);
+		$this->assertNotEmpty($acp_modules);
+
+		// Browse all ACP modules and get their mode URLs array
+		$acp_submodules = [];
+		foreach ($acp_modules as $module)
+		{
+			$crawler = self::$client->click($module);
+			self::assert_response_html();
+			$acp_submodules = array_merge($acp_submodules, $crawler->filter('div.menu-block li a')->each(
+				function ($node, $i)
+				{
+					return $node->link();
+				}
+			));
+		}
+		$this->assertNotEmpty($acp_submodules);
+
+		// Browse all ACP submodules' modes
+		foreach ($acp_submodules as $acp_submodule)
+		{
+			// Don't click the ACP Extensions Catalog to prevent calling an external HTTP service in the test suite
+			if ($acp_submodule->getNode()->textContent === $this->lang('ACP_EXTENSIONS_CATALOG'))
+			{
+				continue;
+			}
+
+			self::$client->click($acp_submodule);
+			self::assert_response_html();
+		}
+	}
+}
diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
index a0c96b21eab..d2cf623b4a6 100644
--- a/tests/functional/auth_test.php
+++ b/tests/functional/auth_test.php
@@ -40,15 +40,14 @@ public function test_login_ucp_other_auth_provider()
 	{
 		global $cache, $config;
 		$cache = new phpbb_mock_null_cache;
-		$db = $this->get_db();
 		$sql = 'UPDATE ' . CONFIG_TABLE . " SET config_value = 'foobar' WHERE config_name = 'auth_method'";
-		$db->sql_query($sql);
+		$this->db->sql_query($sql);
 		$config['auth_method'] = 'foobar';
 		$this->login('anothertestuser');
 		$crawler = self::request('GET', 'index.php');
 		$this->assertStringContainsString('anothertestuser', $crawler->filter('#username_logged_in')->text());
 		$sql = 'UPDATE ' . CONFIG_TABLE . " SET config_value = 'db' WHERE config_name =  'auth_method'";
-		$db->sql_query($sql);
+		$this->db->sql_query($sql);
 		$config['auth_method'] = 'db';
 	}
 
diff --git a/tests/functional/avatar_acp_groups_test.php b/tests/functional/avatar_acp_groups_test.php
index 1ba5dc744f3..6bdef1c499c 100644
--- a/tests/functional/avatar_acp_groups_test.php
+++ b/tests/functional/avatar_acp_groups_test.php
@@ -23,7 +23,7 @@ public function get_url()
 		return 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5';
 	}
 
-	public function avatar_acp_groups_data()
+	public static function avatar_acp_groups_data()
 	{
 		return array(
 			// Correct Gravatar
diff --git a/tests/functional/avatar_acp_users_test.php b/tests/functional/avatar_acp_users_test.php
index e35e1a80117..d674495dd36 100644
--- a/tests/functional/avatar_acp_users_test.php
+++ b/tests/functional/avatar_acp_users_test.php
@@ -23,7 +23,7 @@ public function get_url()
 		return 'adm/index.php?i=acp_users&u=2&mode=avatar';
 	}
 
-	public function avatar_acp_users_data()
+	public static function avatar_acp_users_data()
 	{
 		return array(
 			// Gravatar with incorrect email
diff --git a/tests/functional/avatar_ucp_groups_test.php b/tests/functional/avatar_ucp_groups_test.php
index a3abe596829..800c98ecf10 100644
--- a/tests/functional/avatar_ucp_groups_test.php
+++ b/tests/functional/avatar_ucp_groups_test.php
@@ -22,7 +22,7 @@ public function get_url()
 		return 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5';
 	}
 
-	public function avatar_ucp_groups_data()
+	public static function avatar_ucp_groups_data()
 	{
 		return array(
 			// Gravatar with incorrect email
diff --git a/tests/functional/avatar_ucp_users_test.php b/tests/functional/avatar_ucp_users_test.php
index e004bcd1665..60e0ea8a638 100644
--- a/tests/functional/avatar_ucp_users_test.php
+++ b/tests/functional/avatar_ucp_users_test.php
@@ -23,7 +23,7 @@ public function get_url()
 		return 'ucp.php?i=ucp_profile&mode=avatar';
 	}
 
-	public function avatar_ucp_groups_data()
+	public static function avatar_ucp_groups_data()
 	{
 		return array(
 			// Gravatar with correct settings
diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
index 280e814c062..1c186436a92 100644
--- a/tests/functional/browse_test.php
+++ b/tests/functional/browse_test.php
@@ -36,19 +36,19 @@ public function test_viewtopic()
 
 	public function test_help_faq()
 	{
-		$crawler = self::request('GET', 'app.php/help/faq');
+		$crawler = self::request('GET', 'index.php/help/faq');
 		$this->assertGreaterThan(0, $crawler->filter('h2.faq-title')->count());
 	}
 
 	public function test_help_bbcode()
 	{
-		$crawler = self::request('GET', 'app.php/help/bbcode');
+		$crawler = self::request('GET', 'index.php/help/bbcode');
 		$this->assertGreaterThan(0, $crawler->filter('h2.faq-title')->count());
 	}
 
 	public function test_feed()
 	{
-		$crawler = self::request('GET', 'app.php/feed', array(), false);
+		$crawler = self::request('GET', 'index.php/feed', array(), false);
 		self::assert_response_xml();
 		$this->assertGreaterThan(0, $crawler->filter('entry')->count());
 	}
diff --git a/tests/functional/common_groups_test_case.php b/tests/functional/common_groups_test_case.php
index 0b0ffd9331a..d3ee795c3b3 100644
--- a/tests/functional/common_groups_test_case.php
+++ b/tests/functional/common_groups_test_case.php
@@ -57,7 +57,7 @@ protected function enable_all_avatars()
 		$this->assertStringContainsString($this->lang('CONFIG_UPDATED'), $crawler->text());
 	}
 
-	public function groups_manage_test_data()
+	public static function groups_manage_test_data()
 	{
 		return array(
 			array('', 'GROUP_UPDATED'),
diff --git a/tests/functional/controllers_compatibility_test.php b/tests/functional/controllers_compatibility_test.php
index 03fe6f07ef5..d0152d1d1da 100644
--- a/tests/functional/controllers_compatibility_test.php
+++ b/tests/functional/controllers_compatibility_test.php
@@ -19,29 +19,29 @@ class phpbb_functional_controllers_compatibility_test extends phpbb_functional_t
 {
 	public function test_report_compatibility()
 	{
-		$this->assert301('report.php?f=1&p=1', 'app.php/post/1/report');
-		$this->assert301('report.php?p=1', 'app.php/post/1/report');
-		$this->assert301('report.php?pm=1', 'app.php/pm/1/report');
+		$this->assert301('report.php?f=1&p=1', 'index.php/post/1/report');
+		$this->assert301('report.php?p=1', 'index.php/post/1/report');
+		$this->assert301('report.php?pm=1', 'index.php/pm/1/report');
 	}
 
 	public function test_feed_compatibility()
 	{
-		$this->assert301('feed.php', 'app.php/feed');
-		$this->assert301('feed.php?mode=foobar', 'app.php/feed/foobar');
-		$this->assert301('feed.php?mode=news', 'app.php/feed/news');
-		$this->assert301('feed.php?mode=topics', 'app.php/feed/topics');
-		$this->assert301('feed.php?mode=topics_news', 'app.php/feed/topics_news');
-		$this->assert301('feed.php?mode=topics_active', 'app.php/feed/topics_active');
-		$this->assert301('feed.php?mode=forums', 'app.php/feed/forums');
-		$this->assert301('feed.php?f=1', 'app.php/feed/forum/1');
-		$this->assert301('feed.php?t=1', 'app.php/feed/topic/1');
+		$this->assert301('feed.php', 'index.php/feed');
+		$this->assert301('feed.php?mode=foobar', 'index.php/feed/foobar');
+		$this->assert301('feed.php?mode=news', 'index.php/feed/news');
+		$this->assert301('feed.php?mode=topics', 'index.php/feed/topics');
+		$this->assert301('feed.php?mode=topics_news', 'index.php/feed/topics_news');
+		$this->assert301('feed.php?mode=topics_active', 'index.php/feed/topics_active');
+		$this->assert301('feed.php?mode=forums', 'index.php/feed/forums');
+		$this->assert301('feed.php?f=1', 'index.php/feed/forum/1');
+		$this->assert301('feed.php?t=1', 'index.php/feed/topic/1');
 	}
 
 	public function test_cron_compatibility()
 	{
-		$this->assert301('cron.php?cron_type=foo', 'app.php/cron/foo');
-		$this->assert301('cron.php?cron_type=foo&bar=foobar', 'app.php/cron/foo?bar=foobar');
-		$this->assert301('cron.php?cron_type=foo&bar=foobar&who=me', 'app.php/cron/foo?bar=foobar&who=me');
+		$this->assert301('cron.php?cron_type=foo', 'index.php/cron/foo');
+		$this->assert301('cron.php?cron_type=foo&bar=foobar', 'index.php/cron/foo?bar=foobar');
+		$this->assert301('cron.php?cron_type=foo&bar=foobar&who=me', 'index.php/cron/foo?bar=foobar&who=me');
 	}
 
 	protected function assert301($from, $to)
diff --git a/tests/functional/download_test.php b/tests/functional/download_test.php
index b34b1ad2c23..79fa6d71148 100644
--- a/tests/functional/download_test.php
+++ b/tests/functional/download_test.php
@@ -83,7 +83,7 @@ public function test_download_accessible()
 		));
 
 		// Download attachment as guest
-		$crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
+		$crawler = self::request('GET', "index.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
 		$content = self::$client->getResponse()->getContent();
 		$finfo = new finfo(FILEINFO_MIME_TYPE);
@@ -141,7 +141,7 @@ public function test_download_softdeleted_post()
 		$this->add_lang('viewtopic');
 
 		// No download attachment as guest
-		$crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
+		$crawler = self::request('GET', "index.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_html(404);
 		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
 
@@ -149,7 +149,7 @@ public function test_download_softdeleted_post()
 		$this->login();
 
 		// Download attachment as admin
-		$crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
+		$crawler = self::request('GET', "index.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
 		$content = self::$client->getResponse()->getContent();
 		$finfo = new finfo(FILEINFO_MIME_TYPE);
@@ -208,7 +208,7 @@ public function test_download_softdeleted_topic()
 		$this->add_lang('viewtopic');
 
 		// No download attachment as guest
-		$crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
+		$crawler = self::request('GET', "index.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_html(404);
 		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
 
@@ -216,7 +216,7 @@ public function test_download_softdeleted_topic()
 		$this->login();
 
 		// Download attachment as admin
-		$crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
+		$crawler = self::request('GET', "index.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
 		$content = self::$client->getResponse()->getContent();
 		$finfo = new finfo(FILEINFO_MIME_TYPE);
@@ -225,10 +225,13 @@ public function test_download_softdeleted_topic()
 
 	public function load_ids($data)
 	{
-		$this->db = $this->get_db();
-
 		if (!empty($data['forums']))
 		{
+			array_walk($data['forums'], function(&$value, $key)
+				{
+					$value = $this->db->sql_escape($value);
+				}
+			);
 			$sql = 'SELECT *
 				FROM phpbb_forums
 				WHERE ' . $this->db->sql_in_set('forum_name', $data['forums']);
@@ -245,6 +248,11 @@ public function load_ids($data)
 
 		if (!empty($data['topics']))
 		{
+			array_walk($data['topics'], function(&$value, $key)
+				{
+					$value = $this->db->sql_escape($value);
+				}
+			);
 			$sql = 'SELECT *
 				FROM phpbb_topics
 				WHERE ' . $this->db->sql_in_set('topic_title', $data['topics']);
@@ -262,6 +270,11 @@ public function load_ids($data)
 		$post_ids = array();
 		if (!empty($data['posts']))
 		{
+			array_walk($data['posts'], function(&$value, $key)
+				{
+					$value = $this->db->sql_escape($value);
+				}
+			);
 			$sql = 'SELECT *
 				FROM phpbb_posts
 				WHERE ' . $this->db->sql_in_set('post_subject', $data['posts']);
@@ -276,7 +289,7 @@ public function load_ids($data)
 			}
 			$this->db->sql_freeresult($result);
 
-			if (isset($data['attachments']))
+			if (isset($data['attachments']) && !empty($post_ids))
 			{
 				$sql = 'SELECT *
 					FROM phpbb_attachments
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 02b0ef45f29..94106e0872e 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -79,12 +79,25 @@ protected function setUp(): void
 		$this->add_lang(['acp/common', 'acp/extensions']);
 	}
 
+	/**
+	 * Mocks the extensions catalog cache used in phpBB/phpbb/composer/manager.php
+	 * with a predefined fixture so no external calls are made.
+	 */
+	protected function mock_extensions_catalog_cache():void {
+		$fixture_file = __DIR__ . '/fixtures/files/extensions_catalog.json';
+		$package_type = 'phpbb-extension';
+
+		$available_extensions = json_decode(file_get_contents($fixture_file), true);
+		$this->cache->put('_composer_' . $package_type . '_available', $available_extensions, 24*60*60);
+	}
+
 	public function test_list()
 	{
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
 
 		$this->assertCount(1, $crawler->filter('.ext_enabled'));
-		$this->assertCount(7, $crawler->filter('.ext_disabled'));
+		$this->assertCount(3, $crawler->filter('.ext_disabled'));
+		$this->assertCount(4, $crawler->filter('.ext_not_installed'));
 
 		$this->assertStringContainsString('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text());
 		$this->assertContainsLang('EXTENSION_DISABLE', $crawler->filter('.ext_enabled')->eq(0)->text());
@@ -98,9 +111,9 @@ public function test_list()
 
 		$this->assertStringContainsString('The “vendor/test3” extension is not valid.', $crawler->filter('.ext_disabled')->eq(1)->text());
 
-		$this->assertStringContainsString('phpBB Bar Extension', $crawler->filter('.ext_disabled')->eq(3)->text());
-		$this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(3)->text());
-		$this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_disabled')->eq(3)->text());
+		$this->assertStringContainsString('phpBB Bar Extension', $crawler->filter('.ext_not_installed')->eq(0)->text());
+		$this->assertContainsLang('DETAILS', $crawler->filter('.ext_not_installed')->eq(0)->text());
+		$this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_not_installed')->eq(0)->text());
 
 		// Check that invalid extensions are not listed.
 		$this->assertStringNotContainsString('phpBB BarFoo Extension', $crawler->filter('.table1')->text());
@@ -246,6 +259,7 @@ public function test_actions()
 	public function test_extensions_catalog()
 	{
 		// Access extensions catalog main page
+		$this->mock_extensions_catalog_cache();
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=catalog&sid=' . $this->sid);
 		$this->assertContainsLang('ACP_EXTENSIONS_CATALOG', $this->get_content());
 
@@ -259,6 +273,7 @@ public function test_extensions_catalog()
 		$this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text());
 
 		// Revisit extensions catalog main page after configuration change
+		$this->mock_extensions_catalog_cache();
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=catalog&sid=' . $this->sid);
 		$this->assertContainsLang('ACP_EXTENSIONS_CATALOG', $this->get_content());
 
@@ -269,12 +284,17 @@ public function test_extensions_catalog()
 	public function test_extensions_catalog_installing_extension()
 	{
 		// Let's check the overview, multiple packages should be listed
+		$this->mock_extensions_catalog_cache();
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=catalog&sid=' . $this->sid);
 		$this->assertContainsLang('ACP_EXTENSIONS_CATALOG', $this->get_content());
 		$this->assertGreaterThan(1, $crawler->filter('tr')->count());
 		$this->assertGreaterThan(1, $crawler->selectLink($this->lang('INSTALL'))->count());
 
-		$pages = (int) $crawler->filter('div.pagination li:nth-last-child(2) a')->first()->text();
+		$pages = 1;
+		$pagination = $crawler->filter('div.pagination li:nth-last-child(2) a');
+		if ($pagination->count() > 0) {
+			$pages = (int) $pagination->first()->text();
+		}
 
 		// Get Install links for both extensions
 		$extension_filter = function($crawler, $extension_name, &$install_link)
@@ -296,44 +316,37 @@ function ($node, $i) use ($extension_name)
 		{
 			if ($i != 0)
 			{
+				$this->mock_extensions_catalog_cache();
 				$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&start=' . $i * 20 . '&mode=catalog&sid=' . $this->sid);
 			}
 
-			$extension_filter($crawler, 'Scroll Page', $scrollpage_install_link);
-			$extension_filter($crawler, 'Scroll To Top', $scrolltotop_install_link);
+			$extension_filter($crawler, 'VigLink', $viglink_install_link);
 		}
 
-		if (!isset($scrolltotop_install_link) || !isset($scrollpage_install_link))
+		if (!isset($viglink_install_link))
 		{
 			$this->fail('Failed acquiring install links for test extensions');
 		}
 
-		// Attempt to install vse/scrollpage extension
-		$crawler = self::$client->click($scrollpage_install_link);
-		$this->assertContainsLang('EXTENSIONS_INSTALLED', $crawler->filter('.successbox > p')->text());
-		// Assert there's console log output
-		$this->assertStringContainsString('Locking vse/scrollpage', $crawler->filter('.console-output > pre')->text());
-
-		// Attempt to install vse/scrolltotop extension
-		$crawler = self::$client->click($scrolltotop_install_link);
+		// Attempt to install phpbb/viglink extension
+		$crawler = self::$client->click($viglink_install_link);
 		$this->assertContainsLang('EXTENSIONS_INSTALLED', $crawler->filter('.successbox > p')->text());
 		// Assert there's console log output
-		$this->assertStringContainsString('Locking vse/scrolltotop', $crawler->filter('.console-output > pre')->text());
+		$this->assertStringContainsString('Locking phpbb/viglink', $crawler->filter('.console-output > pre')->text());
 
 		// Ensure installed extension appears in available extensions list
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
-		$this->assertStringContainsString('Scroll To Top', $crawler->filter('strong[title="vse/scrolltotop"]')->text());
-		$this->assertStringContainsString('Scroll Page', $crawler->filter('strong[title="vse/scrollpage"]')->text());
+		$this->assertStringContainsString('VigLink', $crawler->filter('strong[title="phpbb/viglink"]')->text());
 	}
 
 	public function test_extensions_catalog_updating_extension()
 	{
-		// Enable 'Scroll Page' extension installed earlier
+		// Enable 'VigLink' extension installed earlier
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
 		$extension_enable_link = $crawler->filter('tr')->reduce(
 			function ($node, $i)
 			{
-				return (bool) (strpos($node->text(), 'Scroll Page') !== false);
+				return (bool) (strpos($node->text(), 'VigLink') !== false);
 			}
 		)->selectLink($this->lang('EXTENSION_ENABLE'))->link();
 		$crawler = self::$client->click($extension_enable_link);
@@ -341,22 +354,22 @@ function ($node, $i)
 		$crawler = self::submit($form);
 		$this->assertContainsLang('EXTENSION_ENABLE_SUCCESS', $crawler->filter('.successbox')->text());
 
-		// Update 'Scroll Page' enabled extension
+		// Update 'VigLink' enabled extension
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
-		$scrollpage_update_link = $crawler->filter('tr')->reduce(
+		$viglink_update_link = $crawler->filter('tr')->reduce(
 			function ($node, $i)
 			{
-				return (bool) (strpos($node->text(), 'Scroll Page') !== false);
+				return (bool) (strpos($node->text(), 'VigLink') !== false);
 			}
 		)->selectLink($this->lang('EXTENSION_UPDATE'))->link();
-		$crawler = self::$client->click($scrollpage_update_link);
+		$crawler = self::$client->click($viglink_update_link);
 		$this->assertContainsLang('EXTENSIONS_UPDATED', $crawler->filter('.successbox > p')->text());
 		// Assert there's console log output
 		$this->assertStringContainsString('Updating packages', $crawler->filter('.console-output > pre')->text());
 
 		// Ensure installed extension still appears in available extensions list
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
-		$this->assertStringContainsString('Scroll Page', $crawler->filter('strong[title="vse/scrollpage"]')->text());
+		$this->assertStringContainsString('VigLink', $crawler->filter('strong[title="phpbb/viglink"]')->text());
 	}
 
 	public function test_extensions_catalog_removing_extension()
@@ -364,36 +377,22 @@ public function test_extensions_catalog_removing_extension()
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
 
 		// Check if both enabled and disabled extensions have 'Remove' action available
-		$scrollpage_remove_link = $crawler->filter('tr')->reduce(
+		$viglink_remove_link = $crawler->filter('tr')->reduce(
 			function ($node, $i)
 			{
-				return (bool) (strpos($node->text(), 'Scroll Page') !== false);
-			}
-		)->selectLink($this->lang('EXTENSION_REMOVE'))->link();
-
-		$scrolltotop_remove_link = $crawler->filter('tr')->reduce(
-			function ($node, $i)
-			{
-				return (bool) (strpos($node->text(), 'Scroll To Top') !== false);
+				return (bool) (strpos($node->text(), 'VigLink') !== false);
 			}
 		)->selectLink($this->lang('EXTENSION_REMOVE'))->link();
 
 		// Test extensions removal
-		// Remove 'Scroll Page' enabled extension
-		$crawler = self::$client->click($scrollpage_remove_link);
+		// Remove 'VigLink' enabled extension
+		$crawler = self::$client->click($viglink_remove_link);
 		$this->assertContainsLang('EXTENSIONS_REMOVED', $crawler->filter('.successbox > p')->text());
 		// Assert there's console log output
-		$this->assertStringContainsString('Removing vse/scrollpage', $crawler->filter('.console-output > pre')->text());
-
-		// Remove 'Scroll To Top' disabled extension
-		$crawler = self::$client->click($scrolltotop_remove_link);
-		$this->assertContainsLang('EXTENSIONS_REMOVED', $crawler->filter('.successbox > p')->text());
-		// Assert there's console log output
-		$this->assertStringContainsString('Removing vse/scrolltotop', $crawler->filter('.console-output > pre')->text());
+		$this->assertStringContainsString('Removing phpbb/viglink', $crawler->filter('.console-output > pre')->text());
 
 		// Ensure removed extensions do not appear in available extensions list
-		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
-		$this->assertStringNotContainsString('Scroll Page', $this->get_content());
-		$this->assertStringNotContainsString('Scroll To Top', $this->get_content());
+		self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
+		$this->assertStringNotContainsString('VigLink', $this->get_content());
 	}
 }
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 5c42a2353bd..302c3969626 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -16,34 +16,32 @@
 */
 class phpbb_functional_extension_controller_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;
 
 	protected static $fixtures = array(
 		'./',
 	);
 
-	static public function setUpBeforeClass(): void
+	public static function setUpBeforeClass(): void
 	{
 		parent::setUpBeforeClass();
 
 		self::$helper = new phpbb_test_case_helpers(__CLASS__);
 		self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures);
+
+		self::install_ext('foo/bar');
+		self::install_ext('foo/foo');
 	}
 
-	static public function tearDownAfterClass(): void
+	public static function tearDownAfterClass(): void
 	{
 		parent::tearDownAfterClass();
 
+		self::uninstall_ext('foo/bar');
+		self::uninstall_ext('foo/foo');
 		self::$helper->restore_original_ext_dir();
 	}
 
-	protected static function setup_extensions()
-	{
-		return ['foo/bar', 'foo/foo'];
-	}
-
 	protected function setUp(): void
 	{
 		parent::setUp();
@@ -51,20 +49,12 @@ protected function setUp(): void
 		$this->purge_cache();
 	}
 
-	protected function tearDown(): void
-	{
-		$this->uninstall_ext('foo/bar');
-		$this->uninstall_ext('foo/foo');
-
-		parent::tearDown();
-	}
-
 	/**
 	* Check a controller for extension foo/bar.
 	*/
 	public function test_foo_bar()
 	{
-		$crawler = self::request('GET', 'app.php/foo/bar', array(), false);
+		$crawler = self::request('GET', 'index.php/foo/bar', array(), false);
 		self::assert_response_status_code();
 		$this->assertStringContainsString("foo/bar controller handle() method", $crawler->filter('body')->text());
 	}
@@ -74,7 +64,7 @@ public function test_foo_bar()
 	*/
 	public function test_routing_resources()
 	{
-		$crawler = self::request('GET', 'app.php/foo/foo', array(), false);
+		$crawler = self::request('GET', 'index.php/foo/foo', array(), false);
 		self::assert_response_status_code();
 		$this->assertStringContainsString("foo/foo controller handle() method", $crawler->filter('body')->text());
 	}
@@ -84,7 +74,7 @@ public function test_routing_resources()
 	*/
 	public function test_controller_with_template()
 	{
-		$crawler = self::request('GET', 'app.php/foo/template');
+		$crawler = self::request('GET', 'index.php/foo/template');
 		$this->assertStringContainsString("I am a variable", $crawler->filter('#content')->text());
 	}
 
@@ -93,7 +83,7 @@ public function test_controller_with_template()
 	*/
 	public function test_controller_template_include_js_css()
 	{
-		$crawler = self::request('GET', 'app.php/help/faq');
+		$crawler = self::request('GET', 'index.php/help/faq');
 		$this->assertStringContainsString("./../../assets/javascript/core.js", $crawler->filter('body')->html());
 	}
 
@@ -103,9 +93,9 @@ public function test_controller_template_include_js_css()
 	*/
 	public function test_missing_argument()
 	{
-		$crawler = self::request('GET', 'app.php/foo/baz', array(), false);
+		$crawler = self::request('GET', 'index.php/foo/baz', array(), false);
 		$this->assert_response_html(500);
-		$this->assertStringContainsString('Controller "foo\bar\controller\controller::baz" requires that you provide a value for the "$test" argument', $crawler->filter('body')->text());
+		$this->assertStringContainsString('Controller "foo\bar\controller\controller::baz" requires the "$test" argument that could not be resolved', $crawler->filter('body')->text());
 	}
 
 	/**
@@ -113,7 +103,7 @@ public function test_missing_argument()
 	*/
 	public function test_exception_should_result_in_500_status_code()
 	{
-		$crawler = self::request('GET', 'app.php/foo/exception', array(), false);
+		$crawler = self::request('GET', 'index.php/foo/exception', array(), false);
 		$this->assert_response_html(500);
 		$this->assertStringContainsString('Exception thrown from foo/exception route', $crawler->filter('body')->text());
 	}
@@ -129,7 +119,7 @@ public function test_exception_should_result_in_500_status_code()
 	*/
 	public function test_error_ext_disabled_or_404()
 	{
-		$crawler = self::request('GET', 'app.php/does/not/exist', array(), false);
+		$crawler = self::request('GET', 'index.php/does/not/exist', array(), false);
 		$this->assert_response_html(404);
 
 		// Since version 5.3.0-BETA1, Symfony shows full URI when route not found. See https://github.com/symfony/symfony/pull/39893
@@ -145,13 +135,13 @@ public function test_login_redirect()
 		$this->markTestIncomplete('Session table contains incorrect data for controllers on CI,'
 			. 'therefore the redirect fails.');
 
-		$crawler = self::request('GET', 'app.php/foo/login_redirect');
+		$crawler = self::request('GET', 'index.php/foo/login_redirect');
 		$this->assertContainsLang('LOGIN', $crawler->filter('h2')->text());
 		$form = $crawler->selectButton('login')->form(array(
 			'username'	=> 'admin',
 			'password'	=> 'adminadmin',
 		));
-		$this->assertStringStartsWith('./app.php/foo/login_redirect', $form->get('redirect')->getValue());
+		$this->assertStringStartsWith('./index.php/foo/login_redirect', $form->get('redirect')->getValue());
 
 		$crawler = self::submit($form);
 		$this->assertStringContainsString("I am a variable", $crawler->filter('#content')->text(), 'Unsuccessful redirect after using login_box()');
@@ -162,7 +152,7 @@ public function test_login_redirect()
 	*/
 	public function test_redirect()
 	{
-		$crawler = self::request('GET', 'app.php/foo/redirect');
+		$crawler = self::request('GET', 'index.php/foo/redirect');
 
 		$nodes = $crawler->filter('div')->extract(array('id'));
 
diff --git a/tests/functional/extension_global_lang_test.php b/tests/functional/extension_global_lang_test.php
index cf2d9dbf29a..1fb1d053e34 100644
--- a/tests/functional/extension_global_lang_test.php
+++ b/tests/functional/extension_global_lang_test.php
@@ -16,8 +16,6 @@
 */
 class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;
 
 	protected static $fixtures = array(
diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php
index 67dc35ae737..9f7f44fb9d4 100644
--- a/tests/functional/extension_module_test.php
+++ b/tests/functional/extension_module_test.php
@@ -17,43 +17,33 @@
 */
 class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;
 
 	protected static $fixtures = array(
 		'./',
 	);
 
-	static public function setUpBeforeClass(): void
+	public static function setUpBeforeClass(): void
 	{
 		parent::setUpBeforeClass();
 
 		self::$helper = new phpbb_test_case_helpers(__CLASS__);
 		self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures);
+
+		self::install_ext('foo/bar');
 	}
 
-	static public function tearDownAfterClass(): void
+	public static function tearDownAfterClass(): void
 	{
 		parent::tearDownAfterClass();
 
+		self::uninstall_ext('foo/bar');
 		self::$helper->restore_original_ext_dir();
 	}
 
-	protected function tearDown(): void
-	{
-		$this->uninstall_ext('foo/bar');
-
-		parent::tearDown();
-	}
-
-	protected static function setup_extensions()
-	{
-		return ['foo/bar'];
-	}
-
 	public function test_acp()
 	{
+		$this->add_lang('common');
 		$this->login();
 		$this->admin_login();
 
@@ -64,43 +54,86 @@ public function test_acp()
 		$this->assertStringContainsString('SETTING_0', $crawler->filter('dl')->eq(0)->filter('dt > label[for="setting_0"]')->text());
 		$this->assertStringContainsString('SETTING_0_EXPLAIN', $crawler->filter('dl')->eq(0)->filter('dt > span')->text());
 		$this->assertEquals(2, $crawler->filter('dl')->eq(0)->filter('dd > input[type="number"]')->count());
+		$this->assertEquals(1, $crawler->filter('dl')->eq(0)->filter('dd > input[type="number"]')->eq(0)->attr('value'));
+		$this->assertEquals(17, $crawler->filter('dl')->eq(0)->filter('dd > input[type="number"]')->eq(1)->attr('value'));
 
 		$this->assertStringContainsString('SETTING_1', $crawler->filter('dl')->eq(1)->filter('dt > label[for="setting_1"]')->text());
 		$this->assertStringContainsString('CUSTOM_LANG_EXPLAIN', $crawler->filter('dl')->eq(1)->filter('dt > span')->text());
 		$this->assertEquals(1, $crawler->filter('dl')->eq(1)->filter('dd > input[type="submit"]')->count());
+		$this->assertEquals('Test submit button', $crawler->filter('dl')->eq(1)->filter('dd > input[type="submit"]')->attr('value'));
 
 		$this->assertStringContainsString('SETTING_2', $crawler->filter('dl')->eq(2)->filter('dt > label[for="setting_2"]')->text());
 		$this->assertEquals(0, $crawler->filter('dl')->eq(2)->filter('dt > span')->count());
 		$this->assertEquals(2, $crawler->filter('dl')->eq(2)->filter('dd > label > input[type="radio"]')->count());
+		$this->assertContainsLang('YES', $crawler->filter('dl')->eq(2)->filter('dd > label')->eq(0)->text());
+		$this->assertEquals(1, $crawler->filter('dl')->eq(2)->filter('dd > label > input[type="radio"]')->eq(0)->attr('value'));
+		$this->assertEquals('checked', $crawler->filter('dl')->eq(2)->filter('dd > label > input[type="radio"]')->eq(0)->attr('checked'));
+		$this->assertContainsLang('NO', $crawler->filter('dl')->eq(2)->filter('dd > label')->eq(1)->text());
+		$this->assertEquals(0, $crawler->filter('dl')->eq(2)->filter('dd > label > input[type="radio"]')->eq(1)->attr('value'));
 
 		$this->assertStringContainsString('SETTING_3', $crawler->filter('dl')->eq(3)->filter('dt > label[for="setting_3"]')->text());
 		$this->assertStringContainsString('SETTING_3_EXPLAIN', $crawler->filter('dl')->eq(3)->filter('dt > span')->text());
 		$this->assertEquals(1, $crawler->filter('dl')->eq(3)->filter('dd > input[type="number"]')->count());
+		$this->assertEquals(15, $crawler->filter('dl')->eq(3)->filter('dd > input[type="number"]')->attr('value'));
 
 		$this->assertStringContainsString('SETTING_4', $crawler->filter('dl')->eq(4)->filter('dt > label[for="setting_4"]')->text());
 		$this->assertStringContainsString('SETTING_4_EXPLAIN', $crawler->filter('dl')->eq(4)->filter('dt > span')->text());
 		$this->assertEquals(1, $crawler->filter('dl')->eq(4)->filter('dd > select[id="setting_4"]')->count());
 		$this->assertEquals(3, $crawler->filter('dl')->eq(4)->filter('dd > select > option')->count());
+		$this->assertEquals(2, $crawler->filter('dl')->eq(4)->filter('dd > select > option')->eq(1)->attr('value'));
+		$this->assertEquals('selected', $crawler->filter('dl')->eq(4)->filter('dd > select > option')->eq(1)->attr('selected'));
 
 		$this->assertStringContainsString('SETTING_5', $crawler->filter('dl')->eq(5)->filter('dt > label[for="setting_5"]')->text());
 		$this->assertStringContainsString('SETTING_5_EXPLAIN', $crawler->filter('dl')->eq(5)->filter('dt > span')->text());
 		$this->assertEquals(1, $crawler->filter('dl')->eq(5)->filter('dd > input[type="text"]')->count());
+		$this->assertEquals('Setting 5', $crawler->filter('dl')->eq(5)->filter('dd > input[type="text"]')->attr('value'));
 
 		$this->assertStringContainsString('SETTING_6', $crawler->filter('dl')->eq(6)->filter('dt > label[for="setting_6"]')->text());
 		$this->assertStringContainsString('SETTING_6_EXPLAIN', $crawler->filter('dl')->eq(6)->filter('dt > span')->text());
 		$this->assertEquals(1, $crawler->filter('dl')->eq(6)->filter('dd > input[type="password"]')->count());
+		$this->assertEquals('********', $crawler->filter('dl')->eq(6)->filter('dd > input[type="password"]')->attr('value'));
 
 		$this->assertStringContainsString('SETTING_7', $crawler->filter('dl')->eq(7)->filter('dt > label[for="setting_7"]')->text());
 		$this->assertStringContainsString('SETTING_7_EXPLAIN', $crawler->filter('dl')->eq(7)->filter('dt > span')->text());
 		$this->assertEquals(1, $crawler->filter('dl')->eq(7)->filter('dd > input[type="email"]')->count());
+		$this->assertEquals('test@example.dom', $crawler->filter('dl')->eq(7)->filter('dd > input[type="email"]')->attr('value'));
 
 		$this->assertStringContainsString('SETTING_8', $crawler->filter('dl')->eq(8)->filter('dt > label[for="setting_8"]')->text());
 		$this->assertStringContainsString('SETTING_8_EXPLAIN', $crawler->filter('dl')->eq(8)->filter('dt > span')->text());
 		$this->assertEquals(1, $crawler->filter('dl')->eq(8)->filter('dd > textarea[name="config[setting_8]"]')->count());
+		$this->assertEquals('Textarea', $crawler->filter('dl')->eq(8)->filter('dd > textarea[name="config[setting_8]"]')->text());
 
 		$this->assertStringContainsString('SETTING_9', $crawler->filter('dl')->eq(9)->filter('dt > label[for="setting_9"]')->text());
 		$this->assertStringContainsString('SETTING_9_EXPLAIN', $crawler->filter('dl')->eq(9)->filter('dt > span')->text());
 		$this->assertEquals(2, $crawler->filter('dl')->eq(9)->filter('dd > label > input[type="radio"]')->count());
+		$this->assertEquals('checked', $crawler->filter('dl')->eq(9)->filter('dd > label > input[type="radio"]')->eq(0)->attr('checked'));
+
+		$this->assertStringContainsString('SETTING_10', $crawler->filter('dl')->eq(10)->filter('dt > label[for="setting_10"]')->text());
+		$this->assertStringContainsString('SETTING_10_EXPLAIN', $crawler->filter('dl')->eq(10)->filter('dt > span')->text());
+		$this->assertEquals(3, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->count());
+		$this->assertEquals(1, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->eq(0)->attr('value'));
+		$this->assertStringContainsString('LABEL_1', $crawler->filter('dl')->eq(10)->filter('dd > label')->eq(0)->text());
+		$this->assertEquals(3, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->eq(1)->attr('value'));
+		$this->assertEquals('checked', $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->eq(1)->attr('checked'));
+		$this->assertStringContainsString('LABEL_3', $crawler->filter('dl')->eq(10)->filter('dd > label')->eq(1)->text());
+		$this->assertEquals(2, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->eq(2)->attr('value'));
+		$this->assertStringContainsString('LABEL_2', $crawler->filter('dl')->eq(10)->filter('dd > label')->eq(2)->text());
+
+		$this->assertStringContainsString('SETTING_11', $crawler->filter('dl')->eq(11)->filter('dt > label[for="setting_11"]')->text());
+		$this->assertStringContainsString('SETTING_11_EXPLAIN', $crawler->filter('dl')->eq(11)->filter('dt > span')->text());
+		$this->assertEquals('1', $crawler->filter('dl')->eq(11)->filter('dd > label > input[type="radio"]')->eq(0)->attr('value'));
+		$this->assertEquals('0', $crawler->filter('dl')->eq(11)->filter('dd > label > input[type="radio"]')->eq(1)->attr('value'));
+		$this->assertEquals('checked', $crawler->filter('dl')->eq(11)->filter('dd > label > input[type="radio"]')->eq(1)->attr('checked'));
+		$this->assertContainsLang('YES', $crawler->filter('dl')->eq(11)->filter('dd > label')->eq(0)->text());
+		$this->assertContainsLang('NO', $crawler->filter('dl')->eq(11)->filter('dd > label')->eq(1)->text());
+
+		$this->assertStringContainsString('SETTING_12', $crawler->filter('dl')->eq(12)->filter('dt > label[for="setting_12"]')->text());
+		$this->assertStringContainsString('SETTING_12_EXPLAIN', $crawler->filter('dl')->eq(12)->filter('dt > span')->text());
+		$this->assertContainsLang('ENABLED', $crawler->filter('dl')->eq(12)->filter('dd > label')->eq(0)->text());
+		$this->assertEquals(1, $crawler->filter('dl')->eq(12)->filter('dd > label > input[type="radio"]')->eq(0)->attr('value'));
+		$this->assertContainsLang('DISABLED', $crawler->filter('dl')->eq(12)->filter('dd > label')->eq(1)->text());
+		$this->assertEquals(0, $crawler->filter('dl')->eq(12)->filter('dd > label > input[type="radio"]')->eq(1)->attr('value'));
+		$this->assertEquals('checked', $crawler->filter('dl')->eq(12)->filter('dd > label > input[type="radio"]')->eq(1)->attr('checked'));
 	}
 
 	public function test_ucp()
diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php
index 9516e351df5..e7dcb4ebcd3 100644
--- a/tests/functional/extension_permission_lang_test.php
+++ b/tests/functional/extension_permission_lang_test.php
@@ -16,8 +16,6 @@
 */
 class phpbb_functional_extension_permission_lang_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;
 
 	protected static $fixtures = array(
diff --git a/tests/functional/extension_template_event_order_test.php b/tests/functional/extension_template_event_order_test.php
new file mode 100644
index 00000000000..c32e9442b8b
--- /dev/null
+++ b/tests/functional/extension_template_event_order_test.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_extension_template_event_order_test extends phpbb_functional_test_case
+{
+	private static $helper;
+
+	protected static $fixtures = [
+		'./',
+	];
+
+	public static function setUpBeforeClass(): void
+	{
+		parent::setUpBeforeClass();
+
+		self::$helper = new phpbb_test_case_helpers(__CLASS__);
+		self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures);
+
+		self::install_ext('foo/bar');
+		self::install_ext('foo/foo');
+	}
+
+	public static function tearDownAfterClass(): void
+	{
+		parent::tearDownAfterClass();
+
+		self::uninstall_ext('foo/bar');
+		self::uninstall_ext('foo/foo');
+		self::$helper->restore_original_ext_dir();
+	}
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->purge_cache();
+	}
+
+
+	/**
+	 * Check extensions template event listener prioritizing
+	 */
+	public function test_different_template_event_priority()
+	{
+		global $phpbb_root_path;
+
+		$crawler = self::request('GET', 'index.php');
+		$quick_links_menu = $crawler->filter('ul[role="menu"]')->eq(0);
+		$quick_links_menu_nodes_count = (int) $quick_links_menu->filter('li')->count();
+		// Ensure foo/foo template event goes before foo/bar one
+		$this->assertStringContainsString('FOO_FOO_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 4)->filter('span')->text());
+		$this->assertStringContainsString('FOO_BAR_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 3)->filter('span')->text());
+
+		// Change template events order to default, put foo/bar event before foo/foo one
+		$this->disable_ext('foo/bar');
+		$this->disable_ext('foo/foo');
+
+		$this->assertTrue(copy(__DIR__ . '/fixtures/ext/foo/bar/event/template_event_order_higher.php', $phpbb_root_path . 'ext/foo/bar/event/template_event_order.php'));
+		$this->assertTrue(copy(__DIR__ . '/fixtures/ext/foo/foo/event/template_event_order_lower.php', $phpbb_root_path . 'ext/foo/foo/event/template_event_order.php'));
+
+		$this->install_ext('foo/bar');
+		$this->install_ext('foo/foo');
+
+		$crawler = self::request('GET', 'index.php');
+		$quick_links_menu = $crawler->filter('ul[role="menu"]')->eq(0);
+		$quick_links_menu_nodes_count = (int) $quick_links_menu->filter('li')->count();
+		// Ensure foo/bar template event goes before foo/foo one
+		$this->assertStringContainsString('FOO_BAR_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 4)->filter('span')->text());
+		$this->assertStringContainsString('FOO_FOO_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 3)->filter('span')->text());
+	}
+
+	/**
+	 * Check extensions template event listener equal (default - 0) priority rendering
+	 * Should render in the order of reading listener files from the filesystem
+	 */
+	public function test_same_template_event_priority()
+	{
+		global $phpbb_root_path;
+
+		$crawler = self::request('GET', 'index.php');
+		// Ensure foo/bar template event goes before foo/foo one (assuming they have been read from the filesystem in alphabetical order)
+		$this->assertStringContainsString('FOO_BAR_FORUMLIST_BODY_BEFORE', $crawler->filter('p[id*="forumlist_body_before"]')->eq(0)->text());
+		$this->assertStringContainsString('FOO_FOO_FORUMLIST_BODY_BEFORE', $crawler->filter('p[id*="forumlist_body_before"]')->eq(1)->text());
+	}
+}
diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php
index 984f3da0d5d..71fd99eb11d 100644
--- a/tests/functional/feed_test.php
+++ b/tests/functional/feed_test.php
@@ -23,16 +23,10 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 	protected function setUp(): void
 	{
 		parent::setUp();
-		$this->purge_cache();
-	}
 
-	public function __construct($name = null, array $data = array(), $dataName = '')
-	{
-		parent::__construct($name, $data, $dataName);
-
-		$this->backupStaticAttributesExcludeList += [
+		$this->setBackupStaticPropertiesExcludeList([
 			'phpbb_functional_feed_test' => ['init_values'],
-		];
+		]);
 
 		$this->purge_cache();
 	}
@@ -87,45 +81,45 @@ public function test_setup_config_before_state()
 
 	public function test_dump_board_state()
 	{
-		$crawler = self::request('GET', 'app.php/feed/forums', array(), false);
+		$crawler = self::request('GET', 'index.php/feed/forums', array(), false);
 		self::assert_response_xml();
 		self::$init_values['disapprove_user']['forums_value'] = $crawler->filterXPath('//entry')->count();
 
-		$crawler = self::request('GET', 'app.php/feed/overall', array(), false);
+		$crawler = self::request('GET', 'index.php/feed/overall', array(), false);
 		self::assert_response_xml();
 		self::$init_values['disapprove_user']['overall_value'] = $crawler->filterXPath('//entry')->count();
 
-		$crawler = self::request('GET', 'app.php/feed/topics', array(), false);
+		$crawler = self::request('GET', 'index.php/feed/topics', array(), false);
 		self::assert_response_xml();
 		self::$init_values['disapprove_user']['topics_value'] = $crawler->filterXPath('//entry')->count();
 
-		$crawler = self::request('GET', 'app.php/feed/topics_new', array(), false);
+		$crawler = self::request('GET', 'index.php/feed/topics_new', array(), false);
 		self::assert_response_xml();
 		self::$init_values['disapprove_user']['topics_new_value'] = $crawler->filterXPath('//entry')->count();
 
-		$crawler = self::request('GET', 'app.php/feed/topics_active', array(), false);
+		$crawler = self::request('GET', 'index.php/feed/topics_active', array(), false);
 		self::assert_response_xml();
 		self::$init_values['disapprove_user']['topics_active_value'] = $crawler->filterXPath('//entry')->count();
 
 		$this->login();
 
-		$crawler = self::request('GET', 'app.php/feed/forums', array(), false);
+		$crawler = self::request('GET', 'index.php/feed/forums', array(), false);
 		self::assert_response_xml();
 		self::$init_values['admin']['forums_value'] = $crawler->filterXPath('//entry')->count();
 
-		$crawler = self::request('GET', 'app.php/feed/overall', array(), false);
+		$crawler = self::request('GET', 'index.php/feed/overall', array(), false);
 		self::assert_response_xml();
 		self::$init_values['admin']['overall_value'] = $crawler->filterXPath('//entry')->count();
 
-		$crawler = self::request('GET', 'app.php/feed/topics', array(), false);
+		$crawler = self::request('GET', 'index.php/feed/topics', array(), false);
 		self::assert_response_xml();
 		self::$init_values['admin']['topics_value'] = $crawler->filterXPath('//entry')->count();
 
-		$crawler = self::request('GET', 'app.php/feed/topics_new', array(), false);
+		$crawler = self::request('GET', 'index.php/feed/topics_new', array(), false);
 		self::assert_response_xml();
 		self::$init_values['admin']['topics_new_value'] = $crawler->filterXPath('//entry')->count();
 
-		$crawler = self::request('GET', 'app.php/feed/topics_active', array(), false);
+		$crawler = self::request('GET', 'index.php/feed/topics_active', array(), false);
 		self::assert_response_xml();
 		self::$init_values['admin']['topics_active_value'] = $crawler->filterXPath('//entry')->count();
 	}
@@ -175,7 +169,7 @@ public function test_setup_forums()
 		));
 		self::submit($form);
 
-		// 'Feeds #exclude' will not be displayed on app.php/feed/forums
+		// 'Feeds #exclude' will not be displayed on index.php/feed/forums
 		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
 		$form = $crawler->selectButton('addforum')->form(array(
 			'forum_name'	=> 'Feeds #exclude',
@@ -261,6 +255,29 @@ public function test_create_exclude_topic()
 		$this->data['topics']['Feeds #exclude - Topic #1'] = (int) $post['topic_id'];
 	}
 
+	public function test_feeds_disabled()
+	{
+		$this->login();
+		$this->admin_login();
+
+		// Disable feeds in ACP
+		$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=feed");
+		$form = $crawler->selectButton('Submit')->form();
+		$crawler = self::submit($form, ['config[feed_enable]' => 0]);
+		self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text());
+
+		// Assert that feeds aren't available
+		$crawler = self::request('GET', 'index.php/feed/overall', array(), false);
+		self::assert_response_status_code(404);
+		$this->assertContainsLang('NO_FEED_ENABLED', $crawler->text());
+
+		// Enable feeds again in ACP
+		$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=feed");
+		$form = $crawler->selectButton('Submit')->form();
+		$crawler = self::submit($form, ['config[feed_enable]' => 1]);
+		self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text());
+	}
+
 	public function test_feeds_exclude()
 	{
 		$this->load_ids(array(
@@ -1358,19 +1375,19 @@ protected function assert_feeds($data, $username = false)
 
 	protected function assert_feed($params, $data)
 	{
-		$crawler = self::request('GET', 'app.php/feed' . $params, array(), false);
+		$crawler = self::request('GET', 'index.php/feed' . $params, array(), false);
 
 		if (empty($data['invalid']))
 		{
 			self::assert_response_xml();
-			self::assertEquals($data['nb_entries'], $crawler->filter('entry')->count(), "Tested feed : 'app.php/feed{$params}'");
+			self::assertEquals($data['nb_entries'], $crawler->filter('entry')->count(), "Tested feed : 'index.php/feed{$params}'");
 
 			if (!empty($data['xpath']))
 			{
 
 				foreach($data['xpath'] as $xpath => $count_expected)
 				{
-					self::assertCount($count_expected, $crawler->filterXPath($xpath), "Tested feed : 'app.php/feed{$params}', Search for {$xpath}");
+					self::assertCount($count_expected, $crawler->filterXPath($xpath), "Tested feed : 'index.php/feed{$params}', Search for {$xpath}");
 				}
 			}
 
@@ -1379,7 +1396,7 @@ protected function assert_feed($params, $data)
 				foreach($data['contents'] as $entry_id => $string)
 				{
 					$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text();
-					self::assertStringContainsString($string, $content, "Tested feed : 'app.php/feed{$params}'");
+					self::assertStringContainsString($string, $content, "Tested feed : 'index.php/feed{$params}'");
 				}
 			}
 
@@ -1388,7 +1405,7 @@ protected function assert_feed($params, $data)
 				foreach($data['contents_lang'] as $entry_id => $string)
 				{
 					$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text();
-					self::assertContainsLang($string, $content, "Tested feed : 'app.php/feed{$params}'");
+					self::assertContainsLang($string, $content, "Tested feed : 'index.php/feed{$params}'");
 				}
 			}
 
@@ -1399,18 +1416,18 @@ protected function assert_feed($params, $data)
 					$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text();
 					foreach ($attachments as $i => $attachment)
 					{
-						$url = self::$root_url . "app.php/download/attachment/{$attachment['id']}";
+						$url = self::$root_url . "index.php/download/attachment/{$attachment['id']}";
 						$string = "Attachment #{$i}";
 
 						if ($attachment['displayed'])
 						{
-							self::assertStringContainsString($url, $content, "Tested feed : 'app.php/feed{$params}'");
-							self::assertStringNotContainsString($string, $content, "Tested feed : 'app.php/feed{$params}'");
+							self::assertStringContainsString($url, $content, "Tested feed : 'index.php/feed{$params}'");
+							self::assertStringNotContainsString($string, $content, "Tested feed : 'index.php/feed{$params}'");
 						}
 						else
 						{
-							self::assertStringContainsString($string, $content, "Tested feed : 'app.php/feed{$params}'");
-							self::assertStringNotContainsString($url, $content, "Tested feed : 'app.php/feed{$params}'");
+							self::assertStringContainsString($string, $content, "Tested feed : 'index.php/feed{$params}'");
+							self::assertStringNotContainsString($url, $content, "Tested feed : 'index.php/feed{$params}'");
 						}
 					}
 				}
@@ -1425,7 +1442,7 @@ protected function assert_feed($params, $data)
 				$content = $crawler->filter('html')->text();
 				foreach($data['contents_lang'] as $string)
 				{
-					self::assertContainsLang($string, $content, "Tested feed : 'app.php/feed{$params}'");
+					self::assertContainsLang($string, $content, "Tested feed : 'index.php/feed{$params}'");
 				}
 			}
 		}
@@ -1433,8 +1450,6 @@ protected function assert_feed($params, $data)
 
 	protected function load_ids($data)
 	{
-		$this->db = $this->get_db();
-
 		if (!empty($data['forums']))
 		{
 			$sql = 'SELECT *
diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php
index 08cb73da077..ec9e8d01451 100644
--- a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php
+++ b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php
@@ -41,18 +41,39 @@ function main($id, $mode)
 				'setting_0_height'	=> ['lang' => 'SETTING_0',	'validate' => 'int:0',	'type' => false, 'method' => false, 'explain' => false],
 				'setting_0'	=> ['lang' => 'SETTING_0',	'validate' => 'int:0:16',	'type' => 'dimension:0:999', 'explain' => true, 'append' => ' ' . $language->lang('PIXEL')],
 				'setting_1'	=> ['lang' => 'SETTING_1',	'validate' => 'bool',		'type' => 'custom', 'method' => 'submit_button', 'lang_explain' => 'CUSTOM_LANG_EXPLAIN', 'explain' => true],
-				'setting_2'	=> ['lang' => 'SETTING_2',	'validate' => 'bool',		'type' => 'radio:yes_no'],
+				'setting_2'	=> ['lang' => 'SETTING_2',	'validate' => 'bool',		'type' => 'radio', 'function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'YES', 0 => 'NO']]],
 				'setting_3'	=> ['lang' => 'SETTING_3',	'validate' => 'int:0:99999','type' => 'number:0:99999', 'explain' => true],
 				'setting_4'	=> ['lang' => 'SETTING_4',	'validate' => 'string',		'type' => 'select', 'method' => 'create_select', 'explain' => true],
 				'setting_5'	=> ['lang' => 'SETTING_5',	'validate' => 'string',		'type' => 'text:25:255', 'explain' => true],
 				'setting_6'	=> ['lang' => 'SETTING_6',	'validate' => 'string',		'type' => 'password:25:255', 'explain' => true],
 				'setting_7'	=> ['lang' => 'SETTING_7',	'validate' => 'email',		'type' => 'email:0:100', 'explain' => true],
 				'setting_8'	=> ['lang' => 'SETTING_8',	'validate' => 'string',		'type' => 'textarea:5:30', 'explain' => true],
-				'setting_9'	=> ['lang' => 'SETTING_9',	'validate' => 'bool',		'type' => 'radio:enabled_disabled', 'explain' => true],
+				'setting_9'	=> ['lang' => 'SETTING_9',	'validate' => 'bool',		'type' => 'radio', 'function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'ENABLED', 0 => 'DISABLED']], 'explain' => true],
+				'setting_10'=> ['lang' => 'SETTING_10',	'validate' => 'int',		'type' => 'radio', 'function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'LABEL_1', 3 => 'LABEL_3', 2 => 'LABEL_2']], 'explain' => true],
+				'setting_11'=> ['lang' => 'SETTING_11',	'validate' => 'bool',		'type' => 'radio:yes_no', 'explain' => true],
+				'setting_12'=> ['lang' => 'SETTING_12',	'validate' => 'bool',		'type' => 'radio:enabled_disabled', 'explain' => true],
 			]
 		];
 
-		$this->new_config = $cfg_array = $error = [];
+		$config = new \phpbb\config\config([
+			'setting_0_width' => '1',
+			'setting_0_height' => '17',
+			'setting_0' => '10',
+			'setting_2' => '1',
+			'setting_3' => '15',
+			'setting_4' => '2',
+			'setting_5' => 'Setting 5',
+			'setting_6' => 'password',
+			'setting_7' => 'test@example.dom',
+			'setting_8' => 'Textarea',
+			'setting_9' => '1',
+			'setting_10' => '3',
+			'setting_11' => '0',
+			'setting_12' => '0',
+		]);
+		$this->new_config = clone $config;
+		$cfg_array = (isset($_REQUEST['config'])) ? $request->variable('config', ['' => ''], true) : $this->new_config;
+		$error = [];
 
 		validate_config_vars($display_vars['vars'], $cfg_array, $error);
 
@@ -104,7 +125,7 @@ function main($id, $mode)
 				$l_explain = $language->lang($vars['lang_explain'] ?: $vars['lang'] . '_EXPLAIN');
 			}
 
-			$content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);
+			$content = phpbb_build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);
 
 			if (empty($content))
 			{
@@ -123,13 +144,15 @@ function main($id, $mode)
 		}
 	}
 
-	function create_select()
+	function create_select($value)
 	{
-		return '
-			<option value="1" selected="selected">Option 1</option>
-			<option value="2">Option 2</option>
-			<option value="3">Option 3</option>
-		';
+		$options = [
+			1 => 'Option 1',
+			2 => 'Option 2',
+			3 => 'Option 3',
+		];
+
+		return ['options' => build_select($options, $value)];
 	}
 
 	function submit_button()
diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
index 495c775a1f8..cac5f9cd76c 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/services.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml
@@ -14,7 +14,13 @@ services:
         class: foo\bar\event\permission
         tags:
             - { name: event.listener }
+
     foo_bar.listener.user_setup:
         class: foo\bar\event\user_setup
         tags:
             - { name: event.listener }
+
+    foo_bar.listener.template_event_order:
+        class: foo\bar\event\template_event_order
+        tags:
+            - { name: event.listener }
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index 47d856a5df6..960d1c8530c 100644
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -61,7 +61,7 @@ public function redirect()
 	{
 		$url_root = generate_board_url();
 
-		$rewrite_prefix = (!empty($this->config['enable_mod_rewrite'])) ? '' : 'app.php/';
+		$rewrite_prefix = (!empty($this->config['enable_mod_rewrite'])) ? '' : 'index.php/';
 
 		$redirects = array(
 			array(
diff --git a/tests/functional/fixtures/ext/foo/bar/event/template_event_order.php b/tests/functional/fixtures/ext/foo/bar/event/template_event_order.php
new file mode 100644
index 00000000000..16589591c93
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/event/template_event_order.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\bar\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_bar'] = [
+			'event/navbar_header_quick_links_after' => -1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/event/template_event_order_higher.php b/tests/functional/fixtures/ext/foo/bar/event/template_event_order_higher.php
new file mode 100644
index 00000000000..6d3978a2ad2
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/event/template_event_order_higher.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\bar\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_bar'] = [
+			'event/navbar_header_quick_links_after' => 1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/index_body_forumlist_body_before.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/index_body_forumlist_body_before.html
new file mode 100644
index 00000000000..2071af84333
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/index_body_forumlist_body_before.html
@@ -0,0 +1 @@
+<p id="foo_bar_forumlist_body_before">{{ lang('FOO_BAR_FORUMLIST_BODY_BEFORE') }}</p>
\ No newline at end of file
diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/navbar_header_quick_links_after.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/navbar_header_quick_links_after.html
new file mode 100644
index 00000000000..40be5d2b389
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/navbar_header_quick_links_after.html
@@ -0,0 +1 @@
+<li><span>{{ lang('FOO_BAR_QUICK_LINK') }}</span></li>
\ No newline at end of file
diff --git a/tests/functional/fixtures/ext/foo/foo/config/services.yml b/tests/functional/fixtures/ext/foo/foo/config/services.yml
index b3c77197155..fc10b65e56d 100644
--- a/tests/functional/fixtures/ext/foo/foo/config/services.yml
+++ b/tests/functional/fixtures/ext/foo/foo/config/services.yml
@@ -1,3 +1,8 @@
 services:
     foo_foo.controller:
         class: foo\foo\controller\controller
+
+    foo_foo.listener.template_event_order:
+        class: foo\foo\event\template_event_order
+        tags:
+            - { name: event.listener }
diff --git a/tests/functional/fixtures/ext/foo/foo/event/template_event_order.php b/tests/functional/fixtures/ext/foo/foo/event/template_event_order.php
new file mode 100644
index 00000000000..09045e918ef
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/foo/event/template_event_order.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\foo\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_foo'] = [
+			'event/navbar_header_quick_links_after' => 1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}
diff --git a/tests/functional/fixtures/ext/foo/foo/event/template_event_order_lower.php b/tests/functional/fixtures/ext/foo/foo/event/template_event_order_lower.php
new file mode 100644
index 00000000000..d18eb85baf7
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/foo/event/template_event_order_lower.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\foo\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_foo'] = [
+			'event/navbar_header_quick_links_after' => -1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}
diff --git a/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/index_body_forumlist_body_before.html b/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/index_body_forumlist_body_before.html
new file mode 100644
index 00000000000..3b76634e181
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/index_body_forumlist_body_before.html
@@ -0,0 +1 @@
+<p id="foo_foo_forumlist_body_before">{{ lang('FOO_FOO_FORUMLIST_BODY_BEFORE') }}</p>
\ No newline at end of file
diff --git a/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/navbar_header_quick_links_after.html b/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/navbar_header_quick_links_after.html
new file mode 100644
index 00000000000..932c93caff8
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/navbar_header_quick_links_after.html
@@ -0,0 +1 @@
+<li><span>{{ lang('FOO_FOO_QUICK_LINK') }}</span></li>
\ No newline at end of file
diff --git a/tests/functional/fixtures/files/extensions_catalog.json b/tests/functional/fixtures/files/extensions_catalog.json
new file mode 100644
index 00000000000..1ab64d98dff
--- /dev/null
+++ b/tests/functional/fixtures/files/extensions_catalog.json
@@ -0,0 +1,34 @@
+[
+	{
+		"name": "extension1/vendor",
+		"display_name": "Extension 1",
+		"composer_name": "extension1/vendor",
+		"version": "1.0.0",
+		"description": "Dummy extension 1 for testing.",
+		"url": "https://example.com/extension1",
+		"authors": [
+			{
+				"name": "Author One",
+				"email": "author1@example.com",
+				"homepage": "https://author1.example.com",
+				"role": "Developer"
+			}
+		]
+	},
+	{
+		"name": "phpbb/viglink",
+		"display_name": "VigLink",
+		"composer_name": "phpbb/viglink",
+		"version": "dev-master",
+		"description": "The VigLink extension for phpBB makes it possible to earn revenue, without any change to the user experience, when users post and follow links to commercial sites.",
+		"url": "https://www.phpbb.com/",
+		"authors": [
+			{
+				"name": "Author Two",
+				"email": "author2@example.com",
+				"homepage": "https://author2.example.com",
+				"role": "Developer"
+			}
+		]
+	}
+]
diff --git a/tests/functional/forgot_password_test.php b/tests/functional/forgot_password_test.php
index 554b503470d..817eeefb101 100644
--- a/tests/functional/forgot_password_test.php
+++ b/tests/functional/forgot_password_test.php
@@ -19,7 +19,7 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
 	public function test_forgot_password_enabled()
 	{
 		$this->add_lang('ucp');
-		$crawler = self::request('GET', 'app.php/user/forgot_password');
+		$crawler = self::request('GET', 'index.php/user/forgot_password');
 		$this->assertEquals($this->lang('RESET_PASSWORD'), $crawler->filter('h2')->text());
 	}
 
@@ -39,7 +39,7 @@ public function test_forgot_password_disabled()
 
 		$this->logout();
 
-		$crawler = self::request('GET', 'app.php/user/forgot_password');
+		$crawler = self::request('GET', 'index.php/user/forgot_password');
 		$this->assertStringContainsString($this->lang('UCP_PASSWORD_RESET_DISABLED', '', ''), $crawler->text());
 
 	}
diff --git a/tests/functional/forum_password_test.php b/tests/functional/forum_password_test.php
index 4b2b69a92c2..93c0dbb6d61 100644
--- a/tests/functional/forum_password_test.php
+++ b/tests/functional/forum_password_test.php
@@ -34,7 +34,7 @@ public function test_setup_forum_with_password()
 		$crawler = self::submit($form);
 	}
 
-	public function data_enter_forum_with_password()
+	public static function data_enter_forum_with_password()
 	{
 		return array(
 			array('foowrong', 'WRONG_PASSWORD'),
diff --git a/tests/functional/forum_style_test.php b/tests/functional/forum_style_test.php
index c397c9d7fb3..e2d5fdd129e 100644
--- a/tests/functional/forum_style_test.php
+++ b/tests/functional/forum_style_test.php
@@ -30,9 +30,8 @@ public function test_default_forum_style()
 
 	public function test_custom_forum_style()
 	{
-		$db = $this->get_db();
 		$this->add_style(2, 'test_style');
-		$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 2 WHERE forum_id = 2');
+		$this->db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 2 WHERE forum_id = 2');
 
 		$crawler = self::request('GET', 'viewtopic.php?t=1&f=2');
 		$this->assertStringContainsString('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
@@ -43,7 +42,7 @@ public function test_custom_forum_style()
 		$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
 		$this->assertStringContainsString('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
 
-		$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2');
+		$this->db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2');
 		$this->delete_style(2, 'test_style');
 	}
 }
diff --git a/tests/functional/jumpbox_test.php b/tests/functional/jumpbox_test.php
index 9e2938f9e25..9acaf5ee627 100644
--- a/tests/functional/jumpbox_test.php
+++ b/tests/functional/jumpbox_test.php
@@ -16,6 +16,8 @@
 */
 class phpbb_functional_jumpbox_test extends phpbb_functional_test_case
 {
+	protected $crawler;
+
 	public function test_jumpbox()
 	{
 		$this->login();
diff --git a/tests/functional/manifest_test.php b/tests/functional/manifest_test.php
new file mode 100644
index 00000000000..429668e9a2d
--- /dev/null
+++ b/tests/functional/manifest_test.php
@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_manifest_test extends phpbb_functional_test_case
+{
+	public function test_manifest()
+	{
+		$url_path = preg_replace('#^(/.+)/$#', '$1/', parse_url(self::$root_url, PHP_URL_PATH));
+
+		$expected = [
+			'name'			=> 'yourdomain.com',
+			'short_name'	=> 'yourdomain',
+			'display'		=> 'standalone',
+			'orientation'	=> 'portrait',
+			'start_url'		=> $url_path,
+			'scope'			=> $url_path,
+		];
+
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=settings&sid=' . $this->sid);
+
+		$form_data = [
+			'config[sitename]'		=> $expected['name'],
+			'config[sitename_short]'	=> $expected['short_name'],
+		];
+		$form = $crawler->selectButton('submit')->form($form_data);
+		$crawler = self::submit($form);
+		$this->assertStringContainsString($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text());
+
+		self::request('GET', 'index.php/manifest', [], false);
+		$this->assertEquals(json_encode($expected), self::get_content());
+	}
+}
diff --git a/tests/functional/mcp/mcp_main_test.php b/tests/functional/mcp/mcp_main_test.php
index a056217f730..4d5bfc1e0a3 100644
--- a/tests/functional/mcp/mcp_main_test.php
+++ b/tests/functional/mcp/mcp_main_test.php
@@ -72,7 +72,7 @@ public function test_mcp_view_forum($post)
 		return $post;
 	}
 
-	public function mcp_view_forum_actions_data()
+	public static function mcp_view_forum_actions_data()
 	{
 		// action, success message, require_confirmation
 		return [
@@ -181,7 +181,7 @@ public function test_mcp_view_forum_permanently_delete_topic()
 		$this->assertStringContainsString($this->lang('TOPICS_DELETED_SUCCESS'), $crawler->filter('#message p')->text());
 	}
 
-	public function mcp_view_topic_actions_data()
+	public static function mcp_view_topic_actions_data()
 	{
 		// action, success message, require_confirmation
 		return [
@@ -208,7 +208,7 @@ public function test_create_topic_with_replies()
 		// Create replies. Flood control was disabled above
 		for ($i = 1; $i <= 15; $i++)
 		{
-			sleep(1);
+			usleep(100000);
 			$post_text = "This is reply number $i to the Test Topic 4 to test moderation actions from MCP/View topic page.";
 			$post[$i] = $this->create_post(2, $post[0]['topic_id'], 'Re: Test Topic 4', $post_text);
 			$crawler = self::request('GET', "viewtopic.php?p={$post[$i]['post_id']}&sid={$this->sid}#p{$post[$i]['post_id']}");
diff --git a/tests/functional/mcp/mcp_test.php b/tests/functional/mcp/mcp_test.php
index ff8dff4564f..b2d8fd6cac4 100644
--- a/tests/functional/mcp/mcp_test.php
+++ b/tests/functional/mcp/mcp_test.php
@@ -24,6 +24,7 @@ public function test_all_mcp_module_links()
 		// Browse MCP main page
 		$crawler = self::request('GET', 'index.php');
 		$crawler = self::$client->click($crawler->selectLink($this->lang('MCP_SHORT'))->link());
+		self::assert_response_html();
 
 		// Get all MCP module URLs array
 		$mcp_modules = $crawler->filter('.tabs a')->each(
@@ -32,12 +33,14 @@ function ($node, $i)
 				return $node->link();
 			}
 		);
+		$this->assertNotEmpty($mcp_modules);
 
 		// Browse all MCP modules and get their mode URLs array
 		$mcp_submodules = [];
 		foreach ($mcp_modules as $module)
 		{
 			$crawler = self::$client->click($module);
+			self::assert_response_html();
 			$mcp_submodules = array_merge($mcp_submodules, $crawler->filter('.cp-menu a')->each(
 				function ($node, $i)
 				{
@@ -45,11 +48,13 @@ function ($node, $i)
 				}
 			));
 		}
+		$this->assertNotEmpty($mcp_submodules);
 
 		// Browse all MCP submodules' modes
 		foreach ($mcp_submodules as $mcp_submodule)
 		{
 			self::$client->click($mcp_submodule);
+			self::assert_response_html();
 		}
 	}
 }
diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php
index 3e40ddc528a..a369b82aafa 100644
--- a/tests/functional/memberlist_test.php
+++ b/tests/functional/memberlist_test.php
@@ -43,7 +43,7 @@ public function test_viewprofile()
 
 	protected function get_memberlist_leaders_table_crawler()
 	{
-		$crawler = self::request('GET', 'memberlist.php?mode=team&sid=' . $this->sid);
+		$crawler = self::request('GET', 'index.php/members/team');
 		return $crawler->filter('.forumbg-table');
 	}
 
@@ -134,4 +134,29 @@ public function test_group_rank()
 
 		unlink(__DIR__ . '/../../phpBB/images/ranks/valid.jpg');
 	}
+
+	public function test_email()
+	{
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(['acp/board', 'acp/common', 'memberlist']);
+
+		$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=email");
+		$form = $crawler->selectButton('Submit')->form([
+			'config[board_email_form]' => 1,
+		]);
+		$crawler = self::submit($form);
+		$this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text());
+
+		$crawler = self::request('GET', 'memberlist.php?mode=email&u=2');
+		$this->assertStringContainsString($this->lang('SEND_EMAIL_USER', 'admin'), $crawler->filter('.titlespace')->text());
+
+		$form = $crawler->selectButton($this->lang('SEND_EMAIL'))->form([
+			'subject' => 'Test email form message',
+			'message' => 'This is a test email message sent from a member profile email form.',
+		]);
+		$crawler = self::submit($form);
+
+		$this->assertContainsLang('EMAIL_SENT', $crawler->text());
+	}
 }
diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php
index 8b4eb8fde56..9744bf08a7f 100644
--- a/tests/functional/metadata_manager_test.php
+++ b/tests/functional/metadata_manager_test.php
@@ -16,33 +16,27 @@
 */
 class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;
 
 	protected static $fixtures = array(
 		'./',
 	);
 
-	protected function tearDown(): void
-	{
-		$this->uninstall_ext('foo/bar');
-
-		parent::tearDown();
-	}
-
 	public static function setUpBeforeClass(): void
 	{
 		parent::setUpBeforeClass();
 
 		self::$helper = new phpbb_test_case_helpers(__CLASS__);
 		self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures);
+
+		self::install_ext('foo/bar');
 	}
 
 	public static function tearDownAfterClass(): void
 	{
 		parent::tearDownAfterClass();
 
+		self::uninstall_ext('foo/bar');
 		self::$helper->restore_original_ext_dir();
 	}
 
@@ -55,11 +49,6 @@ protected function setUp(): void
 		$this->add_lang('acp/extensions');
 	}
 
-	protected static function setup_extensions()
-	{
-		return ['foo/bar'];
-	}
-
 	public function test_extensions_list()
 	{
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php
index 7eed7d371fc..6d4ca216318 100644
--- a/tests/functional/notification_test.php
+++ b/tests/functional/notification_test.php
@@ -65,7 +65,7 @@ public function test_mark_notifications_read()
 		$this->login('notificationtestuser');
 
 		// Post a new post that needs approval
-		$this->create_post(2, 1, 'Re: Welcome to phpBB3', 'This is a test [b]post[/b] posted by notificationtestuser.', array(), 'POST_STORED_MOD');
+		$this->create_post(2, 1, 'Re: Welcome to phpBB', 'This is a test [b]post[/b] posted by notificationtestuser.', array(), 'POST_STORED_MOD');
 		$crawler = self::request('GET', "viewtopic.php?t=1&sid={$this->sid}");
 		$this->assertStringNotContainsString('This is a test post posted by notificationtestuser.', $crawler->filter('html')->text());
 
diff --git a/tests/functional/notification_webpush_test.php b/tests/functional/notification_webpush_test.php
new file mode 100644
index 00000000000..acd15a261d6
--- /dev/null
+++ b/tests/functional/notification_webpush_test.php
@@ -0,0 +1,127 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_notification_webpush_test extends phpbb_functional_test_case
+{
+	public function test_acp_module()
+	{
+		$this->login();
+		$this->admin_login();
+
+		$this->add_lang(['acp/board', 'acp/common']);
+
+		$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=webpush&sid=' . $this->sid);
+
+		$this->assertContainsLang('ACP_WEBPUSH_SETTINGS', $crawler->filter('div.main > h1')->text());
+		$this->assertContainsLang('ACP_WEBPUSH_SETTINGS_EXPLAIN', $crawler->filter('div.main > p')->text());
+		$this->assertContainsLang('WEBPUSH_GENERATE_VAPID_KEYS', $crawler->filter('input[type="button"]')->attr('value'));
+
+		$form_data = [
+			'config[webpush_enable]'	=> 1,
+			'config[webpush_vapid_public]'	=> 'BDnYSJHVZBxq834LqDGr893IfazEez7q-jYH2QBNlT0ji2C9UwGosiqz8Dp_ZN23lqAngBZyRjXVWF4ZLA8X2zI',
+			'config[webpush_vapid_private]'	=> 'IE5OYlmfWsMbBU1lzvr0bxrxVAXIteSkAnwGlZIhmRk',
+			'config[webpush_method_default_enable]'	=> 1,
+			'config[webpush_dropdown_subscribe]'	=> 1,
+		];
+		$form = $crawler->selectButton('submit')->form($form_data);
+		$crawler = self::submit($form);
+		$this->assertStringContainsString($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text());
+
+		$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=webpush&sid=' . $this->sid);
+
+		foreach ($form_data as $config_name => $config_value)
+		{
+			$config_value = ($config_name === 'config[webpush_vapid_private]') ? '********' : $config_value;
+			$this->assertEquals($config_value, $crawler->filter('input[name="' . $config_name . '"]')->attr('value'));
+		}
+	}
+
+	public function test_ucp_module()
+	{
+		$this->login();
+		$this->admin_login();
+
+		$this->add_lang('ucp');
+
+		$crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options');
+
+		$this->assertContainsLang('NOTIFY_WEBPUSH_ENABLE', $crawler->filter('label[for="subscribe_webpush"]')->text());
+		$this->assertContainsLang('NOTIFICATION_METHOD_WEBPUSH', $crawler->filter('th.mark')->eq(2)->text());
+
+		// Assert checkbox is checked
+		$wp_list = $crawler->filter('.table1');
+		$this->assert_checkbox_is_checked($wp_list, 'notification.type.bookmark_notification.method.webpush');
+		$this->assert_checkbox_is_checked($wp_list, 'notification.type.mention_notification.method.webpush');
+		$this->assert_checkbox_is_checked($wp_list, 'notification.type.post_notification.method.webpush');
+		$this->assert_checkbox_is_checked($wp_list, 'notification.type.quote_notification.method.webpush');
+		$this->assert_checkbox_is_checked($wp_list, 'notification.type.topic_notification.method.webpush');
+		$this->assert_checkbox_is_checked($wp_list, 'notification.type.forum_notification.method.webpush');
+		$this->assert_checkbox_is_checked($wp_list, 'notification.type.group_request_notification.method.webpush');
+		$this->assert_checkbox_is_checked($wp_list, 'notification.type.pm_notification.method.webpush');
+		$this->assert_checkbox_is_checked($wp_list, 'notification.type.report_pm_closed_notification.method.webpush');
+		$this->assert_checkbox_is_checked($wp_list, 'notification.type.report_post_closed_notification.method.webpush');
+
+		$this->set_acp_option('webpush_method_default_enable', 0);
+
+		$crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options');
+
+		// Assert checkbox is unchecked
+		$wp_list = $crawler->filter('.table1');
+		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.bookmark_notification.method.webpush');
+		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.mention_notification.method.webpush');
+		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.post_notification.method.webpush');
+		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.quote_notification.method.webpush');
+		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.topic_notification.method.webpush');
+		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.forum_notification.method.webpush');
+		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.group_request_notification.method.webpush');
+		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.pm_notification.method.webpush');
+		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.report_pm_closed_notification.method.webpush');
+		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.report_post_closed_notification.method.webpush');
+	}
+
+	public function test_dropdown_subscribe_button()
+	{
+		$this->login();
+		$this->admin_login();
+
+		// Assert subscribe dropdown is present
+		$crawler = self::request('GET', 'index.php');
+		$this->assertCount(1, $crawler->filter('.webpush-subscribe'));
+		$this->assertContainsLang('NOTIFY_WEB_PUSH_SUBSCRIBE', $crawler->filter('.webpush-subscribe #subscribe_webpush')->text());
+		$this->assertContainsLang('NOTIFY_WEB_PUSH_SUBSCRIBED', $crawler->filter('.webpush-subscribe #unsubscribe_webpush')->text());
+
+		// Assert subscribe button is not displayed in UCP when dropdown subscribe is present
+		$crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options');
+		$this->assertCount(0, $crawler->filter('.webpush-subscribe'));
+
+		$this->set_acp_option('webpush_dropdown_subscribe', 0);
+
+		// Assert subscribe dropdown is not present by default
+		$crawler = self::request('GET', 'index.php');
+		$this->assertCount(0, $crawler->filter('.webpush-subscribe'));
+	}
+
+	protected function set_acp_option($option, $value)
+	{
+		$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=webpush&sid=' . $this->sid);
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+		$values["config[{$option}]"] = $value;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+		$this->assertEquals(1, $crawler->filter('.successbox')->count());
+	}
+}
diff --git a/tests/functional/permission_roles_test.php b/tests/functional/permission_roles_test.php
index e6506fb37c4..5cc6491e4bc 100644
--- a/tests/functional/permission_roles_test.php
+++ b/tests/functional/permission_roles_test.php
@@ -16,7 +16,7 @@
 */
 class functional_permission_roles_test extends phpbb_functional_test_case
 {
-	public function data_permission_roles()
+	public static function data_permission_roles()
 	{
 		return array(
 			array(
diff --git a/tests/functional/plupload_test.php b/tests/functional/plupload_test.php
index 7952d4f17b9..efe64c688c3 100644
--- a/tests/functional/plupload_test.php
+++ b/tests/functional/plupload_test.php
@@ -21,13 +21,12 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
 
 	protected function set_extension_group_permission($val)
 	{
-		$db = $this->get_db();
 		$query = "
 			UPDATE phpbb_extension_groups
 			SET allow_in_pm = '$val'
 			WHERE group_name = 'IMAGES'
 		";
-		$db->sql_query($query);
+		$this->db->sql_query($query);
 	}
 
 	protected function setUp(): void
@@ -60,7 +59,7 @@ protected function tearDown(): void
 		}
 	}
 
-	public function get_urls()
+	public static function get_urls()
 	{
 		return array(
 			array('posting.php?mode=reply&t=1'),
diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index 9f8b2997566..f561a9618c7 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php
@@ -301,7 +301,7 @@ public function test_allowed_schemes_links()
 		);
 	}
 
-	public function nonexistent_post_id_data()
+	public static function nonexistent_post_id_data()
 	{
 		$nonexistent_post_id = 999999; // Random value
 		return [
diff --git a/tests/functional/prune_shadow_topic_test.php b/tests/functional/prune_shadow_topic_test.php
index 698acc75508..c036cfcf47a 100644
--- a/tests/functional/prune_shadow_topic_test.php
+++ b/tests/functional/prune_shadow_topic_test.php
@@ -121,7 +121,6 @@ public function test_move_topic()
 			'forum_topics_softdeleted'	=> 0,
 		), 'after moving');
 
-		$this->db = $this->get_db();
 		// Date topic 3 days back
 		$sql = 'UPDATE phpbb_topics
 			SET topic_last_post_time = ' . (time() - 60*60*24*3) . '
@@ -130,10 +129,10 @@ public function test_move_topic()
 
 		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Prune Shadow']}&sid={$this->sid}");
 		$this->assertNotEmpty($crawler->filter('img')->last()->attr('src'));
-		self::request('GET', "app.php/cron/cron.task.core.prune_shadow_topics?f={$this->data['forums']['Prune Shadow']}&sid={$this->sid}", array(), false);
+		self::request('GET', "index.php/cron/cron.task.core.prune_shadow_topics?f={$this->data['forums']['Prune Shadow']}&sid={$this->sid}", array(), false);
 
 		// Try to ensure that the cron can actually run before we start to wait for it
-		sleep(1);
+		usleep(100000);
 		$cron_lock = new \phpbb\lock\db('cron_lock', new \phpbb\config\db($this->db, new \phpbb\cache\driver\dummy(), 'phpbb_config'), $this->db);
 		while (!$cron_lock->acquire())
 		{
@@ -153,8 +152,6 @@ public function test_move_topic()
 
 	public function assert_forum_details($forum_id, $details, $additional_error_message = '')
 	{
-		$this->db = $this->get_db();
-
 		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
 			FROM phpbb_forums
 			WHERE forum_id = ' . (int) $forum_id;
@@ -167,8 +164,6 @@ public function assert_forum_details($forum_id, $details, $additional_error_mess
 
 	public function load_ids($data)
 	{
-		$this->db = $this->get_db();
-
 		if (!empty($data['forums']))
 		{
 			$sql = 'SELECT *
diff --git a/tests/functional/registration_test.php b/tests/functional/registration_test.php
index 9b77feaa86b..e47d8193b5e 100644
--- a/tests/functional/registration_test.php
+++ b/tests/functional/registration_test.php
@@ -24,6 +24,7 @@ public function test_disable_captcha_on_registration()
 		$crawler = self::request('GET', "adm/index.php?i=acp_board&mode=registration&sid={$this->sid}");
 		$form = $crawler->selectButton('Submit')->form();
 		$form['config[enable_confirm]']->setValue('0');
+		$form['config[pass_complex]']->setValue('PASS_TYPE_ANY');
 		$crawler = self::submit($form);
 
 		$this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('#main .successbox')->text());
diff --git a/tests/functional/report_post_captcha_test.php b/tests/functional/report_post_captcha_test.php
index 1c7435fcf31..d58808d6c19 100644
--- a/tests/functional/report_post_captcha_test.php
+++ b/tests/functional/report_post_captcha_test.php
@@ -18,13 +18,13 @@ class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_ca
 {
 	public function test_guest_report_post()
 	{
-		$crawler = self::request('GET', 'app.php/post/1/report', array(), false);
+		$crawler = self::request('GET', 'index.php/post/1/report', array(), false);
 		$this->assert_response_html(403);
 		$this->add_lang('mcp');
 		$this->assertStringContainsString($this->lang('USER_CANNOT_REPORT'), $crawler->filter('html')->text());
 
 		$this->set_reporting_guest(1);
-		$crawler = self::request('GET', 'app.php/post/1/report');
+		$crawler = self::request('GET', 'index.php/post/1/report');
 		$this->assertStringContainsString($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
 		$this->set_reporting_guest(-1);
 	}
@@ -32,7 +32,7 @@ public function test_guest_report_post()
 	public function test_user_report_post()
 	{
 		$this->login();
-		$crawler = self::request('GET', 'app.php/post/1/report');
+		$crawler = self::request('GET', 'index.php/post/1/report');
 		$this->assertStringNotContainsString($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
 
 		$this->add_lang('mcp');
diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php
index c3f3f6f7dd3..ddf2e7564f9 100644
--- a/tests/functional/search/base.php
+++ b/tests/functional/search/base.php
@@ -51,6 +51,30 @@ protected function assert_search_topics_by_author($author, $topics_found, $sort_
 		$this->assertStringContainsString("Search found $topics_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend);
 	}
 
+	protected function assert_search_posts_by_author_id($author_id, $posts_found, $sort_key = '', $sort_dir = '')
+	{
+		// Test obtaining data from cache if sorting direction is set
+		if (!$sort_dir)
+		{
+			$this->purge_cache();
+		}
+		$crawler = self::request('GET', 'search.php?author_id=' . $author_id . ($sort_key ? "&sk=$sort_key" : '') . ($sort_dir ? "&sk=$sort_dir" : ''));
+		$this->assertEquals($posts_found, $crawler->filter('.postbody')->count(), $this->search_backend);
+		$this->assertStringContainsString("Search found $posts_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend);
+	}
+
+	protected function assert_search_topics_by_author_id($author_id, $topics_found, $sort_key = '', $sort_dir = '')
+	{
+		// Test obtaining data from cache if sorting direction is set
+		if (!$sort_dir)
+		{
+			$this->purge_cache();
+		}
+		$crawler = self::request('GET', 'search.php?sr=topics&author_id=' . $author_id . ($sort_key ? "&sk=$sort_key" : '') . ($sort_dir ? "&sk=$sort_dir" : ''));
+		$this->assertEquals($topics_found, $crawler->filter('.row')->count(), $this->search_backend);
+		$this->assertStringContainsString("Search found $topics_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend);
+	}
+
 	protected function assert_search_in_topic($topic_id, $keywords, $posts_found, $sort_key = '')
 	{
 		$this->purge_cache();
@@ -95,10 +119,14 @@ public function test_search_backend()
 		$this->add_lang('common');
 
 		// Create a new standard user if needed, topic and post to test searh for author
-		if (!$this->user_exists('searchforauthoruser'))
+		if (!$searchforauthoruser_id = $this->user_exists('searchforauthoruser'))
 		{
 			$searchforauthoruser_id = $this->create_user('searchforauthoruser');
 		}
+		else
+		{
+			$searchforauthoruser_id = key($searchforauthoruser_id);
+		}
 		$this->remove_user_group('NEWLY_REGISTERED', ['searchforauthoruser']);
 		$this->set_flood_interval(0);
 		$this->login('searchforauthoruser');
@@ -109,8 +137,6 @@ public function test_search_backend()
 		$this->login();
 		$this->admin_login();
 
-		$this->create_search_index('phpbb\\search\\backend\\fulltext_native');
-
 		$post = $this->create_topic(2, 'Test Topic 1 foosubject', 'This is a test topic posted by the barsearch testing framework.');
 		$topic_multiple_results_count1 = $this->create_topic(2, 'Test Topic for multiple search results', 'This is a test topic posted to test multiple results count.');
 		$this->create_post(2, $topic_multiple_results_count1['topic_id'], 'Re: Test Topic for multiple search results', 'This is a test post 2 posted to test multiple results count.');
@@ -165,13 +191,13 @@ public function test_search_backend()
 
 		foreach (['', 'a', 't', 'f', 'i', 's'] as $sort_key)
 		{
-			$this->assert_search_found('phpbb3+installation', 1, 3, $sort_key);
+			$this->assert_search_found('phpbb+installation', 1, 4, $sort_key);
 			$this->assert_search_found('foosubject+barsearch', 1, 2, $sort_key);
 			$this->assert_search_found('barsearch-testing', 1, 2, $sort_key); // test hyphen ignored
 			$this->assert_search_found('barsearch+-+testing', 1, 2, $sort_key); // test hyphen wrapped with space ignored
 			$this->assert_search_found('multiple+results+count', 3, 15, $sort_key); // test multiple results count - posts
 			$this->assert_search_found_topics('multiple+results+count', 2, $sort_key); // test multiple results count - topics
-			$this->assert_search_found_topics('phpbb3+installation', 1, $sort_key);
+			$this->assert_search_found_topics('phpbb+installation', 1, $sort_key);
 			$this->assert_search_found_topics('foosubject+barsearch', 1, $sort_key);
 
 			$this->assert_search_in_forum(2, 'multiple+search+results', 3, $sort_key); // test multiple results count - forum search - posts
@@ -180,6 +206,11 @@ public function test_search_backend()
 
 			$this->assert_search_posts_by_author('searchforauthoruser', 2, $sort_key);
 			$this->assert_search_topics_by_author('searchforauthoruser', 1, $sort_key);
+
+			$this->assert_search_posts_by_author_id($searchforauthoruser_id, 2, $sort_key);
+			$this->assert_search_topics_by_author_id($searchforauthoruser_id, 1, $sort_key);
+			$this->assert_search_posts_by_author_id($searchforauthoruser_id, 2, $sort_key, 'a'); //search asc order
+			$this->assert_search_topics_by_author_id($searchforauthoruser_id, 1, $sort_key, 'a'); // search asc order
 		}
 
 		$this->assert_search_not_found('loremipsumdedo');
@@ -196,6 +227,159 @@ public function test_search_backend()
 		$this->delete_topic($topic_multiple_results_count2['topic_id']);
 	}
 
+	public function test_caching_search_results()
+	{
+		global $phpbb_root_path;
+
+		// Sphinx search doesn't use phpBB search results caching
+		if (strpos($this->search_backend, 'fulltext_sphinx'))
+		{
+			$this->markTestSkipped("Sphinx search doesn't use phpBB search results caching");
+		}
+
+		$this->purge_cache();
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', 'search.php?author_id=2&sr=posts');
+		$posts_found_text = $crawler->filter('.searchresults-title')->text();
+
+		// Get total user's post count
+		preg_match('!(\d+)!', $posts_found_text, $matches);
+		$posts_count = (int) $matches[1];
+
+		$this->assertStringContainsString("Search found $posts_count matches", $posts_found_text, $this->search_backend);
+
+		// Set this value to cache less results than total count
+		$sql = 'UPDATE ' . CONFIG_TABLE . '
+			SET config_value = ' . floor($posts_count / 3) . "
+			WHERE config_name = '" . $this->db->sql_escape('search_block_size') . "'";
+		$this->db->sql_query($sql);
+
+		// Temporarily set posts_per_page to the value allowing to get several pages (4+)
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post');
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+		$current_posts_per_page = $values['config[posts_per_page]'];
+		$values['config[posts_per_page]'] = floor($posts_count / 10);
+		$form->setValues($values);
+		$crawler = self::submit($form);
+		$this->assertEquals(1, $crawler->filter('.successbox')->count(), $this->search_backend);
+
+		// Now actually test caching search results
+		$this->purge_cache();
+
+		// Default sort direction is 'd' (descending), browse  the 1st page
+		$crawler = self::request('GET', 'search.php?author_id=2&sr=posts');
+		$pagination = $crawler->filter('.pagination')->eq(0);
+		$posts_found_text = $pagination->text();
+
+		$this->assertStringContainsString("Search found $posts_count matches", $posts_found_text, $this->search_backend);
+
+		// Filter all search result page links on the 1st page
+		$pagination = $pagination->filter('li > a')->reduce(
+			function ($node, $i)
+			{
+				return ($node->attr('class') == 'button');
+			}
+		);
+
+		// Get last page number
+		$last_page = (int) $pagination->last()->text();
+
+		// Browse the last search page
+		$crawler = self::$client->click($pagination->selectLink($last_page)->link());
+		$pagination = $crawler->filter('.pagination')->eq(0);
+
+		// Filter all search result page links on the last page
+		$pagination = $pagination->filter('li > a')->reduce(
+			function ($node, $i)
+			{
+				return ($node->attr('class') == 'button');
+			}
+		);
+
+		// Now change sort direction to ascending
+		$form = $crawler->selectButton('sort')->form();
+		$values = $form->getValues();
+		$values['sd'] = 'a';
+		$form->setValues($values);
+		$crawler = self::submit($form);
+
+		$pagination = $crawler->filter('.pagination')->eq(0);
+
+		// Filter all search result page links on the 1st page with new sort direction
+		$pagination = $pagination->filter('li > a')->reduce(
+			function ($node, $i)
+			{
+				return ($node->attr('class') == 'button');
+			}
+		);
+
+		// Browse the rest of search results pages with new sort direction
+		$pages = range(2, $last_page);
+		foreach ($pages as $page_number)
+		{
+			$crawler = self::$client->click($pagination->selectLink($page_number)->link());
+			$pagination = $crawler->filter('.pagination')->eq(0);
+			$pagination = $pagination->filter('li > a')->reduce(
+				function ($node, $i)
+				{
+					return ($node->attr('class') == 'button');
+				}
+			);
+		}
+
+		// Get search results cache varname
+		$finder = new \Symfony\Component\Finder\Finder();
+		$finder
+			->name('data_search_results_*.php')
+			->files()
+			->in($phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT);
+		$iterator = $finder->getIterator();
+		$iterator->rewind();
+		$cache_filename = $iterator->current();
+		$cache_varname = substr($cache_filename->getBasename('.php'), 4);
+
+		// Get cached post ids data
+		$cache = $this->get_cache_driver();
+		$post_ids_cached = $cache->get($cache_varname);
+
+		$cached_results_count = count($post_ids_cached) - 2; // Don't count '-1' and '-2' indexes
+
+		$post_ids_cached_backup = $post_ids_cached;
+
+		// Cached data still should have initial 'd' sort direction
+		$this->assertTrue($post_ids_cached[-2] === 'd', $this->search_backend);
+
+		// Cached search results count should be equal to displayed on search results page
+		$this->assertEquals($posts_count, $post_ids_cached[-1], $this->search_backend);
+
+		// Actual cached data array count should be equal to displayed on search results page too
+		$this->assertEquals($posts_count, $cached_results_count, $this->search_backend);
+
+		// Cached data array shouldn't change after removing duplicates. That is, it shouldn't have any duplicates.
+		unset($post_ids_cached[-2], $post_ids_cached[-1]);
+		unset($post_ids_cached_backup[-2], $post_ids_cached_backup[-1]);
+		$post_ids_cached = array_unique($post_ids_cached);
+		$this->assertEquals($post_ids_cached_backup, $post_ids_cached, $this->search_backend);
+
+		// Restore this value to default
+		$sql = 'UPDATE ' . CONFIG_TABLE . "
+			SET config_value = 250
+			WHERE config_name = '" . $this->db->sql_escape('search_block_size') . "'";
+		$this->db->sql_query($sql);
+
+		// Restore posts_per_page value
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post');
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+		$values['config[posts_per_page]'] = $current_posts_per_page;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+		$this->assertEquals(1, $crawler->filter('.successbox')->count(), $this->search_backend);
+	}
+
 	protected function create_search_index($backend = null)
 	{
 		$this->add_lang('acp/search');
@@ -230,7 +414,12 @@ protected function create_search_index($backend = null)
 
 		// Ensure search index has been actually created
 		$crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid);
-		$posts_indexed = (int) $crawler->filter('#acp_search_index_' . str_replace('\\', '-', $search_type) . ' td')->eq(1)->text();
+		$posts_indexed = (int) $crawler->filter('#acp_search_index_' . str_replace('\\', '-', $search_type) . ' td')->reduce(
+			function ($node, $i) {
+				// Find the value of total posts indexed
+				return (strpos($node->text(), $this->lang('FULLTEXT_MYSQL_TOTAL_POSTS')) !== false  || strpos($node->text(), $this->lang('TOTAL_WORDS')) !== false);
+			})
+		->nextAll()->eq(0)->text();
 		$this->assertTrue($posts_indexed > 0);
 	}
 
@@ -267,7 +456,12 @@ protected function delete_search_index()
 
 		// Ensure search index has been actually removed
 		$crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid);
-		$posts_indexed = (int) $crawler->filter('#acp_search_index_' . str_replace('\\', '-', $this->search_backend) . ' td')->eq(1)->text();
+		$posts_indexed = (int) $crawler->filter('#acp_search_index_' . str_replace('\\', '-', $this->search_backend) . ' td')->reduce(
+			function ($node, $i) {
+				// Find the value of total posts indexed
+				return (strpos($node->text(), $this->lang('FULLTEXT_MYSQL_TOTAL_POSTS')) !== false  || strpos($node->text(), $this->lang('TOTAL_WORDS')) !== false);
+			})
+		->nextAll()->eq(0)->text();
 		$this->assertEquals(0, $posts_indexed);
 	}
 }
diff --git a/tests/functional/search/mysql_test.php b/tests/functional/search/mysql_test.php
index 50b2d6487b9..ef3a273f2ab 100644
--- a/tests/functional/search/mysql_test.php
+++ b/tests/functional/search/mysql_test.php
@@ -20,6 +20,17 @@ class phpbb_functional_search_mysql_test extends phpbb_functional_search_base
 {
 	protected $search_backend = 'phpbb\search\backend\fulltext_mysql';
 
+	protected function setUp(): void
+	{
+		$sql_layer = substr(self::$config['dbms'], strlen('phpbb\\db\\driver\\'));
+		if ($sql_layer !== 'mysqli') // MySQL search backend runs on MySQL/MariaDB only
+		{
+			$this->markTestSkipped($sql_layer . ': MySQL search is not supported');
+		}
+
+		parent::setUp();
+	}
+
 	protected function create_search_index($backend = null)
 	{
 		parent::create_search_index($backend);
@@ -27,10 +38,9 @@ protected function create_search_index($backend = null)
 		// Try optimizing posts table after creating search index.
 		// Some versions of MariaDB might not return any results in the search
 		// until the table has been optimized or the index deleted and re-created.
-		$db = $this->get_db();
-		$db->sql_return_on_error(true);
+		$this->db->sql_return_on_error(true);
 		$sql = 'OPTIMIZE TABLE ' . POSTS_TABLE;
-		$db->sql_query($sql);
-		$db->sql_return_on_error(false);
+		$this->db->sql_query($sql);
+		$this->db->sql_return_on_error(false);
 	}
 }
diff --git a/tests/functional/search/postgres_test.php b/tests/functional/search/postgres_test.php
index 4389705d663..6851a29e803 100644
--- a/tests/functional/search/postgres_test.php
+++ b/tests/functional/search/postgres_test.php
@@ -20,4 +20,14 @@ class phpbb_functional_search_postgres_test extends phpbb_functional_search_base
 {
 	protected $search_backend = 'phpbb\search\backend\fulltext_postgres';
 
+	protected function setUp(): void
+	{
+		$sql_layer = substr(self::$config['dbms'], strlen('phpbb\\db\\driver\\'));
+		if ($sql_layer !== 'postgres') // PostgreSQL search backend runs on PostgreSQL only
+		{
+			$this->markTestSkipped($sql_layer . ': PostgreSQL search is not supported');
+		}
+
+		parent::setUp();
+	}
 }
diff --git a/tests/functional/search/sphinx_test.php b/tests/functional/search/sphinx_test.php
index eaba34d17a7..01ccd1bb7f1 100644
--- a/tests/functional/search/sphinx_test.php
+++ b/tests/functional/search/sphinx_test.php
@@ -20,6 +20,17 @@ class phpbb_functional_search_sphinx_test extends phpbb_functional_search_base
 {
 	protected $search_backend = 'phpbb\search\backend\fulltext_sphinx';
 
+	protected function setUp(): void
+	{
+		$sql_layer = substr(self::$config['dbms'], strlen('phpbb\\db\\driver\\'));
+		if ($sql_layer !== 'mysqli') // Sphinx search backend runs on MySQL/MariaDB only so far
+		{
+			$this->markTestSkipped($sql_layer . ': Sphinx search is not supported');
+		}
+
+		parent::setUp();
+	}
+
 	protected function create_search_index($backend = null)
 	{
 		parent::create_search_index($backend);
@@ -27,22 +38,12 @@ protected function create_search_index($backend = null)
 
 		if (!$backend || $this->search_backend == $backend)
 		{
+			$output = $retval = null;
+
 			// After creating phpBB search index, build Sphinx index
-			exec('sudo -S service sphinxsearch stop', $output, $retval); // Attemtp to stop sphinxsearch service in case it's running
+			exec('sudo -S service sphinxsearch stop', $output, $retval); // Attempt to stop sphinxsearch service in case it's running
 			exec('sudo -S indexer --all', $output, $retval); // Run sphinxsearch indexer
 			exec('sudo -S service sphinxsearch start', $output, $retval); // Attempt to start sphinxsearch service again
 		}
 	}
-
-	public function test_search_backend()
-	{
-		if ($this->db->sql_layer != 'mysqli') // Sphinx test runs on MySQL/MariaDB only so far
-		{
-			$this->markTestIncomplete('Sphinx Tests are not supported');
-		}
-		else
-		{
-			parent::test_search_backend();
-		}
-	}
 }
diff --git a/tests/functional/session_page_update_test.php b/tests/functional/session_page_update_test.php
index b2e04c0deff..66b610f01d5 100644
--- a/tests/functional/session_page_update_test.php
+++ b/tests/functional/session_page_update_test.php
@@ -17,39 +17,33 @@
 
 class phpbb_functional_session_page_update_test extends phpbb_functional_test_case
 {
-	protected function test_session_page_update()
+	public function setUp(): void
 	{
+		parent::setUp();
+
+		// Delete previous session info for admin user
+		$sql = 'DELETE FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = 2';
+		$this->db->sql_query($sql);
+
 		$this->login();
-		$db = $this->get_db();
-
-		if (!function_exists('utf_clean_string'))
-		{
-			require_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php');
-		}
-		if (!function_exists('user_get_id_name'))
-		{
-			require_once(__DIR__ . '/../../phpBB/includes/functions_user.php');
-		}
-
-		$user_ids = [];
-		$username = [$this->get_logged_in_user()];
-		user_get_id_name($user_ids, $username);
-		$user_id = (int) $user_ids[0];
+	}
 
+	public function test_session_page_update()
+	{
 		// Request index page
 		self::request('GET', 'index.php');
-		$this->assertEquals(200, self::$client->getResponse()->getStatus());
+		$this->assertEquals(200, self::$client->getInternalResponse()->getStatusCode(), 'Failed asserting that status of index page is 200');
 
-		$sql = 'SELECT session_page FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = ' . $user_id . ' ORDER BY session_time DESC';
-		$db->sql_query_limit($sql, 1);
-		$this->assertEquals('index.php', $db->sql_fetchfield('session_page'));
+		$sql = 'SELECT session_page FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = 2 ORDER BY session_time DESC';
+		$this->db->sql_query_limit($sql, 1);
+		$this->assertEquals('index.php', $this->db->sql_fetchfield('session_page'), 'Failed asserting that session_page is index.php for admin user');
 
 		// Request non-existent url
-		self::request('GET', 'nonexistent.jpg');
-		$this->assertEquals(404, self::$client->getResponse()->getStatus());
+		self::request('GET', 'nonexistent.jpg', [], false);
+		$this->assertEquals(404, self::$client->getInternalResponse()->getStatusCode(), 'Failed asserting that status of non-existent image is 404');
 
-		$db->sql_query_limit($sql, 1);
+		$this->db->sql_query_limit($sql, 1);
 		// User page should not be updated to non-existent one
-		$this->assertEquals('index.php', $db->sql_fetchfield('session_page'));
+		$this->assertEquals('index.php', $this->db->sql_fetchfield('session_page'), 'Failed asserting that session page has not changed after 404');
 	}
 }
diff --git a/tests/functional/smilies_test.php b/tests/functional/smilies_test.php
index 4ee45e9bde7..3a77ec89f63 100644
--- a/tests/functional/smilies_test.php
+++ b/tests/functional/smilies_test.php
@@ -21,19 +21,18 @@ public function test_smilies_mode()
 		$this->login();
 
 		// Get smilies data
-		$db = $this->get_db();
 		$sql_ary = [
 			'SELECT'	=> 's.smiley_url, MIN(s.emotion) AS emotion, MIN(s.code) AS code, s.smiley_width, s.smiley_height, MIN(s.smiley_order) AS min_smiley_order',
 			'FROM'		=> [
 				SMILIES_TABLE => 's',
 			],
 			'GROUP_BY'	=> 's.smiley_url, s.smiley_width, s.smiley_height',
-			'ORDER_BY'	=> $db->sql_quote('min_smiley_order'),
+			'ORDER_BY'	=> $this->db->sql_quote('min_smiley_order'),
 		];
-		$sql = $db->sql_build_query('SELECT', $sql_ary);
-		$result = $db->sql_query($sql);
-		$smilies = $db->sql_fetchrowset($result);
-		$db->sql_freeresult($result);
+		$sql = $this->db->sql_build_query('SELECT', $sql_ary);
+		$result = $this->db->sql_query($sql);
+		$smilies = $this->db->sql_fetchrowset($result);
+		$this->db->sql_freeresult($result);
 
 		// Visit smilies page
 		$crawler = self::request('GET', 'posting.php?mode=smilies');
diff --git a/tests/functional/subforum_test.php b/tests/functional/subforum_test.php
index 493c2053dac..91a7e777542 100644
--- a/tests/functional/subforum_test.php
+++ b/tests/functional/subforum_test.php
@@ -91,7 +91,6 @@ public function test_display_subforums_limit()
 
 	protected function get_forum_id($forum_name)
 	{
-		$this->db = $this->get_db();
 		$forum_id = 0;
 
 		$sql = 'SELECT *
diff --git a/tests/functional/switch_permissions_test.php b/tests/functional/switch_permissions_test.php
new file mode 100644
index 00000000000..0dbcf3b2b06
--- /dev/null
+++ b/tests/functional/switch_permissions_test.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_switch_permissions_test extends phpbb_functional_test_case
+{
+	private const TEST_USER = 'switch-permissions-test';
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->login();
+		$this->admin_login();
+
+		$this->add_lang(['common', 'ucp']);
+	}
+
+	public function test_switch_permissions_acp()
+	{
+		$user_id = $this->create_user(self::TEST_USER);
+
+		// Open user administration page for new user
+		$crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u={$user_id}&sid={$this->sid}");
+
+		// Use permissions
+		$link = $crawler->selectLink($this->lang('USE_PERMISSIONS'))->link();
+		$crawler = self::$client->click($link);
+
+		// Check that we switched permissions to test user
+		$this->assertStringContainsString(
+			str_replace('<br />', '<br>', $this->lang('PERMISSIONS_TRANSFERRED', self::TEST_USER)),
+			$crawler->html()
+		);
+
+		// Check that ACP pages get forced to acp main with restore permission info
+		$this->add_lang('acp/common');
+		$crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u={$user_id}&sid={$this->sid}");
+		$this->assertStringContainsString(
+			$this->lang('PERMISSIONS_TRANSFERRED'),
+			$crawler->text()
+		);
+
+		// Check that restore permissions link exists
+		$crawler = self::$client->request('GET', '../index.php?sid=' . $this->sid);
+		$this->assertStringContainsString(
+			$this->lang('RESTORE_PERMISSIONS'),
+			$crawler->text()
+		);
+
+		// Check that restore permissions works
+		$crawler = self::$client->request('GET', 'ucp.php?mode=restore_perm&sid=' . $this->sid);
+		$this->assertStringContainsString(
+			$this->lang('PERMISSIONS_RESTORED'),
+			$crawler->text()
+		);
+	}
+
+	/**
+	 * @depends test_switch_permissions_acp
+	 */
+	public function test_switch_permissions_ucp()
+	{
+		$sql = 'SELECT user_id
+			FROM ' . USERS_TABLE . "
+			WHERE username = '" . self::TEST_USER . "'";
+		$result = $this->db->sql_query($sql);
+		$user_id = $this->db->sql_fetchfield('user_id');
+		$this->db->sql_freeresult($result);
+
+		// Open memberlist profile page for user
+		$crawler = self::request('GET', "memberlist.php?mode=viewprofile&u={$user_id}&sid={$this->sid}");
+
+		// Use permissions
+		$link = $crawler->selectLink($this->lang('USE_PERMISSIONS'))->link();
+		$crawler = self::$client->click($link);
+
+		// Check that we switched permissions to test user
+		$this->assertStringContainsString(
+			str_replace('<br />', '<br>', $this->lang('PERMISSIONS_TRANSFERRED', self::TEST_USER)),
+			$crawler->html()
+		);
+
+		// Check that UCP pages don't get forced to UCP main with restore permission info
+		$this->add_lang(['memberlist', 'ucp']);
+		$crawler = self::request('GET', "ucp.php?i=ucp_profile&mode=profile_info&sid={$this->sid}");
+		$this->assertStringContainsString(
+			$this->lang('EDIT_PROFILE'),
+			$crawler->text()
+		);
+
+		// Check that restore permissions link exists
+		$crawler = self::$client->request('GET', 'index.php?sid=' . $this->sid);
+		$this->assertStringContainsString(
+			$this->lang('RESTORE_PERMISSIONS'),
+			$crawler->text()
+		);
+
+		// Check that restore permissions works
+		$crawler = self::$client->request('GET', 'ucp.php?mode=restore_perm&sid=' . $this->sid);
+		$this->assertStringContainsString(
+			$this->lang('PERMISSIONS_RESTORED'),
+			$crawler->text()
+		);
+	}
+}
diff --git a/tests/functional/ucp_allow_pm_test.php b/tests/functional/ucp_allow_pm_test.php
index 6c275ad9168..3859024d58e 100644
--- a/tests/functional/ucp_allow_pm_test.php
+++ b/tests/functional/ucp_allow_pm_test.php
@@ -18,13 +18,13 @@ class phpbb_functional_ucp_allow_pm_test extends phpbb_functional_test_case
 {
 	protected static $data = array();
 
-	public function __construct()
+	protected function setUp(): void
 	{
-		parent::__construct();
+		parent::setUp();
 
-		$this->backupStaticAttributesExcludeList += [
+		$this->setBackupStaticPropertiesExcludeList([
 			'phpbb_functional_ucp_allow_pm_test' => ['data'],
-		];
+		]);
 	}
 
 	// user A sends a PM to user B where B accepts PM
@@ -64,11 +64,10 @@ public function test_disabled_pm_admin_to_user()
 	// enable or disable PM for a user, like from ucp
 	protected function set_user_allow_pm($user_id, $allow)
 	{
-		$db = $this->get_db();
 		$sql = 'UPDATE ' . USERS_TABLE . "
 			SET user_allow_pm = " . $allow . "
 			WHERE user_id = " . $user_id;
-		$result = $db->sql_query($sql);
-		$db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$this->db->sql_freeresult($result);
 	}
 }
diff --git a/tests/functional/ucp_attachments_test.php b/tests/functional/ucp_attachments_test.php
index fbd352ea28f..2c777aba92d 100644
--- a/tests/functional/ucp_attachments_test.php
+++ b/tests/functional/ucp_attachments_test.php
@@ -133,7 +133,7 @@ public function test_ucp_list_attachments()
 
 		$attachment_filename = $crawler->filter('.attachment-filename');
 		$this->assertEquals('valid.jpg', $attachment_filename->attr('title'));
-		$this->assertStringContainsString('app.php/download/attachment/' . $attach_id . '/valid.jpg', $attachment_filename->attr('href'));
+		$this->assertStringContainsString('index.php/download/attachment/' . $attach_id . '/valid.jpg', $attachment_filename->attr('href'));
 		$this->assertFalse($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled'));
 	}
 
diff --git a/tests/functional/ucp_groups_test.php b/tests/functional/ucp_groups_test.php
index 387ae827e46..6e18d610ce8 100644
--- a/tests/functional/ucp_groups_test.php
+++ b/tests/functional/ucp_groups_test.php
@@ -18,8 +18,6 @@
 */
 class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_test_case
 {
-	protected $db;
-
 	protected function get_url()
 	{
 		return 'ucp.php?i=groups&mode=manage&action=edit';
@@ -27,10 +25,6 @@ protected function get_url()
 
 	protected function get_teampage_settings()
 	{
-		if (!isset($this->db))
-		{
-			$this->db = $this->get_db();
-		}
 		$sql = 'SELECT g.group_legend AS group_legend, t.teampage_position AS group_teampage
 			FROM ' . GROUPS_TABLE . ' g
 			LEFT JOIN ' . TEAMPAGE_TABLE . ' t
diff --git a/tests/functional/ucp_profile_test.php b/tests/functional/ucp_profile_test.php
index 2790dfaae30..f8ac77cfae4 100644
--- a/tests/functional/ucp_profile_test.php
+++ b/tests/functional/ucp_profile_test.php
@@ -73,7 +73,6 @@ public function test_autologin_keys_manage()
 	{
 		$this->add_lang('ucp');
 		$this->login('admin', true);
-		$db = $this->get_db();
 
 		$crawler = self::request('GET', 'ucp.php?i=ucp_profile&mode=autologin_keys');
 		$this->assertContainsLang('UCP_PROFILE_AUTOLOGIN_KEYS', $crawler->filter('#cp-main h2')->text());
@@ -87,9 +86,9 @@ public function test_autologin_keys_manage()
 			'WHERE'		=> 'sk.user_id = ' . (int) $user_id,
 			'ORDER_BY'	=> 'sk.last_login ASC',
 		];
-		$result = $db->sql_query_limit($db->sql_build_query('SELECT', $sql_ary), 1);
-		$key_id = substr($db->sql_fetchfield('key_id'), 0, 8);
-		$db->sql_freeresult($result);
+		$result = $this->db->sql_query_limit($this->db->sql_build_query('SELECT', $sql_ary), 1);
+		$key_id = substr($this->db->sql_fetchfield('key_id'), 0, 8);
+		$this->db->sql_freeresult($result);
 
 		$this->assertStringContainsString($key_id, $crawler->filter('label[for="' . $key_id . '"]')->text());
 
diff --git a/tests/functional/user_password_reset_test.php b/tests/functional/user_password_reset_test.php
index eb6631bf285..0e408247963 100644
--- a/tests/functional/user_password_reset_test.php
+++ b/tests/functional/user_password_reset_test.php
@@ -18,20 +18,24 @@ class phpbb_functional_user_password_reset_test extends phpbb_functional_test_ca
 {
 	protected $user_data;
 
+	protected const TEST_USER = 'reset-password-test-user';
+
+	protected const TEST_EMAIL = 'reset-password-test-user@test.com';
+
 	public function test_password_reset()
 	{
 		$this->add_lang('ucp');
-		$user_id = $this->create_user('reset-password-test-user', 'reset-password-test-user@test.com');
+		$user_id = $this->create_user(self::TEST_USER, self::TEST_EMAIL);
 
 		// test without email
 		$crawler = self::request('GET', "ucp.php?mode=sendpassword&sid={$this->sid}");
-		$this->assertStringContainsString('app.php/user/forgot_password', $crawler->getUri());
+		$this->assertStringContainsString('index.php/user/forgot_password', $crawler->getUri());
 		$form = $crawler->selectButton('submit')->form();
 		$crawler = self::submit($form);
 		$this->assertContainsLang('NO_EMAIL_USER', $crawler->text());
 
 		// test with non-existent email
-		$crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}");
+		$crawler = self::request('GET', "index.php/user/forgot_password?sid={$this->sid}");
 		$form = $crawler->selectButton('submit')->form(array(
 			'email'	=> 'non-existent@email.com',
 		));
@@ -39,48 +43,48 @@ public function test_password_reset()
 		$this->assertContainsLang('PASSWORD_RESET_LINK_SENT', $crawler->text());
 
 		// test with correct email
-		$crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}");
+		$crawler = self::request('GET', "index.php/user/forgot_password?sid={$this->sid}");
 		$form = $crawler->selectButton('submit')->form(array(
-			'email'		=> 'reset-password-test-user@test.com',
+			'email'		=> self::TEST_EMAIL,
 		));
 		$crawler = self::submit($form);
 		$this->assertContainsLang('PASSWORD_RESET_LINK_SENT', $crawler->text());
 
 		// Check if columns in database were updated for password reset
-		$this->get_user_data('reset-password-test-user');
+		$this->get_user_data(self::TEST_USER);
 		$this->assertNotEmpty($this->user_data['reset_token']);
 		$this->assertNotEmpty($this->user_data['reset_token_expiration']);
 		$reset_token = $this->user_data['reset_token'];
 		$reset_token_expiration = $this->user_data['reset_token_expiration'];
 
 		// Check that reset token is only created once per day
-		$crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}");
+		$crawler = self::request('GET', "index.php/user/forgot_password?sid={$this->sid}");
 		$form = $crawler->selectButton('submit')->form(array(
-			'email'		=> 'reset-password-test-user@test.com',
+			'email'		=> self::TEST_EMAIL,
 		));
 		$crawler = self::submit($form);
 		$this->assertContainsLang('PASSWORD_RESET_LINK_SENT', $crawler->text());
 
-		$this->get_user_data('reset-password-test-user');
+		$this->get_user_data(self::TEST_USER);
 		$this->assertNotEmpty($this->user_data['reset_token']);
 		$this->assertNotEmpty($this->user_data['reset_token_expiration']);
 		$this->assertEquals($reset_token, $this->user_data['reset_token']);
 		$this->assertEquals($reset_token_expiration, $this->user_data['reset_token_expiration']);
 
 		// Create another user with the same email
-		$this->create_user('reset-password-test-user1', 'reset-password-test-user@test.com');
+		$this->create_user('reset-password-test-user1', self::TEST_EMAIL);
 
 		// Test that username is now also required
-		$crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}");
+		$crawler = self::request('GET', "index.php/user/forgot_password?sid={$this->sid}");
 		$form = $crawler->selectButton('submit')->form(array(
-			'email'		=> 'reset-password-test-user@test.com',
+			'email'		=> self::TEST_EMAIL,
 		));
 		$crawler = self::submit($form);
 		$this->assertContainsLang('EMAIL_NOT_UNIQUE', $crawler->text());
 
 		// Provide both username and email
 		$form = $crawler->selectButton('submit')->form(array(
-			'email'		=> 'reset-password-test-user@test.com',
+			'email'		=> self::TEST_EMAIL,
 			'username'	=> 'reset-password-test-user1',
 		));
 		$crawler = self::submit($form);
@@ -95,10 +99,10 @@ public function test_password_reset()
 
 	public function test_login_after_reset()
 	{
-		$this->login('reset-password-test-user');
+		$this->login(self::TEST_USER);
 	}
 
-	public function data_reset_user_password()
+	public static function data_reset_user_password()
 	{
 		return [
 			['RESET_TOKEN_EXPIRED_OR_INVALID', 0, 'abcdef'],
@@ -117,11 +121,11 @@ public function data_reset_user_password()
 	public function test_reset_user_password($expected, $user_id, $token)
 	{
 		$this->add_lang('ucp');
-		$this->get_user_data('reset-password-test-user');
+		$this->get_user_data(self::TEST_USER);
 		$user_id = !$user_id ? $this->user_data['user_id'] : $user_id;
 		$token = !$token ? $this->user_data['reset_token'] : $token;
 
-		$crawler = self::request('GET', "app.php/user/reset_password?u=$user_id&token=$token");
+		$crawler = self::request('GET', "index.php/user/reset_password?u=$user_id&token=" . urlencode($token));
 
 		if ($expected)
 		{
@@ -131,8 +135,8 @@ public function test_reset_user_password($expected, $user_id, $token)
 		{
 			$form = $crawler->filter('input[type=submit]')->form();
 			$values = array_merge($form->getValues(), [
-				'new_password'			=> 'reset-password-test-user',
-				'new_password_confirm'	=> 'reset-password-test-user',
+				'new_password'			=> self::TEST_USER,
+				'new_password_confirm'	=> self::TEST_USER,
 			]);
 			$crawler = self::submit($form, $values);
 			$this->assertContainsLang('PASSWORD_RESET', $crawler->text());
@@ -146,20 +150,9 @@ public function test_login()
 		$this->assertStringContainsString($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text());
 
 		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
-		$crawler = self::submit($form, array('username' => 'reset-password-test-user', 'password' => 'reset-password-test-user'));
+		$crawler = self::submit($form, array('username' => self::TEST_USER, 'password' => self::TEST_USER));
 		$this->assertStringNotContainsString($this->lang('LOGIN'), $crawler->filter('.navbar')->text());
 
-		$cookies = self::$cookieJar->all();
-
-		// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
-		foreach ($cookies as $cookie)
-		{
-			if (substr($cookie->getName(), -4) == '_sid')
-			{
-				$this->sid = $cookie->getValue();
-			}
-		}
-
 		$this->logout();
 
 		$crawler = self::request('GET', 'ucp.php');
@@ -167,17 +160,17 @@ public function test_login()
 
 		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
 		// Try logging in with the old password
-		$crawler = self::submit($form, array('username' => 'reset-password-test-user', 'password' => 'reset-password-test-userreset-password-test-user'));
+		$crawler = self::submit($form, array('username' => self::TEST_USER, 'password' => 'reset-password-test-userreset-password-test-user'));
 		$this->assertStringContainsString($this->lang('LOGIN_ERROR_PASSWORD', '', ''), $crawler->filter('html')->text());
 	}
 
 	/**
 	 * @depends test_login
 	 */
-	public function test_acivateAfterDeactivate()
+	public function test_activateAfterDeactivate()
 	{
 		// User is active, actkey should not exist
-		$this->get_user_data('reset-password-test-user');
+		$this->get_user_data(self::TEST_USER);
 		$this->assertEmpty($this->user_data['user_actkey']);
 
 		$this->login();
@@ -189,7 +182,7 @@ public function test_acivateAfterDeactivate()
 		$this->assertContainsLang('FIND_USERNAME', $crawler->filter('html')->text());
 
 		$form = $crawler->selectButton('Submit')->form();
-		$crawler = self::submit($form, array('username' => 'reset-password-test-user'));
+		$crawler = self::submit($form, array('username' => self::TEST_USER));
 
 		// Deactivate account and go back to overview of current user
 		$this->assertContainsLang('USER_TOOLS', $crawler->filter('html')->text());
@@ -201,7 +194,7 @@ public function test_acivateAfterDeactivate()
 		$crawler = self::request('GET', preg_replace('#(.+)(adm/index.php.+)#', '$2', $link->getUri()));
 
 		// Ensure again that actkey is empty after deactivation
-		$this->get_user_data('reset-password-test-user');
+		$this->get_user_data(self::TEST_USER);
 		$this->assertEmpty($this->user_data['user_actkey']);
 
 		// Force reactivation of account and check that act key is not empty anymore
@@ -210,18 +203,57 @@ public function test_acivateAfterDeactivate()
 		$crawler = self::submit($form, array('action' => 'reactivate'));
 		$this->assertContainsLang('FORCE_REACTIVATION_SUCCESS', $crawler->filter('html')->text());
 
-		$this->get_user_data('reset-password-test-user');
+		$this->get_user_data(self::TEST_USER);
+		$this->assertNotEmpty($this->user_data['user_actkey']);
+
+		// Logout and try resending activation email, account is deactivated though
+		$this->logout();
+		$this->add_lang('ucp');
+
+		$crawler = self::request('GET', 'ucp.php?mode=resend_act');
+		$this->assertContainsLang('UCP_RESEND', $crawler->filter('html')->text());
+		$form = $crawler->filter('input[name=submit]')->selectButton('Submit')->form();
+		$crawler = self::submit($form, [
+			'username'		=> self::TEST_USER,
+			'email'			=> self::TEST_EMAIL,
+		]);
+		$this->assertContainsLang('ACCOUNT_DEACTIVATED', $crawler->filter('html')->text());
+	}
+
+	/**
+	 * @depends test_activateAfterDeactivate
+	 */
+	public function test_resendActivation()
+	{
+		// User is deactivated and should have actkey, actkey should not exist
+		$this->get_user_data(self::TEST_USER);
 		$this->assertNotEmpty($this->user_data['user_actkey']);
+
+		// Change reason for inactivity
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET user_inactive_reason = ' . INACTIVE_REMIND . '
+			WHERE user_id = ' . (int) $this->user_data['user_id'];
+		$this->db->sql_query($sql);
+
+		$this->add_lang('ucp');
+
+		$crawler = self::request('GET', 'ucp.php?mode=resend_act');
+		$this->assertContainsLang('UCP_RESEND', $crawler->filter('html')->text());
+		$form = $crawler->filter('input[name=submit]')->selectButton('Submit')->form();
+		$crawler = self::submit($form, [
+			'username'		=> self::TEST_USER,
+			'email'			=> self::TEST_EMAIL,
+		]);
+		$this->assertContainsLang('ACTIVATION_ALREADY_SENT', $crawler->filter('html')->text());
 	}
 
 	protected function get_user_data($username)
 	{
-		$db = $this->get_db();
-		$sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey, user_inactive_reason, reset_token, reset_token_expiration
+		$sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_actkey, user_inactive_reason, reset_token, reset_token_expiration
 			FROM ' . USERS_TABLE . "
-			WHERE username = '" . $db->sql_escape($username) . "'";
-		$result = $db->sql_query($sql);
-		$this->user_data = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
+			WHERE username = '" . $this->db->sql_escape($username) . "'";
+		$result = $this->db->sql_query($sql);
+		$this->user_data = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
 	}
 }
diff --git a/tests/functional/viewforum_paging_test.php b/tests/functional/viewforum_paging_test.php
index 2ba29cecc6a..0a2cd38b3a2 100644
--- a/tests/functional/viewforum_paging_test.php
+++ b/tests/functional/viewforum_paging_test.php
@@ -163,8 +163,6 @@ public function test_viewforum_second_page()
 
 	protected function assert_forum_details($forum_id, $details, $additional_error_message = '')
 	{
-		$this->db = $this->get_db();
-
 		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
 			FROM phpbb_forums
 			WHERE forum_id = ' . (int) $forum_id;
@@ -203,8 +201,6 @@ protected function set_post_settings($settings)
 	 */
 	protected function load_ids($data)
 	{
-		$this->db = $this->get_db();
-
 		if (!empty($data['forums']))
 		{
 			$sql = 'SELECT *
diff --git a/tests/functional/viewonline_test.php b/tests/functional/viewonline_test.php
index 882c48a5e13..c71da6daf30 100644
--- a/tests/functional/viewonline_test.php
+++ b/tests/functional/viewonline_test.php
@@ -18,31 +18,27 @@ class phpbb_functional_viewonline_test extends phpbb_functional_test_case
 {
 	protected function get_forum_name_by_topic_id($topic_id)
 	{
-		$db = $this->get_db();
-
 		// Forum info
 		$sql =  'SELECT f.forum_name
 			FROM ' . FORUMS_TABLE . ' f,' . TOPICS_TABLE . ' t
 			WHERE t.forum_id = f.forum_id
 				AND t.topic_id = ' . (int) $topic_id;
-		$result = $db->sql_query($sql);
-		$forum_name = $db->sql_fetchfield('forum_name');
-		$db->sql_freeresult($result, 1800); // cache for 30 minutes
+		$result = $this->db->sql_query($sql);
+		$forum_name = $this->db->sql_fetchfield('forum_name');
+		$this->db->sql_freeresult($result, 1800); // cache for 30 minutes
 
 		return $forum_name;
 	}
 
 	protected function get_forum_name_by_forum_id($forum_id)
 	{
-		$db = $this->get_db();
-
 		// Forum info
 		$sql =  'SELECT forum_name
 			FROM ' . FORUMS_TABLE . '
 			WHERE forum_id = ' . (int) $forum_id;
-		$result = $db->sql_query($sql);
-		$forum_name = $db->sql_fetchfield('forum_name');
-		$db->sql_freeresult($result, 1800); // cache for 30 minutes
+		$result = $this->db->sql_query($sql);
+		$forum_name = $this->db->sql_fetchfield('forum_name');
+		$this->db->sql_freeresult($result, 1800); // cache for 30 minutes
 
 		return $forum_name;
 	}
@@ -61,7 +57,7 @@ public function test_viewonline()
 		$this->login();
 		// PHP goes faster than DBMS, make sure session data got written to the database
 		sleep(1);
-		$crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid);
+		$crawler = self::request('GET', 'index.php/members/online');
 		// Make sure posting reply page is in the list
 		$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
 		$this->assertStringContainsString($this->lang('REPLYING_MESSAGE', $this->get_forum_name_by_topic_id(1)), $crawler->text());
@@ -76,7 +72,7 @@ public function test_viewonline()
 		$this->login();
 		// PHP goes faster than DBMS, make sure session data got written to the database
 		sleep(1);
-		$crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid);
+		$crawler = self::request('GET', 'index.php/members/online');
 		// Make sure posting message page is in the list
 		$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
 		$this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text());
@@ -92,7 +88,7 @@ public function test_viewonline()
 		$this->login();
 		// PHP goes faster than DBMS, make sure session data got written to the database
 		sleep(1);
-		$crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid);
+		$crawler = self::request('GET', 'index.php/members/online');
 		// Make sure posting message page is in the list
 		$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
 		$this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text());
@@ -106,7 +102,7 @@ public function test_viewonline()
 		$this->login();
 		// PHP goes faster than DBMS, make sure session data got written to the database
 		sleep(1);
-		$crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid);
+		$crawler = self::request('GET', 'index.php/members/online');
 		// Make sure reading topic page is in the list
 		$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
 		$this->assertStringContainsString($this->lang('READING_TOPIC', $this->get_forum_name_by_topic_id(1)), $crawler->text());
@@ -120,7 +116,7 @@ public function test_viewonline()
 		$this->login();
 		// PHP goes faster than DBMS, make sure session data got written to the database
 		sleep(1);
-		$crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid);
+		$crawler = self::request('GET', 'index.php/members/online');
 		// Make sure reading forum page is in the list
 		$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
 		$this->assertStringContainsString($this->lang('READING_FORUM', $this->get_forum_name_by_forum_id(2)), $crawler->text());
diff --git a/tests/functional/visibility_disapprove_test.php b/tests/functional/visibility_disapprove_test.php
index f8534914147..95b371ac4fb 100644
--- a/tests/functional/visibility_disapprove_test.php
+++ b/tests/functional/visibility_disapprove_test.php
@@ -243,8 +243,6 @@ public function test_disapprove_topic()
 
 	protected function assert_forum_details($forum_id, $details, $additional_error_message = '')
 	{
-		$this->db = $this->get_db();
-
 		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
 			FROM phpbb_forums
 			WHERE forum_id = ' . (int) $forum_id;
@@ -257,8 +255,6 @@ protected function assert_forum_details($forum_id, $details, $additional_error_m
 
 	protected function load_ids($data)
 	{
-		$this->db = $this->get_db();
-
 		if (!empty($data['forums']))
 		{
 			$sql = 'SELECT *
diff --git a/tests/functional/visibility_reapprove_test.php b/tests/functional/visibility_reapprove_test.php
index c9da0942b49..af0f553c0a4 100644
--- a/tests/functional/visibility_reapprove_test.php
+++ b/tests/functional/visibility_reapprove_test.php
@@ -339,8 +339,6 @@ public function test_reset_flood_interval()
 
 	protected function assert_forum_details($forum_id, $details, $additional_error_message = '')
 	{
-		$this->db = $this->get_db();
-
 		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
 			FROM phpbb_forums
 			WHERE forum_id = ' . (int) $forum_id;
@@ -353,8 +351,6 @@ protected function assert_forum_details($forum_id, $details, $additional_error_m
 
 	protected function load_ids($data)
 	{
-		$this->db = $this->get_db();
-
 		if (!empty($data['forums']))
 		{
 			$sql = 'SELECT *
diff --git a/tests/functional/visibility_softdelete_test.php b/tests/functional/visibility_softdelete_test.php
index 5128bb60050..9e8d29ab620 100644
--- a/tests/functional/visibility_softdelete_test.php
+++ b/tests/functional/visibility_softdelete_test.php
@@ -601,7 +601,16 @@ public function test_split_topic()
 		// Assert new topic title is indexed as well
 		$this->add_lang('search');
 		self::request('GET', "search.php?keywords=bang&sid={$this->sid}");
-		$this->assertStringContainsString(sprintf($this->lang['FOUND_SEARCH_MATCHES'][1], 1), self::get_content());
+
+		// Sphinx search doesn't apply to unapproved or softdeleted posts
+		if (strpos($this->get_search_type(), 'fulltext_sphinx'))
+		{
+			$this->assertStringContainsString(sprintf($this->lang['FOUND_SEARCH_MATCHES'][2], 0), self::get_content());
+		}
+		else
+		{
+			$this->assertStringContainsString(sprintf($this->lang['FOUND_SEARCH_MATCHES'][1], 1), self::get_content());
+		}
 	}
 
 	public function test_move_topic_back()
@@ -774,8 +783,6 @@ public function test_fork_topic()
 
 	public function assert_forum_details($forum_id, $details, $additional_error_message = '')
 	{
-		$this->db = $this->get_db();
-
 		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
 			FROM phpbb_forums
 			WHERE forum_id = ' . (int) $forum_id;
@@ -788,8 +795,6 @@ public function assert_forum_details($forum_id, $details, $additional_error_mess
 
 	public function load_ids($data)
 	{
-		$this->db = $this->get_db();
-
 		if (!empty($data['forums']))
 		{
 			$sql = 'SELECT *
diff --git a/tests/functional/visibility_unapproved_posts_test.php b/tests/functional/visibility_unapproved_posts_test.php
index 51e56417882..2d019379819 100644
--- a/tests/functional/visibility_unapproved_posts_test.php
+++ b/tests/functional/visibility_unapproved_posts_test.php
@@ -14,7 +14,7 @@
 /**
 * @group functional
 */
-class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_case
+class phpbb_functional_visibility_unapproved_posts_test extends phpbb_functional_test_case
 {
 	protected $data = [];
 
@@ -256,8 +256,6 @@ public function test_reset_flood_interval()
 
 	protected function assert_forum_details($forum_id, $details, $additional_error_message = '')
 	{
-		$this->db = $this->get_db();
-
 		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
 			FROM phpbb_forums
 			WHERE forum_id = ' . (int) $forum_id;
@@ -270,8 +268,6 @@ protected function assert_forum_details($forum_id, $details, $additional_error_m
 
 	protected function load_ids($data)
 	{
-		$this->db = $this->get_db();
-
 		if (!empty($data['forums']))
 		{
 			$sql = 'SELECT forum_id, forum_name
diff --git a/tests/functional/visit_installer_test.php b/tests/functional/visit_installer_test.php
index 742007fa5f5..2b08939e541 100644
--- a/tests/functional/visit_installer_test.php
+++ b/tests/functional/visit_installer_test.php
@@ -19,12 +19,9 @@ class phpbb_functional_visit_installer_test extends phpbb_functional_test_case
 	public function test_visit_installer()
 	{
 		self::request('GET', 'install/', [], false);
-		$this->assertStringContainsString('<meta http-equiv="refresh" content="0; url=./app.php" />', $this->get_content());
-
-		self::request('GET', 'install/index.html', [], false);
-		$this->assertStringContainsString('<meta http-equiv="refresh" content="0; url=./app.php" />', $this->get_content());
+		$this->assertStringContainsString('installation system', $this->get_content());
 
-		self::request('GET', 'install/app.php');
+		self::request('GET', 'install/index.php');
 		$this->assertStringContainsString('installation system', $this->get_content());
 	}
 }
diff --git a/tests/functions/build_hidden_fields_for_query_params_test.php b/tests/functions/build_hidden_fields_for_query_params_test.php
deleted file mode 100644
index aee7a569d4e..00000000000
--- a/tests/functions/build_hidden_fields_for_query_params_test.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-class phpbb_build_hidden_fields_for_query_params_test extends phpbb_test_case
-{
-	public function build_hidden_fields_for_query_params_test_data()
-	{
-		return array(
-			// get
-			// post
-			// exclude
-			// expected
-			array(
-				array('foo' => 'bar'),
-				array(),
-				array(),
-				"<input type='hidden' name=\"foo\" value=\"bar\" />",
-			),
-			array(
-				array('foo' => 'bar', 'a' => 'b'),
-				array(),
-				array(),
-				"<input type='hidden' name=\"foo\" value=\"bar\" /><input type='hidden' name=\"a\" value=\"b\" />",
-			),
-			array(
-				array('a' => 'quote"', 'b' => '<less>'),
-				array(),
-				array(),
-				"<input type='hidden' name=\"a\" value='quote\"' /><input type='hidden' name=\"b\" value=\"&lt;less&gt;\" />",
-			),
-			array(
-				array('a' => "quotes'\""),
-				array(),
-				array(),
-				"<input type='hidden' name=\"a\" value=\"quotes'&quot;\" />",
-			),
-			array(
-				array('foo' => 'bar', 'a' => 'b'),
-				array('a' => 'c'),
-				array(),
-				"<input type='hidden' name=\"foo\" value=\"bar\" />",
-			),
-			// strict equality check
-			array(
-				array('foo' => 'bar', 'a' => '0'),
-				array('a' => ''),
-				array(),
-				"<input type='hidden' name=\"foo\" value=\"bar\" />",
-			),
-		);
-	}
-
-	/**
-	* @dataProvider build_hidden_fields_for_query_params_test_data
-	*/
-	public function test_build_hidden_fields_for_query_params($get, $post, $exclude, $expected)
-	{
-		$request = new phpbb_mock_request($get, $post);
-		$result = phpbb_build_hidden_fields_for_query_params($request, $exclude);
-
-		$this->assertEquals($expected, $result);
-	}
-}
diff --git a/tests/functions/build_url_test.php b/tests/functions/build_url_test.php
index 6e1fc573069..da38cae6353 100644
--- a/tests/functions/build_url_test.php
+++ b/tests/functions/build_url_test.php
@@ -15,13 +15,16 @@ class phpbb_build_url_test extends phpbb_test_case
 {
 	protected function setUp(): void
 	{
-		global $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpbb_path_helper;
+		global $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpbb_path_helper, $config;
 
 		parent::setUp();
 
 		$phpbb_container = new phpbb_mock_container_builder();
 		$user = new phpbb_mock_user();
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$config = new \phpbb\config\config([
+			'enable_mod_rewrite' => 0,
+		]);
 
 		$phpbb_path_helper = new \phpbb\path_helper(
 			new \phpbb\symfony_request(
@@ -33,7 +36,7 @@ protected function setUp(): void
 		);
 		$phpbb_container->set('path_helper', $phpbb_path_helper);
 	}
-	public function build_url_test_data()
+	public static function build_url_test_data()
 	{
 		return array(
 			array(
@@ -79,8 +82,9 @@ public function build_url_test_data()
 	*/
 	public function test_build_url($page, $strip_vars, $expected)
 	{
-		global $user;
+		global $config, $user, $phpbb_path_helper, $phpbb_dispatcher, $_SID;
 
+		$_SID = '';
 		$user->page['page'] = $page;
 		$output = build_url($strip_vars);
 
diff --git a/tests/functions/convert_30_dbms_to_31_test.php b/tests/functions/convert_30_dbms_to_31_test.php
index e88da592a78..f3fbda79d90 100644
--- a/tests/functions/convert_30_dbms_to_31_test.php
+++ b/tests/functions/convert_30_dbms_to_31_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_convert_30_dbms_to_31_test extends phpbb_test_case
 {
-	public function convert_30_dbms_to_31_data()
+	public static function convert_30_dbms_to_31_data()
 	{
 		return array(
 			array('mssql_odbc'),
diff --git a/tests/functions/fixtures/user_delete.xml b/tests/functions/fixtures/user_delete.xml
index 4c4479d29bd..65df5616be5 100644
--- a/tests/functions/fixtures/user_delete.xml
+++ b/tests/functions/fixtures/user_delete.xml
@@ -40,7 +40,7 @@
 			<value>2</value>
 			<value>897a897b797c8789997d7979879</value>
 			<value>auth.provider.oauth.service.google</value>
-			<value>{"accessToken":"ya29.YPHwCWVkrvwu1kgbYKiDNYaQ451ZuHy9OEQAGVME8if-WBzR-v7a9ftxbx41kaL)5VLEXB-6qJEvri","endOfLife":1429959670,"extraParams":{"token_type":"Bearer","id_token":"eyJhbGciOiJSUzI1NiIsImupZCI6IjE0YuRjNzc2MDQwYjUyNDZmNTI5OWFkZDVlMmQ1NWNOPTdjMDdlZTAifQ.eyJpc3MiOiJhY2NvdW90cy5nb78nbGUuY29tIiwic3ViIjoiMTExMDMwNwerNjM4MTM5NTQwMTM1IiwiYXpwIjoiOTk3MzUwMTY0NzE0LWhwOXJrYjZpcjM4MW80YjV1NjRpaGtmM29zMnRvbWxhLmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29tIiwiZW1haWwiOiJtYXJjLmFsZXhhbmRlci4zN0BnbWFpbC5jb20iLCJhdF9oYXNoIjoiWHk2b1JabnVZUWRfRTZDeDV0RkItdyIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJhdWQiOiI5OTczNTAxNjQ3MTQtaHA5cmtiNmlyMzgxbzRiNXU2NGloa2Yzb3MydG9tbGEuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJpYXQiOjE0Mjk5NTYwNzEsImV4cCI6MTQyOTk1OTY3MX0.C5gfSzjqwlRRvVMuTP6jfWIuEHMXn55oYHsSA3eh97n2BZL0TZHhUm4K206Fgucd6ufAphan4l0J7y6tMAHLZPr-kk6KDINxWnPG-up99reblGutay0lRYjMCcrhJAOql8EI1bi84GyliZFYHL67pE0ZtSf-CMb1CeH18TFe-Fk"},"refreshToken":null,"token_class":"OAuth\\\\OAuth2\\\\Token\\\\StdOAuth2Token"}</value>
+			<value>{"accessToken":"ya29.YPHwCWVkrvwu1kgbYKiDNYaQ451ZuHy9OEQAGVME8if-WBzR-v7a9ftxbx41kaL)5VLEXB-6qJEvri","endOfLife":1429959670,"extraParams":{"token_type":"Bearer","id_token":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTUxNjIzOTAyMn0.KMUFsIDTnFmyG3nMiGM6H9FNFUROf3wh7SmqJp-QV30"},"refreshToken":null,"token_class":"OAuth\\\\OAuth2\\\\Token\\\\StdOAuth2Token"}</value>
 		</row>
 	</table>
 </dataset>
diff --git a/tests/functions/generate_string_list.php b/tests/functions/generate_string_list.php
index b23c38854b5..3b531398ad4 100644
--- a/tests/functions/generate_string_list.php
+++ b/tests/functions/generate_string_list.php
@@ -29,7 +29,7 @@ protected function setUp(): void
 		$this->user->add_lang('common');
 	}
 
-	public function generate_string_list_data()
+	public static function generate_string_list_data()
 	{
 		return array(
 			array(
diff --git a/tests/functions/get_formatted_filesize_test.php b/tests/functions/get_formatted_filesize_test.php
index 290515b64f4..d2a94453f65 100644
--- a/tests/functions/get_formatted_filesize_test.php
+++ b/tests/functions/get_formatted_filesize_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_get_formatted_filesize_test extends phpbb_test_case
 {
-	public function get_formatted_filesize_test_data()
+	public static function get_formatted_filesize_test_data()
 	{
 		return array(
 			// exact powers of 2
diff --git a/tests/functions/get_preg_expression_test.php b/tests/functions/get_preg_expression_test.php
index b8254b03ea5..5b98d706462 100644
--- a/tests/functions/get_preg_expression_test.php
+++ b/tests/functions/get_preg_expression_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_functions_get_preg_expression_test extends phpbb_test_case
 {
-	public function data_path_remove_dot_trailing_slash()
+	public static function data_path_remove_dot_trailing_slash()
 	{
 		return array(
 			array('./../', '$2', '/..'),
diff --git a/tests/functions/get_remote_file_test.php b/tests/functions/get_remote_file_test.php
deleted file mode 100644
index c0330d01f8a..00000000000
--- a/tests/functions/get_remote_file_test.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-/**
-* @group slow
-*/
-class phpbb_functions_get_remote_file extends phpbb_test_case
-{
-	public function test_version_phpbb_com()
-	{
-		global $phpbb_container;
-		$phpbb_container = new phpbb_mock_container_builder();
-		$phpbb_container->set('file_downloader', new \phpbb\file_downloader());
-
-		$hostname = 'version.phpbb.com';
-
-		if (!checkdnsrr($hostname, 'A'))
-		{
-			$this->markTestSkipped(sprintf(
-				'Could not find a DNS record for hostname %s. ' .
-				'Assuming network is down.',
-				$hostname
-			));
-		}
-
-		$errstr = $errno = null;
-		$file = get_remote_file($hostname, '/phpbb', '30x.txt', $errstr, $errno);
-
-		$this->assertNotEquals(
-			0,
-			strlen($file),
-			'Failed asserting that the response is not empty.'
-		);
-
-		$this->assertSame(
-			'',
-			$errstr,
-			'Failed asserting that the error string is empty.'
-		);
-
-		$this->assertSame(
-			0,
-			$errno,
-			'Failed asserting that the error number is 0 (i.e. no error occurred).'
-		);
-
-		$lines = explode("\n", $file);
-
-		$this->assertGreaterThanOrEqual(
-			2,
-			count($lines),
-			'Failed asserting that the version file has at least two lines.'
-		);
-
-		$this->assertStringStartsWith(
-			'3.',
-			$lines[0],
-			"Failed asserting that the first line of the version file starts with '3.'"
-		);
-
-		$this->assertNotSame(
-			false,
-			filter_var($lines[1], FILTER_VALIDATE_URL),
-			'Failed asserting that the second line of the version file is a valid URL.'
-		);
-
-		$this->assertStringContainsString('http', $lines[1]);
-		$this->assertStringContainsString('phpbb.com', $lines[1], '', true);
-	}
-}
diff --git a/tests/functions/make_clickable_email_test.php b/tests/functions/make_clickable_email_test.php
index 47b9edcdbbc..5b19f66e8e3 100644
--- a/tests/functions/make_clickable_email_test.php
+++ b/tests/functions/make_clickable_email_test.php
@@ -17,7 +17,11 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
-		global $user, $request, $symfony_request;
+		global $user, $request, $symfony_request, $config;
+		$config = new \phpbb\config\config([
+			'force_server_vars' => 0,
+			'server_name' => 'testhost',
+		]);
 		$user = new phpbb_mock_user();
 		$request = new phpbb_mock_request();
 		$symfony_request = new \phpbb\symfony_request($request);
@@ -26,7 +30,7 @@ protected function setUp(): void
 	/**
 	* 'e' tag for email addresses html
 	**/
-	public function data_test_make_clickable_email_positive()
+	public static function data_test_make_clickable_email_positive()
 	{
 		return array(
 			array(
@@ -147,7 +151,7 @@ public function data_test_make_clickable_email_positive()
 		);
 	}
 
-	public function data_test_make_clickable_email_negative()
+	public static function data_test_make_clickable_email_negative()
 	{
 		return array(
 			array('foo.example.com'),			// @ is missing
@@ -206,6 +210,7 @@ public function data_test_make_clickable_email_negative()
 	 */
 	public function test_email_matching_positive($email, $expected)
 	{
+		global $config, $user, $request, $symfony_request;
 		$this->assertSame($expected, make_clickable($email));
 	}
 
@@ -214,6 +219,7 @@ public function test_email_matching_positive($email, $expected)
 	 */
 	public function test_email_matching_negative($email, $expected = null)
 	{
+		global $config, $user, $request, $symfony_request;
 		$expected = ($expected) ?: $email;
 		$this->assertSame($expected, make_clickable($email));
 	}
diff --git a/tests/functions/make_clickable_test.php b/tests/functions/make_clickable_test.php
index 5b24696460e..443b78b3a4d 100644
--- a/tests/functions/make_clickable_test.php
+++ b/tests/functions/make_clickable_test.php
@@ -25,7 +25,7 @@ class phpbb_functions_make_clickable_test extends phpbb_test_case
 	* "postlink" for the rest of URLs
 	* empty for email addresses
 	**/
-	public function data_test_make_clickable_url_positive()
+	public static function data_test_make_clickable_url_positive()
 	{
 		return [
 			[
@@ -82,7 +82,7 @@ public function data_test_make_clickable_url_positive()
 		];
 	}
 
-	public function data_test_make_clickable_url_idn()
+	public static function data_test_make_clickable_url_idn()
 	{
 		return [
 			[
@@ -135,7 +135,7 @@ public function data_test_make_clickable_url_idn()
 		];
 	}
 
-	public function data_test_make_clickable_local_url_idn()
+	public static function data_test_make_clickable_local_url_idn()
 	{
 		return [
 			[
@@ -154,7 +154,7 @@ public function data_test_make_clickable_local_url_idn()
 		];
 	}
 
-	public function data_test_make_clickable_custom_classes()
+	public static function data_test_make_clickable_custom_classes()
 	{
 		return [
 			[
@@ -200,7 +200,11 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
-		global $user, $request, $symfony_request;
+		global $user, $request, $symfony_request, $config;
+		$config = new \phpbb\config\config([
+			'force_server_vars' => 0,
+			'server_name' => 'testhost',
+		]);
 		$user = new phpbb_mock_user();
 		$request = new phpbb_mock_request();
 		$symfony_request = new \phpbb\symfony_request($request);
@@ -212,6 +216,7 @@ protected function setUp(): void
 	 */
 	public function test_urls_matching_positive($url, $expected)
 	{
+		global $user, $request, $symfony_request, $config;
 		$this->assertSame($expected, make_clickable($url));
 	}
 
@@ -220,6 +225,7 @@ public function test_urls_matching_positive($url, $expected)
 	 */
 	public function test_local_urls_matching_idn($url, $expected)
 	{
+		global $user, $request, $symfony_request, $config;
 		$this->assertSame($expected, make_clickable($url, "http://www.домен.рф"));
 	}
 
@@ -228,6 +234,7 @@ public function test_local_urls_matching_idn($url, $expected)
 	 */
 	public function test_make_clickable_custom_classes($url, $server_url, $class, $expected)
 	{
+		global $user, $request, $symfony_request, $config;
 		$this->assertSame($expected, make_clickable($url, $server_url, $class));
 	}
 }
diff --git a/tests/functions/obtain_online_test.php b/tests/functions/obtain_online_test.php
index 1a2d000d0de..2beb14d8261 100644
--- a/tests/functions/obtain_online_test.php
+++ b/tests/functions/obtain_online_test.php
@@ -33,7 +33,7 @@ protected function setUp(): void
 		);
 	}
 
-	static public function obtain_guest_count_data()
+	public static function obtain_guest_count_data()
 	{
 		return array(
 			array(0, 2),
@@ -53,7 +53,7 @@ public function test_obtain_guest_count($forum_id, $expected)
 		$this->assertEquals($expected, obtain_guest_count($forum_id));
 	}
 
-	static public function obtain_users_online_data()
+	public static function obtain_users_online_data()
 	{
 		return array(
 			array(0, false, array(
@@ -123,7 +123,7 @@ public function test_obtain_users_online($forum_id, $display_guests, $expected)
 		$this->assertEquals($expected, obtain_users_online($forum_id));
 	}
 
-	static public function obtain_users_online_string_data()
+	public static function obtain_users_online_string_data()
 	{
 		return array(
 			array(0, false, array(
diff --git a/tests/functions/parse_cfg_file_test.php b/tests/functions/parse_cfg_file_test.php
index 017a931f28f..0ac63a13a3e 100644
--- a/tests/functions/parse_cfg_file_test.php
+++ b/tests/functions/parse_cfg_file_test.php
@@ -11,9 +11,9 @@
 *
 */
 
-class phpbb_functions_parse_cfg_file extends phpbb_test_case
+class phpbb_functions_parse_cfg_file_test extends phpbb_test_case
 {
-	public function parse_cfg_file_data()
+	public static function parse_cfg_file_data()
 	{
 		return array(
 			array(
diff --git a/tests/functions/phpbb_get_banned_user_ids.php b/tests/functions/phpbb_get_banned_user_ids.php
index 6aaa5f86412..b0c0307d84a 100644
--- a/tests/functions/phpbb_get_banned_user_ids.php
+++ b/tests/functions/phpbb_get_banned_user_ids.php
@@ -61,7 +61,7 @@ protected function setUp(): void
 		$phpbb_container->set('ban.manager', $ban_manager);
 	}
 
-	public function phpbb_get_banned_user_ids_data()
+	public static function phpbb_get_banned_user_ids_data()
 	{
 		return array(
 			// Input to phpbb_get_banned_user_ids (user_id list, ban_end)
diff --git a/tests/functions/phpbb_get_install_redirect_test.php b/tests/functions/phpbb_get_install_redirect_test.php
index 22b9ade5895..aa0515dabcd 100644
--- a/tests/functions/phpbb_get_install_redirect_test.php
+++ b/tests/functions/phpbb_get_install_redirect_test.php
@@ -13,42 +13,42 @@
 
 class phpbb_get_install_redirect_test extends phpbb_test_case
 {
-	public function data_redirect(): array
+	public static function data_redirect(): array
 	{
 		return [
 			[
 				['REQUEST_URI'	=> '/foo/bar/'],
-				'/foo/bar/install/app.php',
+				'/foo/bar/install/index.php',
 			],
 			[
 				['REQUEST_URI'	=> '/foo/bar/index.php'],
-				'/foo/bar/install/app.php',
+				'/foo/bar/install/index.php',
 			],
 			[
 				['REQUEST_URI'	=> '/foo/bar'],
-				'/foo/install/app.php',
+				'/foo/install/index.php',
 			],
 			[
 				['REQUEST_URI'	=> '/foo/'],
-				'/foo/install/app.php',
+				'/foo/install/index.php',
 			],
 			[
 				['REQUEST_URI'	=> '/foo/index.php'],
-				'/foo/install/app.php',
+				'/foo/install/index.php',
 			],
 			[
 				[
 					'REQUEST_URI'	=> '/foo/bar/',
 					'PHP_SELF'		=> '/foo/bar/index.php'
 				],
-				'/foo/bar/install/app.php',
+				'/foo/bar/install/index.php',
 			],
 			[
 				[
 					'REQUEST_URI'	=> '',
 					'PHP_SELF'		=> '/foo/bar/index.php'
 				],
-				'/foo/bar/install/app.php',
+				'/foo/bar/install/index.php',
 			],
 		];
 	}
diff --git a/tests/functions/quoteattr_test.php b/tests/functions/quoteattr_test.php
index dbad7a99d8a..a84ad174835 100644
--- a/tests/functions/quoteattr_test.php
+++ b/tests/functions/quoteattr_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_quoteattr_test extends phpbb_test_case
 {
-	public function quoteattr_test_data()
+	public static function quoteattr_test_data()
 	{
 		return array(
 			array('foo', null, '"foo"'),
diff --git a/tests/functions/short_ipv6__test.php b/tests/functions/short_ipv6__test.php
index 8fa9cd7420c..d62f652746f 100644
--- a/tests/functions/short_ipv6__test.php
+++ b/tests/functions/short_ipv6__test.php
@@ -13,7 +13,7 @@
 
 class short_ipv6__test extends phpbb_test_case
 {
-	public function data_short_ipv6(): array
+	public static function data_short_ipv6(): array
 	{
 		return [
 			['::1', 0, ''],
diff --git a/tests/functions/style_select_test.php b/tests/functions/style_select_test.php
index e36b799bde2..b3b4b42598e 100644
--- a/tests/functions/style_select_test.php
+++ b/tests/functions/style_select_test.php
@@ -18,16 +18,121 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__.'/fixtures/style_select.xml');
 	}
 
-	static public function style_select_data()
+	public static function style_select_data()
 	{
-		return array(
-			array('', false, '<option value="1">prosilver</option><option value="2">subsilver2</option>'),
-			array('', true, '<option value="1">prosilver</option><option value="2">subsilver2</option><option value="3">zoo</option>'),
-			array('1', false, '<option value="1" selected="selected">prosilver</option><option value="2">subsilver2</option>'),
-			array('1', true, '<option value="1" selected="selected">prosilver</option><option value="2">subsilver2</option><option value="3">zoo</option>'),
-			array('3', false, '<option value="1">prosilver</option><option value="2">subsilver2</option>'),
-			array('3', true, '<option value="1">prosilver</option><option value="2">subsilver2</option><option value="3" selected="selected">zoo</option>'),
-		);
+		return [
+			[
+				'',
+				false,
+				[
+					[
+						'value'	=>	'1',
+						'selected'	=> false,
+						'label'		=> 'prosilver',
+					],
+					[
+						'value'	=>	'2',
+						'selected'	=> false,
+						'label'		=> 'subsilver2',
+					],
+				]
+			],
+			[
+				'',
+				true,
+				[
+					[
+						'value'	=>	'1',
+						'selected'	=> false,
+						'label'		=> 'prosilver',
+					],
+					[
+						'value'	=>	'2',
+						'selected'	=> false,
+						'label'		=> 'subsilver2',
+					],
+					[
+						'value'	=>	'3',
+						'selected'	=> false,
+						'label'		=> 'zoo',
+					],
+				]
+			],
+			[
+				'1',
+				false,
+				[
+					[
+						'value'	=>	'1',
+						'selected'	=> true,
+						'label'		=> 'prosilver',
+					],
+					[
+						'value'	=>	'2',
+						'selected'	=> false,
+						'label'		=> 'subsilver2',
+					],
+				]
+			],
+			[
+				'1',
+				true,
+				[
+					[
+						'value'	=>	'1',
+						'selected'	=> true,
+						'label'		=> 'prosilver',
+					],
+					[
+						'value'	=>	'2',
+						'selected'	=> false,
+						'label'		=> 'subsilver2',
+					],
+					[
+						'value'	=>	'3',
+						'selected'	=> false,
+						'label'		=> 'zoo',
+					],
+				]
+			],
+			[
+				'3',
+				false,
+				[
+					[
+						'value'	=>	'1',
+						'selected'	=> false,
+						'label'		=> 'prosilver',
+					],
+					[
+						'value'	=>	'2',
+						'selected'	=> false,
+						'label'		=> 'subsilver2',
+					],
+				]
+			],
+			[
+				'3',
+				true,
+				[
+					[
+						'value'	=>	'1',
+						'selected'	=> false,
+						'label'		=> 'prosilver',
+					],
+					[
+						'value'	=>	'2',
+						'selected'	=> false,
+						'label'		=> 'subsilver2',
+					],
+					[
+						'value'	=>	'3',
+						'selected'	=> true,
+						'label'		=> 'zoo',
+					],
+				]
+			],
+		];
 	}
 
 	/**
diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php
index 41951c29bc4..8490afe30f2 100644
--- a/tests/functions/user_delete_test.php
+++ b/tests/functions/user_delete_test.php
@@ -62,14 +62,14 @@ protected function setUp(): void
 		$passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers));
 
 		$plugins = new \phpbb\di\service_collection($phpbb_container);
-		$plugins->add('core.captcha.plugins.nogd');
+		$plugins->add('core.captcha.plugins.qa');
 		$phpbb_container->set(
 			'captcha.factory',
 			new \phpbb\captcha\factory($phpbb_container, $plugins)
 		);
 		$phpbb_container->set(
-			'core.captcha.plugins.nogd',
-			new \phpbb\captcha\plugins\nogd()
+			'core.captcha.plugins.qa',
+			new \phpbb\captcha\plugins\qa('', '', '')
 		);
 		// Set up passwords manager
 		$db_auth_provider = new \phpbb\auth\provider\db(
@@ -80,6 +80,9 @@ protected function setUp(): void
 			$user
 		);
 
+		$routing_helper = $this->getMockBuilder(\phpbb\routing\helper::class)
+			->disableOriginalConstructor()
+			->getMock();
 		$oauth_provider = new \phpbb\auth\provider\oauth\oauth(
 			$config,
 			$db,
@@ -87,6 +90,7 @@ protected function setUp(): void
 			$phpbb_dispatcher,
 			$lang,
 			$request,
+			$routing_helper,
 			$oauth_provider_collection,
 			$user,
 			'phpbb_oauth_tokens',
diff --git a/tests/functions/validate_hex_colour_test.php b/tests/functions/validate_hex_colour_test.php
index 467bcd1d89e..c82cce140be 100644
--- a/tests/functions/validate_hex_colour_test.php
+++ b/tests/functions/validate_hex_colour_test.php
@@ -15,7 +15,7 @@
 
 class phpbb_functions_validate_hex_colour_test extends phpbb_test_case
 {
-	public function positive_match_data()
+	public static function positive_match_data()
 	{
 		return array(
 			array('a00'),
@@ -27,7 +27,7 @@ public function positive_match_data()
 		);
 	}
 
-	public function negative_match_data()
+	public static function negative_match_data()
 	{
 		return array(
 			// Invalid prefix
@@ -53,7 +53,7 @@ public function negative_match_data()
 		);
 	}
 
-	public function optional_only_data()
+	public static function optional_only_data()
 	{
 		return array(
 			// The empty colour, i.e. "no colour".
@@ -61,19 +61,19 @@ public function optional_only_data()
 		);
 	}
 
-	public function strict_negative_match_data()
+	public static function strict_negative_match_data()
 	{
 		return array_merge(
-			$this->negative_match_data(),
-			$this->optional_only_data()
+			self::negative_match_data(),
+			self::optional_only_data()
 		);
 	}
 
-	public function nonstrict_positive_match_data()
+	public static function nonstrict_positive_match_data()
 	{
 		return array_merge(
-			$this->positive_match_data(),
-			$this->optional_only_data()
+			self::positive_match_data(),
+			self::optional_only_data()
 		);
 	}
 
diff --git a/tests/functions/validate_jabber_test.php b/tests/functions/validate_jabber_test.php
deleted file mode 100644
index 92cf5062d5c..00000000000
--- a/tests/functions/validate_jabber_test.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
-require_once __DIR__ . '/validate_data_helper.php';
-
-class phpbb_functions_validate_jabber_test extends phpbb_test_case
-{
-	protected $helper;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->helper = new phpbb_functions_validate_data_helper($this);
-	}
-
-	public function test_validate_jabber()
-	{
-		$this->helper->assert_valid_data(array(
-			'empty' => array(
-				array(),
-				'',
-				array('jabber'),
-			),
-			'no_seperator' => array(
-				array('WRONG_DATA'),
-				'testjabber.ccc',
-				array('jabber'),
-			),
-			'no_user' => array(
-				array('WRONG_DATA'),
-				'@jabber.ccc',
-				array('jabber'),
-			),
-			'no_realm' => array(
-				array('WRONG_DATA'),
-				'user@',
-				array('jabber'),
-			),
-			'dot_realm' => array(
-				array('WRONG_DATA'),
-				'user@.....',
-				array('jabber'),
-			),
-			'-realm' => array(
-				array('WRONG_DATA'),
-				'user@-jabber.ccc',
-				array('jabber'),
-			),
-			'realm-' => array(
-				array('WRONG_DATA'),
-				'user@jabber.ccc-',
-				array('jabber'),
-			),
-			'correct' => array(
-				array(),
-				'user@jabber.09A-z.org',
-				array('jabber'),
-			),
-			'prohibited' => array(
-				array('WRONG_DATA'),
-				'u@ser@jabber.ccc.org',
-				array('jabber'),
-			),
-			'prohibited_char' => array(
-				array('WRONG_DATA'),
-				'u<s>er@jabber.ccc.org',
-				array('jabber'),
-			),
-		));
-	}
-}
diff --git a/tests/functions/validate_password_test.php b/tests/functions/validate_password_test.php
index bf74cb30fb3..56be2b6441b 100644
--- a/tests/functions/validate_password_test.php
+++ b/tests/functions/validate_password_test.php
@@ -25,7 +25,7 @@ protected function setUp(): void
 		$this->helper = new phpbb_functions_validate_data_helper($this);
 	}
 
-	public function validate_password_data()
+	public static function validate_password_data()
 	{
 		return array(
 			array('PASS_TYPE_ANY', array(
diff --git a/tests/functions/validate_user_email_test.php b/tests/functions/validate_user_email_test.php
index a43244bd502..e1f8526e218 100644
--- a/tests/functions/validate_user_email_test.php
+++ b/tests/functions/validate_user_email_test.php
@@ -28,12 +28,14 @@ public function getDataSet()
 
 	protected function setUp(): void
 	{
-		global $cache, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
+		global $cache, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $config;
 
 		parent::setUp();
 
 		$phpbb_container = new phpbb_mock_container_builder();
-		$config = new \phpbb\config\config([]);
+		$config = new \phpbb\config\config([
+			'allow_emailreuse' => 0,
+		]);
 		$this->db = $this->new_dbal();
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$language = new phpbb\language\language(new phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
@@ -99,6 +101,8 @@ public static function validate_user_email_data()
 	*/
 	public function test_validate_user_email($case, $errors, $email)
 	{
+		global $config, $db, $user;
+
 		$this->set_validation_prerequisites(false);
 
 		$this->helper->assert_valid_data(array(
@@ -124,6 +128,8 @@ public static function validate_user_email_mx_data()
 	*/
 	public function test_validate_user_email_mx($case, $errors, $email)
 	{
+		global $config, $db, $user;
+
 		$this->set_validation_prerequisites(true);
 
 		$this->helper->assert_valid_data(array(
diff --git a/tests/functions/validate_username_test.php b/tests/functions/validate_username_test.php
index fc52f91347e..0da6b99a6c5 100644
--- a/tests/functions/validate_username_test.php
+++ b/tests/functions/validate_username_test.php
@@ -15,7 +15,7 @@
 require_once __DIR__ . '/../mock/cache.php';
 require_once __DIR__ . '/validate_data_helper.php';
 
-class phpbb_functions_validate_data_test extends phpbb_database_test_case
+class phpbb_functions_validate_username_test extends phpbb_database_test_case
 {
 	protected $db;
 	protected $cache;
@@ -35,7 +35,7 @@ protected function setUp(): void
 		$this->helper = new phpbb_functions_validate_data_helper($this);
 	}
 
-	public function validate_username_data()
+	public static function validate_username_data()
 	{
 		return array(
 			array('USERNAME_CHARS_ANY', array(
diff --git a/tests/functions_acp/build_cfg_template_test.php b/tests/functions_acp/build_cfg_template_test.php
index 76558152ff8..4ddd891f81a 100644
--- a/tests/functions_acp/build_cfg_template_test.php
+++ b/tests/functions_acp/build_cfg_template_test.php
@@ -15,7 +15,7 @@
 
 class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case
 {
-	public function build_cfg_template_text_data()
+	public static function build_cfg_template_text_data()
 	{
 		return array(
 			array(
@@ -81,10 +81,10 @@ public function test_build_cfg_template_text($tpl_type, $key, $new, $config_key,
 		$language = new phpbb_mock_lang();
 		$user->lang = $language;
 
-		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
+		$this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
 	}
 
-	public function build_cfg_template_dimension_data()
+	public static function build_cfg_template_dimension_data()
 	{
 		return array(
 			array(
@@ -151,10 +151,10 @@ public function test_build_cfg_template_dimension($tpl_type, $key, $new, $config
 		$user = new phpbb_mock_user();
 		$user->lang = new phpbb_mock_lang();
 
-		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
+		$this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
 	}
 
-	public function build_cfg_template_number_data()
+	public static function build_cfg_template_number_data()
 	{
 		return array(
 			array(
@@ -219,10 +219,10 @@ public function test_build_cfg_template_number($tpl_type, $key, $new, $config_ke
 		$user = new phpbb_mock_user();
 		$user->lang = new phpbb_mock_lang();
 
-		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
+		$this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
 	}
 
-	public function build_cfg_template_textarea_data()
+	public static function build_cfg_template_textarea_data()
 	{
 		return array(
 			array(
@@ -254,18 +254,18 @@ public function test_build_cfg_template_textarea($tpl_type, $key, $new, $config_
 		$user = new phpbb_mock_user();
 		$user->lang = new phpbb_mock_lang();
 
-		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
+		$this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
 	}
 
-	public function build_cfg_template_radio_data()
+	public static function build_cfg_template_radio_data()
 	{
-		return array(
-			array(
-				array('radio', 'enabled_disabled'),
+		return [
+			[
+				['radio', 'enabled_disabled'],
 				'key_name',
-				array('config_key_name'	=> '0'),
+				['config_key_name'	=> '0'],
 				'config_key_name',
-				array(),
+				[],
 				[
 					'tag'		=> 'radio',
 					'buttons'	=> [
@@ -286,13 +286,40 @@ public function build_cfg_template_radio_data()
 						],
 					],
 				],
-			),
-			array(
-				array('radio', 'enabled_disabled'),
+			],
+			[
+				['radio'],
 				'key_name',
-				array('config_key_name'	=> '1'),
+				['config_key_name'	=> '0'],
 				'config_key_name',
-				array(),
+				['function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'ENABLED', 0 => 'DISABLED']]],
+				[
+					'tag'		=> 'radio',
+					'buttons'	=> [
+						[
+							'id'		=> 'key_name',
+							'type'		=> 'radio',
+							'value'		=> 1,
+							'name'		=> 'config[config_key_name]',
+							'label'		=> 'ENABLED',
+							'checked'	=> false,
+						],
+						[
+							'type'		=> 'radio',
+							'value'		=> 0,
+							'checked'	=> true,
+							'name'		=> 'config[config_key_name]',
+							'label'		=> 'DISABLED',
+						],
+					],
+				],
+			],
+			[
+				['radio', 'enabled_disabled'],
+				'key_name',
+				['config_key_name'	=> '1'],
+				'config_key_name',
+				[],
 				[
 					'tag'		=> 'radio',
 					'buttons'	=> [
@@ -313,13 +340,40 @@ public function build_cfg_template_radio_data()
 						],
 					],
 				],
-			),
-			array(
-				array('radio', 'yes_no'),
+			],
+			[
+				['radio'],
 				'key_name',
-				array('config_key_name'	=> '0'),
+				['config_key_name'	=> '1'],
 				'config_key_name',
-				array(),
+				['function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'ENABLED', 0 => 'DISABLED']]],
+				[
+					'tag'		=> 'radio',
+					'buttons'	=> [
+						[
+							'id'		=> 'key_name',
+							'type'		=> 'radio',
+							'value'		=> 1,
+							'name'		=> 'config[config_key_name]',
+							'label'		=> 'ENABLED',
+							'checked'	=> true,
+						],
+						[
+							'type'		=> 'radio',
+							'value'		=> 0,
+							'checked'	=> false,
+							'name'		=> 'config[config_key_name]',
+							'label'		=> 'DISABLED',
+						],
+					],
+				],
+			],
+			[
+				['radio', 'yes_no'],
+				'key_name',
+				['config_key_name'	=> '0'],
+				'config_key_name',
+				[],
 				[
 					'tag'		=> 'radio',
 					'buttons'	=> [
@@ -340,13 +394,40 @@ public function build_cfg_template_radio_data()
 						],
 					],
 				],
-			),
-			array(
-				array('radio', 'yes_no'),
+			],
+			[
+				['radio'],
 				'key_name',
-				array('config_key_name'	=> '1'),
+				['config_key_name'	=> '0'],
 				'config_key_name',
-				array(),
+				['function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'YES', 0 => 'NO']]],
+				[
+					'tag'		=> 'radio',
+					'buttons'	=> [
+						[
+							'id'		=> 'key_name',
+							'type'		=> 'radio',
+							'value'		=> 1,
+							'name'		=> 'config[config_key_name]',
+							'label'		=> 'YES',
+							'checked'	=> false,
+						],
+						[
+							'type'		=> 'radio',
+							'value'		=> 0,
+							'checked'	=> true,
+							'name'		=> 'config[config_key_name]',
+							'label'		=> 'NO',
+						],
+					],
+				],
+			],
+			[
+				['radio', 'yes_no'],
+				'key_name',
+				['config_key_name'	=> '1'],
+				'config_key_name',
+				[],
 				[
 					'tag'		=> 'radio',
 					'buttons'	=> [
@@ -367,8 +448,35 @@ public function build_cfg_template_radio_data()
 						],
 					],
 				],
-			),
-		);
+			],
+			[
+				['radio'],
+				'key_name',
+				['config_key_name'	=> '1'],
+				'config_key_name',
+				['function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'YES', 0 => 'NO']]],
+				[
+					'tag'		=> 'radio',
+					'buttons'	=> [
+						[
+							'id'		=> 'key_name',
+							'type'		=> 'radio',
+							'value'		=> 1,
+							'name'		=> 'config[config_key_name]',
+							'label'		=> 'YES',
+							'checked'	=> true,
+						],
+						[
+							'type'		=> 'radio',
+							'value'		=> 0,
+							'checked'	=> false,
+							'name'		=> 'config[config_key_name]',
+							'label'		=> 'NO',
+						],
+					],
+				],
+			],
+		];
 	}
 
 	/**
@@ -381,10 +489,10 @@ public function test_build_cfg_template_radio($tpl_type, $key, $new, $config_key
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$language = new \phpbb_mock_lang();
 
-		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
+		$this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
 	}
 
-	public function build_cfg_template_append_data()
+	public static function build_cfg_template_append_data()
 	{
 		return array(
 			array(
@@ -417,10 +525,10 @@ public function test_build_cfg_template_append($tpl_type, $key, $new, $config_ke
 		$user = new phpbb_mock_user();
 		$user->lang = new phpbb_mock_lang();
 
-		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
+		$this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
 	}
 
-	public function build_cfg_template_select_data()
+	public static function build_cfg_template_select_data()
 	{
 		return [
 			[
@@ -431,8 +539,11 @@ public function build_cfg_template_select_data()
 				['method' => 'select_helper'],
 				[
 					'tag'		=> 'select',
+					'class'		=> false,
 					'id'		=> 'key_name',
+					'data'		=> [],
 					'name'		=> 'config[config_key_name]',
+					'toggleable' => false,
 					'options'	=> [
 						[
 							'value'		=> 1,
@@ -450,7 +561,9 @@ public function build_cfg_template_select_data()
 							'selected'	=> false,
 						]
 					],
-					'toggleable' => false,
+					'group_only'	=> false,
+					'size'			=> 1,
+					'multiple'		=> false,
 				],
 			],
 			[
@@ -461,9 +574,11 @@ public function build_cfg_template_select_data()
 				['method' => 'select_helper'],
 				[
 					'tag'		=> 'select',
+					'class'		=> false,
 					'id'		=> 'key_name',
+					'data'		=> [],
 					'name'		=> 'config[config_key_name]',
-					'size'		=> 8,
+					'toggleable' => false,
 					'options'	=> [
 						[
 							'value'		=> 1,
@@ -481,7 +596,9 @@ public function build_cfg_template_select_data()
 							'selected'	=> false,
 						]
 					],
-					'toggleable' => false,
+					'group_only'	=> false,
+					'size'			=> 8,
+					'multiple'		=> false,
 				],
 			],
 		];
@@ -501,18 +618,19 @@ public function test_build_cfg_template_select($tpl_type, $key, $new, $config_ke
 		$user->module = $this;
 		$module = $user;
 
-		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
+		$this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
 	}
 
 	public function select_helper()
 	{
-		return build_select(
-			array(
-				'1'	=> 'First_Option',
-				'2'	=> 'Second_Option',
-				'3'	=> 'Third_Option',
-			),
-			'2'
-		);
+		return [
+			'options' => build_select(
+				[
+					'1'	=> 'First_Option',
+					'2'	=> 'Second_Option',
+					'3'	=> 'Third_Option',
+				],
+				'2'),
+		];
 	}
 }
diff --git a/tests/functions_acp/build_select_test.php b/tests/functions_acp/build_select_test.php
index e59f25e9776..693eabe3c9c 100644
--- a/tests/functions_acp/build_select_test.php
+++ b/tests/functions_acp/build_select_test.php
@@ -13,7 +13,7 @@
 
 require_once __DIR__ . '/../../phpBB/includes/functions_acp.php';
 
-class phpbb_functions_acp_built_select_test extends phpbb_test_case
+class phpbb_functions_acp_build_select_test extends phpbb_test_case
 {
 	protected function setUp(): void
 	{
@@ -25,7 +25,7 @@ protected function setUp(): void
 		$user->lang = new phpbb_mock_lang();
 	}
 
-	public function build_select_data()
+	public static function build_select_data()
 	{
 		return array(
 			array(
diff --git a/tests/functions_acp/h_radio_test.php b/tests/functions_acp/h_radio_test.php
deleted file mode 100644
index acba1068f4c..00000000000
--- a/tests/functions_acp/h_radio_test.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions_acp.php';
-
-class phpbb_functions_acp_h_radio_test extends phpbb_test_case
-{
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		global $user;
-
-		$user = new phpbb_mock_user();
-		$user->lang = new phpbb_mock_lang();
-	}
-
-	public function h_radio_data()
-	{
-		return array(
-			array(
-				'test_name',
-				array(
-					'test'		=> 'TEST',
-					'second'	=> 'SEC_OPTION',
-				),
-				false,
-				false,
-				false,
-				'<label><input type="radio" name="test_name" value="test" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" class="radio" /> SEC_OPTION</label>',
-			),
-			array(
-				'test_name',
-				array(
-					'test'		=> 'TEST',
-					'second'	=> 'SEC_OPTION',
-				),
-				'test',
-				false,
-				false,
-				'<label><input type="radio" name="test_name" value="test" checked="checked" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" class="radio" /> SEC_OPTION</label>',
-			),
-			array(
-				'test_name',
-				array(
-					'test'		=> 'TEST',
-					'second'	=> 'SEC_OPTION',
-				),
-				false,
-				'test_id',
-				false,
-				'<label><input type="radio" name="test_name" id="test_id" value="test" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" class="radio" /> SEC_OPTION</label>',
-			),
-			array(
-				'test_name',
-				array(
-					'test'		=> 'TEST',
-					'second'	=> 'SEC_OPTION',
-				),
-				'test',
-				'test_id',
-				false,
-				'<label><input type="radio" name="test_name" id="test_id" value="test" checked="checked" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" class="radio" /> SEC_OPTION</label>',
-			),
-
-			array(
-				'test_name',
-				array(
-					'test'		=> 'TEST',
-					'second'	=> 'SEC_OPTION',
-				),
-				false,
-				false,
-				'k',
-				'<label><input type="radio" name="test_name" value="test" accesskey="k" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" accesskey="k" class="radio" /> SEC_OPTION</label>',
-			),
-			array(
-				'test_name',
-				array(
-					'test'		=> 'TEST',
-					'second'	=> 'SEC_OPTION',
-				),
-				'test',
-				false,
-				'k',
-				'<label><input type="radio" name="test_name" value="test" checked="checked" accesskey="k" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" accesskey="k" class="radio" /> SEC_OPTION</label>',
-			),
-			array(
-				'test_name',
-				array(
-					'test'		=> 'TEST',
-					'second'	=> 'SEC_OPTION',
-				),
-				false,
-				'test_id',
-				'k',
-				'<label><input type="radio" name="test_name" id="test_id" value="test" accesskey="k" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" accesskey="k" class="radio" /> SEC_OPTION</label>',
-			),
-			array(
-				'test_name',
-				array(
-					'test'		=> 'TEST',
-					'second'	=> 'SEC_OPTION',
-				),
-				'test',
-				'test_id',
-				'k',
-				'<label><input type="radio" name="test_name" id="test_id" value="test" checked="checked" accesskey="k" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" accesskey="k" class="radio" /> SEC_OPTION</label>',
-			),
-		);
-	}
-
-	/**
-	* @dataProvider h_radio_data
-	*/
-	public function test_h_radio($name, $input_ary, $input_default, $id, $key, $expected)
-	{
-		$this->assertEquals($expected, h_radio($name, $input_ary, $input_default, $id, $key));
-	}
-}
diff --git a/tests/functions_acp/insert_config_array_test.php b/tests/functions_acp/insert_config_array_test.php
index bf71b4e32f2..f61b6dceacc 100644
--- a/tests/functions_acp/insert_config_array_test.php
+++ b/tests/functions_acp/insert_config_array_test.php
@@ -27,7 +27,7 @@ public function config_display_vars()
 		);
 	}
 
-	public function insert_config_array_data()
+	public static function insert_config_array_data()
 	{
 		return array(
 			array( // Add a new config after 1st array item
diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php
index c1b4eb60e42..a94e9b1405e 100644
--- a/tests/functions_acp/validate_config_vars_test.php
+++ b/tests/functions_acp/validate_config_vars_test.php
@@ -29,7 +29,7 @@ protected function setUp(): void
 	/**
 	* Data sets that don't throw an error.
 	*/
-	public function validate_config_vars_fit_data()
+	public static function validate_config_vars_fit_data()
 	{
 		return array(
 			array(
@@ -86,7 +86,7 @@ public function test_validate_config_vars_fit($test_data, $cfg_array)
 	/**
 	* Data sets that throw the error.
 	*/
-	public function validate_config_vars_error_data()
+	public static function validate_config_vars_error_data()
 	{
 		return array(
 			array(
diff --git a/tests/functions_acp/validate_range_test.php b/tests/functions_acp/validate_range_test.php
index 8e590118291..16891d936ba 100644
--- a/tests/functions_acp/validate_range_test.php
+++ b/tests/functions_acp/validate_range_test.php
@@ -28,7 +28,7 @@ protected function setUp(): void
 	/**
 	* Data sets that don't throw an error.
 	*/
-	public function validate_range_data_fit()
+	public static function validate_range_data_fit()
 	{
 		return array(
 			array(array(array('column_type' => 'BOOL', 'lang' => 'TEST', 'value' => 0))),
@@ -74,7 +74,7 @@ public function test_validate_range_fit($test_data)
 	/**
 	* Data sets that throw the SETTING_TOO_LOW-error.
 	*/
-	public function validate_range_data_too_low()
+	public static function validate_range_data_too_low()
 	{
 		return array(
 			array(array(array('column_type' => 'BOOL', 'lang' => 'TEST', 'value' => -1))),
@@ -109,7 +109,7 @@ public function test_validate_range_too_low($test_data)
 	/**
 	* Data sets that throw the SETTING_TOO_BIG-error.
 	*/
-	public function validate_range_data_too_big()
+	public static function validate_range_data_too_big()
 	{
 		return array(
 			array(array(array('column_type' => 'BOOL', 'lang' => 'TEST', 'value' => 2))),
@@ -144,7 +144,7 @@ public function test_validate_range_too_big($test_data)
 	/**
 	* Data sets that throw the SETTING_TOO_LONG-error.
 	*/
-	public function validate_range_data_too_long()
+	public static function validate_range_data_too_long()
 	{
 		return array(
 			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => str_repeat('a', 256)))),
diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php
new file mode 100644
index 00000000000..0b98018aab5
--- /dev/null
+++ b/tests/functions_content/get_context_test.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use PHPUnit\Framework\TestCase;
+
+class phpbb_functions_content_get_context_test extends TestCase
+{
+	/**
+	 * Data provider for get_context test cases.
+	 *
+	 * @return array
+	 */
+	public static function data_get_context(): array
+	{
+		return [
+			'text contains words and length greater than text' => [
+				'text' => 'This is a sample text containing several words, including sample, text, and words.',
+				'words' => ['sample', 'words'],
+				'length' => 100,
+				'expected' => 'This is a sample text containing several words, including sample, text, and words.',
+			],
+			'text contains words and length less than text' => [
+				'text' => 'This is a sample text containing several words, including sample, text, and words.',
+				'words' => ['sample', 'words'],
+				'length' => 50,
+				'expected' => 'This is a sample text containing several words ...',
+			],
+			'text does not contain words' => [
+				'text' => 'This is a sample text containing several words, but none of them match the given words.',
+				'words' => ['nonexistent'],
+				'length' => 50,
+				'expected' => 'This is a sample text containing several words ...',
+			],
+			'desired length equal to text length' => [
+				'text' => 'Exact length text.',
+				'words' => ['Exact', 'text'],
+				'length' => 18,
+				'expected' => 'Exact length text.',
+			],
+			'text with html entities' => [
+				'text' => 'This is a sample text containing &amp; and &lt; and &gt; entities.',
+				'words' => ['sample', 'containing'],
+				'length' => 50,
+				'expected' => 'This is a sample text containing &amp; and &lt; and ...',
+			],
+			'text with html entities and contains last word' => [
+				'text' => 'This is a sample text containing &amp; and &lt; and &gt; entities.',
+				'words' => ['sample', 'entities'],
+				'length' => 50,
+				'expected' => 'This is a sample text ... and &lt; and &gt; entities.',
+			],
+			'text with multiple spaces and special characters' => [
+				'text' => 'This    is    a   sample   text containing    several   words.',
+				'words' => ['sample', 'several'],
+				'length' => 50,
+				'expected' => 'This is a sample text containing several words.',
+			],
+			'empty text' => [
+				'text' => '',
+				'words' => ['sample', 'words'],
+				'length' => 50,
+				'expected' => '',
+			],
+			'empty words array' => [
+				'text' => 'This is a sample text containing several words.',
+				'words' => [],
+				'length' => 50,
+				'expected' => 'This is a sample text containing several words.',
+			],
+			'zero length' => [
+				'text' => 'This is a sample text.',
+				'words' => ['sample'],
+				'length' => 0,
+				'expected' => 'This is a sample text.',
+			],
+			'negative length' => [
+				'text' => 'This is a sample text.',
+				'words' => ['sample'],
+				'length' => -10,
+				'expected' => 'This is a sample text.',
+			],
+			'ellipses_beginning' => [
+				'text' => 'foo foo foo foo foo foo foo foo bar',
+				'words' => ['bar'],
+				'length' => 10,
+				'expected' => '... foo foo bar',
+			],
+			'ellipsis_end' => [
+				'text' => 'bar foo foo foo foo foo foo foo foo',
+				'words' => ['bar'],
+				'length' => 10,
+				'expected' => 'bar foo foo ...',
+			],
+			'ellipsis_middle' => [
+				'text' => 'foo word1 foo foo foo foo foo foo foo foo foo word2 foo',
+				'words' => ['word1', 'word2'],
+				'length' => 10,
+				'expected' => '... word1 ... word2 ...',
+			],
+			'ellipsis_middle2' => [
+				'text' => 'word1 foo foo foo foo foo foo foo foo foo word2',
+				'words' => ['word1', 'word2'],
+				'length' => 10,
+				'expected' => 'word1 ... word2',
+			],
+		];
+	}
+
+	/**
+	 * Data provider for unicode get_context test cases.
+	 *
+	 * @return array
+	 */
+	public static function data_get_context_unicode(): array
+	{
+		return [
+			'text contains words and length greater than text unicode' => [
+				'text' => 'Это пример текста, содержащего разнообразные слова, включая пример, текст и слова.',
+				'words' => ['пример', 'слова'],
+				'length' => 100,
+				'expected' => 'Это пример текста, содержащего разнообразные слова, включая пример, текст и слова.',
+			],
+			'text contains words and length less than text unicode' => [
+				'text' => 'Это пример текста, содержащего разнообразные слова, включая шаблон, текст и слова.',
+				'words' => ['пример', 'слова'],
+				'length' => 50,
+				'expected' => 'Это пример текста, содержащего разнообразные слова ...',
+			],
+			'text does not contain words unicode' => [
+				'text' => 'Это пример текста, содержащего разнообразные слова, но ни одно из них не совпадает с искомыми.',
+				'words' => ['nonexistent'],
+				'length' => 50,
+				'expected' => 'Это пример текста, содержащего разнообразные слова ...',
+			],
+			'desired length equal to text length unicode' => [
+				'text' => 'Текст точной длины.',
+				'words' => ['Текст', 'точной'],
+				'length' => 19,
+				'expected' => 'Текст точной длины.',
+			],
+			'text with html entities unicode' => [
+				'text' => 'Это пример текста, содержащего &amp; и &lt; и &gt; лексемы.',
+				'words' => ['пример', 'содержащего'],
+				'length' => 40,
+				'expected' => 'Это пример текста, содержащего &amp; и &lt; и ...',
+			],
+			'text with html entities and contains last word unicode' => [
+				'text' => 'Это пример текста, содержащего &amp; и &lt; и &gt; лексемы.',
+				'words' => ['пример', 'лексемы'],
+				'length' => 40,
+				'expected' => 'Это пример текста ... и &lt; и &gt; лексемы.',
+			],
+			'text with multiple spaces and special characters unicode' => [
+				'text' => 'Это    пример   текста, содержащего    разнообразные   слова.',
+				'words' => ['пример', 'разнообразные'],
+				'length' => 50,
+				'expected' => 'Это пример текста, содержащего разнообразные слова.',
+			],
+			'empty text unicode' => [
+				'text' => '',
+				'words' => ['пример', 'слова'],
+				'length' => 50,
+				'expected' => '',
+			],
+			'empty words array unicode' => [
+				'text' => 'Это пример текста, содержащего разнообразные слова.',
+				'words' => [],
+				'length' => 50,
+				'expected' => 'Это пример текста, содержащего разнообразные слова.',
+			],
+			'zero length unicode' => [
+				'text' => 'Это пример текста.',
+				'words' => ['пример'],
+				'length' => 0,
+				'expected' => 'Это пример текста.',
+			],
+			'negative length unicode' => [
+				'text' => 'Это пример текста.',
+				'words' => ['sample'],
+				'length' => -10,
+				'expected' => 'Это пример текста.',
+			],
+			'ellipses_beginning unicode' => [
+				'text' => 'раз раз раз раз раз раз раз раз два',
+				'words' => ['два'],
+				'length' => 10,
+				'expected' => '... раз раз два',
+			],
+			'ellipsis_end unicode' => [
+				'text' => 'два раз раз раз раз раз раз раз раз',
+				'words' => ['два'],
+				'length' => 10,
+				'expected' => 'два раз раз ...',
+			],
+			'ellipsis_middle unicode' => [
+				'text' => 'раз слово1 раз раз раз раз раз раз раз раз раз слово2 раз',
+				'words' => ['слово1', 'слово2'],
+				'length' => 15,
+				'expected' => '... слово1 ... слово2 ...',
+			],
+			'ellipsis_middle2 unicode' => [
+				'text' => 'слово1 foo foo foo foo foo foo foo foo foo слово2',
+				'words' => ['слово1', 'слово2'],
+				'length' => 10,
+				'expected' => 'слово1 ... слово2',
+			],
+			'fruits_spanish unicode' => [
+				'text' => 'Manzana,plátano,naranja,fresa,mango,uva,piña,pera,kiwi,cereza,sandía,melón,papaya,arándano,durazno',
+				'words' => ['piña'],
+				'length' => 20,
+				'expected' => '... uva,piña,pera ...',
+			]
+		];
+	}
+
+	/**
+	 * @dataProvider data_get_context
+	 * @dataProvider data_get_context_unicode
+	 */
+	public function test_get_context($text, $words, $length, $expected)
+	{
+		$this->assertEquals($expected, get_context($text, $words, $length));
+	}
+
+}
diff --git a/tests/functions_content/get_username_string_test.php b/tests/functions_content/get_username_string_test.php
index 94ac99f272a..3abd10be5cb 100644
--- a/tests/functions_content/get_username_string_test.php
+++ b/tests/functions_content/get_username_string_test.php
@@ -30,7 +30,7 @@ protected function setUp(): void
 		$user->lang['GUEST'] = 'Guest';
 	}
 
-	public function get_username_string_profile_data()
+	public static function get_username_string_profile_data()
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -49,7 +49,7 @@ public function test_get_username_string_profile($user_id, $username, $user_colo
 		$this->assertEquals($expected, get_username_string('profile', $user_id, $username, $user_colour, $guest_username, $custom_profile_url));
 	}
 
-	public function get_username_string_username_data()
+	public static function get_username_string_username_data()
 	{
 		return array(
 			array(ANONYMOUS, '', '', false, false, 'Guest'),
@@ -68,7 +68,7 @@ public function test_get_username_string_username($user_id, $username, $user_col
 		$this->assertEquals($expected, get_username_string('username', $user_id, $username, $user_colour, $guest_username, $custom_profile_url));
 	}
 
-	public function get_username_string_colour_data()
+	public static function get_username_string_colour_data()
 	{
 		return array(
 			array(0, '', '', false, false, ''),
@@ -86,7 +86,7 @@ public function test_get_username_string_colour($user_id, $username, $user_colou
 		$this->assertEquals($expected, get_username_string('colour', $user_id, $username, $user_colour, $guest_username, $custom_profile_url));
 	}
 
-	public function get_username_string_full_data()
+	public static function get_username_string_full_data()
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -107,7 +107,7 @@ public function test_get_username_string_full($user_id, $username, $user_colour,
 		$this->assertEquals($expected, get_username_string('full', $user_id, $username, $user_colour, $guest_username, $custom_profile_url));
 	}
 
-	public function get_username_string_no_profile_data()
+	public static function get_username_string_no_profile_data()
 	{
 		return array(
 			array(ANONYMOUS, 'Anonymous', '', false, false, '<span class="username">Anonymous</span>'),
diff --git a/tests/functions_content/phpbb_clean_search_string_test.php b/tests/functions_content/phpbb_clean_search_string_test.php
index 34ae0575c53..0744fa1764d 100644
--- a/tests/functions_content/phpbb_clean_search_string_test.php
+++ b/tests/functions_content/phpbb_clean_search_string_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_functions_content_phpbb_clean_search_string_test extends phpbb_test_case
 {
-	public function phpbb_clean_search_string_data()
+	public static function phpbb_clean_search_string_data()
 	{
 		return array(
 			array('*', ''),
diff --git a/tests/functions_content/phpbb_format_quote_test.php b/tests/functions_content/phpbb_format_quote_test.php
index 04dc620c296..7156ea7317f 100644
--- a/tests/functions_content/phpbb_format_quote_test.php
+++ b/tests/functions_content/phpbb_format_quote_test.php
@@ -31,7 +31,7 @@ protected function setUp(): void
 		parent::setUp();
 	}
 
-	public function data_phpbb_format_quote()
+	public static function data_phpbb_format_quote()
 	{
 		return [
 			[true, ['author' => 'admin', 'user_id' => 2], '[quote=&quot;username&quot;]quoted[/quote]', '', "[quote=admin user_id=2][quote=&quot;username&quot;]quoted[/quote][/quote]\n\n"],
diff --git a/tests/functions_user/delete_user_test.php b/tests/functions_user/delete_user_test.php
index 9f4f69d0c29..a7bdcdfb2ba 100644
--- a/tests/functions_user/delete_user_test.php
+++ b/tests/functions_user/delete_user_test.php
@@ -68,7 +68,7 @@ protected function setUp(): void
 		$phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications');
 	}
 
-	 public function first_last_post_data()
+	 public static function first_last_post_data()
 	{
 		return array(
 			array(
@@ -227,7 +227,7 @@ public function test_first_last_post_info($mode, $retain_username, $expected_pos
 		$this->db->sql_freeresult($result);
 	}
 
-	 public function report_attachment_data()
+	 public static function report_attachment_data()
 	{
 		return array(
 			array(
@@ -311,7 +311,7 @@ public function test_report_attachment_info($mode, $expected_posts, $expected_re
 		$this->db->sql_freeresult($result);
 	}
 
-	 public function delete_data()
+	 public static function delete_data()
 	{
 		return array(
 			array(
@@ -397,7 +397,7 @@ public function test_delete_data($mode, $expected_users, $expected_zebra, $expec
 		$this->db->sql_freeresult($result);
 	}
 
-	 public function delete_user_id_data()
+	 public static function delete_user_id_data()
 	{
 		return array(
 			array(
diff --git a/tests/functions_user/group_user_attributes_test.php b/tests/functions_user/group_user_attributes_test.php
index 887c21d4ca5..c0d884e4d8b 100644
--- a/tests/functions_user/group_user_attributes_test.php
+++ b/tests/functions_user/group_user_attributes_test.php
@@ -20,7 +20,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__.'/fixtures/group_user_attributes.xml');
 	}
 
-	public function group_user_attributes_data()
+	public static function group_user_attributes_data()
 	{
 		return array(
 			array(
diff --git a/tests/functions_user/whois_test.php b/tests/functions_user/whois_test.php
index 4dd72311bb5..0da4927cbf9 100644
--- a/tests/functions_user/whois_test.php
+++ b/tests/functions_user/whois_test.php
@@ -30,11 +30,13 @@ public function setUp(): void
 			->getMock();
 	}
 
-	public function ips_data()
+	public static function ips_data()
 	{
 		return [
-			['2001:4860:4860::8888'], // Google public DNS
-			['64.233.161.139'], // google.com
+			['2001:4860:4860::8888'], // Google public DNS (ARIN)
+			['64.233.161.139'], // google.com (ARIN)
+			['1.1.1.1'], // Cloudflare (APNIC via whois:// referral)
+			['213.133.116.44'], // Hetzner (RIPE via non-whois:// referral)
 		];
 	}
 
@@ -44,8 +46,18 @@ public function ips_data()
 	public function test_ip_whois($ip)
 	{
 		$ip_whois = user_ipwhois($ip);
+
+		if (preg_match('/%ERROR:201:\s*access denied/i', $ip_whois)
+			|| stripos($ip_whois, 'daily limit of controlled objects') !== false
+			|| stripos($ip_whois, 'Access from your host has been temporarily denied') !== false
+		)
+		{
+			$this->markTestSkipped('WHOIS provider temporarily denied access due to rate limiting (RIPE ERROR:201).');
+		}
+
 		$this->assertStringNotContainsString('Query terms are ambiguous', $ip_whois);
 		$this->assertStringNotContainsString('no entries found', $ip_whois);
 		$this->assertStringNotContainsString('ERROR', $ip_whois);
+		$this->assertStringNotContainsString('Allocated to RIPE NCC', $ip_whois); // This only shows if the referral isn't found
 	}
 }
diff --git a/tests/group/helper_get_name_string_test.php b/tests/group/helper_get_name_string_test.php
index 34dab1471dd..154fcb2f626 100644
--- a/tests/group/helper_get_name_string_test.php
+++ b/tests/group/helper_get_name_string_test.php
@@ -16,7 +16,7 @@
 class phpbb_group_helper_get_name_string_test extends phpbb_group_helper_test_case
 {
 
-	public function get_name_string_profile_data()
+	public static function get_name_string_profile_data()
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -35,7 +35,7 @@ public function test_get_name_string_profile($group_id, $group_name, $group_colo
 		$this->assertEquals($expected, $this->group_helper->get_name_string('profile', $group_id, $group_name, $group_colour, $custom_profile_url));
 	}
 
-	public function get_name_string_group_name_data()
+	public static function get_name_string_group_name_data()
 	{
 		return array(
 			// Should be fine
@@ -57,7 +57,7 @@ public function test_get_name_string_group_name($group_id, $group_name, $group_c
 		$this->assertEquals($expected, $this->group_helper->get_name_string('group_name', $group_id, $group_name, $group_colour, $custom_profile_url));
 	}
 
-	public function get_name_string_colour_data()
+	public static function get_name_string_colour_data()
 	{
 		return array(
 			array(0, '', '', false, ''),
@@ -75,7 +75,7 @@ public function test_get_name_string_colour($group_id, $group_name, $group_colou
 		$this->assertEquals($expected, $this->group_helper->get_name_string('colour', $group_id, $group_name, $group_colour, $custom_profile_url));
 	}
 
-	public function get_name_string_full_data()
+	public static function get_name_string_full_data()
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -95,7 +95,7 @@ public function test_get_name_string_full($group_id, $group_name, $group_colour,
 		$this->assertEquals($expected, $this->group_helper->get_name_string('full', $group_id, $group_name, $group_colour, $custom_profile_url));
 	}
 
-	public function get_name_string_no_profile_data()
+	public static function get_name_string_no_profile_data()
 	{
 		return array(
 			array(0, 'BOTS', '000000', false, '<span class="username-coloured" style="color: #000000;">Bots</span>'),
diff --git a/tests/group/helper_get_rank_test.php b/tests/group/helper_get_rank_test.php
index 95dc2ae600f..5d427b49ee2 100644
--- a/tests/group/helper_get_rank_test.php
+++ b/tests/group/helper_get_rank_test.php
@@ -15,7 +15,7 @@
 
 class phpbb_group_helper_get_rank_test extends phpbb_group_helper_test_case
 {
-	public function get_rank_data()
+	public static function get_rank_data()
 	{
 		global $phpbb_root_path;
 
diff --git a/tests/group/helper_test_case.php b/tests/group/helper_test_case.php
index f42dd13fa02..e23a1d8f467 100644
--- a/tests/group/helper_test_case.php
+++ b/tests/group/helper_test_case.php
@@ -67,6 +67,9 @@ protected function setup_engine(array $new_config = array())
 				array('u_viewprofile', true),
 			)));
 
+		// Set up database connection for testing
+		$db = $this->getMockBuilder('\phpbb\db\driver\driver_interface')->getMock();
+
 		// Set up cache service
 		$cache_service = $this->getMockBuilder('\phpbb\cache\service')->disableOriginalConstructor()->getMock();
 		$cache_service->expects($this->any())
@@ -87,12 +90,10 @@ protected function setup_engine(array $new_config = array())
 
 		// Set default language files loaded flag to true
 		$loaded_flag = $reflection_class->getProperty('common_language_files_loaded');
-		$loaded_flag->setAccessible(true);
 		$loaded_flag->setValue($lang, true);
 
 		// Set up test language data
 		$lang_array = $reflection_class->getProperty('lang');
-		$lang_array->setAccessible(true);
 		$lang_array->setValue($lang, $this->get_test_language_data_set());
 
 		// Set up event dispatcher
@@ -101,7 +102,7 @@ protected function setup_engine(array $new_config = array())
 		// Set up path helper
 		$path_helper = $this->getMockBuilder('\phpbb\path_helper')
 			->disableOriginalConstructor()
-			->setMethods(array())
+			->onlyMethods(['get_phpbb_root_path', 'get_php_ext', 'update_web_root_path'])
 			->getMock();
 		$path_helper->method('get_phpbb_root_path')
 			->willReturn($phpbb_root_path);
@@ -110,6 +111,8 @@ protected function setup_engine(array $new_config = array())
 		$path_helper->method('update_web_root_path')
 			->will($this->returnArgument(0));
 
+		$template = $this->getMockBuilder('\phpbb\template\template')->disableOriginalConstructor()->getMock();
+
 		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$user->data['user_id'] = ANONYMOUS;
 
@@ -117,7 +120,7 @@ protected function setup_engine(array $new_config = array())
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->group_helper = new \phpbb\group\helper($auth, $avatar_helper, $cache_service, $config, $lang, $phpbb_dispatcher, $path_helper, $user);
+		$this->group_helper = new \phpbb\group\helper($auth, $avatar_helper, $db, $cache_service, $config, $lang, $phpbb_dispatcher, $path_helper, $template, $user);
 	}
 
 	protected function setUp(): void
diff --git a/tests/groupposition/legend_test.php b/tests/groupposition/legend_test.php
index 13c909b6e51..9381cd8b5fd 100644
--- a/tests/groupposition/legend_test.php
+++ b/tests/groupposition/legend_test.php
@@ -18,7 +18,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/legend.xml');
 	}
 
-	public function get_group_value_data()
+	public static function get_group_value_data()
 	{
 		return array(
 			array(1, 0, ''),
@@ -57,7 +57,7 @@ public function test_get_group_count()
 		$this->assertEquals(2, $test_class->get_group_count());
 	}
 
-	public function add_group_data()
+	public static function add_group_data()
 	{
 		return array(
 			array(
@@ -101,7 +101,7 @@ public function test_add_group($group_id, $expected_added, $expected)
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public function delete_group_data()
+	public static function delete_group_data()
 	{
 		return array(
 			array(
@@ -187,7 +187,7 @@ public function test_delete_group($group_id, $skip_group, $expected_deleted, $ex
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public function move_up_data()
+	public static function move_up_data()
 	{
 		return array(
 			array(
@@ -240,7 +240,7 @@ public function test_move_up($group_id, $excepted_moved, $expected)
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public function move_down_data()
+	public static function move_down_data()
 	{
 		return array(
 			array(
@@ -293,7 +293,7 @@ public function test_move_down($group_id, $excepted_moved, $expected)
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public function move_data()
+	public static function move_data()
 	{
 		return array(
 			array(
diff --git a/tests/groupposition/teampage_test.php b/tests/groupposition/teampage_test.php
index c8cfed6c49d..56200996989 100644
--- a/tests/groupposition/teampage_test.php
+++ b/tests/groupposition/teampage_test.php
@@ -18,7 +18,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/teampage.xml');
 	}
 
-	public function get_group_value_data()
+	public static function get_group_value_data()
 	{
 		return array(
 			array(2, 3, ''),
@@ -57,7 +57,7 @@ public function test_get_group_count()
 		$this->assertEquals(8, $test_class->get_group_count());
 	}
 
-	public function add_group_teampage_data()
+	public static function add_group_teampage_data()
 	{
 		return array(
 			array(
@@ -145,7 +145,7 @@ public function test_add_group_teampage($group_id, $parent_id, $expected_added,
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public function add_category_teampage_data()
+	public static function add_category_teampage_data()
 	{
 		return array(
 			array(
@@ -186,7 +186,7 @@ public function test_add_category_teampage($group_name, $expected_added, $expect
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public function delete_group_data()
+	public static function delete_group_data()
 	{
 		return array(
 			array(
@@ -251,7 +251,7 @@ public function test_delete_group($group_id, $expected_deleted, $expected)
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public function delete_teampage_data()
+	public static function delete_teampage_data()
 	{
 		return array(
 			array(
@@ -301,7 +301,7 @@ public function test_delete_teampage($teampage_id, $expected_deleted, $expected)
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public function move_data()
+	public static function move_data()
 	{
 		return array(
 			array(
@@ -462,7 +462,7 @@ public function test_move($group_id, $move_delta, $excepted_moved, $expected)
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public function move_teampage_data()
+	public static function move_teampage_data()
 	{
 		return array(
 			array(
diff --git a/tests/help/manager_test.php b/tests/help/manager_test.php
index 02695806b6b..428e0e5201b 100644
--- a/tests/help/manager_test.php
+++ b/tests/help/manager_test.php
@@ -36,7 +36,7 @@ protected function setUp(): void
 		);
 	}
 
-	public function add_block_data()
+	public static function add_block_data()
 	{
 		return array(
 			array('abc', false, array(), false),
@@ -78,25 +78,31 @@ public function test_add_block($block_name, $switch, $questions, $switch_expecte
 
 		$this->language->expects($this->exactly(count($questions)*2 + 1))
 			->method('lang')
-			->withConsecutive([$block_name], ...$question_ary)
-			->will($this->onConsecutiveCalls(strtoupper($block_name), ...$question_ary_upper));
+			->willReturnCallback(fn(string $arg) => strtoupper($arg));
+
+		$expected_calls = [
+			['faq_block', [
+				'BLOCK_TITLE' => strtoupper($block_name),
+				'SWITCH_COLUMN' => $switch_expected,
+			]],
+			...$template_call_args
+		];
 
 		$this->template->expects($this->exactly(count($questions) + 1))
 			->method('assign_block_vars')
-			->withConsecutive(
-				['faq_block', [
-					'BLOCK_TITLE' => strtoupper($block_name),
-					'SWITCH_COLUMN' => $switch_expected,
-				]],
-				...$template_call_args
-			);
+			->willReturnCallback(function($blockName, $blockVars) use (&$expected_calls) {
+				static $call = 0;
+				$this->assertEquals($expected_calls[$call][0], $blockName);
+				$this->assertEquals($expected_calls[$call][1], $blockVars);
+				$call++;
+			});
 
 		$this->manager->add_block($block_name, $switch, $questions);
 
 		$this->assertEquals($switch_expected, $this->manager->switched_column());
 	}
 
-	public function add_question_data()
+	public static function add_question_data()
 	{
 		return array(
 			array('question1', 'answer1'),
@@ -114,11 +120,7 @@ public function test_add_question($question, $answer)
 	{
 		$this->language->expects($this->exactly(2))
 			->method('lang')
-			->withConsecutive(
-				[$question],
-				[$answer]
-			)
-			->will($this->onConsecutiveCalls(strtoupper($question), strtoupper($answer)));
+			->willReturnCallback(fn(string $arg) => strtoupper($arg));
 
 		$this->template->expects($this->once())
 			->method('assign_block_vars')
@@ -137,22 +139,27 @@ public function test_add_block_double_switch()
 
 		$this->language->expects($this->exactly(2))
 			->method('lang')
-			->withConsecutive([$block_name[0]], [$block_name[1]])
-			->will($this->onConsecutiveCalls(strtoupper($block_name[0]), strtoupper($block_name[1])));
-
-		$this->template->expects($this->exactly(2))
+			->willReturnCallback(fn(string $arg) => strtoupper($arg));
+
+		$expected_calls = [
+			['faq_block', [
+				'BLOCK_TITLE' => strtoupper($block_name[0]),
+				'SWITCH_COLUMN' => $switch_expected[0],
+			]],
+			['faq_block', [
+				'BLOCK_TITLE' => strtoupper($block_name[1]),
+				'SWITCH_COLUMN' => $switch_expected[1],
+			]]
+		];
+
+		$this->template->expects($this->exactly(count($expected_calls)))
 			->method('assign_block_vars')
-			->withConsecutive(
-				['faq_block', [
-					'BLOCK_TITLE' => strtoupper($block_name[0]),
-					'SWITCH_COLUMN' => $switch_expected[0],
-				]],
-				['faq_block', [
-					'BLOCK_TITLE' => strtoupper($block_name[1]),
-					'SWITCH_COLUMN' => $switch_expected[1],
-				]]
-		
-			);
+			->willReturnCallback(function($blockName, $blockVars) use (&$expected_calls) {
+				static $call = 0;
+				$this->assertEquals($expected_calls[$call][0], $blockName);
+				$this->assertEquals($expected_calls[$call][1], $blockVars);
+				$call++;
+			});
 
 		$this->manager->add_block($block_name[0], true);
 		$this->assertTrue($this->manager->switched_column());
diff --git a/tests/installer/database_helper_test.php b/tests/installer/database_helper_test.php
index 03c9152a5bf..306a8c1926a 100644
--- a/tests/installer/database_helper_test.php
+++ b/tests/installer/database_helper_test.php
@@ -57,7 +57,7 @@ public function test_split_sql($expected, $sql, $delimiter)
 	public function test_validate_table_prefix($expected, $test_string)
 	{
 		$db_helper_mock = $this->getMockBuilder('\phpbb\install\helper\database')
-			->setMethods(array('get_available_dbms'))
+			->onlyMethods(array('get_available_dbms'))
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -76,7 +76,7 @@ public function test_validate_table_prefix($expected, $test_string)
 	}
 
 	// Data provider for the remove comments function
-	public function comment_string_provider()
+	public static function comment_string_provider()
 	{
 		return array(
 			array(
@@ -99,7 +99,7 @@ public function comment_string_provider()
 	}
 
 	// Data provider for the sql file splitter function
-	public function sql_file_string_provider()
+	public static function sql_file_string_provider()
 	{
 		return array(
 			array(
@@ -116,7 +116,7 @@ public function sql_file_string_provider()
 	}
 
 	// Test data for prefix test
-	public function prefix_test_case_provider()
+	public static function prefix_test_case_provider()
 	{
 		return array(
 			array(
diff --git a/tests/installer/installer_config_test.php b/tests/installer/installer_config_test.php
index 9b08dc3b269..5e19a9d640b 100644
--- a/tests/installer/installer_config_test.php
+++ b/tests/installer/installer_config_test.php
@@ -25,9 +25,9 @@ protected function setUp(): void
 		$phpbb_root_path = __DIR__ . './../../phpBB/';
 		$filesystem = $this->createMock('\phpbb\filesystem\filesystem');
 		$php_ini = $this->getMockBuilder('\bantu\IniGetWrapper\IniGetWrapper')
-			->setMethods(array('getInt', 'getBytes'))
+			->onlyMethods(array('getNumeric', 'getBytes'))
 			->getMock();
-		$php_ini->method('getInt')
+		$php_ini->method('getNumeric')
 			->willReturn(-1);
 		$php_ini->method('getBytes')
 			->willReturn(-1);
diff --git a/tests/json/sanitizer_test.php b/tests/json/sanitizer_test.php
index 267dcaf7741..286d02d6f11 100644
--- a/tests/json/sanitizer_test.php
+++ b/tests/json/sanitizer_test.php
@@ -15,7 +15,7 @@
 
 class phpbb_json_sanitizer_test extends phpbb_test_case
 {
-	public function data_decode()
+	public static function data_decode()
 	{
 		return [
 			[false, []],
diff --git a/tests/language/language_test.php b/tests/language/language_test.php
index 2b1b2454915..eaf2d5c800c 100644
--- a/tests/language/language_test.php
+++ b/tests/language/language_test.php
@@ -30,12 +30,10 @@ protected function setUp(): void
 
 		// Set default language files loaded flag to true
 		$loaded_flag = $reflection_class->getProperty('common_language_files_loaded');
-		$loaded_flag->setAccessible(true);
 		$loaded_flag->setValue($this->lang, true);
 
 		// Set up test language data
 		$lang_array = $reflection_class->getProperty('lang');
-		$lang_array->setAccessible(true);
 		$lang_array->setValue($this->lang, $this->get_test_data_set());
 	}
 
diff --git a/tests/lint_test.php b/tests/lint_test.php
index 55fc3941704..e7904f9c837 100644
--- a/tests/lint_test.php
+++ b/tests/lint_test.php
@@ -52,12 +52,12 @@ public function test_lint($path)
 		$this->assertEquals(0, $status, "PHP lint failed for $path:\n$output");
 	}
 
-	public function lint_data()
+	public static function lint_data(): array
 	{
-		return $this->check(__DIR__ . '/..');
+		return self::check(__DIR__ . '/..');
 	}
 
-	protected function check($root)
+	protected static function check($root): array
 	{
 		$files = array();
 		$dh = opendir($root);
@@ -92,7 +92,7 @@ protected function check($root)
 					__DIR__ . '/../node_modules',
 				)))
 			{
-				$files = array_merge($files, $this->check($path));
+				$files = array_merge($files, self::check($path));
 			}
 			else if (substr($filename, strlen($filename)-4) == '.php')
 			{
diff --git a/tests/lock/posting_test.php b/tests/lock/posting_test.php
new file mode 100644
index 00000000000..75716dd2bac
--- /dev/null
+++ b/tests/lock/posting_test.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\cache\driver\file as file_cache;
+use phpbb\config\config;
+use phpbb\lock\posting;
+
+class phpbb_lock_posting_test extends phpbb_test_case
+{
+	/** @var \phpbb\cache\driver\file */
+	protected $cache;
+
+	/** @var config */
+	protected $config;
+
+	/** @var posting */
+	protected $lock;
+
+	public function setUp(): void
+	{
+		$this->cache = new file_cache(__DIR__ . '/../tmp/');
+		$this->cache->purge(); // ensure cache is clean
+		$this->config = new config([
+			'flood_interval' => 15,
+		]);
+		$this->lock = new posting($this->cache, $this->config);
+	}
+
+	public function test_lock_acquire()
+	{
+		$this->assertTrue($this->lock->acquire(100, 'foo'));
+		$this->assertFalse($this->lock->acquire(100, 'foo'));
+
+		$this->assertTrue($this->cache->_exists(sha1('100foo') . '_posting_lock'));
+		$this->assertFalse($this->lock->acquire(100, 'foo'));
+		$this->cache->put(sha1('100foo') . '_posting_lock', 'foo', -30);
+
+		$this->assertTrue($this->lock->acquire(100, 'foo'));
+		$this->assertTrue($this->cache->_exists(sha1('100foo') . '_posting_lock'));
+		$this->config->offsetSet('ci_tests_no_lock_posting', true);
+		$this->assertTrue($this->lock->acquire(100, 'foo'));
+		$this->assertTrue($this->cache->_exists(sha1('100foo') . '_posting_lock'));
+		// Multiple acquires possible due to special ci test flag
+		$this->assertTrue($this->lock->acquire(100, 'foo'));
+	}
+}
diff --git a/tests/log/delete_test.php b/tests/log/delete_test.php
index 366d66ee0bc..5383d3d04af 100644
--- a/tests/log/delete_test.php
+++ b/tests/log/delete_test.php
@@ -37,7 +37,7 @@ protected function setUp(): void
 		parent::setUp();
 	}
 
-	public function log_delete_data()
+	public static function log_delete_data()
 	{
 		return array(
 			array(
diff --git a/tests/log/function_add_log_test.php b/tests/log/function_add_log_test.php
index bcb4db0705b..8d89c15ab89 100644
--- a/tests/log/function_add_log_test.php
+++ b/tests/log/function_add_log_test.php
@@ -172,19 +172,63 @@ public function test_add_log_function($expected, $user_id, $mode, $required1, $a
 
 		if ($additional3 != null)
 		{
-			add_log($mode, $required1, $additional1, $additional2, $additional3);
+			$additional_data = [
+				'forum_id'	=> $required1,
+				'topic_id'	=> $additional1,
+				$additional3,
+			];
+			$phpbb_log->add($mode, $user_id, '', $additional2, false, $additional_data);
 		}
 		else if ($additional2 != null)
 		{
-			add_log($mode, $required1, $additional1, $additional2);
+			if ($mode == 'user')
+			{
+				$additional_data = [
+					'reportee_id'	=> $required1,
+					$additional2,
+				];
+				$log_operation = $additional1;
+			}
+			else if ($mode == 'mod')
+			{
+				$additional_data = [
+					'forum_id'	=> $required1,
+					'topic_id'	=> $additional1,
+				];
+				$log_operation = $additional2;
+			}
+			else
+			{
+				$log_operation = $required1;
+				$additional_data = [
+					$additional1,
+					$additional2,
+				];
+			}
+			$phpbb_log->add($mode, $user_id, '', $log_operation, false, $additional_data);
 		}
 		else if ($additional1 != null)
 		{
-			add_log($mode, $required1, $additional1);
+			if ($mode == 'user')
+			{
+				$additional_data = [
+					'reportee_id'	=> $required1,
+				];
+				$log_operation = $additional1;
+			}
+			else
+			{
+				$log_operation = $required1;
+				$additional_data = [
+					$additional1,
+				];
+			}
+
+			$phpbb_log->add($mode, $user_id, '', $log_operation, false, $additional_data);
 		}
 		else
 		{
-			add_log($mode, $required1);
+			$phpbb_log->add($mode, $user_id, '', $required1);
 		}
 
 		$result = $db->sql_query('SELECT user_id, log_type, log_operation, log_data, reportee_id, forum_id, topic_id
diff --git a/tests/manifest/controller_test.php b/tests/manifest/controller_test.php
new file mode 100644
index 00000000000..6b98002a1e2
--- /dev/null
+++ b/tests/manifest/controller_test.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+class phpbb_manifest_controller_test extends phpbb_test_case
+{
+	protected $config;
+	protected $user;
+	protected $manifest;
+
+	protected function setUp(): void
+	{
+		global $config, $user, $phpbb_root_path, $phpEx;
+
+		parent::setUp();
+
+		$config = $this->config = new phpbb\config\config([
+			'sitename'			=> 'phpBB Testing Framework',
+			'sitename_short'	=> '',
+			'force_server_vars'	=> false,
+			'script_path'		=> '',
+		]);
+
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$lang_loader = new phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$language = new phpbb\language\language($lang_loader);
+		$user = $this->user = new phpbb\user($language, '\phpbb\datetime');
+
+		$this->manifest = new phpbb\manifest($this->config, $phpbb_dispatcher, $this->user);
+	}
+
+	public static function manifest_data()
+	{
+		return [
+			'using board url root path' => [
+				[
+					'force_server_vars'	=> false,
+				],
+				[
+					'name'		=> 'phpBB Testing Framework',
+					'short_name'	=> 'phpBB Testin',
+					'display'		=> 'standalone',
+					'orientation'	=> 'portrait',
+					'start_url'		=> '/',
+					'scope'			=> '/',
+				],
+			],
+			'using script path' => [
+				[
+					'force_server_vars'	=> true,
+					'script_path'		=> '/foo/',
+				],
+				[
+					'name'		=> 'phpBB Testing Framework',
+					'short_name'	=> 'phpBB Testin',
+					'display'		=> 'standalone',
+					'orientation'	=> 'portrait',
+					'start_url'		=> '/foo/',
+					'scope'			=> '/foo/',
+				],
+			],
+			'with shortname' => [
+				[
+					'sitename_short'	=> 'phpBB Test',
+				],
+				[
+					'name'		=> 'phpBB Testing Framework',
+					'short_name'	=> 'phpBB Test',
+					'display'		=> 'standalone',
+					'orientation'	=> 'portrait',
+					'start_url'		=> '/',
+					'scope'			=> '/',
+				],
+			],
+			'without shortname or script path' => [
+				[],
+				[
+					'name'		=> 'phpBB Testing Framework',
+					'short_name'	=> 'phpBB Testin',
+					'display'		=> 'standalone',
+					'orientation'	=> 'portrait',
+					'start_url'		=> '/',
+					'scope'			=> '/',
+				],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider manifest_data
+	 */
+	public function test_manifest($configs, $expected)
+	{
+		foreach ($configs as $key => $value)
+		{
+			$this->config->set($key, $value);
+		}
+
+		$response = $this->manifest->handle();
+
+		$this->assertInstanceOf(JsonResponse::class, $response);
+
+		$this->assertEquals($expected, json_decode($response->getContent(), true));
+	}
+
+	public static function manifest_with_bot_data()
+	{
+		return [
+			'is a bot' => [true, 'yes'],
+			'not a bot' => [false, null],
+		];
+	}
+
+	/**
+	 * @dataProvider manifest_with_bot_data
+	 */
+	public function test_manifest_with_bot($is_bot, $expected)
+	{
+		$this->user->data['is_bot'] = $is_bot;
+
+		$response = $this->manifest->handle();
+
+		$this->assertInstanceOf(JsonResponse::class, $response);
+
+		$this->assertEquals($expected, $response->headers->get('X-PHPBB-IS-BOT'));
+	}
+}
diff --git a/tests/mcp/post_ip_test.php b/tests/mcp/post_ip_test.php
index bd443892e1b..1a8e9624b35 100644
--- a/tests/mcp/post_ip_test.php
+++ b/tests/mcp/post_ip_test.php
@@ -30,7 +30,7 @@ protected function setUp(): void
 		$this->db = $this->new_dbal();
 	}
 
-	public function data_get_num_ips()
+	public static function data_get_num_ips()
 	{
 		return array(
 			array(2, 1),
@@ -47,7 +47,7 @@ public function test_get_num_ips($expected, $poster_id)
 		$this->assertSame($expected, phpbb_get_num_ips_for_poster($this->db, $poster_id));
 	}
 
-	public function data_get_num_posters()
+	public static function data_get_num_posters()
 	{
 		return array(
 			array(2, '127.0.0.1'),
diff --git a/tests/mention/controller_test.php b/tests/mention/controller_test.php
index 664ab2bc92f..650d4e158bc 100644
--- a/tests/mention/controller_test.php
+++ b/tests/mention/controller_test.php
@@ -14,10 +14,11 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class phpbb_mention_controller_test extends phpbb_database_test_case
 {
-	protected $db, $container, $user, $config, $auth, $cache;
+	protected $controller_helper, $db, $container, $user, $config, $auth, $cache, $form_helper;
 
 	/**
 	 * @var \phpbb\mention\controller\mention
@@ -38,35 +39,51 @@ public function setUp(): void
 	{
 		parent::setUp();
 
-		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader;
+		global $cache, $phpbb_dispatcher, $lang, $user, $phpEx, $phpbb_root_path, $user_loader;
 
 		// Database
 		$this->db = $this->new_dbal();
-		$db = $this->db;
 
 		// Auth
-		$auth = $this->createMock('\phpbb\auth\auth');
-		$auth->expects($this->any())
+		$this->auth = $this->createMock('\phpbb\auth\auth');
+		$this->auth->expects($this->any())
 			 ->method('acl_gets')
 			 ->with('a_group', 'a_groupadd', 'a_groupdel')
 			 ->willReturn(false)
 		;
+		$this->auth->expects($this->any())
+			 ->method('acl_get')
+			 ->willReturnMap([
+					['u_mention', 0, true],
+					['f_mention', 1, true],
+				]);
 
 		// Config
-		$config = new \phpbb\config\config(array(
+		$this->config = new \phpbb\config\config(array(
 			'allow_mentions'      => true,
 			'mention_batch_size'  => 8,
 			'mention_names_limit' => 3,
 		));
 
+		$this->form_helper = $this->getMockBuilder('\phpbb\form\form_helper')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->form_helper->method('get_form_tokens')
+			->willReturn([
+				'creation_time' => 1777098416,
+				'form_token' => 'test_token',
+			]);
+		$this->form_helper->method('check_form_tokens')
+			->willReturn(true);
+
 		// Event dispatcher
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 
 		$cache_driver = new \phpbb\cache\driver\dummy();
 		$cache = new \phpbb\cache\service(
 			$cache_driver,
-			$config,
-			$db,
+			$this->config,
+			$this->db,
 			$phpbb_dispatcher,
 			$phpbb_root_path,
 			$phpEx
@@ -76,10 +93,7 @@ public function setUp(): void
 		$lang = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 
 		// User
-		$user = $this->createMock('\phpbb\user', array(), array(
-			$lang,
-			'\phpbb\datetime'
-		));
+		$user = $this->createMock('\phpbb\user');
 		$user->ip = '';
 		$user->data = array(
 			'user_id'       => 2,
@@ -89,36 +103,42 @@ public function setUp(): void
 		);
 
 		// Request
-		$this->request = $request = $this->createMock('\phpbb\request\request');
+		$this->request = $this->createMock('\phpbb\request\request');
 
-		$request->expects($this->any())
+		$this->request->expects($this->any())
 				->method('is_ajax')
 				->willReturn(true);
 		$avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$user_loader = new \phpbb\user_loader($avatar_helper, $db, $phpbb_root_path, $phpEx, USERS_TABLE);
+		$user_loader = new \phpbb\user_loader($avatar_helper, $this->db, $phpbb_root_path, $phpEx, USERS_TABLE);
+
+		// Controller helper
+		$this->controller_helper = $this->createMock('\phpbb\controller\helper');
 
 		// Container
-		$phpbb_container = new ContainerBuilder();
+		$this->container = new ContainerBuilder();
 
-		$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures'));
+		$loader = new YamlFileLoader($this->container, new FileLocator(__DIR__ . '/fixtures'));
 		$loader->load('services_mention.yml');
-		$phpbb_container->set('user_loader', $user_loader);
-		$phpbb_container->set('user', $user);
-		$phpbb_container->set('language', $lang);
-		$phpbb_container->set('config', $config);
-		$phpbb_container->set('dbal.conn', $db);
-		$phpbb_container->set('auth', $auth);
-		$phpbb_container->set('cache.driver', $cache_driver);
-		$phpbb_container->set('cache', $cache);
-		$phpbb_container->set('request', $request);
-		$phpbb_container->set('group_helper', new \phpbb\group\helper(
+		$this->container->set('user_loader', $user_loader);
+		$this->container->set('user', $user);
+		$this->container->set('language', $lang);
+		$this->container->set('config', $this->config);
+		$this->container->set('dbal.conn', $this->db);
+		$this->container->set('auth', $this->auth);
+		$this->container->set('cache.driver', $cache_driver);
+		$this->container->set('cache', $cache);
+		$this->container->set('request', $this->request);
+		$this->container->set('controller.helper', $this->controller_helper);
+		$this->container->set('form_helper', $this->form_helper);
+		$this->container->set('group_helper', new \phpbb\group\helper(
 			$this->getMockBuilder('\phpbb\auth\auth')->disableOriginalConstructor()->getMock(),
 			$avatar_helper,
+			$this->db,
 			$cache,
-			$config,
+			$this->config,
 			new \phpbb\language\language(
 				new phpbb\language\language_file_loader($phpbb_root_path, $phpEx)
 			),
@@ -131,37 +151,47 @@ public function setUp(): void
 				$phpbb_root_path,
 				$phpEx
 			),
+			$this->getMockBuilder('\phpbb\template\template')->disableOriginalConstructor()->getMock(),
 			$user
 		));
-		$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
-		$phpbb_container->set(
+		$this->container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
+		$this->container->set(
 			'text_formatter.s9e.mention_helper',
 			new \phpbb\textformatter\s9e\mention_helper(
 				$this->db,
-				$auth,
+				$this->auth,
 				$user,
 				$phpbb_root_path,
 				$phpEx
 			)
 		);
-		$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
-		$phpbb_container->setParameter('core.php_ext', $phpEx);
-		$phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass());
-		$phpbb_container->compile();
+		$this->container->setParameter('core.root_path', $phpbb_root_path);
+		$this->container->setParameter('core.php_ext', $phpEx);
+		$this->container->addCompilerPass(new phpbb\di\pass\markpublic_pass());
+		$this->container->compile();
 
 		// Mention Sources
 		$mention_sources = array('friend', 'group', 'team', 'topic', 'user', 'usergroup');
-		$mention_sources_array = array();
+		$mention_sources_array = new \phpbb\di\service_collection($this->container);
 		foreach ($mention_sources as $source)
 		{
-			$class = $phpbb_container->get('mention.source.' . $source);
-			$mention_sources_array['mention.source.' . $source] = $class;
+			$mention_sources_array->add('mention.source.' . $source);
 		}
 
-		$this->controller = new \phpbb\mention\controller\mention($mention_sources_array, $request, $phpbb_root_path, $phpEx);
+		$this->controller = new \phpbb\mention\controller\mention(
+			$this->auth,
+			$this->config,
+			$this->db,
+			$this->form_helper,
+			$mention_sources_array,
+			$this->request,
+			$this->controller_helper,
+			$phpbb_root_path,
+			$phpEx
+		);
 	}
 
-	public function handle_data()
+	public static function handle_data()
 	{
 		/**
 		 * NOTE:
@@ -285,6 +315,10 @@ public function handle_data()
 					],
 				],
 				'all'   => false,
+				'form_tokens' => [
+					'form_token' => 'test_token',
+					'creation_time' => 1777098416,
+				],
 			]],
 			['', 1, [
 				'names' => [
@@ -418,6 +452,10 @@ public function handle_data()
 					],
 				],
 				'all'   => false,
+				'form_tokens' => [
+					'form_token' => 'test_token',
+					'creation_time' => 1777098416,
+				],
 			]],
 			['t', 1, [
 				'names' => [
@@ -487,6 +525,10 @@ public function handle_data()
 					],
 				],
 				'all'   => true,
+				'form_tokens' => [
+					'form_token' => 'test_token',
+					'creation_time' => 1777098416,
+				],
 			]],
 			['test', 1, [
 				'names' => [
@@ -524,6 +566,10 @@ public function handle_data()
 					],
 				],
 				'all'   => true,
+				'form_tokens' => [
+					'form_token' => 'test_token',
+					'creation_time' => 1777098416,
+				],
 			]],
 			['test1', 1, [
 				'names' => [[
@@ -535,6 +581,10 @@ public function handle_data()
 					'priority' => 0,
 				]],
 				'all'   => true,
+				'form_tokens' => [
+					'form_token' => 'test_token',
+					'creation_time' => 1777098416,
+				],
 			]],
 		];
 	}
@@ -546,14 +596,281 @@ public function test_handle($keyword, $topic_id, $expected_result)
 	{
 		$this->request->expects($this->atLeast(2))
 			->method('variable')
-			->withConsecutive(
-				['keyword', '', true],
-				['topic_id', 0])
-			->willReturnOnConsecutiveCalls(
-				$keyword,
-				$topic_id
-			);
+			->willReturnCallback(function() use ($keyword, $topic_id) {
+				$args = func_get_args();
+				return match($args) {
+					['keyword', '', true, \phpbb\request\request_interface::REQUEST] => $keyword,
+					['topic_id', 0, false, \phpbb\request\request_interface::REQUEST] => $topic_id,
+					['forum_id', 0, false, \phpbb\request\request_interface::REQUEST] => 1,
+				};
+			});
+
 		$data = json_decode($this->controller->handle()->getContent(), true);
 		$this->assertEquals($expected_result, $data);
 	}
+
+	public function test_redirect_not_ajax()
+	{
+		$this->controller_helper->method('route')
+			->with('phpbb_index_controller')
+			->willReturn('/index.php');
+
+		$this->request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->request->method('is_ajax')
+			->willReturn(false);
+		$this->request->expects($this->atLeast(2))
+			->method('variable')
+			->willReturnCallback(function() {
+				$args = func_get_args();
+				return match($args) {
+					['keyword', '', true, \phpbb\request\request_interface::REQUEST] => 'admin',
+					['topic_id', 0, false, \phpbb\request\request_interface::REQUEST] => 2,
+					['forum_id', 0, false, \phpbb\request\request_interface::REQUEST] => 1,
+				};
+			});
+
+		$this->controller = new \phpbb\mention\controller\mention(
+			$this->auth,
+			$this->config,
+			$this->db,
+			$this->form_helper,
+			new \phpbb\di\service_collection($this->container),
+			$this->request,
+			$this->controller_helper,
+			'',
+			''
+		);
+
+		$response = $this->controller->handle();
+		$this->assertInstanceOf(RedirectResponse::class, $response);
+	}
+
+	public function test_redirect_no_forum_no_topic()
+	{
+		$this->controller_helper->method('route')
+			->with('phpbb_index_controller')
+			->willReturn('/index.php');
+
+		$this->request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->request->method('is_ajax')
+			->willReturn(true);
+		$this->request->expects($this->atLeast(2))
+			->method('variable')
+			->willReturnCallback(function() {
+				$args = func_get_args();
+				return match($args) {
+					['keyword', '', true, \phpbb\request\request_interface::REQUEST] => 'admin',
+					['topic_id', 0, false, \phpbb\request\request_interface::REQUEST] => 0,
+					['forum_id', 0, false, \phpbb\request\request_interface::REQUEST] => 0,
+				};
+			});
+
+		$this->controller = new \phpbb\mention\controller\mention(
+			$this->auth,
+			$this->config,
+			$this->db,
+			$this->form_helper,
+			new \phpbb\di\service_collection($this->container),
+			$this->request,
+			$this->controller_helper,
+			'',
+			''
+		);
+
+		$response = $this->controller->handle();
+		$this->assertInstanceOf(RedirectResponse::class, $response);
+	}
+
+	public function test_redirect_invalid_form_token()
+	{
+		$this->controller_helper->method('route')
+			->with('phpbb_index_controller')
+			->willReturn('/index.php');
+
+		$this->request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->request->method('is_ajax')
+			->willReturn(true);
+		$this->request->expects($this->atLeast(2))
+			->method('variable')
+			->willReturnCallback(function() {
+				$args = func_get_args();
+				return match($args) {
+					['keyword', '', true, \phpbb\request\request_interface::REQUEST] => 'admin',
+					['topic_id', 0, false, \phpbb\request\request_interface::REQUEST] => 9999,
+					['forum_id', 0, false, \phpbb\request\request_interface::REQUEST] => 0,
+				};
+			});
+
+		$this->form_helper = $this->getMockBuilder('\phpbb\form\form_helper')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->form_helper->method('get_form_tokens')
+			->willReturn([
+				'creation_time' => time(),
+				'form_token' => 'test_token',
+			]);
+		$this->form_helper->method('check_form_tokens')
+			->willReturn(false);
+
+		$this->controller = new \phpbb\mention\controller\mention(
+			$this->auth,
+			$this->config,
+			$this->db,
+			$this->form_helper,
+			new \phpbb\di\service_collection($this->container),
+			$this->request,
+			$this->controller_helper,
+			'',
+			''
+		);
+
+		$response = $this->controller->handle();
+		$this->assertInstanceOf(RedirectResponse::class, $response);
+	}
+
+	public function test_redirect_invalid_topic_id()
+	{
+		$this->controller_helper->method('route')
+			->with('phpbb_index_controller')
+			->willReturn('/index.php');
+
+		$this->request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->request->method('is_ajax')
+			->willReturn(true);
+		$this->request->expects($this->atLeast(2))
+			->method('variable')
+			->willReturnCallback(function() {
+				$args = func_get_args();
+				return match($args) {
+					['keyword', '', true, \phpbb\request\request_interface::REQUEST] => 'admin',
+					['topic_id', 0, false, \phpbb\request\request_interface::REQUEST] => 9999,
+					['forum_id', 0, false, \phpbb\request\request_interface::REQUEST] => 0,
+				};
+			});
+
+		$this->controller = new \phpbb\mention\controller\mention(
+			$this->auth,
+			$this->config,
+			$this->db,
+			$this->form_helper,
+			new \phpbb\di\service_collection($this->container),
+			$this->request,
+			$this->controller_helper,
+			'',
+			''
+		);
+
+		$response = $this->controller->handle();
+		$this->assertInstanceOf(RedirectResponse::class, $response);
+	}
+
+	public function test_redirect_no_u_mention()
+	{
+		$this->controller_helper->method('route')
+			->with('phpbb_index_controller')
+			->willReturn('/index.php');
+
+		$this->request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->request->method('is_ajax')
+			->willReturn(true);
+		$this->request->expects($this->atLeast(2))
+			->method('variable')
+			->willReturnCallback(function() {
+				$args = func_get_args();
+				return match($args) {
+					['keyword', '', true, \phpbb\request\request_interface::REQUEST] => 'admin',
+					['topic_id', 0, false, \phpbb\request\request_interface::REQUEST] => 2,
+					['forum_id', 0, false, \phpbb\request\request_interface::REQUEST] => 1,
+				};
+			});
+
+		$this->auth = $this->createMock('\phpbb\auth\auth');
+		$this->auth->expects($this->any())
+			->method('acl_gets')
+			->with('a_group', 'a_groupadd', 'a_groupdel')
+			->willReturn(false)
+		;
+		$this->auth->expects($this->any())
+			->method('acl_get')
+			->willReturnMap([
+				['u_mention', 0, false],
+				['f_mention', 1, true],
+			]);
+
+		$this->controller = new \phpbb\mention\controller\mention(
+			$this->auth,
+			$this->config,
+			$this->db,
+			$this->form_helper,
+			new \phpbb\di\service_collection($this->container),
+			$this->request,
+			$this->controller_helper,
+			'',
+			''
+		);
+
+		$response = $this->controller->handle();
+		$this->assertInstanceOf(RedirectResponse::class, $response);
+	}
+
+	public function test_redirect_no_f_mention()
+	{
+		$this->controller_helper->method('route')
+			->with('phpbb_index_controller')
+			->willReturn('/index.php');
+
+		$this->request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->request->method('is_ajax')
+			->willReturn(true);
+		$this->request->expects($this->atLeast(2))
+			->method('variable')
+			->willReturnCallback(function() {
+				$args = func_get_args();
+				return match($args) {
+					['keyword', '', true, \phpbb\request\request_interface::REQUEST] => 'admin',
+					['topic_id', 0, false, \phpbb\request\request_interface::REQUEST] => 2,
+					['forum_id', 0, false, \phpbb\request\request_interface::REQUEST] => 1,
+				};
+			});
+
+		$this->auth = $this->createMock('\phpbb\auth\auth');
+		$this->auth->expects($this->any())
+			->method('acl_gets')
+			->with('a_group', 'a_groupadd', 'a_groupdel')
+			->willReturn(false)
+		;
+		$this->auth->expects($this->any())
+			->method('acl_get')
+			->willReturnMap([
+				['u_mention', 0, true],
+				['f_mention', 1, false],
+			]);
+
+		$this->controller = new \phpbb\mention\controller\mention(
+			$this->auth,
+			$this->config,
+			$this->db,
+			$this->form_helper,
+			new \phpbb\di\service_collection($this->container),
+			$this->request,
+			$this->controller_helper,
+			'',
+			''
+		);
+
+		$response = $this->controller->handle();
+		$this->assertInstanceOf(RedirectResponse::class, $response);
+	}
 }
diff --git a/tests/messenger/method_base_test.php b/tests/messenger/method_base_test.php
new file mode 100644
index 00000000000..4c6e90e84c7
--- /dev/null
+++ b/tests/messenger/method_base_test.php
@@ -0,0 +1,276 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\config\config;
+use phpbb\language\language;
+use phpbb\language\language_file_loader;
+use phpbb\messenger\method\email;
+use phpbb\messenger\queue;
+use phpbb\path_helper;
+use phpbb\symfony_request;
+use phpbb\template\assets_bag;
+
+class phpbb_messenger_method_base_test extends \phpbb_test_case
+{
+	protected $assets_bag;
+	protected $cache_path;
+	protected config $config;
+	protected $dispatcher;
+	protected $extension_manager;
+	protected email $method_email;
+	protected $method_base;
+	protected $language;
+	protected $log;
+	protected $path_helper;
+	protected queue $queue;
+	protected $request;
+	protected $twig_extensions_collection;
+	protected $twig_lexer;
+	protected $user;
+	protected $filesystem;
+	protected $symfony_request;
+
+	public function setUp(): void
+	{
+		global $config, $request, $symfony_request, $user, $phpbb_root_path, $phpEx;
+
+		$this->assets_bag = new assets_bag();
+		$this->cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig';
+		$this->config = new config([
+			'force_server_vars' => false,
+		]);
+		$config = $this->config;
+		$this->dispatcher = $this->getMockBuilder('\phpbb\event\dispatcher')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->filesystem = new \phpbb\filesystem\filesystem();
+		$this->language = new language(new language_file_loader($phpbb_root_path, $phpEx));
+		$this->queue = $this->createMock(queue::class);
+		$this->request = new phpbb_mock_request();
+		$request = $this->request;
+		$this->symfony_request = new symfony_request(new phpbb_mock_request());
+		$symfony_request = $this->symfony_request;
+		$this->user = $this->getMockBuilder('\phpbb\user')
+			->setConstructorArgs([$this->language, '\phpbb\datetime'])
+			->getMock();
+		$user = $this->user;
+		$user->page['root_script_path'] = 'phpbb/';
+		$this->user->host = 'yourdomain.com';
+		$this->path_helper = new path_helper(
+			$this->symfony_request,
+			$this->request,
+			$phpbb_root_path,
+			$phpEx
+		);
+		$phpbb_container = new phpbb_mock_container_builder;
+		$this->twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container);
+		$twig = new \phpbb\template\twig\environment(
+			$this->assets_bag,
+			$this->config,
+			$this->filesystem,
+			$this->path_helper,
+			$this->cache_path,
+			null,
+			new \phpbb\template\twig\loader(''),
+			$this->dispatcher,
+			array(
+				'cache' => false,
+				'debug' => false,
+				'auto_reload' => true,
+				'autoescape' => false,
+			)
+		);
+		$this->twig_lexer = new \phpbb\template\twig\lexer($twig);
+		$this->extension_manager = new phpbb_mock_extension_manager(
+			__DIR__ . '/',
+			array(
+				'vendor2/foo' => array(
+					'ext_name' => 'vendor2/foo',
+					'ext_active' => '1',
+					'ext_path' => 'ext/vendor2/foo/',
+				),
+			)
+		);
+		$this->log = $this->createMock(\phpbb\log\log_interface::class);
+
+		$this->method_email = new email(
+			$this->assets_bag,
+			$this->config,
+			$this->dispatcher,
+			$this->language,
+			$this->queue,
+			$this->path_helper,
+			$this->request,
+			$this->twig_extensions_collection,
+			$this->twig_lexer,
+			$this->user,
+			$phpbb_root_path,
+			$this->cache_path,
+			$this->extension_manager,
+			$this->log
+		);
+
+		$this->method_base = $this->getMockBuilder(\phpbb\messenger\method\base::class)
+			->setConstructorArgs([
+				$this->assets_bag,
+				$this->config,
+				$this->dispatcher,
+				$this->language,
+				$this->queue,
+				$this->path_helper,
+				$this->request,
+				$this->twig_extensions_collection,
+				$this->twig_lexer,
+				$this->user,
+				$phpbb_root_path,
+				$this->cache_path,
+				$this->extension_manager,
+				$this->log
+			])
+			->getMockForAbstractClass();
+	}
+
+	public function test_header()
+	{
+		$this->method_base->header('X-AntiAbuse', 'Board servername - ' . $this->user->host);
+		$this->assertTrue(true); // No exception should be thrown
+	}
+
+	public function test_set_use_queue()
+	{
+		$use_queue_property = new \ReflectionProperty($this->method_base, 'use_queue');
+		$this->method_base->set_use_queue();
+		$this->assertTrue($use_queue_property->getValue($this->method_base));
+		$this->method_base->set_use_queue(false);
+		$this->assertFalse($use_queue_property->getValue($this->method_base));
+	}
+
+	public function test_error_wout_session()
+	{
+		$errors = [];
+		$this->log->method('add')
+			->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) {
+				$errors[] = $additional_data[0];
+			});
+
+		$this->user->data['user_id'] = 2;
+		$this->user->session_id = '';
+		$this->user
+			->expects($this->once())
+			->method('session_begin')
+			->willReturnCallback(function() {
+				$this->assertTrue(true);
+			});
+
+		$this->method_base->error('Test error message');
+
+		$this->assertCount(1, $errors);
+		$this->assertEquals('<strong></strong><br><em></em><br><br>Test error message<br>', $errors[0]);
+	}
+
+	public function test_save_queue()
+	{
+		$this->queue->expects($this->once())
+			->method('save');
+		$this->method_base->set_use_queue(false);
+		$this->method_base->save_queue();
+		$this->method_base->set_use_queue(true);
+		$this->method_base->save_queue();
+	}
+
+	public function test_template_no_lang()
+	{
+		$template_mock = $this->getMockBuilder(\phpbb\template\template::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$filenames = [];
+		$template_mock->method('set_filenames')
+			->willReturnCallback(function($filename_array) use (&$filenames, $template_mock) {
+				$filenames = array_merge($filenames, $filename_array);
+
+				return $template_mock;
+			});
+
+		$base_reflection = new \ReflectionClass($this->method_base);
+		$template_reflection = $base_reflection->getProperty('template');
+		$template_reflection->setValue($this->method_base, $template_mock);
+
+		$this->config->set('default_lang', 'en');
+		$this->method_base->template('test');
+		$this->assertEquals(['body' => 'test.txt'], $filenames);
+	}
+
+	public function test_template_template_path()
+	{
+		global $phpbb_root_path;
+
+		$template_mock = $this->getMockBuilder(\phpbb\template\template::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$filenames = [];
+		$template_mock->method('set_filenames')
+			->willReturnCallback(function($filename_array) use (&$filenames, $template_mock) {
+				$filenames = array_merge($filenames, $filename_array);
+
+				return $template_mock;
+			});
+		$template_mock->method('set_custom_style')
+			->willReturnCallback(function($path_name, $paths) use($phpbb_root_path) {
+				$this->assertEquals([['name' => 'en_email', 'ext_path' => 'language/en/email']], $path_name);
+				$this->assertEquals([$phpbb_root_path . 'language/en/email'], $paths);
+			});
+
+		$base_reflection = new \ReflectionClass($this->method_base);
+		$template_reflection = $base_reflection->getProperty('template');
+		$template_reflection->setValue($this->method_base, $template_mock);
+
+		$this->config->set('default_lang', 'en');
+		$this->method_base->template('test', '', $phpbb_root_path . 'language/en/email');
+		$this->assertEquals(['body' => 'test.txt'], $filenames);
+	}
+
+	public function test_template_path_fallback()
+	{
+		global $phpbb_root_path;
+
+		$template_mock = $this->getMockBuilder(\phpbb\template\template::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$filenames = [];
+		$template_mock->method('set_filenames')
+			->willReturnCallback(function($filename_array) use (&$filenames, $template_mock) {
+				$filenames = array_merge($filenames, $filename_array);
+
+				return $template_mock;
+			});
+		$template_mock->method('set_custom_style')
+			->willReturnCallback(function($path_name, $paths) use($phpbb_root_path) {
+				$this->assertEquals([
+					['name' => 'de_email', 'ext_path' => 'language/de/email'],
+					['name' => 'en_email', 'ext_path' => 'language/en/email'],
+				], $path_name);
+				$this->assertEquals([
+					$phpbb_root_path . 'language/de/email',
+					$phpbb_root_path . 'language/en/email'
+				], $paths);
+			});
+
+		$base_reflection = new \ReflectionClass($this->method_base);
+		$template_reflection = $base_reflection->getProperty('template');
+		$template_reflection->setValue($this->method_base, $template_mock);
+
+		$this->config->set('default_lang', 'de');
+		$this->method_base->template('test', 'de');
+		$this->assertEquals(['body' => 'test.txt'], $filenames);
+	}
+}
diff --git a/tests/messenger/method_email_test.php b/tests/messenger/method_email_test.php
new file mode 100644
index 00000000000..84346c52984
--- /dev/null
+++ b/tests/messenger/method_email_test.php
@@ -0,0 +1,797 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\config\config;
+use phpbb\language\language;
+use phpbb\language\language_file_loader;
+use phpbb\messenger\method\email;
+use phpbb\messenger\queue;
+use phpbb\path_helper;
+use phpbb\symfony_request;
+use phpbb\template\assets_bag;
+use Symfony\Component\Mime\RawMessage;
+
+class phpbb_messenger_method_email_test extends \phpbb_test_case
+{
+	protected $assets_bag;
+	protected $cache_path;
+	protected config $config;
+	protected $dispatcher;
+	protected $extension_manager;
+	protected email $method_email;
+	protected $language;
+	protected $log;
+	protected $path_helper;
+	protected queue $queue;
+	protected $request;
+	protected $twig_extensions_collection;
+	protected $twig_lexer;
+	protected $user;
+	protected $filesystem;
+	protected $symfony_request;
+
+	public function setUp(): void
+	{
+		global $config, $request, $symfony_request, $user, $phpbb_root_path, $phpEx;
+
+		$this->assets_bag = new assets_bag();
+		$this->cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig';
+		$this->config = new config([
+			'force_server_vars' => false,
+		]);
+		$config = $this->config;
+		$this->dispatcher = $this->getMockBuilder('\phpbb\event\dispatcher')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->filesystem = new \phpbb\filesystem\filesystem();
+		$this->language = new language(new language_file_loader($phpbb_root_path, $phpEx));
+		$this->queue = $this->createMock(queue::class);
+		$this->request = new phpbb_mock_request();
+		$request = $this->request;
+		$this->symfony_request = new symfony_request(new phpbb_mock_request());
+		$symfony_request = $this->symfony_request;
+		$this->user = new \phpbb\user($this->language, '\phpbb\datetime');
+		$user = $this->user;
+		$user->page['root_script_path'] = 'phpbb/';
+		$this->user->host = 'yourdomain.com';
+		$this->path_helper = new path_helper(
+			$this->symfony_request,
+			$this->request,
+			$phpbb_root_path,
+			$phpEx
+		);
+		$phpbb_container = new phpbb_mock_container_builder;
+		$this->twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container);
+		$twig = new \phpbb\template\twig\environment(
+			$this->assets_bag,
+			$this->config,
+			$this->filesystem,
+			$this->path_helper,
+			$this->cache_path,
+			null,
+			new \phpbb\template\twig\loader(''),
+			$this->dispatcher,
+			array(
+				'cache'			=> false,
+				'debug'			=> false,
+				'auto_reload'	=> true,
+				'autoescape'	=> false,
+			)
+		);
+		$this->twig_lexer = new \phpbb\template\twig\lexer($twig);
+		$this->extension_manager = new phpbb_mock_extension_manager(
+			__DIR__ . '/',
+			array(
+				'vendor2/foo' => array(
+					'ext_name' => 'vendor2/foo',
+					'ext_active' => '1',
+					'ext_path' => 'ext/vendor2/foo/',
+				),
+			)
+		);
+		$this->log = $this->createMock(\phpbb\log\log_interface::class);
+
+		$this->method_email = new email(
+			$this->assets_bag,
+			$this->config,
+			$this->dispatcher,
+			$this->language,
+			$this->queue,
+			$this->path_helper,
+			$this->request,
+			$this->twig_extensions_collection,
+			$this->twig_lexer,
+			$this->user,
+			$phpbb_root_path,
+			$this->cache_path,
+			$this->extension_manager,
+			$this->log
+		);
+	}
+
+	public function test_miscellaneous(): void
+	{
+		$this->assertEquals('email', $this->method_email->get_queue_object_name());
+		$this->assertFalse($this->method_email->is_enabled());
+		$this->config->offsetSet('email_enable', true);
+		$this->assertTrue($this->method_email->is_enabled());
+	}
+
+	public function test_set_dsn_from_config()
+	{
+		$config_values = [
+			'smtp_delivery'		=> true,
+			'smtp_host'			=> 'smtp.example.com',
+			'smtp_username'		=> 'user',
+			'smtp_password'		=> 'pass',
+			'smtp_port'			=> 587,
+		];
+		foreach ($config_values as $key => $value)
+		{
+			$this->config->set($key, $value);
+		}
+
+		$this->method_email->set_dsn();
+		$this->assertEquals('smtp://user:pass@smtp.example.com:587', $this->method_email->get_dsn());
+
+		$this->config->set('smtp_host', '');
+		$this->method_email->set_dsn();
+		$this->assertEquals('null://null', $this->method_email->get_dsn());
+	}
+
+	public function test_set_dns()
+	{
+		$this->assertEquals('', $this->method_email->get_dsn());
+		$this->method_email->set_dsn('');
+		$this->assertEquals('sendmail://default', $this->method_email->get_dsn());
+
+		$this->method_email->set_dsn('smtp://user:pass1@smtp.example.com:587');
+		$this->assertEquals('smtp://user:pass1@smtp.example.com:587', $this->method_email->get_dsn());
+	}
+
+	public function test_set_transport()
+	{
+		$this->assertEmpty($this->method_email->get_dsn());
+
+		$config_values = [
+			'smtp_delivery'				=> true,
+			'smtp_host'					=> 'smtp.example.com',
+			'smtp_username'				=> 'user',
+			'smtp_password'				=> 'pass',
+			'smtp_port'					=> 587,
+			'smtp_verify_peer'			=> true,
+			'smtp_verify_peer_name'		=> true,
+			'smtp_allow_self_signed'	=> false,
+		];
+		foreach ($config_values as $key => $value)
+		{
+			$this->config->set($key, $value);
+		}
+
+		$this->method_email->set_transport();
+
+		// set_dsn() should have been called in set_transport()
+		$this->assertEquals('smtp://user:pass@smtp.example.com:587', $this->method_email->get_dsn());
+
+		$transport = $this->method_email->get_transport();
+		$this->assertInstanceOf('\Symfony\Component\Mailer\Transport\Smtp\SmtpTransport', $transport);
+		if (method_exists($transport->getStream(), 'getStreamOptions'))
+		{
+			$this->assertEquals([
+				'verify_peer'		=> true,
+				'verify_peer_name'	=> true,
+				'allow_self_signed'	=> false,
+			], $transport->getStream()->getStreamOptions()['ssl'] ?? null);
+		}
+	}
+
+	public function test_init()
+	{
+		$this->config->set('email_package_size', 100);
+		$email_reflection = new \ReflectionClass($this->method_email);
+		$email_property = $email_reflection->getProperty('email');
+
+		$use_queue_property = $email_reflection->getProperty('use_queue');
+		$this->assertFalse($use_queue_property->getValue($this->method_email));
+
+		$this->method_email->init();
+		/** @var \Symfony\Component\Mime\Email $email */
+		$email = $email_property->getValue($this->method_email);
+		$this->assertNotNull($email);
+
+		$this->assertTrue($use_queue_property->getValue($this->method_email));
+		$this->assertEmpty($email->getTo());
+
+		$this->method_email->to('foo@bar.com');
+		$this->assertNotEmpty($email->getTo());
+
+		$this->method_email->init();
+
+		$email = $email_property->getValue($this->method_email);
+		$this->assertNotNull($email);
+		$this->assertEmpty($email->getTo());
+	}
+
+	public function test_get_mailer()
+	{
+		$email_reflection = new \ReflectionClass($this->method_email);
+		$this->method_email->init();
+		$this->method_email->set_transport();
+		$mailer_method = $email_reflection->getMethod('get_mailer');
+
+		$mailer = $mailer_method->invoke($this->method_email);
+		$this->assertInstanceOf(\Symfony\Component\Mailer\Mailer::class, $mailer);
+	}
+
+	public function test_set_addresses()
+	{
+		$email_reflection = new \ReflectionClass($this->method_email);
+		$email_property = $email_reflection->getProperty('email');
+		$this->method_email->init();
+		/** @var \Symfony\Component\Mime\Email $email */
+		$email = $email_property->getValue($this->method_email);
+		$this->assertNotNull($email);
+
+		$this->method_email->set_addresses([]);
+		$this->assertEmpty($email->getTo());
+
+		$this->method_email->set_addresses(['user_email' => 'foo@bar.com']);
+		$this->assertNotEmpty($email->getTo());
+		$this->assertEquals('foo@bar.com', $email->getTo()[0]->getAddress());
+		$this->assertEmpty($email->getTo()[0]->getName());
+
+		$this->method_email->set_addresses(['user_email' => 'bar@foo.com', 'username' => 'Bar Foo']);
+
+		$this->assertEquals('bar@foo.com', $email->getTo()[1]->getAddress());
+		$this->assertEquals('Bar Foo', $email->getTo()[1]->getName());
+	}
+
+	public function test_to()
+	{
+		$email_reflection = new \ReflectionClass($this->method_email);
+		$email_property = $email_reflection->getProperty('email');
+		$this->method_email->init();
+		/** @var \Symfony\Component\Mime\Email $email */
+		$email = $email_property->getValue($this->method_email);
+		$this->assertNotNull($email);
+
+		// Empty address
+		$this->assertEmpty($email->getTo());
+		$this->method_email->to('');
+		$this->assertEmpty($email->getTo());
+
+		// Valid address
+		$this->method_email->to('foo@bar.com');
+		$this->assertNotEmpty($email->getTo());
+		$this->assertEquals('foo@bar.com', $email->getTo()[0]->getAddress());
+		$this->assertEmpty($email->getTo()[0]->getName());
+
+		// Valid address with name
+		$this->method_email->to('bar@foo.com', 'Bar Foo');
+		$this->assertEquals('bar@foo.com', $email->getTo()[1]->getAddress());
+		$this->assertEquals('Bar Foo', $email->getTo()[1]->getName());
+	}
+
+	public function test_cc()
+	{
+		$email_reflection = new \ReflectionClass($this->method_email);
+		$email_property = $email_reflection->getProperty('email');
+		$this->method_email->init();
+		/** @var \Symfony\Component\Mime\Email $email */
+		$email = $email_property->getValue($this->method_email);
+		$this->assertNotNull($email);
+
+		// Empty address
+		$this->assertEmpty($email->getCc());
+		$this->method_email->cc('');
+		$this->assertEmpty($email->getCc());
+
+		// Valid address
+		$this->method_email->cc('foo@bar.com');
+		$this->assertNotEmpty($email->getCc());
+		$this->assertEquals('foo@bar.com', $email->getCc()[0]->getAddress());
+		$this->assertEmpty($email->getCc()[0]->getName());
+
+		// Valid address with name
+		$this->method_email->cc('bar@foo.com', 'Bar Foo');
+		$this->assertEquals('bar@foo.com', $email->getCc()[1]->getAddress());
+		$this->assertEquals('Bar Foo', $email->getCc()[1]->getName());
+	}
+
+	public function test_bcc()
+	{
+		$email_reflection = new \ReflectionClass($this->method_email);
+		$email_property = $email_reflection->getProperty('email');
+		$this->method_email->init();
+		/** @var \Symfony\Component\Mime\Email $email */
+		$email = $email_property->getValue($this->method_email);
+		$this->assertNotNull($email);
+
+		// Empty address
+		$this->assertEmpty($email->getBcc());
+		$this->method_email->bcc('');
+		$this->assertEmpty($email->getBcc());
+
+		// Valid address
+		$this->method_email->bcc('foo@bar.com');
+		$this->assertNotEmpty($email->getBcc());
+		$this->assertEquals('foo@bar.com', $email->getBcc()[0]->getAddress());
+		$this->assertEmpty($email->getBcc()[0]->getName());
+
+		// Valid address with name
+		$this->method_email->bcc('bar@foo.com', 'Bar Foo');
+		$this->assertEquals('bar@foo.com', $email->getBcc()[1]->getAddress());
+		$this->assertEquals('Bar Foo', $email->getBcc()[1]->getName());
+	}
+
+	public function test_reply_to()
+	{
+		$email_reflection = new \ReflectionClass($this->method_email);
+		$email_property = $email_reflection->getProperty('email');
+		$this->method_email->init();
+		/** @var \Symfony\Component\Mime\Email $email */
+		$email = $email_property->getValue($this->method_email);
+		$this->assertNotNull($email);
+
+		// Empty address
+		$this->assertEmpty($email->getReplyTo());
+		$this->method_email->reply_to('');
+		$this->assertEmpty($email->getReplyTo());
+
+		// Valid address
+		$this->method_email->reply_to('foo@bar.com');
+		$this->assertNotEmpty($email->getReplyTo());
+		$this->assertEquals('foo@bar.com', $email->getReplyTo()[0]->getAddress());
+		$this->assertEmpty($email->getReplyTo()[0]->getName());
+
+		// Valid address with name
+		$this->method_email->reply_to('bar@foo.com', 'Bar Foo');
+		$this->assertEquals('bar@foo.com', $email->getReplyTo()[1]->getAddress());
+		$this->assertEquals('Bar Foo', $email->getReplyTo()[1]->getName());
+	}
+
+	public function test_from()
+	{
+		$email_reflection = new \ReflectionClass($this->method_email);
+		$email_property = $email_reflection->getProperty('email');
+		$this->method_email->init();
+		/** @var \Symfony\Component\Mime\Email $email */
+		$email = $email_property->getValue($this->method_email);
+		$this->assertNotNull($email);
+
+		// Empty address
+		$this->assertEmpty($email->getFrom());
+		$this->method_email->from('');
+		$this->assertEmpty($email->getFrom());
+
+		// Valid address
+		$this->method_email->from('foo@bar.com');
+		$this->assertNotEmpty($email->getFrom());
+		$this->assertEquals('foo@bar.com', $email->getFrom()[0]->getAddress());
+		$this->assertEmpty($email->getFrom()[0]->getName());
+
+		// Valid address with name
+		$this->method_email->from('bar@foo.com', 'Bar Foo');
+		$this->assertEquals('bar@foo.com', $email->getFrom()[1]->getAddress());
+		$this->assertEquals('Bar Foo', $email->getFrom()[1]->getName());
+	}
+
+	public function test_subject()
+	{
+		$email_reflection = new \ReflectionClass($this->method_email);
+		$email_property = $email_reflection->getProperty('email');
+		$this->method_email->init();
+		/** @var \Symfony\Component\Mime\Email $email */
+		$email = $email_property->getValue($this->method_email);
+		$this->assertNotNull($email);
+
+		// Empty subject
+		$this->assertEmpty($email->getSubject());
+		$this->method_email->subject('');
+		$this->assertEmpty($email->getSubject());
+
+		// Test subject
+		$this->method_email->subject('Test email');
+		$this->assertNotEmpty($email->getSubject());
+		$this->assertEquals('Test email', $email->getSubject());
+
+		// Overwrite subject
+		$this->method_email->subject('Reply to test email');
+		$this->assertNotEmpty($email->getSubject());
+		$this->assertEquals('Reply to test email', $email->getSubject());
+	}
+
+	public function test_anti_abuse_headers()
+	{
+		$email_reflection = new \ReflectionClass($this->method_email);
+		$headers_property = $email_reflection->getProperty('headers');
+		$this->method_email->init();
+
+		/** @var \Symfony\Component\Mime\Header\Headers $headers */
+		$headers = $headers_property->getValue($this->method_email);
+
+		$this->config->set('server_name', 'yourdomain.com');
+		$this->user->data['user_id'] = 2;
+		$this->user->data['username'] = 'admin';
+		$this->user->ip = '127.0.0.1';
+
+		$this->assertEmpty($headers->toArray());
+		$this->method_email->anti_abuse_headers($this->config, $this->user);
+
+		$this->assertEquals(
+			[
+				'X-AntiAbuse: Board servername - yourdomain.com',
+				'X-AntiAbuse: User_id - 2',
+				'X-AntiAbuse: Username - admin',
+				'X-AntiAbuse: User IP - 127.0.0.1',
+			],
+			$headers->toArray()
+		);
+	}
+
+	public function test_set_mail_priority()
+	{
+		$email_reflection = new \ReflectionClass($this->method_email);
+		$email_property = $email_reflection->getProperty('email');
+		$this->method_email->init();
+		/** @var \Symfony\Component\Mime\Email $email */
+		$email = $email_property->getValue($this->method_email);
+		$this->assertNotNull($email);
+
+		// Default priority
+		$this->assertEquals(\Symfony\Component\Mime\Email::PRIORITY_NORMAL, $email->getPriority());
+
+		// Highest priority
+		$this->method_email->set_mail_priority(\Symfony\Component\Mime\Email::PRIORITY_HIGHEST);
+		$this->assertEquals(\Symfony\Component\Mime\Email::PRIORITY_HIGHEST, $email->getPriority());
+	}
+
+	public function test_process_queue_not_enabled()
+	{
+		$this->method_email->init();
+
+		$queue_data = [
+			'email'	=> [
+				'data'	=> [
+					'message_one',
+					'message_two',
+				]
+			]
+		];
+
+		// Process queue will remove emails if email method is not enabled
+		$this->method_email->process_queue($queue_data);
+		$this->assertEmpty($queue_data);
+	}
+
+	public function test_process_queue()
+	{
+		global $phpbb_root_path;
+
+		$this->config->set('email_enable', true);
+		$this->user->data['user_id'] = 2;
+		$this->user->session_id = 'abcdef';
+
+		$this->method_email = $this->getMockBuilder($this->method_email::class)
+			->setConstructorArgs([$this->assets_bag,
+				$this->config,
+				$this->dispatcher,
+				$this->language,
+				$this->queue,
+				$this->path_helper,
+				$this->request,
+				$this->twig_extensions_collection,
+				$this->twig_lexer,
+				$this->user,
+				$phpbb_root_path,
+				$this->cache_path,
+				$this->extension_manager,
+				$this->log
+			])
+			->onlyMethods(['get_mailer'])
+			->getMock();
+
+		$mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class)
+			->disableOriginalConstructor()
+			->onlyMethods(['send'])
+			->getMock();
+		$sent_emails = 0;
+		$mailer_mock->method('send')
+			->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) {
+				if ($mail->toString() === 'throw_exception')
+				{
+					throw new \Symfony\Component\Mailer\Exception\TransportException('exception');
+				}
+
+				$sent_emails++;
+			});
+		$this->method_email->method('get_mailer')->willReturn($mailer_mock);
+
+		$this->method_email->init();
+		$errors = [];
+		$this->log->method('add')
+			->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) {
+				$errors[] = $additional_data[0];
+			});
+
+		$this->dispatcher
+			->expects($this->atLeastOnce())
+			->method('trigger_event')
+			->willReturnCallback(function($event_name, $value_array) {
+				if ($event_name === 'core.notification_message_process' && $value_array['email']->toString() == 'message_three')
+				{
+					$value_array['break'] = true;
+				}
+
+				return $value_array;
+			});
+
+		$queue_data = [
+			'email'	=> [
+				'data'	=> [
+					['email' => new RawMessage('message_one')],
+					['email' => new RawMessage('message_two')],
+					['email' => new RawMessage('message_three')],
+					['email' => new RawMessage('throw_exception')],
+					['email' => new RawMessage('message_four')],
+				]
+			]
+		];
+
+		$this->assertEmpty($errors);
+		$this->method_email->process_queue($queue_data);
+		$this->assertEmpty($queue_data);
+		$this->assertEquals(3, $sent_emails);
+
+		$this->assertEquals(['<strong>EMAIL</strong><br><em></em><br><br><br>'], $errors);
+	}
+
+	public function test_send_break()
+	{
+		$this->dispatcher
+			->expects($this->atLeastOnce())
+			->method('trigger_event')
+			->willReturnCallback(function($event_name, $value_array) {
+				if ($event_name !== 'core.notification_message_email')
+				{
+					return $value_array;
+				}
+
+				$value_array['break'] = true;
+				return $value_array;
+			});
+
+		$this->config->set('board_email', 'admin@yourdomain.com');
+
+		$this->method_email->init();
+		$this->method_email->to('foo@bar.com');
+		$this->method_email->subject('Test email');
+		$this->method_email->template('test', 'en');
+		$this->method_email->assign_block_vars('foo', ['bar' => 'baz']);
+
+		$this->method_email->send();
+	}
+
+	public static function email_template_data(): array
+	{
+		return [
+			['test'],
+			['admin_send_email'],
+			['topic_notify'],
+		];
+	}
+
+	/**
+	 * @dataProvider email_template_data
+	 */
+	public function test_send_no_queue($email_template)
+	{
+		global $phpbb_root_path;
+
+		$this->config->set('email_enable', true);
+		$this->user->data['user_id'] = 2;
+		$this->user->session_id = 'abcdef';
+
+		$this->method_email = $this->getMockBuilder($this->method_email::class)
+			->setConstructorArgs([$this->assets_bag,
+				$this->config,
+				$this->dispatcher,
+				$this->language,
+				$this->queue,
+				$this->path_helper,
+				$this->request,
+				$this->twig_extensions_collection,
+				$this->twig_lexer,
+				$this->user,
+				$phpbb_root_path,
+				$this->cache_path,
+				$this->extension_manager,
+				$this->log
+			])
+			->onlyMethods(['get_mailer'])
+			->getMock();
+
+		$mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class)
+			->disableOriginalConstructor()
+			->onlyMethods(['send'])
+			->getMock();
+		$sent_emails = 0;
+		$mailer_mock->method('send')
+			->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) {
+				$sent_emails++;
+			});
+		$this->method_email->method('get_mailer')->willReturn($mailer_mock);
+
+		$this->config->set('board_email', 'admin@yourdomain.com');
+
+		$this->method_email->init();
+		$errors = [];
+		$this->log->method('add')
+			->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) {
+				$errors[] = $additional_data[0];
+			});
+
+		$this->dispatcher
+			->expects($this->atLeastOnce())
+			->method('trigger_event')
+			->willReturnCallback(function($event_name, $value_array) {
+				return $value_array;
+			});
+
+		$this->method_email->to('foo@bar.com');
+		$this->method_email->subject('Test email');
+		$this->method_email->template($email_template, 'en');
+
+		$this->assertTrue($this->method_email->send());
+		$this->assertEquals(1, $sent_emails);
+
+		$this->assertEmpty($errors);
+	}
+
+	public function test_send_exception()
+	{
+		global $phpbb_root_path;
+
+		$this->config->set('email_enable', true);
+		$this->user->data['user_id'] = 2;
+		$this->user->session_id = 'abcdef';
+
+		$this->method_email = $this->getMockBuilder($this->method_email::class)
+			->setConstructorArgs([$this->assets_bag,
+				$this->config,
+				$this->dispatcher,
+				$this->language,
+				$this->queue,
+				$this->path_helper,
+				$this->request,
+				$this->twig_extensions_collection,
+				$this->twig_lexer,
+				$this->user,
+				$phpbb_root_path,
+				$this->cache_path,
+				$this->extension_manager,
+				$this->log
+			])
+			->onlyMethods(['get_mailer'])
+			->getMock();
+
+		$mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class)
+			->disableOriginalConstructor()
+			->onlyMethods(['send'])
+			->getMock();
+		$mailer_mock->method('send')
+			->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) {
+				throw new \Symfony\Component\Mailer\Exception\TransportException('exception');
+			});
+		$this->method_email->method('get_mailer')->willReturn($mailer_mock);
+
+		$this->config->set('board_email', 'admin@yourdomain.com');
+
+		$this->method_email->init();
+		$errors = [];
+		$this->log->method('add')
+			->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) {
+				$errors[] = $additional_data[0];
+			});
+
+		$this->dispatcher
+			->expects($this->atLeastOnce())
+			->method('trigger_event')
+			->willReturnCallback(function($event_name, $value_array) {
+				return $value_array;
+			});
+
+		$this->method_email->to('foo@bar.com');
+		$this->method_email->subject('Test email');
+		$this->method_email->template('test', 'en');
+
+		$this->assertFalse($this->method_email->send());
+
+		$this->assertEquals(['<strong>EMAIL</strong><br><em></em><br><br><br>'], $errors);
+	}
+
+	public function test_send_queue()
+	{
+		global $phpbb_root_path;
+
+		$this->config->set('email_enable', true);
+		$this->config->set('email_package_size', 100);
+		$this->user->data['user_id'] = 2;
+		$this->user->session_id = 'abcdef';
+
+		$this->method_email = $this->getMockBuilder($this->method_email::class)
+			->setConstructorArgs([$this->assets_bag,
+				$this->config,
+				$this->dispatcher,
+				$this->language,
+				$this->queue,
+				$this->path_helper,
+				$this->request,
+				$this->twig_extensions_collection,
+				$this->twig_lexer,
+				$this->user,
+				$phpbb_root_path,
+				$this->cache_path,
+				$this->extension_manager,
+				$this->log
+			])
+			->onlyMethods(['get_mailer'])
+			->getMock();
+
+		$mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class)
+			->disableOriginalConstructor()
+			->onlyMethods(['send'])
+			->getMock();
+		$mailer_mock->method('send')
+			->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) {
+				throw new \Symfony\Component\Mailer\Exception\TransportException('exception');
+			});
+		$this->method_email->method('get_mailer')->willReturn($mailer_mock);
+
+		$this->config->set('board_email', 'admin@yourdomain.com');
+
+		$this->method_email->init();
+		$errors = [];
+		$this->log->method('add')
+			->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) {
+				$errors[] = $additional_data[0];
+			});
+
+		$this->dispatcher
+			->expects($this->atLeastOnce())
+			->method('trigger_event')
+			->willReturnCallback(function($event_name, $value_array) {
+				return $value_array;
+			});
+
+		// Mock queue methods
+		$this->queue->method('init')
+			->willReturnCallback(function(string $object, int $package_size) {
+				$this->assertEquals('email', $object);
+				$this->assertEquals($this->config['email_package_size'], $package_size);
+			});
+		$this->queue->method('put')
+			->willReturnCallback(function(string $object, array $message_data) {
+				$this->assertEquals('email', $object);
+				$this->assertStringContainsString('phpBB is correctly configured to send emails', $message_data['email']->getSubject());
+			});
+
+		$this->method_email->to('foo@bar.com');
+		$this->method_email->subject('Test email');
+		$this->method_email->template('test', 'en');
+
+		$this->assertTrue($this->method_email->send());
+
+		$this->assertEmpty($errors);
+	}
+}
diff --git a/tests/messenger/queue_test.php b/tests/messenger/queue_test.php
new file mode 100644
index 00000000000..457604fb251
--- /dev/null
+++ b/tests/messenger/queue_test.php
@@ -0,0 +1,320 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\config\config;
+use phpbb\filesystem\exception\filesystem_exception;
+use phpbb\messenger\queue;
+
+class phpbb_messenger_queue_test extends phpbb_test_case
+{
+	protected $config;
+	protected $cache_file;
+	protected $dispatcher;
+	protected $service_collection;
+
+	/** @var queue */
+	protected $messenger_queue;
+
+	/**
+	 * Set up the test case
+	 */
+	protected function setUp(): void
+	{
+		$this->config = new config([
+				'last_queue_run'	=> time() - 30,
+				'queue_interval'	=> 600,
+			]);
+		$this->dispatcher = $this->getMockBuilder('phpbb\event\dispatcher')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->service_collection = $this->getMockBuilder('phpbb\di\service_collection')
+			->disableOriginalConstructor()
+			->onlyMethods(['getIterator', 'add_service_class'])
+			->getMock();
+
+		$this->cache_file = __DIR__ . '/../tmp/queue_test';
+
+		if (file_exists($this->cache_file))
+		{
+			@unlink($this->cache_file);
+		}
+
+		$this->messenger_queue = $this->getMockBuilder('phpbb\messenger\queue')
+			->setConstructorArgs([
+				$this->config,
+				$this->dispatcher,
+				$this->service_collection,
+				$this->cache_file
+			])
+			->addMethods(['get_data'])
+			->getMock();
+
+		$this->messenger_queue->method('get_data')
+			->willReturnCallback(function(){
+				$data_reflection = new \ReflectionProperty(queue::class, 'data');
+				return $data_reflection->getValue($this->messenger_queue);
+			});
+	}
+
+	public function test_init()
+	{
+		$this->messenger_queue->init('email', 5);
+		$this->assertEquals([
+			'email' => [
+				'package_size' => 5,
+				'data' => [],
+			]
+		], $this->messenger_queue->get_data());
+
+		$this->messenger_queue->init('jabber', 9);
+
+		$this->assertEquals([
+			'email' => [
+				'package_size' => 5,
+				'data' => [],
+			],
+			'jabber' => [
+				'package_size' => 9,
+				'data' => [],
+			]
+		], $this->messenger_queue->get_data());
+	}
+
+	public function test_put()
+	{
+		$this->messenger_queue->init('email', 5);
+		$this->assertEquals([
+			'email' => [
+				'package_size' => 5,
+				'data' => [],
+			]
+		], $this->messenger_queue->get_data());
+
+		$this->messenger_queue->put('email', ['data1']);
+
+		$this->assertEquals([
+			'email' => [
+				'package_size' => 5,
+				'data' => [
+					['data1'],
+				],
+			],
+		], $this->messenger_queue->get_data());
+	}
+
+	public function test_process_no_cache_file()
+	{
+		$this->assertFileDoesNotExist($this->cache_file);
+		$this->assertGreaterThan(5, time() - $this->config['last_queue_run']);
+		$this->messenger_queue->init('email', 5);
+		$this->assertEquals([
+			'email' => [
+				'package_size' => 5,
+				'data' => [],
+			]
+		], $this->messenger_queue->get_data());
+
+		$this->messenger_queue->process();
+		$this->assertFileDoesNotExist($this->cache_file);
+		$this->assertLessThan(5, time() - $this->config['last_queue_run']);
+	}
+
+	public function test_process_no_queue_handling()
+	{
+		// First save queue data
+		$this->assertFileDoesNotExist($this->cache_file);
+		$this->messenger_queue->init('email', 5);
+		$this->messenger_queue->init('jabber', 10);
+		$this->assertEquals([
+			'email' => [
+				'package_size' => 5,
+				'data' => [],
+			],
+			'jabber' => [
+				'package_size' => 10,
+				'data' => [],
+			]
+		], $this->messenger_queue->get_data());
+
+		$this->messenger_queue->put('email', ['data1']);
+		$this->messenger_queue->put('jabber', ['data2']);
+		$this->messenger_queue->save();
+		$this->assertFileExists($this->cache_file);
+		$this->assertEquals([], $this->messenger_queue->get_data());
+
+		$this->config['last_queue_run'] = time() - 1000;
+
+		// Process the queue
+		$this->messenger_queue->process();
+	}
+
+	public function test_process_no_queue_handling_chmod_exception()
+	{
+		// First save queue data
+		$this->assertFileDoesNotExist($this->cache_file);
+		$this->messenger_queue->init('email', 5);
+		$this->messenger_queue->init('jabber', 10);
+		$this->assertEquals([
+			'email' => [
+				'package_size' => 5,
+				'data' => [],
+			],
+			'jabber' => [
+				'package_size' => 10,
+				'data' => [],
+			]
+		], $this->messenger_queue->get_data());
+
+		$this->messenger_queue->put('email', ['data1']);
+		$this->messenger_queue->put('jabber', ['data2']);
+		$this->messenger_queue->save();
+		$this->assertFileExists($this->cache_file);
+		$this->assertEquals([], $this->messenger_queue->get_data());
+
+		$this->config['last_queue_run'] = time() - 1000;
+
+		// Override the filesystem to simulate a chmod failure
+		$filesystem = $this->getMockBuilder('phpbb\filesystem\filesystem')
+			->disableOriginalConstructor()
+			->onlyMethods(['phpbb_chmod'])
+			->getMock();
+		$filesystem->method('phpbb_chmod')
+			->will($this->throwException(new filesystem_exception('Chmod failed')));
+		$filesystem_reflection = new \ReflectionProperty(queue::class, 'filesystem');
+		$filesystem_reflection->setValue($this->messenger_queue, $filesystem);
+
+		// Process the queue
+		$this->messenger_queue->process();
+	}
+
+	public function test_process_complete()
+	{
+		// First save queue data
+		$this->assertFileDoesNotExist($this->cache_file);
+		$this->messenger_queue->init('email', 5);
+		$this->assertEquals([
+			'email' => [
+				'package_size' => 5,
+				'data' => [],
+			],
+		], $this->messenger_queue->get_data());
+
+		$this->messenger_queue->put('email', ['data1']);
+		$this->messenger_queue->save();
+		$this->assertFileExists($this->cache_file);
+		$this->assertEquals([], $this->messenger_queue->get_data());
+
+		$this->config['last_queue_run'] = time() - 1000;
+
+		// Prepare service iterator and messenger methods
+		$email_method = $this->getMockBuilder('phpbb\messenger\method\email')
+			->disableOriginalConstructor()
+			->onlyMethods(['get_queue_object_name', 'process_queue'])
+			->getMock();
+		$email_method->method('get_queue_object_name')
+			->willReturn('email');
+		$email_method->method('process_queue')
+			->willReturnCallback(function(array &$queue_data) {
+				$this->assertEquals([
+					'package_size' => 5,
+					'data' => [
+						['data1'],
+					],
+				], $queue_data['email']);
+				unset($queue_data['email']);
+			});
+
+		$this->service_collection->method('getIterator')
+			->willReturn(new \ArrayIterator([
+				'email' => $email_method,
+			]));
+
+		// Process the queue
+		$this->messenger_queue->process();
+		$this->assertFileDoesNotExist($this->cache_file);
+	}
+
+	public function test_save_no_data()
+	{
+		$this->assertFileDoesNotExist($this->cache_file);
+		$this->messenger_queue->save();
+		$this->assertFileDoesNotExist($this->cache_file);
+	}
+
+	public function test_save()
+	{
+		$this->assertFileDoesNotExist($this->cache_file);
+		$this->messenger_queue->init('email', 5);
+		$this->assertEquals([
+			'email' => [
+				'package_size' => 5,
+				'data' => [],
+			]
+		], $this->messenger_queue->get_data());
+
+		$this->messenger_queue->put('email', ['data1']);
+		$this->messenger_queue->save();
+		$this->assertFileExists($this->cache_file);
+		$this->assertEquals([], $this->messenger_queue->get_data());
+	}
+
+	public function test_save_twice()
+	{
+		$this->assertFileDoesNotExist($this->cache_file);
+		$this->messenger_queue->init('email', 5);
+		$this->assertEquals([
+			'email' => [
+				'package_size' => 5,
+				'data' => [],
+			]
+		], $this->messenger_queue->get_data());
+
+		$this->messenger_queue->put('email', ['data1']);
+		$this->messenger_queue->put('jabber', ['data2']);
+		$this->messenger_queue->save();
+		$this->assertFileExists($this->cache_file);
+		$this->assertEquals([], $this->messenger_queue->get_data());
+
+		$this->messenger_queue->put('email', ['data3']);
+		$this->messenger_queue->save();
+		$this->assertEquals([], $this->messenger_queue->get_data());
+	}
+
+	public function test_save_chmod_fail()
+	{
+		$this->assertFileDoesNotExist($this->cache_file);
+		$this->messenger_queue->init('email', 5);
+		$this->assertEquals([
+			'email' => [
+				'package_size' => 5,
+				'data' => [],
+			]
+		], $this->messenger_queue->get_data());
+
+		$this->messenger_queue->put('email', ['data1']);
+
+		// Override the filesystem to simulate a chmod failure
+		$filesystem = $this->getMockBuilder('phpbb\filesystem\filesystem')
+			->disableOriginalConstructor()
+			->onlyMethods(['phpbb_chmod'])
+			->getMock();
+		$filesystem->method('phpbb_chmod')
+			->will($this->throwException(new filesystem_exception('Chmod failed')));
+		$filesystem_reflection = new \ReflectionProperty(queue::class, 'filesystem');
+		$filesystem_reflection->setValue($this->messenger_queue, $filesystem);
+
+		$this->messenger_queue->save();
+		$this->assertFileExists($this->cache_file);
+		$this->assertEquals([], $this->messenger_queue->get_data());
+	}
+}
diff --git a/tests/migrations/fixtures/migration_remove_jabber.xml b/tests/migrations/fixtures/migration_remove_jabber.xml
new file mode 100644
index 00000000000..e263cdafcf7
--- /dev/null
+++ b/tests/migrations/fixtures/migration_remove_jabber.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_migrations">
+		<column>migration_name</column>
+		<column>migration_depends_on</column>
+		<column>migration_schema_done</column>
+		<column>migration_data_done</column>
+		<column>migration_data_state</column>
+		<column>migration_start_time</column>
+		<column>migration_end_time</column>
+	</table>
+	<table name="phpbb_config">
+		<column>config_name</column>
+		<column>config_value</column>
+		<row>
+			<value>jab_enable</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>jab_host</value>
+			<value></value>
+		</row>
+		<row>
+			<value>jab_package_size</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>jab_password</value>
+			<value></value>
+		</row>
+		<row>
+			<value>jab_port</value>
+			<value></value>
+		</row>
+		<row>
+			<value>jab_use_ssl</value>
+			<value></value>
+		</row>
+		<row>
+			<value>jab_username</value>
+			<value>user</value>
+		</row>
+		<row>
+			<value>jab_verify_peer</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>jab_verify_peer_name</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>jab_allow_self_signed</value>
+			<value>0</value>
+		</row>
+	</table>
+	<table name="phpbb_modules">
+		<column>module_id</column>
+		<column>module_enabled</column>
+		<column>module_display</column>
+		<column>module_basename</column>
+		<column>module_class</column>
+		<column>parent_id</column>
+		<column>left_id</column>
+		<column>right_id</column>
+		<column>module_langname</column>
+		<column>module_mode</column>
+		<column>module_auth</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+			<value>acp</value>
+			<value>0</value>
+			<value>1</value>
+			<value>76</value>
+			<value>ACP_CAT_GENERAL</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+			<value>acp</value>
+			<value>1</value>
+			<value>48</value>
+			<value>59</value>
+			<value>ACP_CLIENT_COMMUNICATION</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>75</value>
+			<value>1</value>
+			<value>1</value>
+			<value>acp_jabber</value>
+			<value>acp</value>
+			<value>4</value>
+			<value>53</value>
+			<value>54</value>
+			<value>ACP_JABBER_SETTINGS</value>
+			<value>settings</value>
+			<value>acl_a_jabber</value>
+		</row>
+	</table>
+	<table name="phpbb_acl_options">
+		<column>auth_option_id</column>
+		<column>auth_option</column>
+		<column>is_global</column>
+		<column>is_local</column>
+		<column>founder_only</column>
+		<row>
+			<value>70</value>
+			<value>a_jabber</value>
+			<value>1</value>
+			<value>0</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>121</value>
+			<value>u_sendim</value>
+			<value>1</value>
+			<value>0</value>
+			<value>0</value>
+		</row>
+	</table>
+	<table name="phpbb_acl_groups">
+		<column>group_id</column>
+		<column>forum_id</column>
+		<column>auth_option_id</column>
+		<column>auth_role_id</column>
+		<column>auth_setting</column>
+	</table>
+	<table name="phpbb_acl_roles_data">
+		<column>role_id</column>
+		<column>auth_option_id</column>
+		<column>auth_setting</column>
+		<row>
+			<value>4</value>
+			<value>70</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>121</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>121</value>
+			<value>1</value>
+		</row>
+	</table>
+	<table name="phpbb_acl_users">
+		<column>user_id</column>
+		<column>forum_id</column>
+		<column>auth_option_id</column>
+		<column>auth_role_id</column>
+		<column>auth_setting</column>
+	</table>
+	<table name="phpbb_user_notifications">
+		<column>id</column>
+		<column>item_type</column>
+		<column>item_id</column>
+		<column>user_id</column>
+		<column>method</column>
+		<column>notify</column>
+		<row>
+			<value>1</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>2</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>3</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>4</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>5</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>6</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>7</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>7</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>8</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>8</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>2</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>9</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>3</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>10</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>4</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>11</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>5</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>12</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>6</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>13</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>7</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>14</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>8</value>
+			<value>notification.method.jabber</value>
+			<value>1</value>
+		</row>
+	</table>
+
+</dataset>
diff --git a/tests/migrations/migration_test_base.php b/tests/migrations/migration_test_base.php
new file mode 100644
index 00000000000..44d0e258745
--- /dev/null
+++ b/tests/migrations/migration_test_base.php
@@ -0,0 +1,166 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+abstract class phpbb_migration_test_base extends phpbb_database_test_case
+{
+	/** @var \phpbb\auth\auth */
+	protected $auth;
+
+	/** @var \phpbb\cache\driver\driver_interface */
+	protected $cache;
+
+	/** @var \phpbb\cache\service */
+	protected $cache_service;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\db\tools\tools_interface */
+	protected $db_tools;
+
+	/** @var \Doctrine\DBAL\Connection */
+	protected $doctrine_db;
+
+	/** @var \phpbb\extension\manager */
+	protected $extension_manager;
+
+	/** @var \phpbb\db\migrator */
+	protected $migrator;
+
+	/** @var \phpbb\db\migration\tool\tool_interface */
+	protected $tools;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var string */
+	protected $fixture;
+
+	/** @var string */
+	protected $migration_class;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(__DIR__ . $this->fixture);
+	}
+
+	protected function setUp(): void
+	{
+		global $cache, $db, $phpbb_log, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $skip_add_log, $table_prefix, $user;
+
+		parent::setUp();
+
+		// Disable the logs
+		$skip_add_log = true;
+
+		$db = $this->db = $this->new_dbal();
+		$this->doctrine_db = $this->new_doctrine_dbal();
+		$factory = new \phpbb\db\tools\factory();
+		$this->db_tools = $factory->get($this->doctrine_db);
+		$this->db_tools->set_table_prefix($table_prefix);
+		$this->cache = new phpbb_mock_cache();
+		$this->auth = new \phpbb\auth\auth();
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$this->config = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config');
+		$this->config->initialise($this->cache);
+		$cache = $this->cache_service = new \phpbb\cache\service($this->cache, $this->config, $this->db, $phpbb_dispatcher, $phpbb_root_path, $phpEx);
+
+
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = $this->user = new \phpbb\user($lang, '\phpbb\datetime');
+
+		$phpbb_log = new \phpbb\log\log($this->db, $this->user, $this->auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
+
+		$container = new phpbb_mock_container_builder();
+		$container->set('event_dispatcher', $phpbb_dispatcher);
+
+		$finder_factory = $this->createMock('\phpbb\finder\factory');
+		$this->extension_manager = new \phpbb\extension\manager(
+			$container,
+			$this->db,
+			$this->config,
+			$finder_factory,
+			'phpbb_ext',
+			__DIR__ . '/../../phpBB/',
+			null
+		);
+
+		$module_manager = new \phpbb\module\module_manager($this->cache, $this->db, $this->extension_manager, 'phpbb_modules', $phpbb_root_path, $phpEx);
+
+		$this->tools = array(
+			'config'		=> new \phpbb\db\migration\tool\config($this->config),
+			'config_text'	=> new \phpbb\db\migration\tool\config_text(new \phpbb\config\db_text($this->db, 'phpbb_config_text')),
+			'module'		=> new \phpbb\db\migration\tool\module($this->db, $this->user, $module_manager, 'phpbb_modules'),
+			'permission'	=> new \phpbb\db\migration\tool\permission($this->db, $this->cache_service, $this->auth, $phpbb_root_path, $phpEx),
+		);
+
+		$this->migrator = new \phpbb\db\migrator(
+			$container,
+			$this->config,
+			$this->db,
+			$this->db_tools,
+			'phpbb_migrations',
+			__DIR__ . '/../../phpBB/',
+			'php',
+			'phpbb_',
+			self::get_core_tables(),
+			$this->tools,
+			new \phpbb\db\migration\helper()
+		);
+		$container->set('migrator', $this->migrator);
+
+		$migration = $this->migrator->get_migration($this->migration_class);
+		$depends = $migration->depends_on();
+		$this->migrator->populate_migrations($depends);
+
+		$this->migrator->set_migrations([$this->migration_class]);
+	}
+
+	protected function apply_migration()
+	{
+		while (!$this->migrator->finished())
+		{
+			try
+			{
+				$this->migrator->update();
+			}
+			catch (\phpbb\db\migration\exception $e)
+			{
+				$this->fail('Applying migration error: ' . $e->__toString());
+			}
+		}
+
+		return $this->migrator->finished();
+	}
+
+	protected function revert_migration()
+	{
+		while ($this->migrator->migration_state($this->migration_class) !== false)
+		{
+			try
+			{
+				$this->migrator->revert($this->migration_class);
+			}
+			catch (\phpbb\db\migration\exception $e)
+			{
+				$this->fail('Reverting migration error: ' . $e->__toString());
+			}
+		}
+
+		return !$this->migrator->migration_state($this->migration_class);
+	}
+}
diff --git a/tests/migrations/migrations_check_config_added_test.php b/tests/migrations/migrations_check_config_added_test.php
index 969a0f5e795..71c5ee7f077 100644
--- a/tests/migrations/migrations_check_config_added_test.php
+++ b/tests/migrations/migrations_check_config_added_test.php
@@ -43,6 +43,9 @@ class migrations_check_config_added_test extends phpbb_test_case
 	/** @var string */
 	protected $php_ext;
 
+	/** @var string */
+	protected $schema_data;
+
 	protected function setUp(): void
 	{
 		global $phpbb_root_path;
@@ -51,10 +54,14 @@ protected function setUp(): void
 		$this->schema_data = file_get_contents($phpbb_root_path . 'install/schemas/schema_data.sql');
 	}
 
-	public function get_config_options_from_migrations()
+	protected function get_config_names()
 	{
 		global $phpbb_root_path, $phpEx;
 
+		$this->table_prefix = 'phpbb_';
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $phpEx;
+
 		$this->config = new \phpbb\config\config([
 			'search_type'		=> '\phpbb\search\fulltext_mysql',
 		]);
@@ -63,9 +70,7 @@ public function get_config_options_from_migrations()
 		$this->db_doctrine = $this->createMock(\Doctrine\DBAL\Connection::class);
 		$factory = new \phpbb\db\tools\factory();
 		$this->db_tools = $factory->get($this->db_doctrine);
-		$this->table_prefix = 'phpbb_';
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $phpEx;
+		$this->db_tools->set_table_prefix($this->table_prefix);
 
 		$tools = [
 			new \phpbb\db\migration\tool\config($this->config),
@@ -142,7 +147,7 @@ public function get_config_options_from_migrations()
 					continue;
 				}
 
-				// Fill error entries for configuration options which were not added to shema_data.sql
+				// Fill error entries for configuration options which were not added to schema_data.sql
 				if (!isset($config_names[$config_name]))
 				{
 					$config_names[$config_name] = [$config_name, $class];
@@ -152,18 +157,18 @@ public function get_config_options_from_migrations()
 
 		// Drop configuration options which were removed by config.remove
 		$config_names = array_diff_key($config_names, $config_removed);
-		return $config_names;
+
+		return array_combine(array_column($config_names, 0), array_column($config_names, 1));
 	}
 
-	/**
-	* @dataProvider get_config_options_from_migrations
-	*/
-	public function test_config_option_exists_in_schema_data($config_name, $class)
+	public function test_config_option_exists_in_schema_data()
 	{
-		$message = 'Migration: %1$s, config_name: %2$s; not added to shema_data.sql';
-
-		$this->assertNotFalse(strpos($this->schema_data, $config_name),
-			sprintf($message, $class, $config_name)
-		);
+		$message = 'Migration: %1$s, config_name: %2$s; not added to schema_data.sql';
+		foreach ($this->get_config_names() as $config_name => $class)
+		{
+			$this->assertNotFalse(strpos($this->schema_data, $config_name),
+				sprintf($message, $class, $config_name)
+			);
+		}
 	}
 }
diff --git a/tests/migrations/remove_jabber_migration_test.php b/tests/migrations/remove_jabber_migration_test.php
new file mode 100644
index 00000000000..bf1962b6675
--- /dev/null
+++ b/tests/migrations/remove_jabber_migration_test.php
@@ -0,0 +1,76 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+require_once __DIR__ . '/migration_test_base.php';
+
+class phpbb_migrations_remove_jabber_migration_test extends phpbb_migration_test_base
+{
+
+	protected $migration_class = '\phpbb\db\migration\data\v400\remove_jabber';
+	protected $fixture = '/fixtures/migration_remove_jabber.xml';
+
+	public function test_remove_jabber_migration()
+	{
+		$sql = "SELECT id FROM phpbb_user_notifications
+			WHERE method = 'notification.method.jabber'";
+		$result = $this->db->sql_query($sql);
+		$rowset = $this->db->sql_fetchrowset($result);
+		$this->db->sql_freeresult($result);
+		$this->assertEquals(14, count($rowset));
+
+		$sql = "SELECT config_name FROM phpbb_config
+			WHERE config_name = 'jab_enable'";
+		$this->assertNotFalse($this->db->sql_query($sql));
+
+		$this->assertTrue($this->tools['permission']->exists('a_jabber'));
+		$this->assertTrue($this->tools['permission']->exists('u_sendim'));
+		$this->assertTrue($this->tools['module']->exists('acp', 'ACP_CLIENT_COMMUNICATION', 'ACP_JABBER_SETTINGS'));
+
+		$this->apply_migration();
+
+		$sql = "SELECT id FROM phpbb_user_notifications
+			WHERE method = 'notification.method.jabber'";
+		$this->db->sql_query($sql);
+		$this->assertFalse($this->db->sql_fetchfield('id'));
+
+		$sql = "SELECT id FROM phpbb_user_notifications
+			WHERE method = 'notification.method.jabber'";
+		$result = $this->db->sql_query($sql);
+		$rowset = $this->db->sql_fetchrowset($result);
+		$this->db->sql_freeresult($result);
+		$this->assertEquals(0, count($rowset));
+
+		$sql = "SELECT config_name FROM phpbb_config
+			WHERE config_name = 'jab_enable'";
+		$this->db->sql_query($sql);
+		$this->assertFalse($this->db->sql_fetchfield('config_name'));
+
+		$this->assertFalse($this->tools['permission']->exists('a_jabber'));
+		$this->assertFalse($this->tools['permission']->exists('u_sendim'));
+		$this->assertFalse($this->tools['module']->exists('acp', 'ACP_CLIENT_COMMUNICATION', 'ACP_JABBER_SETTINGS'));
+
+		$this->revert_migration();
+
+		$sql = "SELECT config_name FROM phpbb_config
+			WHERE config_name = 'jab_enable'";
+		$this->db->sql_query($sql);
+		$this->assertEquals('jab_enable', $this->db->sql_fetchfield('config_name'));
+
+		$this->assertTrue($this->tools['permission']->exists('a_jabber'));
+		$this->assertTrue($this->tools['permission']->exists('u_sendim'));
+		$this->assertTrue($this->tools['module']->exists('acp', 'ACP_CLIENT_COMMUNICATION', 'ACP_JABBER_SETTINGS'));
+
+		// Apply migration back
+		$this->apply_migration();
+	}
+}
diff --git a/tests/migrator/convert_timezones_test.php b/tests/migrator/convert_timezones_test.php
index 7bc434e33c4..59869454bce 100644
--- a/tests/migrator/convert_timezones_test.php
+++ b/tests/migrator/convert_timezones_test.php
@@ -15,6 +15,7 @@ class phpbb_migrator_convert_timezones_test extends phpbb_database_test_case
 {
 	protected $db;
 	protected $db_doctrine;
+	protected $migration;
 
 	public function getDataSet()
 	{
diff --git a/tests/migrator/get_callable_from_step_test.php b/tests/migrator/get_callable_from_step_test.php
index 1200568046d..467ec99aa89 100644
--- a/tests/migrator/get_callable_from_step_test.php
+++ b/tests/migrator/get_callable_from_step_test.php
@@ -13,6 +13,9 @@
 
 class get_callable_from_step_test extends phpbb_database_test_case
 {
+	protected $migrator;
+	protected $module_added;
+
 	protected function setUp(): void
 	{
 		global $phpbb_root_path, $php_ext, $table_prefix, $phpbb_log, $user;
@@ -23,6 +26,8 @@ protected function setUp(): void
 		$db = $this->new_dbal();
 		$db_doctrine = $this->new_doctrine_dbal();
 		$factory = new \phpbb\db\tools\factory();
+		$db_tools = $factory->get($db_doctrine);
+		$db_tools->set_table_prefix($table_prefix);
 		$user = $this->getMockBuilder('\phpbb\user')->disableOriginalConstructor()->getMock();
 		$user->ip = '127.0.0.1';
 		$module_manager = new \phpbb\module\module_manager(
@@ -38,7 +43,7 @@ protected function setUp(): void
 			new phpbb_mock_container_builder(),
 			new \phpbb\config\config(array()),
 			$db,
-			$factory->get($db_doctrine),
+			$db_tools,
 			'phpbb_migrations',
 			$phpbb_root_path,
 			$php_ext,
@@ -68,7 +73,7 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__ . '/../dbal/fixtures/migrator.xml');
 	}
 
-	public function get_callable_from_step_provider()
+	public static function get_callable_from_step_provider()
 	{
 		return array(
 			array(
@@ -132,7 +137,6 @@ protected function call_get_callable_from_step($step)
 	{
 		$class = new ReflectionClass($this->migrator);
 		$method = $class->getMethod('get_callable_from_step');
-		$method->setAccessible(true);
 		return $method->invokeArgs($this->migrator, array($step));
 	}
 }
diff --git a/tests/migrator/get_schema_steps_test.php b/tests/migrator/get_schema_steps_test.php
index 9b5e6c6697d..71f9baaef29 100644
--- a/tests/migrator/get_schema_steps_test.php
+++ b/tests/migrator/get_schema_steps_test.php
@@ -13,6 +13,8 @@
 
 class get_schema_steps_test extends phpbb_test_case
 {
+	protected $helper;
+
 	protected function setUp(): void
 	{
 		parent::setUp();
@@ -20,7 +22,7 @@ protected function setUp(): void
 		$this->helper = new \phpbb\db\migration\helper();
 	}
 
-	public function schema_provider()
+	public static function schema_provider()
 	{
 		return array(
 			array(
diff --git a/tests/migrator/reverse_update_data_test.php b/tests/migrator/reverse_update_data_test.php
index 83ae8e780dc..856cf121496 100644
--- a/tests/migrator/reverse_update_data_test.php
+++ b/tests/migrator/reverse_update_data_test.php
@@ -23,7 +23,7 @@ protected function setUp(): void
 		$this->helper = new \phpbb\db\migration\helper();
 	}
 
-	public function update_data_provider()
+	public static function update_data_provider()
 	{
 		return array(
 			array(
@@ -34,7 +34,7 @@ public function update_data_provider()
 						array('permission.add', array('some_data')),
 					)),
 					array('config.remove', array('foobar')),
-					array('custom', array(array($this, 'foo_bar'))),
+					array('custom', array(array(self::class, 'foo_bar'))),
 					array('tool.method', array('test_data')),
 				),
 				array(
diff --git a/tests/migrator/revert_data_merge_test.php b/tests/migrator/revert_data_merge_test.php
new file mode 100644
index 00000000000..5509cd966ac
--- /dev/null
+++ b/tests/migrator/revert_data_merge_test.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\config\config;
+use phpbb\db\driver\driver_interface;
+use phpbb\db\migration\helper;
+use phpbb\db\migration\migration;
+use phpbb\db\migrator;
+use phpbb\db\tools\tools_interface;
+use PHPUnit\Framework\MockObject\MockObject;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class phpbb_migrator_revert_data_merge_test extends phpbb_test_case
+{
+	/**
+	 * Data provider for test_revert_steps_merge.
+	 *
+	 * Each row:
+	 *	0 - steps returned by update_data()
+	 *	1 - steps returned by revert_data()
+	 *	2 - expected merged revert step list
+	 */
+	public static function revert_steps_provider(): array
+	{
+		return [
+			'update_and_revert' => [
+				[
+					['module.add', [[
+						'module_basename'	=> 'foo_module',
+						'module_class'		=> 'acp',
+					]]],
+					['config.add', ['foo_config', 0]],
+					['permission.add', ['a_foo']],
+				],
+				[
+					['permission.remove', ['a_foo']],
+				],
+				[
+					['permission.reverse', ['add', 'a_foo']],
+					['config.reverse', ['add', 'foo_config', 0]],
+					['module.reverse', ['add', [
+						'module_basename'	=> 'foo_module',
+						'module_class'		=> 'acp',
+					]]],
+					['permission.remove', ['a_foo']],
+				],
+			],
+			'empty_revert_data' => [
+				[
+					['config.add', ['bar_config', 1]],
+				],
+				[],
+				[
+					['config.reverse', ['add', 'bar_config', 1]],
+				],
+			],
+			'empty_update_data' => [
+				[],
+				[
+					['permission.remove', ['a_bar']],
+				],
+				[
+					['permission.remove', ['a_bar']],
+				],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider revert_steps_provider
+	 */
+	public function test_revert_steps_merge(array $update_data, array $revert_data, array $expected): void
+	{
+		$db = $this->createMock(driver_interface::class);
+		$db_tools = $this->createMock(tools_interface::class);
+		$container = $this->createMock(ContainerInterface::class);
+
+		/** @var migrator|MockObject $migrator */
+		$migrator = $this->getMockBuilder(migrator::class)
+			->setConstructorArgs([
+				$container,
+				new config([]),
+				$db,
+				$db_tools,
+				'phpbb_migrations',
+				'',
+				'php',
+				'phpbb_',
+				[],
+				[],
+				new helper(),
+			])
+			->onlyMethods(['load_migration_state', 'set_migration_state', 'process_data_step', 'get_migration'])
+			->getMock();
+
+		$migrator->method('load_migration_state')->willReturn(null);
+		$migrator->method('set_migration_state')->willReturn(null);
+
+		// Mock migration
+		$migration = $this->getMockBuilder(migration::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$migration->method('update_data')->willReturn($update_data);
+		$migration->method('revert_data')->willReturn($revert_data);
+		$migrator->method('get_migration')->willReturn($migration);
+
+		// Intercept process_data_step() to capture the assembled step list
+		$captured_steps = null;
+		$migrator->method('process_data_step')
+			->willReturnCallback(function ($steps, $state, $revert = false) use (&$captured_steps) {
+				$captured_steps = $steps;
+				return true;
+			});
+
+		// Seed migration_state via reflection so try_revert() sees the migration as
+		// fully applied (data phase done). stdClass is used as the migration name
+		// because any existing class name satisfies the class_exists() guard inside
+		// try_revert(), and get_migration() is already stubbed above.
+		$migration_name = stdClass::class;
+
+		$ref = new ReflectionClass($migrator);
+		$state_prop = $ref->getProperty('migration_state');
+		$state_prop->setAccessible(true);
+		$state_prop->setValue($migrator, [
+			$migration_name => [
+				'migration_depends_on'	=> [],
+				'migration_schema_done'	=> true,
+				'migration_data_done'	=> true,
+				'migration_data_state'	=> '',
+				'migration_start_time'	=> 0,
+				'migration_end_time'	=> 0,
+			],
+		]);
+
+		// Call the protected try_revert() directly via reflection.
+		$try_revert = $ref->getMethod('try_revert');
+		$try_revert->setAccessible(true);
+		$try_revert->invoke($migrator, $migration_name);
+
+		$this->assertEquals(
+			$expected,
+			$captured_steps,
+			'try_revert() must pass both reversed update_data() and explicit revert_data() steps ' .
+			'to process_data_step() – neither half may be suppressed or duplicated.'
+		);
+	}
+}
diff --git a/tests/migrator/schema_generator_test.php b/tests/migrator/schema_generator_test.php
index 04c73f925eb..2df7bf05d36 100644
--- a/tests/migrator/schema_generator_test.php
+++ b/tests/migrator/schema_generator_test.php
@@ -21,23 +21,54 @@
 
 class schema_generator_test extends phpbb_test_case
 {
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\db\tools\doctrine */
+	protected $db_tools;
+
+	/** @var \Doctrine\DBAL\Connection */
+	protected $doctrine_db;
+
 	/** @var \phpbb\db\migration\schema_generator */
 	protected $generator;
 
+	/** @var string */
+	protected $table_prefix;
+
+	/** @var string */
+	protected $phpbb_root_path;
+
+	/** @var string */
+	protected $php_ext;
+
 	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 
 		parent::setUp();
 
+		$this->table_prefix = 'phpbb_';
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $phpEx;
+
 		$this->config = new \phpbb\config\config(array());
 		$this->db = new \phpbb\db\driver\sqlite3();
-		$this->doctrine_db = \phpbb\db\doctrine\connection_factory::get_connection(new phpbb_mock_config_php_file());
+		// Some local setups may not configure a DB driver. If the configured
+		// 'dbms' is null, skip this test instead of failing with a TypeError in
+		// the connection factory which expects a non-null driver name.
+		$mock_config = new phpbb_mock_config_php_file();
+		if ($mock_config->get('dbms') === null)
+		{
+			self::markTestSkipped('Skipping schema generator tests: dbms is not configured (null) in local environment.');
+		}
+		$this->doctrine_db = \phpbb\db\doctrine\connection_factory::get_connection($mock_config);
 		$factory = new \phpbb\db\tools\factory();
 		$this->db_tools = $factory->get($this->doctrine_db);
-		$this->table_prefix = 'phpbb_';
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $phpEx;
+		$this->db_tools->set_table_prefix($this->table_prefix);
 	}
 
 	protected function get_schema_generator(array $class_names)
@@ -66,7 +97,7 @@ public function test_get_schema_success()
 		$this->assertArrayHasKey('phpbb_users', $this->generator->get_schema());
 	}
 
-	public function column_add_after_data()
+	public static function column_add_after_data()
 	{
 		return array(
 			array(
diff --git a/tests/mimetype/guesser_test.php b/tests/mimetype/guesser_test.php
index 559a880a7a9..8333f9542c9 100644
--- a/tests/mimetype/guesser_test.php
+++ b/tests/mimetype/guesser_test.php
@@ -27,6 +27,12 @@ class guesser_test extends \phpbb_test_case
 
 	protected $fileinfo_supported = false;
 
+	protected $guesser;
+	protected $guesser_no_fileinfo;
+	protected $path;
+	protected $jpg_file;
+	protected $phpbb_root_path;
+
 	protected function setUp(): void
 	{
 		global $phpbb_root_path;
@@ -50,7 +56,7 @@ protected function setUp(): void
 		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
-	public function data_guess_files()
+	public static function data_guess_files()
 	{
 		return array(
 			array('image/gif', 'gif'),
@@ -76,7 +82,7 @@ public function test_guess_files($expected, $file)
 		$this->assertEquals($expected, $this->guesser->guess($this->path . '/../upload/fixture/' . $file));
 	}
 
-	public function data_guess_files_no_fileinfo()
+	public static function data_guess_files_no_fileinfo()
 	{
 		return array(
 			array('application/octet-stream', 'gif'),
@@ -112,7 +118,7 @@ public function test_null_guess()
 		$this->assertEquals('application/octet-stream', $guesser->guess($this->jpg_file));
 	}
 
-	public function data_incorrect_guessers()
+	public static function data_incorrect_guessers()
 	{
 		return array(
 			array(array(new \phpbb\mimetype\incorrect_guesser)),
@@ -130,7 +136,7 @@ public function test_incorrect_guesser($guessers)
 		$guesser = new \phpbb\mimetype\guesser($guessers);
 	}
 
-	public function data_content_guesser()
+	public static function data_content_guesser()
 	{
 		return array(
 			array(
@@ -210,7 +216,7 @@ public function test_sort_priority()
 		$this->assertInstanceOf('\phpbb\mimetype\extension_guesser', $guessers[3]);
 	}
 
-	public function data_choose_mime_type()
+	public static function data_choose_mime_type()
 	{
 		return array(
 			array('application/octet-stream', 'application/octet-stream', null),
diff --git a/tests/mock/container_builder.php b/tests/mock/container_builder.php
index 9200ed07671..f67d3d35d44 100644
--- a/tests/mock/container_builder.php
+++ b/tests/mock/container_builder.php
@@ -35,7 +35,7 @@ public function __construct()
 	*
 	* @api
 	*/
-	public function set($id, $service, $shared = false)
+	public function set(string $id, mixed $service): void
 	{
 		$this->services[$id] = $service;
 	}
@@ -56,7 +56,7 @@ public function set($id, $service, $shared = false)
 	*
 	* @api
 	*/
-	public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE): ?object
+	public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE): object|null
 	{
 		if ($this->has($id))
 		{
@@ -99,7 +99,7 @@ public function has(string $id): bool
 	*
 	* @api
 	*/
-	public function getParameter(string $name): mixed
+	public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
 	{
 		if ($this->hasParameter($name))
 		{
@@ -131,7 +131,7 @@ public function hasParameter(string $name): bool
 	*
 	* @api
 	*/
-	public function setParameter($name, $value)
+	public function setParameter($name, array|bool|string|int|float|\UnitEnum|null $value): void
 	{
 		$this->parameters[$name] = $value;
 	}
diff --git a/tests/mock/event_dispatcher.php b/tests/mock/event_dispatcher.php
index fa8b4a10363..53a1e2d87b0 100644
--- a/tests/mock/event_dispatcher.php
+++ b/tests/mock/event_dispatcher.php
@@ -22,8 +22,16 @@ public function __construct()
 	{
 	}
 
-	public function trigger_event($eventName, $data = array())
+	public function trigger_event($eventName, $data = array()): array
 	{
-		return array();
+		$data = (array) $data;
+
+		// Throw an exception if we reach the core's exit_handler()
+		if ($eventName === 'core.exit_handler')
+		{
+			throw new \RuntimeException('Exit handler called');
+		}
+
+		return $data;
 	}
 }
diff --git a/tests/mock/notification_type_post.php b/tests/mock/notification_type_post.php
index 4116fecf5e8..fbc82c9845f 100644
--- a/tests/mock/notification_type_post.php
+++ b/tests/mock/notification_type_post.php
@@ -21,9 +21,10 @@
 
 class phpbb_mock_notification_type_post extends \phpbb\notification\type\post
 {
-	public function __construct($user_loader, $db, $cache, $language, $user, $auth, $config, $phpbb_root_path, $php_ext, $notification_types_table, $user_notifications_table)
+	public function __construct($user_loader, $controller_helper, $db, $cache, $language, $user, $auth, $config, $phpbb_root_path, $php_ext, $notification_types_table, $user_notifications_table)
 	{
 		$this->user_loader = $user_loader;
+		$this->controller_helper = $controller_helper;
 		$this->db = $db;
 		$this->cache = $cache;
 		$this->language = $language;
diff --git a/tests/mock/search_backend_mock.php b/tests/mock/search_backend_mock.php
index 84dd26385ea..33579ee5570 100644
--- a/tests/mock/search_backend_mock.php
+++ b/tests/mock/search_backend_mock.php
@@ -82,13 +82,13 @@ public function tidy(): void
 		// Nothing
 	}
 
-	public function create_index(int &$post_counter = 0): ?array
+	public function create_index(int &$post_counter = 0): array|null
 	{
 		$this->index_created = true;
 		return null;
 	}
 
-	public function delete_index(int &$post_counter = 0): ?array
+	public function delete_index(int &$post_counter = 0): array|null
 	{
 		$this->index_created = true;
 		return null;
diff --git a/tests/mock/user.php b/tests/mock/user.php
index 254c02f6698..f6bf0166e19 100644
--- a/tests/mock/user.php
+++ b/tests/mock/user.php
@@ -24,6 +24,9 @@ class phpbb_mock_user
 	public $style = [];
 	public $data = [];
 	public $lang = [];
+	public $ip = '';
+	public $module;
+	public $session_id;
 
 	private $options = array();
 	public function optionget($item, $data = false)
diff --git a/tests/network/ip_normalise_test.php b/tests/network/ip_normalise_test.php
index 52e594e1152..e15c76af1d8 100644
--- a/tests/network/ip_normalise_test.php
+++ b/tests/network/ip_normalise_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_network_ip_normalise_test extends phpbb_test_case
 {
-	public function data_provider()
+	public static function data_provider()
 	{
 		return array(
 			// From: A Recommendation for IPv6 Address Text Representation
diff --git a/tests/notification/base.php b/tests/notification/base.php
index 545508eedd3..d3d07c46c06 100644
--- a/tests/notification/base.php
+++ b/tests/notification/base.php
@@ -21,7 +21,7 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 {
 	/** @var phpbb_notification_manager_helper */
 	protected $notifications;
-	protected $db, $container, $user, $config, $auth, $cache;
+	protected $db, $container, $user, $config, $auth, $cache, $user_loader, $phpbb_dispatcher;
 
 	protected function get_notification_types()
 	{
@@ -98,14 +98,17 @@ protected function setUp(): void
 		$phpbb_container = $this->container = new ContainerBuilder();
 		$loader     = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures'));
 		$loader->load('services_notification.yml');
+		$phpbb_container->set('avatar.helper', $avatar_helper);
 		$phpbb_container->set('user_loader', $this->user_loader);
 		$phpbb_container->set('user', $user);
 		$phpbb_container->set('language', $lang);
 		$phpbb_container->set('config', $this->config);
+		$phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper'));
 		$phpbb_container->set('dbal.conn', $this->db);
 		$phpbb_container->set('auth', $auth);
 		$phpbb_container->set('cache.driver', $cache_driver);
 		$phpbb_container->set('cache', $cache);
+		$phpbb_container->set('log', new \phpbb\log\dummy());
 		$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
 		$phpbb_container->set(
 			'text_formatter.s9e.mention_helper',
@@ -124,6 +127,8 @@ protected function setUp(): void
 		$phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications');
 		$phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types');
 		$phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails');
+		$phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push');
+		$phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions');
 
 		$this->notifications = new phpbb_notification_manager_helper(
 			array(),
@@ -143,6 +148,10 @@ protected function setUp(): void
 
 		$phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass());
 
+		$messenger_method_collection = new \phpbb\di\service_collection($phpbb_container);
+		$messenger_method_collection->add('messenger.method.email');
+		$phpbb_container->set('messenger.method_collection', $messenger_method_collection);
+
 		$phpbb_container->compile();
 
 		$this->notifications->setDependencies($this->auth, $this->config);
diff --git a/tests/notification/convert_test.php b/tests/notification/convert_test.php
index 0def0be5edd..b890b475999 100644
--- a/tests/notification/convert_test.php
+++ b/tests/notification/convert_test.php
@@ -14,7 +14,9 @@
 
 class phpbb_notification_convert_test extends phpbb_database_test_case
 {
-	protected $notifications, $db, $doctrine_db, $container, $user, $config, $auth, $cache;
+	protected $db;
+	protected $doctrine_db;
+	protected $migration;
 
 	public function getDataSet()
 	{
@@ -30,15 +32,33 @@ protected function setUp(): void
 		$this->db = $this->new_dbal();
 		$this->doctrine_db = $this->new_doctrine_dbal();
 		$factory = new \phpbb\db\tools\factory();
+		$db_tools = $factory->get($this->doctrine_db);
+		$core_tables = self::get_core_tables();
+
+		// Add user_notify_type column for testing this migration and set type
+		$db_tools->sql_column_add($core_tables['users'], 'user_notify_type', ['TINT:4', 0]);
+		$user_notify_type_map = [
+			1 => 0,
+			2 => 0,
+			3 => 1,
+			4 => 1,
+			5 => 2,
+			6 => 2,
+		];
+
+		foreach ($user_notify_type_map as $user_id => $notify_type)
+		{
+			$this->db->sql_query('UPDATE ' . $core_tables['users'] . ' SET user_notify_type = ' . (int) $notify_type . ' WHERE user_id = ' . (int) $user_id);
+		}
 
 		$this->migration = new \phpbb\db\migration\data\v310\notification_options_reconvert(
 			new \phpbb\config\config(array()),
 			$this->db,
-			$factory->get($this->doctrine_db),
+			$db_tools,
 			$phpbb_root_path,
 			$phpEx,
 			'phpbb_',
-			self::get_core_tables()
+			$core_tables
 		);
 	}
 
diff --git a/tests/notification/fixtures/convert.xml b/tests/notification/fixtures/convert.xml
index c9d8fafa973..9b357504d16 100644
--- a/tests/notification/fixtures/convert.xml
+++ b/tests/notification/fixtures/convert.xml
@@ -4,7 +4,6 @@
 		<column>user_id</column>
 		<column>username</column>
 		<column>username_clean</column>
-		<column>user_notify_type</column>
 		<column>user_notify_pm</column>
 		<column>user_permissions</column>
 		<column>user_sig</column>
@@ -13,7 +12,6 @@
 			<value>1</value>
 			<value>1</value>
 			<value>0</value>
-			<value>0</value>
 			<value></value>
 			<value></value>
 		</row>
@@ -21,7 +19,6 @@
 			<value>2</value>
 			<value>2</value>
 			<value>2</value>
-			<value>0</value>
 			<value>1</value>
 			<value></value>
 			<value></value>
@@ -30,7 +27,6 @@
 			<value>3</value>
 			<value>3</value>
 			<value>3</value>
-			<value>1</value>
 			<value>0</value>
 			<value></value>
 			<value></value>
@@ -40,7 +36,6 @@
 			<value>4</value>
 			<value>4</value>
 			<value>1</value>
-			<value>1</value>
 			<value></value>
 			<value></value>
 		</row>
@@ -48,7 +43,6 @@
 			<value>5</value>
 			<value>5</value>
 			<value>5</value>
-			<value>2</value>
 			<value>0</value>
 			<value></value>
 			<value></value>
@@ -57,7 +51,6 @@
 			<value>6</value>
 			<value>6</value>
 			<value>6</value>
-			<value>2</value>
 			<value>1</value>
 			<value></value>
 			<value></value>
diff --git a/tests/notification/fixtures/email_notification.type.post.xml b/tests/notification/fixtures/email_notification.type.post.xml
index 6d064141b71..7a4a7191eb3 100644
--- a/tests/notification/fixtures/email_notification.type.post.xml
+++ b/tests/notification/fixtures/email_notification.type.post.xml
@@ -164,12 +164,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -177,6 +179,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -184,6 +187,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -191,6 +195,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -198,6 +203,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -205,6 +211,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -212,6 +219,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>7</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -219,6 +227,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>8</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -226,6 +235,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>9</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -233,6 +243,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>10</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -240,6 +251,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>11</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -247,6 +259,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>12</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -254,6 +267,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>13</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -261,6 +275,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>14</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>
diff --git a/tests/notification/fixtures/services_notification.yml b/tests/notification/fixtures/services_notification.yml
index 69e6374f4cf..fd256f3016e 100644
--- a/tests/notification/fixtures/services_notification.yml
+++ b/tests/notification/fixtures/services_notification.yml
@@ -14,6 +14,9 @@ services:
     config:
         synthetic: true
 
+    controller.helper:
+        synthetic: true
+
     dbal.conn:
         synthetic: true
 
@@ -38,6 +41,9 @@ services:
     groupposition.teampage:
         synthetic: true
 
+    request:
+        synthetic: true
+
     text_formatter.s9e.factory:
         synthetic: true
 
diff --git a/tests/notification/fixtures/submit_post_notification.type.bookmark.xml b/tests/notification/fixtures/submit_post_notification.type.bookmark.xml
index b6163e9ed0f..1e6b6a19ca8 100644
--- a/tests/notification/fixtures/submit_post_notification.type.bookmark.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.bookmark.xml
@@ -119,12 +119,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>2</value>
@@ -132,6 +134,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>3</value>
@@ -139,6 +142,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>4</value>
@@ -146,6 +150,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>5</value>
@@ -153,6 +158,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>6</value>
@@ -160,6 +166,7 @@
 			<value>0</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>3</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.forum.xml b/tests/notification/fixtures/submit_post_notification.type.forum.xml
index b8df34bedcb..c12c8786043 100644
--- a/tests/notification/fixtures/submit_post_notification.type.forum.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.forum.xml
@@ -155,12 +155,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -168,6 +170,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -175,6 +178,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -182,6 +186,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -189,6 +194,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -196,6 +202,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -203,6 +210,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>7</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -210,6 +218,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>8</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -217,6 +226,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>9</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -224,6 +234,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>10</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -231,6 +242,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>11</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -238,6 +250,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>12</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -245,6 +258,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>13</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -252,6 +266,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>14</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.mention.xml b/tests/notification/fixtures/submit_post_notification.type.mention.xml
index 86ae1fd0375..7faf22c4011 100644
--- a/tests/notification/fixtures/submit_post_notification.type.mention.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.mention.xml
@@ -136,12 +136,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>2</value>
@@ -149,6 +151,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>3</value>
@@ -156,6 +159,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>4</value>
@@ -163,6 +167,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>5</value>
@@ -170,6 +175,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>6</value>
@@ -177,6 +183,7 @@
 			<value>0</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>8</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.post.xml b/tests/notification/fixtures/submit_post_notification.type.post.xml
index 75bfb03e89e..7d760cd1ebf 100644
--- a/tests/notification/fixtures/submit_post_notification.type.post.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.post.xml
@@ -155,12 +155,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -168,6 +170,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -175,6 +178,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -182,6 +186,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -189,6 +194,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -196,6 +202,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -203,6 +210,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>7</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -210,6 +218,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>8</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -217,6 +226,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>9</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -224,6 +234,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>10</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -231,6 +242,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>11</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -238,6 +250,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>12</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -245,6 +258,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>13</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -252,6 +266,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>14</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml b/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml
index 12e73b0ff22..fe0a99bdc51 100644
--- a/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml
@@ -103,12 +103,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>2</value>
@@ -116,6 +118,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>3</value>
@@ -123,6 +126,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>4</value>
@@ -130,6 +134,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>5</value>
@@ -137,6 +142,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>6</value>
@@ -144,6 +150,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>7</value>
@@ -151,6 +158,7 @@
 			<value>0</value>
 		</row>
 		<row>
+			<value>7</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>9</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.quote.xml b/tests/notification/fixtures/submit_post_notification.type.quote.xml
index 9f4ba914754..8fe85d0db39 100644
--- a/tests/notification/fixtures/submit_post_notification.type.quote.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.quote.xml
@@ -91,12 +91,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>2</value>
@@ -104,6 +106,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>3</value>
@@ -111,6 +114,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>4</value>
@@ -118,6 +122,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>5</value>
@@ -125,6 +130,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>6</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.topic.xml b/tests/notification/fixtures/submit_post_notification.type.topic.xml
index 1f96ed2ee78..eebab64e6b4 100644
--- a/tests/notification/fixtures/submit_post_notification.type.topic.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.topic.xml
@@ -99,12 +99,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>2</value>
@@ -112,6 +114,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>6</value>
@@ -119,6 +122,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>7</value>
@@ -126,6 +130,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>8</value>
diff --git a/tests/notification/fixtures/webpush_notification.type.post.xml b/tests/notification/fixtures/webpush_notification.type.post.xml
new file mode 100644
index 00000000000..89c5354030a
--- /dev/null
+++ b/tests/notification/fixtures/webpush_notification.type.post.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_log">
+	</table>
+	<table name="phpbb_forums_watch">
+		<column>forum_id</column>
+		<column>user_id</column>
+		<column>notify_status</column>
+		<row>
+			<value>1</value>
+			<value>6</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>7</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>8</value>
+			<value>0</value>
+		</row>
+	</table>
+	<table name="phpbb_notifications">
+		<column>notification_id</column>
+		<column>notification_type_id</column>
+		<column>user_id</column>
+		<column>item_id</column>
+		<column>item_parent_id</column>
+		<column>notification_read</column>
+		<column>notification_data</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>5</value>
+			<value>1</value>
+			<value>1</value>
+			<value>0</value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>1</value>
+			<value>8</value>
+			<value>1</value>
+			<value>1</value>
+			<value>0</value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_notification_push">
+	</table>
+	<table name="phpbb_notification_types">
+		<column>notification_type_id</column>
+		<column>notification_type_name</column>
+		<column>notification_type_enabled</column>
+		<row>
+			<value>1</value>
+			<value>notification.type.post</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>notification.type.forum</value>
+			<value>1</value>
+		</row>
+	</table>
+	<table name="phpbb_posts">
+		<column>post_id</column>
+		<column>topic_id</column>
+		<column>forum_id</column>
+		<column>post_text</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_push_subscriptions">
+		<column>subscription_id</column>
+		<column>user_id</column>
+		<column>endpoint</column>
+	</table>
+	<table name="phpbb_topics">
+		<column>topic_id</column>
+		<column>forum_id</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>1</value>
+		</row>
+	</table>
+	<table name="phpbb_topics_watch">
+		<column>topic_id</column>
+		<column>user_id</column>
+		<column>notify_status</column>
+		<row>
+			<value>1</value>
+			<value>2</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>2</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>3</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>4</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>5</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>6</value>
+			<value>0</value>
+		</row>
+	</table>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<row>
+			<value>1</value>
+			<value>Anonymous</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>poster</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>test</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>unauthorized</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>notified</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>disabled</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>7</value>
+			<value>default</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>8</value>
+			<value>latest</value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_user_notifications">
+		<column>id</column>
+		<column>item_type</column>
+		<column>item_id</column>
+		<column>user_id</column>
+		<column>method</column>
+		<column>notify</column>
+		<row>
+			<value>1</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>2</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>3</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>4</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>5</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>6</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>7</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>7</value>
+			<value>notification.type.post</value>
+			<value>0</value>
+			<value>8</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>8</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>2</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>9</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>3</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>10</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>4</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>11</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>5</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>12</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>6</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>13</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>7</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>14</value>
+			<value>notification.type.forum</value>
+			<value>0</value>
+			<value>8</value>
+			<value>notification.method.webpush</value>
+			<value>1</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/notification/group_request_test.php b/tests/notification/group_request_test.php
index d523c80f34f..b593957bbcb 100644
--- a/tests/notification/group_request_test.php
+++ b/tests/notification/group_request_test.php
@@ -49,6 +49,7 @@ public function test_notifications()
 		$this->container->set('group_helper', new \phpbb\group\helper(
 			$this->getMockBuilder('\phpbb\auth\auth')->disableOriginalConstructor()->getMock(),
 			$this->getMockBuilder('\phpbb\avatar\helper')->disableOriginalConstructor()->getMock(),
+			$this->db,
 			$this->cache,
 			$this->config,
 			new \phpbb\language\language(
@@ -63,6 +64,7 @@ public function test_notifications()
 				$phpbb_root_path,
 				$phpEx
 			),
+			$this->getMockBuilder('\phpbb\template\template')->disableOriginalConstructor()->getMock(),
 			$this->user
 		));
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
diff --git a/tests/notification/manager_mark_by_id_test.php b/tests/notification/manager_mark_by_id_test.php
new file mode 100644
index 00000000000..e3204d1c35a
--- /dev/null
+++ b/tests/notification/manager_mark_by_id_test.php
@@ -0,0 +1,352 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+require_once __DIR__ . '/base.php';
+
+class phpbb_notification_manager_mark_by_id_test extends phpbb_tests_notification_base
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(__DIR__ . '/fixtures/notification.xml');
+	}
+
+	public function setUp(): void
+	{
+		parent::setUp();
+
+		if (strpos($this->get_database_config()['dbms'], 'mssql') !== false)
+		{
+			$this->db->sql_query('SET IDENTITY_INSERT phpbb_notification_types ON;');
+		}
+	}
+
+	public function tearDown(): void
+	{
+		if (strpos($this->get_database_config()['dbms'], 'mssql') !== false)
+		{
+			$this->db->sql_query('SET IDENTITY_INSERT phpbb_notification_types OFF;');
+		}
+
+		parent::tearDown();
+	}
+
+	/**
+	* Test mark_notifications_by_id with a single notification ID
+	*/
+	public function test_mark_notification_by_single_id()
+	{
+		// Add a test notification
+		$this->db->sql_query('DELETE FROM phpbb_notification_types');
+		$this->db->sql_query('INSERT INTO phpbb_notification_types ' .
+			$this->db->sql_build_array('INSERT', array(
+				'notification_type_id'		=> 1,
+				'notification_type_name'	=> 'test',
+				'notification_type_enabled'	=> 1,
+			))
+		);
+
+		$this->notifications->add_notifications('test', array(
+			'post_id'		=> 1,
+			'topic_id'		=> 1,
+			'post_time'		=> 1234567890,
+		));
+
+		// Load notifications to get the notification ID
+		$loaded = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+		));
+
+		$this->assertEquals(1, $loaded['unread_count']);
+		$notification_id = key($loaded['notifications']);
+
+		// Mark as read
+		$this->notifications->mark_notifications_by_id('notification.method.board', $notification_id, false, true);
+
+		// Verify it's marked as read
+		$loaded_after = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+		));
+
+		$this->assertEquals(0, $loaded_after['unread_count']);
+
+		// Mark as unread again
+		$this->notifications->mark_notifications_by_id('notification.method.board', $notification_id, false, false);
+
+
+		// Verify it's marked as unread again
+		$loaded_finally = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+		));
+		$this->assertEquals(1, $loaded_finally['unread_count']);
+	}
+
+	/**
+	* Test mark_notifications_by_id with multiple notification IDs
+	*/
+	public function test_mark_notifications_by_multiple_ids()
+	{
+		// Add test notifications
+		$this->db->sql_query('DELETE FROM phpbb_notification_types');
+		$this->db->sql_query('INSERT INTO phpbb_notification_types ' .
+			$this->db->sql_build_array('INSERT', array(
+				'notification_type_id'		=> 1,
+				'notification_type_name'	=> 'test',
+				'notification_type_enabled'	=> 1,
+			))
+		);
+
+		$this->notifications->add_notifications('test', array(
+			'post_id'		=> 1,
+			'topic_id'		=> 1,
+			'post_time'		=> 1234567890,
+		));
+
+		$this->notifications->add_notifications('test', array(
+			'post_id'		=> 2,
+			'topic_id'		=> 1,
+			'post_time'		=> 1234567891,
+		));
+
+		$this->notifications->add_notifications('test', array(
+			'post_id'		=> 3,
+			'topic_id'		=> 1,
+			'post_time'		=> 1234567892,
+		));
+
+		// Load notifications to get notification IDs
+		$loaded = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+		));
+
+		$this->assertEquals(3, $loaded['unread_count']);
+		$notification_ids = array_keys($loaded['notifications']);
+
+		// Mark multiple notifications as read
+		$this->notifications->mark_notifications_by_id('notification.method.board', $notification_ids, false, true);
+
+		// Verify they're all marked as read
+		$loaded_after = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+		));
+
+		$this->assertEquals(0, $loaded_after['unread_count']);
+	}
+
+	/**
+	* Test mark_notifications_by_id with time constraint
+	*/
+	public function test_mark_notifications_by_id_with_time()
+	{
+		// Add test notifications
+		$this->db->sql_query('DELETE FROM phpbb_notification_types');
+		$this->db->sql_query('INSERT INTO phpbb_notification_types ' .
+			$this->db->sql_build_array('INSERT', array(
+				'notification_type_id'		=> 1,
+				'notification_type_name'	=> 'test',
+				'notification_type_enabled'	=> 1,
+			))
+		);
+
+		$old_time = 1234567890;
+		$new_time = 1234567900;
+
+		$this->notifications->add_notifications('test', array(
+			'post_id'		=> 1,
+			'topic_id'		=> 1,
+			'post_time'		=> $old_time,
+		));
+
+		$this->notifications->add_notifications('test', array(
+			'post_id'		=> 2,
+			'topic_id'		=> 1,
+			'post_time'		=> $new_time,
+		));
+
+		// Load notifications to get notification IDs
+		$loaded = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+		));
+
+		$this->assertEquals(2, $loaded['unread_count']);
+		$notification_ids = array_keys($loaded['notifications']);
+
+		// Mark notifications as read with time constraint (only old ones)
+		$this->notifications->mark_notifications_by_id('notification.method.board', $notification_ids, $old_time, true);
+
+		// Verify only old notification is marked as read
+		$loaded_after = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+		));
+
+		$this->assertEquals(1, $loaded_after['unread_count']);
+	}
+
+	/**
+	* Test mark_notifications_by_id with unavailable method
+	*/
+	public function test_mark_notifications_by_id_unavailable_method()
+	{
+		// Add a test notification
+		$this->db->sql_query('DELETE FROM phpbb_notification_types');
+		$this->db->sql_query('INSERT INTO phpbb_notification_types ' .
+			$this->db->sql_build_array('INSERT', array(
+				'notification_type_id'		=> 1,
+				'notification_type_name'	=> 'test',
+				'notification_type_enabled'	=> 1,
+			))
+		);
+
+		$this->notifications->add_notifications('test', array(
+			'post_id'		=> 1,
+			'topic_id'		=> 1,
+			'post_time'		=> 1234567890,
+		));
+
+		// Load notifications
+		$loaded = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+		));
+
+		$this->assertEquals(1, $loaded['unread_count']);
+		$notification_id = key($loaded['notifications']);
+
+		// Try to mark with non-existent method - should throw exception from container
+		try
+		{
+			$this->notifications->mark_notifications_by_id('notification.method.nonexistent', $notification_id, false, true);
+			$this->fail('Expected exception for non-existent method');
+		}
+		catch (\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException $e)
+		{
+			// Expected exception - test passes
+			$this->assertTrue(true);
+		}
+
+		// Verify notification is still unread
+		$loaded_after = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+		));
+
+		$this->assertEquals(1, $loaded_after['unread_count']);
+	}
+
+	/**
+	* Test mark_notifications_by_id with non-existent notification ID
+	*/
+	public function test_mark_notifications_by_id_nonexistent_id()
+	{
+		// Add a test notification
+		$this->db->sql_query('DELETE FROM phpbb_notification_types');
+		$this->db->sql_query('INSERT INTO phpbb_notification_types ' .
+			$this->db->sql_build_array('INSERT', array(
+				'notification_type_id'		=> 1,
+				'notification_type_name'	=> 'test',
+				'notification_type_enabled'	=> 1,
+			))
+		);
+
+		$this->notifications->add_notifications('test', array(
+			'post_id'		=> 1,
+			'topic_id'		=> 1,
+			'post_time'		=> 1234567890,
+		));
+
+		// Try to mark a non-existent notification ID (should not affect existing notifications)
+		$this->notifications->mark_notifications_by_id('notification.method.board', 999999, false, true);
+
+		// Verify notification is still unread
+		$loaded = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+		));
+
+		$this->assertEquals(1, $loaded['unread_count']);
+	}
+
+	/**
+	* Test that a user cannot mark another user's notification as read
+	*/
+	public function test_mark_notifications_by_id_wrong_user()
+	{
+		// Setup notification type
+		$this->db->sql_query('DELETE FROM phpbb_notification_types');
+		$this->db->sql_query('INSERT INTO phpbb_notification_types ' .
+			$this->db->sql_build_array('INSERT', array(
+				'notification_type_id'		=> 1,
+				'notification_type_name'	=> 'test',
+				'notification_type_enabled'	=> 1,
+			))
+		);
+
+		// Add subscription for user 2
+		$this->notifications->add_subscription('test', 0, 'notification.method.board', 2);
+
+		// Create a notification for user 2
+		$this->notifications->add_notifications_for_users('test', array(
+			'post_id'		=> 1,
+			'topic_id'		=> 1,
+			'post_time'		=> 1234567890,
+		), array(
+			2	=> array('notification.method.board'),
+		));
+
+		// Load notifications for user 2 to get the notification ID
+		$loaded_user2 = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+			'user_id'		=> 2,
+		));
+
+		$this->assertEquals(1, $loaded_user2['unread_count'], 'User 2 should have 1 unread notification');
+		$notification_id = key($loaded_user2['notifications']);
+
+		// Verify the notification belongs to user 2
+		$sql = 'SELECT user_id, notification_read
+			FROM phpbb_notifications
+			WHERE notification_id = ' . (int) $notification_id;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEquals(2, $row['user_id'], 'Notification should belong to user 2');
+		$this->assertEquals(0, $row['notification_read'], 'Notification should be unread initially');
+
+		// Try to mark user 2's notification as read while being other user
+		$userReflection = new \ReflectionProperty($this->notifications, 'user');
+		$userReflection->setAccessible(true);
+		$user = $userReflection->getValue($this->notifications);
+		$user->data['id'] = 3;
+		$this->notifications->mark_notifications_by_id('notification.method.board', $notification_id);
+
+		// Check if the notification was actually marked as read
+		$sql = 'SELECT notification_read
+			FROM phpbb_notifications
+			WHERE notification_id = ' . (int) $notification_id;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEquals(0, $row['notification_read'], 'Notification should remain unread - user 0 cannot mark user 2 notification');
+
+		// Verify user 2's notification count remains unchanged
+		$loaded_user2_after = $this->notifications->load_notifications('notification.method.board', array(
+			'count_unread'	=> true,
+			'user_id'		=> 2,
+		));
+
+		$this->assertEquals(1, $loaded_user2_after['unread_count'], 'User 2 should still have 1 unread notification');
+	}
+}
+
+
+
+
+
diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php
index d9b52cae2d6..05586e5cc8a 100644
--- a/tests/notification/notification_method_email_test.php
+++ b/tests/notification/notification_method_email_test.php
@@ -75,14 +75,17 @@ protected function setUp(): void
 		$phpbb_container = $this->container = new ContainerBuilder();
 		$loader     = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures'));
 		$loader->load('services_notification.yml');
+		$phpbb_container->set('avatar.helper', $avatar_helper);
 		$phpbb_container->set('user_loader', $this->user_loader);
 		$phpbb_container->set('user', $user);
 		$phpbb_container->set('language', $lang);
 		$phpbb_container->set('config', $this->config);
+		$phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper'));
 		$phpbb_container->set('dbal.conn', $this->db);
 		$phpbb_container->set('auth', $auth);
 		$phpbb_container->set('cache.driver', $cache_driver);
 		$phpbb_container->set('cache', $cache);
+		$phpbb_container->set('log', new \phpbb\log\dummy());
 		$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
 		$phpbb_container->set('event_dispatcher', $this->phpbb_dispatcher);
 		$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
@@ -91,6 +94,8 @@ protected function setUp(): void
 		$phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications');
 		$phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types');
 		$phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails');
+		$phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push');
+		$phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions');
 		$phpbb_container->set(
 			'text_formatter.s9e.mention_helper',
 			new \phpbb\textformatter\s9e\mention_helper(
@@ -102,6 +107,10 @@ protected function setUp(): void
 			)
 		);
 
+		$messenger_method_collection = new \phpbb\di\service_collection($phpbb_container);
+		$messenger_method_collection->add('messenger.method.email');
+		$phpbb_container->set('messenger.method_collection', $messenger_method_collection);
+
 		$this->notification_method_email = $this->getMockBuilder('\phpbb\notification\method\email')
 			->setConstructorArgs([
 				$phpbb_container->get('user_loader'),
@@ -110,15 +119,15 @@ protected function setUp(): void
 				$phpbb_container->get('dbal.conn'),
 				$phpbb_root_path,
 				$phpEx,
-				$phpbb_container->getParameter('tables.notification_emails')
+				$phpbb_container->getParameter('tables.notification_emails'),
+				$phpbb_container->get('messenger.method_collection')
 			])
-			->setMethods(['notify_using_messenger'])
+			->onlyMethods(['notify_using_messenger'])
 			->getMock();
 		$notification_method_email = $this->notification_method_email;
 
 		$class = new ReflectionClass($notification_method_email);
 		$empty_queue_method = $class->getMethod('empty_queue');
-		$empty_queue_method->setAccessible(true);
 
 		$this->notification_method_email->method('notify_using_messenger')
 			->will($this->returnCallback(function () use ($notification_method_email, $empty_queue_method) {
@@ -170,7 +179,7 @@ protected function setUp(): void
 		$this->notifications->set_var('notification_methods', $methods);
 	}
 
-	public function data_notification_email()
+	public static function data_notification_email()
 	{
 		return [
 			/**
diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php
new file mode 100644
index 00000000000..2e8c7910aa3
--- /dev/null
+++ b/tests/notification/notification_method_webpush_test.php
@@ -0,0 +1,791 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\notification\method\webpush;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+require_once __DIR__ . '/base.php';
+
+/**
+ * @group slow
+ */
+class notification_method_webpush_test extends phpbb_tests_notification_base
+{
+	/** @var string[] VAPID keys for testing purposes */
+	public const VAPID_KEYS = [
+		'publicKey'		=> 'BIcGkq1Ncj3a2-J0UW-1A0NETLjvxZzNLiYBiPVMKNjgwmwPi5jyK87VfS4FZn9n7S9pLMQzjV3LmFuOnRSOvmI',
+		'privateKey'	=> 'SrlbBEVgibWmKHYbDPu4Y2XvDWPjeGcc9fC16jq01xU',
+	];
+
+	/** @var webpush */
+	protected $notification_method_webpush;
+
+	/** @var \phpbb\language\language */
+	protected $language;
+
+	/** @var \phpbb\log\log_interface */
+	protected $log;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(__DIR__ . '/fixtures/webpush_notification.type.post.xml');
+	}
+
+	protected function get_notification_methods()
+	{
+		return [
+			'notification.method.webpush',
+		];
+	}
+
+	public static function setUpBeforeClass(): void
+	{
+		self::start_webpush_testing();
+	}
+
+	public static function tearDownAfterClass(): void
+	{
+		self::stop_webpush_testing();
+	}
+
+	protected static function start_webpush_testing(): void
+	{
+		// Stop first to ensure port is available
+		self::stop_webpush_testing();
+
+		$process = new \Symfony\Component\Process\Process(['node_modules/.bin/web-push-testing', '--port', '9012', 'start']);
+		$process->run();
+		if (!$process->isSuccessful())
+		{
+			self::fail('Starting web push testing service failed: ' . $process->getErrorOutput());
+		}
+	}
+
+	protected static function stop_webpush_testing(): void
+	{
+		$process = new \Symfony\Component\Process\Process(['node_modules/.bin/web-push-testing', '--port', '9012', 'stop']);
+		$process->run();
+	}
+
+	protected function setUp(): void
+	{
+		phpbb_database_test_case::setUp();
+
+		global $phpbb_root_path, $phpEx;
+
+		include_once(__DIR__ . '/ext/test/notification/type/test.' . $phpEx);
+
+		global $db, $config, $user, $auth, $cache, $phpbb_container, $phpbb_dispatcher;
+
+		$avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper')
+							  ->disableOriginalConstructor()
+							  ->getMock();
+		$controller_helper = $this->getMockBuilder('\phpbb\controller\helper')
+								  ->disableOriginalConstructor()
+								  ->getMock();
+		$db = $this->db = $this->new_dbal();
+		$config = $this->config = new \phpbb\config\config([
+			'allow_privmsg'			=> true,
+			'allow_bookmarks'		=> true,
+			'allow_topic_notify'	=> true,
+			'allow_forum_notify'	=> true,
+			'allow_board_notifications'	=> true,
+			'webpush_vapid_public'	=> self::VAPID_KEYS['publicKey'],
+			'webpush_vapid_private'	=> self::VAPID_KEYS['privateKey'],
+		]);
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$this->language = new \phpbb\language\language($lang_loader);
+		$this->language->add_lang('acp/common');
+		$user = new \phpbb\user($this->language, '\phpbb\datetime');
+		$this->user = $user;
+		$this->user->data['user_options'] = 230271;
+		$this->user_loader = new \phpbb\user_loader($avatar_helper, $this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
+		$auth = $this->auth = new phpbb_mock_notifications_auth();
+		$this->phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$phpbb_dispatcher = $this->phpbb_dispatcher;
+		$cache_driver = new \phpbb\cache\driver\dummy();
+		$cache = $this->cache = new \phpbb\cache\service(
+			$cache_driver,
+			$this->config,
+			$this->db,
+			$this->phpbb_dispatcher,
+			$phpbb_root_path,
+			$phpEx
+		);
+
+		$log_table = 'phpbb_log';
+		$this->log = new \phpbb\log\log($this->db, $user, $auth, $this->phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, $log_table);
+
+		$phpbb_container = $this->container = new ContainerBuilder();
+		$loader     = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures'));
+		$loader->load('services_notification.yml');
+		$phpbb_container->set('avatar.helper', $avatar_helper);
+		$phpbb_container->set('user_loader', $this->user_loader);
+		$phpbb_container->set('user', $user);
+		$phpbb_container->set('language', $this->language);
+		$phpbb_container->set('config', $this->config);
+		$phpbb_container->set('dbal.conn', $this->db);
+		$phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper'));
+		$phpbb_container->set('auth', $auth);
+		$phpbb_container->set('cache.driver', $cache_driver);
+		$phpbb_container->set('cache', $cache);
+		$phpbb_container->set('log', $this->log);
+		$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
+		$phpbb_container->set('dispatcher', $this->phpbb_dispatcher);
+		$phpbb_container->set('event_dispatcher', $this->phpbb_dispatcher);
+		$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
+		$phpbb_container->setParameter('core.php_ext', $phpEx);
+		$phpbb_container->setParameter('tables.notifications', 'phpbb_notifications');
+		$phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications');
+		$phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types');
+		$phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails');
+		$phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push');
+		$phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions');
+		$phpbb_container->set(
+			'text_formatter.s9e.mention_helper',
+			new \phpbb\textformatter\s9e\mention_helper(
+				$this->db,
+				$auth,
+				$this->user,
+				$phpbb_root_path,
+				$phpEx
+			)
+		);
+
+		$ban_type_email = new \phpbb\ban\type\email($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys');
+		$ban_type_user = new \phpbb\ban\type\user($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys');
+		$ban_type_ip = new \phpbb\ban\type\ip($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys');
+		$phpbb_container->set('ban.type.email', $ban_type_email);
+		$phpbb_container->set('ban.type.user', $ban_type_user);
+		$phpbb_container->set('ban.type.ip', $ban_type_ip);
+		$collection = new \phpbb\di\service_collection($phpbb_container);
+		$collection->add('ban.type.email');
+		$collection->add('ban.type.user');
+		$collection->add('ban.type.ip');
+		$ban_manager = new \phpbb\ban\manager($collection, new \phpbb\cache\driver\dummy(), $this->db, $this->language, $this->log, $user, 'phpbb_bans', 'phpbb_users');
+		$phpbb_container->set('ban.manager', $ban_manager);
+
+		$messenger_method_collection = new \phpbb\di\service_collection($phpbb_container);
+		$phpbb_container->set('messenger.method_collection', $messenger_method_collection);
+
+		$this->notification_method_webpush = new \phpbb\notification\method\webpush(
+			$phpbb_container->get('config'),
+			$phpbb_container->get('dbal.conn'),
+			$phpbb_container->get('log'),
+			$phpbb_container->get('user_loader'),
+			$phpbb_container->get('user'),
+			$phpbb_root_path,
+			$phpEx,
+			$phpbb_container->getParameter('tables.notification_push'),
+			$phpbb_container->getParameter('tables.push_subscriptions')
+		);
+
+		$phpbb_container->set('notification.method.webpush', $this->notification_method_webpush);
+
+		$this->notifications = new phpbb_notification_manager_helper(
+			array(),
+			array(),
+			$this->container,
+			$this->user_loader,
+			$this->phpbb_dispatcher,
+			$this->db,
+			$this->cache,
+			$this->language,
+			$this->user,
+			'phpbb_notification_types',
+			'phpbb_user_notifications'
+		);
+
+		$phpbb_container->set('notification_manager', $this->notifications);
+
+		$phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass());
+
+		$phpbb_container->compile();
+
+		$this->notifications->setDependencies($this->auth, $this->config);
+
+		$types = array();
+		foreach ($this->get_notification_types() as $type)
+		{
+			$class = $this->build_type($type);
+
+			$types[$type] = $class;
+		}
+
+		$this->notifications->set_var('notification_types', $types);
+
+		$methods = array();
+		foreach ($this->get_notification_methods() as $method)
+		{
+			$class = $this->container->get($method);
+
+			$methods[$method] = $class;
+		}
+
+		$this->notifications->set_var('notification_methods', $methods);
+	}
+
+	public static function data_notification_webpush()
+	{
+		return [
+			/**
+			* Normal post
+			*
+			* User => State description
+			*	2	=> Topic id=1 and id=2 subscribed, should receive a new topics post notification
+			*	3	=> Topic id=1 subscribed, should receive a new topic post notification
+			*	4	=> Topic id=1 subscribed, should receive a new topic post notification
+			*	5	=> Topic id=1 subscribed, post id=1 already notified, should receive a new topic post notification
+			*	6	=> Topic id=1 and forum id=1 subscribed, should receive a new topic/forum post notification
+			*	7	=> Forum id=1 subscribed, should NOT receive a new topic post but a forum post notification
+			*	8	=> Forum id=1 subscribed, post id=1 already notified, should NOT receive a new topic post but a forum post notification
+			*/
+			[
+				'notification.type.post',
+				[
+					'forum_id'		=> '1',
+					'post_id'		=> '2',
+					'topic_id'		=> '1',
+				],
+				[
+					2 => ['user_id' => '2'],
+					3 => ['user_id' => '3'],
+					4 => ['user_id' => '4'],
+					5 => ['user_id' => '5'],
+					6 => ['user_id' => '6'],
+				],
+			],
+			[
+				'notification.type.forum',
+				[
+					'forum_id'		=> '1',
+					'post_id'		=> '3',
+					'topic_id'		=> '1',
+				],
+				[
+					6 => ['user_id' => '6'],
+					7 => ['user_id' => '7'],
+					8 => ['user_id' => '8']
+				],
+			],
+			[
+				'notification.type.post',
+				[
+					'forum_id'		=> '1',
+					'post_id'		=> '4',
+					'topic_id'		=> '2',
+				],
+				[
+					2 => ['user_id' => '2'],
+				],
+			],
+			[
+				'notification.type.forum',
+				[
+					'forum_id'		=> '1',
+					'post_id'		=> '5',
+					'topic_id'		=> '2',
+				],
+				[
+					6 => ['user_id' => '6'],
+					7 => ['user_id' => '7'],
+					8 => ['user_id' => '8'],
+				],
+			],
+			[
+				'notification.type.post',
+				[
+					'forum_id'		=> '2',
+					'post_id'		=> '6',
+					'topic_id'		=> '3',
+				],
+				[
+				],
+			],
+			[
+				'notification.type.forum',
+				[
+					'forum_id'		=> '2',
+					'post_id'		=> '6',
+					'topic_id'		=> '3',
+				],
+				[
+				],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider data_notification_webpush
+	 */
+	public function test_notification_webpush($notification_type, $post_data, $expected_users)
+	{
+		$post_data = array_merge([
+				'post_time' => 1349413322,
+				'poster_id' => 1,
+				'topic_title' => '',
+				'post_subject' => '',
+				'post_username' => '',
+				'forum_name' => '',
+			],
+
+			$post_data);
+		$notification_options = [
+			'item_id'			=> $post_data['post_id'],
+			'item_parent_id'	=> $post_data['topic_id'],
+		];
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet');
+
+		$this->notifications->add_notifications($notification_type, $post_data);
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified');
+
+		$post_data['post_id']++;
+		$notification_options['item_id'] = $post_data['post_id'];
+		$post_data['post_time'] = 1349413323;
+
+		$this->notifications->add_notifications($notification_type, $post_data);
+
+		$notified_users2 = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals($expected_users, $notified_users2, 'Assert that expected users stay the same after replying to same topic');
+	}
+
+	/**
+	 * @dataProvider data_notification_webpush
+	 */
+	public function test_get_subscription($notification_type, $post_data, $expected_users): void
+	{
+		$subscription_info = [];
+		foreach ($expected_users as $user_id => $user_data)
+		{
+			$subscription_info[$user_id][] = $this->create_subscription_for_user($user_id);
+		}
+
+		// Create second subscription for first user ID passed
+		if (count($expected_users))
+		{
+			$first_user_id = array_key_first($expected_users);
+			$subscription_info[$first_user_id][] = $this->create_subscription_for_user($first_user_id);
+		}
+
+		$post_data = array_merge([
+			'post_time' => 1349413322,
+			'poster_id' => 1,
+			'topic_title' => '',
+			'post_subject' => '',
+			'post_username' => '',
+			'forum_name' => '',
+		],
+
+			$post_data);
+		$notification_options = [
+			'item_id'			=> $post_data['post_id'],
+			'item_parent_id'	=> $post_data['topic_id'],
+		];
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet');
+
+		foreach ($expected_users as $user_id => $data)
+		{
+			$messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']);
+			$this->assertEmpty($messages);
+		}
+
+		$this->notifications->add_notifications($notification_type, $post_data);
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified');
+
+		foreach ($expected_users as $user_id => $data)
+		{
+			$messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']);
+			$this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.');
+		}
+	}
+
+	/**
+	 * @dataProvider data_notification_webpush
+	 */
+	public function test_notify_empty_queue($notification_type, $post_data, $expected_users): void
+	{
+		foreach ($expected_users as $user_id => $user_data)
+		{
+			$this->create_subscription_for_user($user_id);
+		}
+
+		$post_data = array_merge([
+			'post_time' => 1349413322,
+			'poster_id' => 1,
+			'topic_title' => '',
+			'post_subject' => '',
+			'post_username' => '',
+			'forum_name' => '',
+		],
+
+			$post_data);
+		$notification_options = [
+			'item_id'			=> $post_data['post_id'],
+			'item_parent_id'	=> $post_data['topic_id'],
+		];
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet');
+
+		$this->notification_method_webpush->notify(); // should have no effect
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet');
+
+		$post_data['post_id']++;
+		$notification_options['item_id'] = $post_data['post_id'];
+		$post_data['post_time'] = 1349413323;
+
+		$this->notifications->add_notifications($notification_type, $post_data);
+
+		$notified_users2 = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals($expected_users, $notified_users2, 'Assert that expected users stay the same after replying to same topic');
+	}
+
+	/**
+	 * @dataProvider data_notification_webpush
+	 */
+	public function test_notify_invalid_endpoint($notification_type, $post_data, $expected_users): void
+	{
+		$subscription_info = [];
+		foreach ($expected_users as $user_id => $user_data)
+		{
+			$subscription_info[$user_id][] = $this->create_subscription_for_user($user_id);
+		}
+
+		// Create second subscription for first user ID passed
+		if (count($expected_users))
+		{
+			$first_user_id = array_key_first($expected_users);
+			$first_user_sub = $this->create_subscription_for_user($first_user_id, true);
+			$subscription_info[$first_user_id][] = $first_user_sub;
+		}
+
+		$post_data = array_merge([
+			'post_time' => 1349413322,
+			'poster_id' => 1,
+			'topic_title' => '',
+			'post_subject' => '',
+			'post_username' => '',
+			'forum_name' => '',
+		],
+
+			$post_data);
+		$notification_options = [
+			'item_id'			=> $post_data['post_id'],
+			'item_parent_id'	=> $post_data['topic_id'],
+		];
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet');
+
+		foreach ($expected_users as $user_id => $data)
+		{
+			$messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']);
+			$this->assertEmpty($messages);
+		}
+
+		$this->notifications->add_notifications($notification_type, $post_data);
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified');
+
+		foreach ($expected_users as $user_id => $data)
+		{
+			$messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']);
+			$this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.');
+		}
+
+		if (isset($first_user_sub))
+		{
+			$admin_logs = $this->log->get_logs('admin');
+			$this->db->sql_query('DELETE FROM phpbb_log'); // Clear logs
+			$this->assertCount(1, $admin_logs, 'Assert that an admin log was created for invalid endpoint');
+
+			$log_entry = $admin_logs[0];
+
+			$this->assertStringStartsWith('<strong>Web Push message could not be sent:</strong>', $log_entry['action']);
+			$this->assertStringContainsString('400', $log_entry['action']);
+		}
+	}
+
+	/**
+	 * @dataProvider data_notification_webpush
+	 */
+	public function test_notify_expired($notification_type, $post_data, $expected_users)
+	{
+		$subscription_info = [];
+		foreach ($expected_users as $user_id => $user_data)
+		{
+			$subscription_info[$user_id][] = $this->create_subscription_for_user($user_id);
+		}
+
+		$expected_delivered_users = $expected_users;
+
+		// Expire subscriptions for first user
+		if (count($expected_users))
+		{
+
+			$first_user_id = array_key_first($expected_users);
+			$first_user_subs = $subscription_info[$first_user_id];
+			unset($expected_delivered_users[$first_user_id]);
+			$this->expire_subscription($first_user_subs[0]['clientHash']);
+		}
+
+		$post_data = array_merge([
+			'post_time' => 1349413322,
+			'poster_id' => 1,
+			'topic_title' => '',
+			'post_subject' => '',
+			'post_username' => '',
+			'forum_name' => '',
+		],
+
+			$post_data);
+		$notification_options = [
+			'item_id'			=> $post_data['post_id'],
+			'item_parent_id'	=> $post_data['topic_id'],
+		];
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet');
+
+		foreach ($expected_delivered_users as $user_id => $data)
+		{
+			$messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']);
+			$this->assertEmpty($messages);
+		}
+
+		$this->notifications->add_notifications($notification_type, $post_data);
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified');
+
+		foreach ($expected_delivered_users as $user_id => $data)
+		{
+			$messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']);
+			$this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.');
+		}
+	}
+
+	public function test_get_type(): void
+	{
+		$this->assertEquals('notification.method.webpush', $this->notification_method_webpush->get_type());
+	}
+
+	/**
+	 * @dataProvider data_notification_webpush
+	 */
+	public function test_prune_notifications($notification_type, $post_data, $expected_users): void
+	{
+		$subscription_info = [];
+		foreach ($expected_users as $user_id => $user_data)
+		{
+			$subscription_info[$user_id][] = $this->create_subscription_for_user($user_id);
+		}
+
+		// Create second subscription for first user ID passed
+		if (count($expected_users))
+		{
+			$first_user_id = array_key_first($expected_users);
+			$subscription_info[$first_user_id][] = $this->create_subscription_for_user($first_user_id);
+		}
+
+		$post_data = array_merge([
+			'post_time' => 1349413322,
+			'poster_id' => 1,
+			'topic_title' => '',
+			'post_subject' => '',
+			'post_username' => '',
+			'forum_name' => '',
+		],
+
+			$post_data);
+		$notification_options = [
+			'item_id'			=> $post_data['post_id'],
+			'item_parent_id'	=> $post_data['topic_id'],
+		];
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet');
+
+		foreach ($expected_users as $user_id => $data)
+		{
+			$messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']);
+			$this->assertEmpty($messages);
+		}
+
+		$this->notifications->add_notifications($notification_type, $post_data);
+
+		$notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
+		$this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified');
+
+		foreach ($expected_users as $user_id => $data)
+		{
+			$messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']);
+			$this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.');
+		}
+
+		// Prune notifications with 0 time, shouldn't change anything
+		$prune_time = time();
+		$this->notification_method_webpush->prune_notifications(0);
+		$this->assertGreaterThanOrEqual($prune_time, $this->config->offsetGet('read_notification_last_gc'), 'Assert that prune time was set');
+
+		$cur_notifications = $this->get_notifications();
+		$this->assertSameSize($cur_notifications, $expected_users, 'Assert that no notifications have been pruned');
+
+		// Prune only read not supported, will prune all
+		$this->notification_method_webpush->prune_notifications($prune_time);
+		$this->assertGreaterThanOrEqual($prune_time, $this->config->offsetGet('read_notification_last_gc'), 'Assert that prune time was set');
+
+		$cur_notifications = $this->get_notifications();
+		$this->assertCount(0, $cur_notifications, 'Assert that no notifications have been pruned');
+	}
+
+	public static function data_set_endpoint_padding(): array
+	{
+		return [
+			[
+				'foo.mozilla.com',
+				webpush::MOZILLA_FALLBACK_PADDING
+			],
+			[
+				'foo.mozaws.net',
+				webpush::MOZILLA_FALLBACK_PADDING
+			],
+			[
+				'foo.android.googleapis.com',
+				\Minishlink\WebPush\Encryption::MAX_COMPATIBILITY_PAYLOAD_LENGTH,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider data_set_endpoint_padding
+	 */
+	public function test_set_endpoint_padding($endpoint, $expected_padding): void
+	{
+		$web_push_reflection = new \ReflectionMethod($this->notification_method_webpush, 'set_endpoint_padding');
+
+		$auth = [
+			'VAPID' => [
+				'subject' => generate_board_url(),
+				'publicKey' => $this->config['webpush_vapid_public'],
+				'privateKey' => $this->config['webpush_vapid_private'],
+			],
+		];
+
+		$web_push = new \Minishlink\WebPush\WebPush($auth);
+
+		$this->assertEquals(\Minishlink\WebPush\Encryption::MAX_COMPATIBILITY_PAYLOAD_LENGTH, $web_push->getAutomaticPadding());
+		$web_push_reflection->invoke($this->notification_method_webpush, $web_push, $endpoint);
+		$this->assertEquals($expected_padding, $web_push->getAutomaticPadding());
+	}
+
+	protected function create_subscription_for_user($user_id, bool $invalidate_endpoint = false): array
+	{
+		$client = new \GuzzleHttp\Client();
+		try
+		{
+			$response = $client->request('POST', 'http://localhost:9012/subscribe', ['form_params' => [
+				'applicationServerKey'	=> self::VAPID_KEYS['publicKey'],
+			]]);
+		}
+		catch (\GuzzleHttp\Exception\GuzzleException $exception)
+		{
+			$this->fail('Failed getting subscription from web-push-testing client: ' . $exception->getMessage());
+		}
+
+		$subscription_return = \phpbb\json\sanitizer::decode((string) $response->getBody());
+		$subscription_data = $subscription_return['data'];
+		$this->assertNotEmpty($subscription_data['endpoint']);
+		$this->assertStringStartsWith('http://localhost:9012/notify/', $subscription_data['endpoint']);
+		$this->assertIsArray($subscription_data['keys']);
+
+		if ($invalidate_endpoint)
+		{
+			$subscription_data['endpoint'] .= 'invalid';
+		}
+
+		$push_subscriptions_table = $this->container->getParameter('tables.push_subscriptions');
+
+		$sql = 'INSERT INTO ' . $push_subscriptions_table  . ' ' . $this->db->sql_build_array('INSERT', [
+			'user_id'		=> $user_id,
+			'endpoint'		=> $subscription_data['endpoint'],
+			'p256dh'		=> $subscription_data['keys']['p256dh'],
+			'auth'			=> $subscription_data['keys']['auth'],
+		]);
+		$this->db->sql_query($sql);
+
+		return $subscription_data;
+	}
+
+	protected function expire_subscription(string $client_hash): void
+	{
+		$client = new \GuzzleHttp\Client();
+		try
+		{
+			$response = $client->request('POST', 'http://localhost:9012/expire-subscription/' . $client_hash);
+		}
+		catch (\GuzzleHttp\Exception\GuzzleException $exception)
+		{
+			$this->fail('Failed expiring subscription with web-push-testing client: ' . $exception->getMessage());
+		}
+
+		$subscription_return = \phpbb\json\sanitizer::decode((string) $response->getBody());
+		$this->assertEquals(200, $response->getStatusCode(), 'Expected response status to be 200');
+	}
+
+	protected function get_messages_for_subscription($client_hash): array
+	{
+		$client = new \GuzzleHttp\Client();
+		try
+		{
+			$response = $client->request('POST', 'http://localhost:9012/get-notifications', ['form_params' => [
+				'clientHash'	=> $client_hash,
+			]]);
+		}
+		catch (\GuzzleHttp\Exception\GuzzleException $exception)
+		{
+			$this->fail('Failed getting messages from web-push-testing client: ' . $exception->getMessage());
+		}
+
+		$response_data = json_decode($response->getBody()->getContents(), true);
+		$this->assertNotEmpty($response_data);
+		$this->assertArrayHasKey('data', $response_data);
+		$this->assertArrayHasKey('messages', $response_data['data']);
+
+		return $response_data['data']['messages'];
+	}
+
+	protected function get_notifications(): array
+	{
+		$webpush_table = $this->container->getParameter('tables.notification_push');
+		$sql = 'SELECT * FROM ' . $webpush_table;
+		$result = $this->db->sql_query($sql);
+		$sql_ary = $this->db->sql_fetchrowset($result);
+		$this->db->sql_freeresult($result);
+
+		return $sql_ary;
+	}
+}
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index e8ad00e5ef9..6c5979be05b 100644
--- a/tests/notification/submit_post_base.php
+++ b/tests/notification/submit_post_base.php
@@ -19,8 +19,7 @@
 
 abstract class phpbb_notification_submit_post_base extends phpbb_database_test_case
 {
-	protected $notifications, $db, $container, $user, $config, $auth, $cache;
-
+	protected $db;
 	protected $item_type = '';
 
 	protected $poll_data = array();
@@ -52,9 +51,9 @@ public function getDataSet()
 
 	protected function setUp(): void
 	{
-		parent::setUp();
+		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log;
 
-		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader;
+		parent::setUp();
 
 		// Database
 		$this->db = $this->new_dbal();
@@ -103,15 +102,15 @@ protected function setUp(): void
 		$storage = $this->createMock('\phpbb\storage\storage');
 
 		// User
-		$user = $this->createMock('\phpbb\user');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$user->ip = '';
-		$user->data = array(
-			'user_id'		=> 2,
-			'username'		=> 'user-name',
-			'is_registered'	=> true,
-			'user_colour'	=> '',
-			'user_lastmark'	=> 0,
-		);
+		$user->data['user_id'] = 2;
+		$user->data['username'] = 'user-name';
+		$user->data['is_registered'] = true;
+		$user->data['user_colour'] = '';
+		$user->data['user_lastmark'] = 0;
 
 		// Request
 		$request = new phpbb_mock_request();
@@ -122,11 +121,13 @@ protected function setUp(): void
 
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$user_loader = new \phpbb\user_loader($avatar_helper, $db, $phpbb_root_path, $phpEx, USERS_TABLE);
+		$phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
 
 		// Container
 		$phpbb_container = new ContainerBuilder();
 		$loader     = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures'));
 		$loader->load('services_notification.yml');
+		$phpbb_container->set('avatar.helper', $avatar_helper);
 		$phpbb_container->set('user_loader', $user_loader);
 		$phpbb_container->set('user', $user);
 		$phpbb_container->set('language', $lang);
@@ -135,6 +136,8 @@ protected function setUp(): void
 		$phpbb_container->set('auth', $auth);
 		$phpbb_container->set('cache.driver', $cache_driver);
 		$phpbb_container->set('cache', $cache);
+		$phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper'));
+		$phpbb_container->set('log', new \phpbb\log\dummy());
 		$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
 		$phpbb_container->set(
 			'text_formatter.s9e.mention_helper',
@@ -154,7 +157,14 @@ protected function setUp(): void
 		$phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications');
 		$phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types');
 		$phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails');
+		$phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push');
+		$phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions');
 		$phpbb_container->set('content.visibility', new \phpbb\content_visibility($auth, $config, $phpbb_dispatcher, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE));
+
+		$messenger_method_collection = new \phpbb\di\service_collection($phpbb_container);
+		$messenger_method_collection->add('messenger.method.email');
+		$phpbb_container->set('messenger.method_collection', $messenger_method_collection);
+
 		$phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass());
 		$phpbb_container->compile();
 
@@ -182,6 +192,14 @@ protected function setUp(): void
 	*/
 	public function test_submit_post($additional_post_data, $expected_before, $expected_after)
 	{
+		global $db, $auth, $user, $config, $phpEx, $phpbb_root_path, $phpbb_container, $phpbb_dispatcher, $phpbb_log, $request;
+
+		if (isset($additional_post_data['message']))
+		{
+			$parser = $this->get_test_case_helpers()->set_s9e_services($phpbb_container)->get('text_formatter.parser');
+			$additional_post_data['message'] = $parser->parse($additional_post_data['message']);
+		}
+
 		$sql = 'SELECT user_id, item_id, item_parent_id
 			FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt
 			WHERE nt.notification_type_name = '" . $this->item_type . "'
diff --git a/tests/notification/submit_post_type_bookmark_test.php b/tests/notification/submit_post_type_bookmark_test.php
index d3161b5ccda..1726d09e9bf 100644
--- a/tests/notification/submit_post_type_bookmark_test.php
+++ b/tests/notification/submit_post_type_bookmark_test.php
@@ -19,6 +19,8 @@ class phpbb_notification_submit_post_type_bookmark_test extends phpbb_notificati
 
 	protected function setUp(): void
 	{
+		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log;
+
 		parent::setUp();
 
 		global $auth;
@@ -49,7 +51,7 @@ protected function setUp(): void
 	* submit_post() $mode = 'reply'
 	* Notification item_type = 'bookmark'
 	*/
-	public function submit_post_data()
+	public static function submit_post_data()
 	{
 		return array(
 			/**
diff --git a/tests/notification/submit_post_type_forum_test.php b/tests/notification/submit_post_type_forum_test.php
index 7f06b18951b..e6c20fd9dd6 100644
--- a/tests/notification/submit_post_type_forum_test.php
+++ b/tests/notification/submit_post_type_forum_test.php
@@ -19,6 +19,8 @@ class phpbb_notification_submit_post_type_forum_test extends phpbb_notification_
 
 	public function setUp(): void
 	{
+		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log;
+
 		parent::setUp();
 
 		global $auth;
@@ -59,7 +61,7 @@ public function setUp(): void
 	* submit_post() $mode = 'reply'
 	* Notification item_type = 'notification.type.forum'
 	*/
-	public function submit_post_data()
+	public static function submit_post_data()
 	{
 		return array(
 			/**
diff --git a/tests/notification/submit_post_type_mention_test.php b/tests/notification/submit_post_type_mention_test.php
index f660a38ecc1..80204b8351f 100644
--- a/tests/notification/submit_post_type_mention_test.php
+++ b/tests/notification/submit_post_type_mention_test.php
@@ -11,7 +11,7 @@
 *
 */
 
-require_once dirname(__FILE__) . '/submit_post_base.php';
+require_once __DIR__ . '/submit_post_base.php';
 
 class phpbb_notification_submit_post_type_mention_test extends phpbb_notification_submit_post_base
 {
@@ -19,9 +19,9 @@ class phpbb_notification_submit_post_type_mention_test extends phpbb_notificatio
 
 	public function setUp(): void
 	{
-		parent::setUp();
+		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log;
 
-		global $auth;
+		parent::setUp();
 
 		// Add additional permissions
 		$auth->expects($this->any())
@@ -53,11 +53,8 @@ public function setUp(): void
 	* submit_post() $mode = 'reply'
 	* Notification item_type = 'mention'
 	*/
-	public function submit_post_data()
+	public static function submit_post_data()
 	{
-		// The new mock container is needed because the data providers may be executed before phpunit call setUp()
-		$parser = $this->get_test_case_helpers()->set_s9e_services(new phpbb_mock_container_builder())->get('text_formatter.parser');
-
 		return array(
 			/**
 			* Normal post
@@ -73,7 +70,7 @@ public function submit_post_data()
 			*/
 			array(
 				array(
-					'message'			=> $parser->parse(implode(' ', array(
+					'message'			=> implode(' ', array(
 						'[mention=u:2]poster[/mention] poster should not be notified',
 						'[mention=u:3]test[/mention] test should be notified',
 						'[mention=u:4]unauthorized[/mention] unauthorized to read, should not receive a notification',
@@ -83,7 +80,7 @@ public function submit_post_data()
 						'[mention=g:1]normal group[/mention] group members of a normal group shoud receive a notification',
 						'[mention=g:2]hidden group[/mention] group members of a hidden group shoud not receive a notification from a non-member',
 						'[mention=u:10]doesn\'t exist[/mention] user does not exist, should not receive a notification',
-					))),
+					)),
 					'bbcode_uid'		=> 'uid',
 				),
 				array(
@@ -105,7 +102,7 @@ public function submit_post_data()
 			*/
 			array(
 				array(
-					'message'			=> $parser->parse(implode(' ', array(
+					'message'			=> implode(' ', array(
 						'[mention=u:2]poster[/mention] poster should not be notified',
 						'[mention=u:3]test[/mention] test should be notified',
 						'[mention=u:4]unauthorized[/mention] unauthorized to read, should not receive a notification',
@@ -113,7 +110,7 @@ public function submit_post_data()
 						'[mention=u:6]disabled[/mention] option disabled, should not receive a notification',
 						'[mention=u:7]default[/mention] option set to default, should receive a notification',
 						'[mention=u:8]doesn\'t exist[/mention] user does not exist, should not receive a notification',
-					))),
+					)),
 					'bbcode_uid'		=> 'uid',
 					'force_approved_state' => false,
 				),
diff --git a/tests/notification/submit_post_type_post_in_queue_test.php b/tests/notification/submit_post_type_post_in_queue_test.php
index 3ef4395c0f9..002bb60f2b9 100644
--- a/tests/notification/submit_post_type_post_in_queue_test.php
+++ b/tests/notification/submit_post_type_post_in_queue_test.php
@@ -19,6 +19,8 @@ class phpbb_notification_submit_post_type_post_in_queue_test extends phpbb_notif
 
 	protected function setUp(): void
 	{
+		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log;
+
 		parent::setUp();
 
 		global $auth;
@@ -62,7 +64,7 @@ protected function setUp(): void
 	* submit_post() $mode = 'reply'
 	* Notification item_type = 'post_in_queue'
 	*/
-	public function submit_post_data()
+	public static function submit_post_data()
 	{
 		return array(
 			/**
diff --git a/tests/notification/submit_post_type_post_test.php b/tests/notification/submit_post_type_post_test.php
index d63822bad0e..cb6008f500e 100644
--- a/tests/notification/submit_post_type_post_test.php
+++ b/tests/notification/submit_post_type_post_test.php
@@ -19,6 +19,8 @@ class phpbb_notification_submit_post_type_post_test extends phpbb_notification_s
 
 	protected function setUp(): void
 	{
+		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log;
+
 		parent::setUp();
 
 		global $auth;
@@ -59,7 +61,7 @@ protected function setUp(): void
 	* submit_post() $mode = 'reply'
 	* Notification item_type = 'post'
 	*/
-	public function submit_post_data()
+	public static function submit_post_data()
 	{
 		return array(
 			/**
diff --git a/tests/notification/submit_post_type_quote_test.php b/tests/notification/submit_post_type_quote_test.php
index fd73a264fa4..92222f9e41f 100644
--- a/tests/notification/submit_post_type_quote_test.php
+++ b/tests/notification/submit_post_type_quote_test.php
@@ -19,6 +19,8 @@ class phpbb_notification_submit_post_type_quote_test extends phpbb_notification_
 
 	protected function setUp(): void
 	{
+		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log;
+
 		parent::setUp();
 
 		global $auth;
@@ -49,11 +51,8 @@ protected function setUp(): void
 	* submit_post() $mode = 'reply'
 	* Notification item_type = 'quote'
 	*/
-	public function submit_post_data()
+	public static function submit_post_data()
 	{
-		// The new mock container is needed because the data providers may be executed before phpunit call setUp()
-		$parser = $this->get_test_case_helpers()->set_s9e_services(new phpbb_mock_container_builder())->get('text_formatter.parser');
-
 		return array(
 			/**
 			* Normal post
@@ -68,7 +67,7 @@ public function submit_post_data()
 			*/
 			array(
 				array(
-					'message'			=> $parser->parse(implode(' ', array(
+					'message'			=> implode(' ', array(
 						'[quote="poster"]poster should not be notified[/quote]',
 						'[quote="test"]test should be notified[/quote]',
 						'[quote="unauthorized"]unauthorized to read, should not receive a notification[/quote]',
@@ -76,7 +75,7 @@ public function submit_post_data()
 						'[quote="disabled"]option disabled, should not receive a notification[/quote]',
 						'[quote="default"]option set to default, should receive a notification[/quote]',
 						'[quote="doesn\'t exist"]user does not exist, should not receive a notification[/quote]',
-					))),
+					)),
 					'bbcode_uid'		=> 'uid',
 				),
 				array(
@@ -97,7 +96,7 @@ public function submit_post_data()
 			*/
 			array(
 				array(
-					'message'			=> $parser->parse(implode(' ', array(
+					'message'			=> implode(' ', array(
 						'[quote="poster"]poster should not be notified[/quote]',
 						'[quote="test"]test should be notified[/quote]',
 						'[quote="unauthorized"]unauthorized to read, should not receive a notification[/quote]',
@@ -105,7 +104,7 @@ public function submit_post_data()
 						'[quote="disabled"]option disabled, should not receive a notification[/quote]',
 						'[quote="default"]option set to default, should receive a notification[/quote]',
 						'[quote="doesn\'t exist"]user does not exist, should not receive a notification[/quote]',
-					))),
+					)),
 					'bbcode_uid'		=> 'uid',
 					'force_approved_state' => false,
 				),
diff --git a/tests/notification/submit_post_type_topic_test.php b/tests/notification/submit_post_type_topic_test.php
index b4297dee6b6..28403ec0ed9 100644
--- a/tests/notification/submit_post_type_topic_test.php
+++ b/tests/notification/submit_post_type_topic_test.php
@@ -19,9 +19,9 @@ class phpbb_notification_submit_post_type_topic_test extends phpbb_notification_
 
 	protected function setUp(): void
 	{
-		parent::setUp();
+		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log;
 
-		global $auth, $phpbb_log;
+		parent::setUp();
 
 		// Add additional permissions
 		$auth->expects($this->any())
@@ -41,8 +41,6 @@ protected function setUp(): void
 					),
 				),
 			)));
-
-		$phpbb_log = $this->createMock('\phpbb\log\dummy');
 	}
 
 	/**
@@ -51,7 +49,7 @@ protected function setUp(): void
 	* submit_post() $mode = 'post'
 	* Notification item_type = 'topic'
 	*/
-	public function submit_post_data()
+	public static function submit_post_data()
 	{
 		return array(
 			/**
@@ -97,6 +95,8 @@ public function submit_post_data()
 	 */
 	public function test_submit_post($additional_post_data, $expected_before, $expected_after)
 	{
+		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log;
+
 		$sql = 'SELECT user_id, item_id, item_parent_id
 			FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt
 			WHERE nt.notification_type_name = '" . $this->item_type . "'
diff --git a/tests/notification/user_list_trim_test.php b/tests/notification/user_list_trim_test.php
index 6ae225b6678..640adf6e4e4 100644
--- a/tests/notification/user_list_trim_test.php
+++ b/tests/notification/user_list_trim_test.php
@@ -66,11 +66,11 @@ protected function setUp(): void
 		$user_loader->load_users(array(2, 3, 4, 5, 6));
 
 		$this->notification = new phpbb_mock_notification_type_post(
-			$user_loader, null, null, $lang, $user, null, null, $phpbb_root_path, $phpEx, null, null
+			$user_loader, null, null, null, $lang, $user, null, null, $phpbb_root_path, $phpEx, null, null
 		);
 	}
 
-	public function user_list_trim_data()
+	public static function user_list_trim_data()
 	{
 		return array(
 			array(
diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php
index 0a665c1cfb4..a7539438354 100644
--- a/tests/pagination/pagination_test.php
+++ b/tests/pagination/pagination_test.php
@@ -15,6 +15,10 @@
 
 class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 {
+	protected $config;
+	protected $helper;
+	protected $routing_helper;
+	protected $pagination;
 	protected $test_path = 'tests/pagination';
 
 	public function return_callback_implode()
@@ -49,9 +53,9 @@ protected function setUp(): void
 		$router = new phpbb_mock_router(new phpbb_mock_container_builder(), $resources_locator, $loader, 'php', __DIR__ . '/', true, true);
 
 		$request = new phpbb_mock_request();
-		$request->overwrite('SCRIPT_NAME', '/app.php', \phpbb\request\request_interface::SERVER);
-		$request->overwrite('SCRIPT_FILENAME', 'app.php', \phpbb\request\request_interface::SERVER);
-		$request->overwrite('REQUEST_URI', '/app.php', \phpbb\request\request_interface::SERVER);
+		$request->overwrite('SCRIPT_NAME', '/index.php', \phpbb\request\request_interface::SERVER);
+		$request->overwrite('SCRIPT_FILENAME', 'index.php', \phpbb\request\request_interface::SERVER);
+		$request->overwrite('REQUEST_URI', '/index.php', \phpbb\request\request_interface::SERVER);
 
 		$symfony_request = new \phpbb\symfony_request(
 			$request
@@ -82,7 +86,7 @@ protected function setUp(): void
 		$this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper, $phpbb_dispatcher);
 	}
 
-	public function generate_template_pagination_data()
+	public static function generate_template_pagination_data()
 	{
 		return array(
 			array(
@@ -229,7 +233,7 @@ public function test_generate_template_pagination_double_nested($base_url, $star
 		$this->assertEquals(str_replace("\t", '', $expect), $this->display('test'));
 	}
 
-	public function on_page_data()
+	public static function on_page_data()
 	{
 		return array(
 			array(
@@ -255,7 +259,7 @@ public function test_on_page($num_items, $per_page, $start_item, $expect_return)
 		$this->assertEquals($expect_return, $this->pagination->on_page($num_items, $per_page, $start_item));
 	}
 
-	public function validate_start_data()
+	public static function validate_start_data()
 	{
 		return array(
 			array(
@@ -304,7 +308,7 @@ public function test_validate_start($start, $num_items, $expect)
 		$this->assertEquals($expect, $this->pagination->validate_start($start, 10, $num_items));
 	}
 
-	public function reverse_start_data()
+	public static function reverse_start_data()
 	{
 		return array(
 			array(
@@ -330,7 +334,7 @@ public function test_reverse_start($start, $limit, $num_items, $expect)
 		$this->assertEquals($expect, $this->pagination->reverse_start($start, $limit, $num_items));
 	}
 
-	public function reverse_limit_data()
+	public static function reverse_limit_data()
 	{
 		return array(
 			array(
diff --git a/tests/passwords/drivers_test.php b/tests/passwords/drivers_test.php
index 51da57c2782..d690979a8d0 100644
--- a/tests/passwords/drivers_test.php
+++ b/tests/passwords/drivers_test.php
@@ -11,11 +11,22 @@
 *
 */
 
-class phpbb_passwords_helper_test extends \phpbb_test_case
+class phpbb_passwords_drivers_test extends \phpbb_test_case
 {
+	/** @var \phpbb\passwords\driver\helper */
+	protected $driver_helper = [];
+
 	/** @var array */
 	protected $passwords_drivers = [];
 
+	// Initialize argon2 default options
+	public static $argon2_default_cost_options =
+	[
+		'memory_cost'	=> 65536,
+		'time_cost'		=> 4,
+		'threads'		=> 2
+	];
+
 	protected function setUp(): void
 	{
 		// Prepare dependencies for drivers
@@ -25,13 +36,6 @@ protected function setUp(): void
 		$phpbb_root_path = __DIR__ . '/../../phpBB/';
 		$php_ext = 'php';
 
-		// Initialize argon2 default options
-		$this->argon2_default_cost_options = [
-			'memory_cost' => 65536,
-			'time_cost'   => 4,
-			'threads'     => 2
-		];
-
 		$this->passwords_drivers = array(
 			'passwords.driver.bcrypt_2y'	=> new \phpbb\passwords\driver\bcrypt_2y($config, $this->driver_helper, 10),
 			'passwords.driver.bcrypt'	=> new \phpbb\passwords\driver\bcrypt($config, $this->driver_helper, 10),
@@ -52,17 +56,17 @@ protected function setUp(): void
 		if (defined('PASSWORD_ARGON2I') && $pwhash_supported)
 		{
 			$this->passwords_drivers['passwords.driver.argon2i'] = new \phpbb\passwords\driver\argon2i($config, $this->driver_helper);
-			$this->argon2_default_cost_options = $this->passwords_drivers['passwords.driver.argon2i']->get_options();
+			self::$argon2_default_cost_options = $this->passwords_drivers['passwords.driver.argon2i']->get_options();
 		}
 
 		if (defined('PASSWORD_ARGON2ID') && $pwhash_supported)
 		{
 			$this->passwords_drivers['passwords.driver.argon2id'] = new \phpbb\passwords\driver\argon2id($config, $this->driver_helper);
-			$this->argon2_default_cost_options = $this->passwords_drivers['passwords.driver.argon2id']->get_options();
+			self::$argon2_default_cost_options = $this->passwords_drivers['passwords.driver.argon2id']->get_options();
 		}
 	}
 
-	public function data_helper_encode64()
+	public static function data_helper_encode64()
 	{
 		return array(
 			array('foobars', 6, 'axqPW3aQ'),
@@ -80,7 +84,7 @@ public function test_helper_encode64($input, $length, $output)
 		$this->assertSame($output, $return);
 	}
 
-	public function data_get_random_salt()
+	public static function data_get_random_salt()
 	{
 		return array(
 			array(24, false),
@@ -118,7 +122,7 @@ public function test_get_hash_settings_salted_md5()
 		$this->assertEquals(false, $this->passwords_drivers['passwords.driver.salted_md5']->get_hash_settings(false));
 	}
 
-	public function data_hash_sha1_smf()
+	public static function data_hash_sha1_smf()
 	{
 		return array(
 			array(false, 'test', array()),
@@ -135,7 +139,7 @@ public function test_hash_sha1_smf($expected, $password, $user_row)
 		$this->assertSame($expected, $this->passwords_drivers['passwords.driver.sha1_smf']->hash($password, $user_row));
 	}
 
-	public function data_get_settings()
+	public static function data_get_settings()
 	{
 		return array(
 			array(false, '6f9e2a1899e1f15708fd2e554103480eb53e8b57', 'passwords.driver.sha1_smf'),
@@ -150,7 +154,7 @@ public function test_get_settings_only($expected, $hash, $driver)
 		$this->assertSame($expected, $this->passwords_drivers[$driver]->get_settings_only($hash));
 	}
 
-	public function data_md5_phpbb2_check()
+	public static function data_md5_phpbb2_check()
 	{
 		return array(
 			array(false, 'foobar', 'ae2fc75e20ee25d4520766788fbc96ae'),
@@ -158,8 +162,8 @@ public function data_md5_phpbb2_check()
 			array(false, 'fööbar', 'ae2fc75e20ee25d4520766788fbc96ae'),
 			array(true, 'fööbar', 'ae2fc75e20ee25d4520766788fbc96ae', utf8_decode('fööbar')),
 			array(true, 'fööbar', '$H$966CepJh9RC3hFIm7aKywR6jEn0kpA0', utf8_decode('fööbar')),
-			array(true, 'fööbar', '$H$9rNjgwETtmc8befO8JL1xFMrrMw8MC.', $this->utf8_to_cp1252(utf8_decode('fööbar'))),
-			array(true, 'fööbar', '$H$9rNjgwETtmc8befO8JL1xFMrrMw8MC.', $this->utf8_to_cp1252('fööbar')),
+			array(true, 'fööbar', '$H$9rNjgwETtmc8befO8JL1xFMrrMw8MC.', self::utf8_to_cp1252(utf8_decode('fööbar'))),
+			array(true, 'fööbar', '$H$9rNjgwETtmc8befO8JL1xFMrrMw8MC.', self::utf8_to_cp1252('fööbar')),
 		);
 	}
 
@@ -194,7 +198,7 @@ public function test_sha1_driver()
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1']->hash('foobar'));
 	}
 
-	public function data_md5_mybb_check()
+	public static function data_md5_mybb_check()
 	{
 		return array(
 			array(false, 'foobar', '083d11daea8675b1b4b502c7e55f8dbd'),
@@ -216,7 +220,7 @@ public function test_md5_mybb_driver()
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_mybb']->hash('foobar'));
 	}
 
-	public function data_md5_vb_check()
+	public static function data_md5_vb_check()
 	{
 		return array(
 			array(false, 'foobar', '083d11daea8675b1b4b502c7e55f8dbd'),
@@ -240,7 +244,7 @@ public function test_md5_vb_driver()
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_vb']->hash('foobar'));
 	}
 
-	public function data_sha1_wcf1_check()
+	public static function data_sha1_wcf1_check()
 	{
 		return array(
 			array(false, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff'),
@@ -262,7 +266,7 @@ public function test_sha1_wcf1_driver()
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1_wcf1']->hash('foobar'));
 	}
 
-	public function data_bcrypt_wcf2_check()
+	public static function data_bcrypt_wcf2_check()
 	{
 		return array(
 			array(false, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff'),
@@ -284,7 +288,7 @@ public function test_bcrypt_wcf2_driver()
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.bcrypt_wcf2']->hash('foobar'));
 	}
 
-	public function data_sha_xf1_check()
+	public static function data_sha_xf1_check()
 	{
 		return array(
 			array(false, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff'),
@@ -307,7 +311,7 @@ public function test_sha_xf1_driver()
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha_xf1']->hash('foobar'));
 	}
 
-	protected function utf8_to_cp1252($string)
+	protected static function utf8_to_cp1252($string)
 	{
 		static $transform = array(
 			"\xE2\x82\xAC" => "\x80",
@@ -437,36 +441,24 @@ protected function utf8_to_cp1252($string)
 		return strtr($string, $transform);
 	}
 
-	public function data_needs_rehash()
+	public static function data_needs_rehash()
 	{
-		$data_array = [
+		return [
 			array('passwords.driver.bcrypt_2y', '$2y$10$somerandomhash', false),
 			array('passwords.driver.bcrypt', '$2a$10$somerandomhash', false),
 			array('passwords.driver.salted_md5', 'foobar', false),
 			array('passwords.driver.bcrypt_2y', '$2y$9$somerandomhash', true),
 			array('passwords.driver.bcrypt', '$2a$04$somerandomhash', true),
-		];
 
-		if (isset($this->passwords_drivers['passwords.driver.argon2i']))
-		{
-			$data_array = array_merge($data_array, [
-				array('passwords.driver.argon2i', '$argon2i$v=19$m=' . $this->argon2_default_cost_options['memory_cost'] . ',t=' . $this->argon2_default_cost_options['time_cost'] . ',p=' . $this->argon2_default_cost_options['threads'] . '$NEF0S1JSN04yNGQ1UVRKdA$KYGNI9CbjoKh1UEu1PpdlqbuLbveGwkMcwcT2Un9pPM', false),
-				array('passwords.driver.argon2i', '$argon2i$v=19$m=128,t=2,p=2$M29GUi51QjdKLjIzbC9scQ$6h1gZDqn7JTmVdQ0lJh1x5nyvgO/DaJWUKOFJ0itCJ0', true),
-				array('passwords.driver.argon2i', '$argon2i$v=19$m=1024,t=1,p=2$UnFHb2F4NER3M0xWWmxMUQ$u3javvoAZJeIyR1P3eg0tb8VjEeXvQPagqwetonq1NA', true),
-				array('passwords.driver.argon2i', '$argon2i$v=19$m=1024,t=2,p=1$bm5SeGJ3R3ZRY1A0YXJPNg$v1A9m4sJW+ge0RBtpJ4w9861+J9xkguKBAsZHrG8LQU', true),
-			]);
-		}
+			array('passwords.driver.argon2i', '$argon2i$v=19$m=' . self::$argon2_default_cost_options['memory_cost'] . ',t=' . self::$argon2_default_cost_options['time_cost'] . ',p=' . self::$argon2_default_cost_options['threads'] . '$NEF0S1JSN04yNGQ1UVRKdA$KYGNI9CbjoKh1UEu1PpdlqbuLbveGwkMcwcT2Un9pPM', false),
+			array('passwords.driver.argon2i', '$argon2i$v=19$m=128,t=2,p=2$M29GUi51QjdKLjIzbC9scQ$6h1gZDqn7JTmVdQ0lJh1x5nyvgO/DaJWUKOFJ0itCJ0', true),
+			array('passwords.driver.argon2i', '$argon2i$v=19$m=1024,t=1,p=2$UnFHb2F4NER3M0xWWmxMUQ$u3javvoAZJeIyR1P3eg0tb8VjEeXvQPagqwetonq1NA', true),
+			array('passwords.driver.argon2i', '$argon2i$v=19$m=1024,t=2,p=1$bm5SeGJ3R3ZRY1A0YXJPNg$v1A9m4sJW+ge0RBtpJ4w9861+J9xkguKBAsZHrG8LQU', true),
 
-		if (isset($this->passwords_drivers['passwords.driver.argon2id']))
-		{
-			$data_array = array_merge($data_array, [
-				array('passwords.driver.argon2id', '$argon2id$v=19$m=' . $this->argon2_default_cost_options['memory_cost'] . ',t=' . $this->argon2_default_cost_options['time_cost'] . ',p=' . $this->argon2_default_cost_options['threads'] . '$MXB4OW5sczE5TnFPYkEuYQ$2bxaMIp8+9x37O6v8zkqpBU72ohCibUrtgVZw7vyr5Q', false),
-				array('passwords.driver.argon2id', '$argon2id$v=19$m=128,t=2,p=2$RWV2VFAuWXk5bTVjbktOLg$Nt7Z7koa25SVRSKr3RKqjwKz26FENDuU+aL1DfMcWRo', true),
-				array('passwords.driver.argon2id', '$argon2id$v=19$m=1024,t=1,p=2$Rmw5M21IUFZDVEltYU0uTA$GIObGbHV6sOw5OQEtF8z+2ESztT96OWhCk17sUlwLAY', true),
-			]);
-		}
-
-		return $data_array;
+			array('passwords.driver.argon2id', '$argon2id$v=19$m=' . self::$argon2_default_cost_options['memory_cost'] . ',t=' . self::$argon2_default_cost_options['time_cost'] . ',p=' . self::$argon2_default_cost_options['threads'] . '$MXB4OW5sczE5TnFPYkEuYQ$2bxaMIp8+9x37O6v8zkqpBU72ohCibUrtgVZw7vyr5Q', false),
+			array('passwords.driver.argon2id', '$argon2id$v=19$m=128,t=2,p=2$RWV2VFAuWXk5bTVjbktOLg$Nt7Z7koa25SVRSKr3RKqjwKz26FENDuU+aL1DfMcWRo', true),
+			array('passwords.driver.argon2id', '$argon2id$v=19$m=1024,t=1,p=2$Rmw5M21IUFZDVEltYU0uTA$GIObGbHV6sOw5OQEtF8z+2ESztT96OWhCk17sUlwLAY', true),
+		];
 	}
 
 	/**
@@ -474,7 +466,7 @@ public function data_needs_rehash()
 	 */
 	public function test_needs_rehash($driver, $hash, $expected)
 	{
-		if (!$this->passwords_drivers[$driver]->is_supported())
+		if (!isset($this->passwords_drivers[$driver]) || !$this->passwords_drivers[$driver]->is_supported())
 		{
 			$this->markTestSkipped($driver . ' is not supported');
 		}
diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php
index 7b1b9a1cc36..273683a0976 100644
--- a/tests/passwords/manager_test.php
+++ b/tests/passwords/manager_test.php
@@ -58,7 +58,7 @@ protected function setUp(): void
 		$this->manager = new \phpbb\passwords\manager($config, $this->passwords_drivers, $this->helper, array_keys($this->passwords_drivers));
 	}
 
-	public function hash_password_data()
+	public static function hash_password_data()
 	{
 		return array(
 			array('', '2y', 60),
@@ -94,7 +94,7 @@ public function test_hash_password($type, $prefix, $length)
 		}
 	}
 
-	public function check_password_data()
+	public static function check_password_data()
 	{
 		return array(
 			array('passwords.driver.bcrypt_2y'),
@@ -126,7 +126,7 @@ public function test_check_password($hash_type)
 	}
 
 
-	public function check_hash_exceptions_data()
+	public static function check_hash_exceptions_data()
 	{
 		return array(
 			array('3858f62230ac3c915f300c664312c63f', true),
@@ -164,7 +164,7 @@ public function test_check_hash_exceptions($hash, $expected, $password = 'foobar
 		$this->assertEquals($expected, $this->manager->check($password, $hash, $user_row));
 	}
 
-	public function data_hash_password_length()
+	public static function data_hash_password_length()
 	{
 		return array(
 			array('passwords.driver.bcrypt', false),
@@ -188,7 +188,7 @@ public function test_hash_password_8bit_bcrypt()
 		$this->assertNotEquals(false, $this->manager->hash('foobar𝄞', 'passwords.driver.bcrypt_2y'));
 	}
 
-	public function combined_hash_data()
+	public static function combined_hash_data()
 	{
 		return array(
 			array(
@@ -276,7 +276,7 @@ public function test_hash_password_with_large_input()
 		$this->assertLessThanOrEqual(5, time() - $start_time);
 	}
 
-	public function data_test_string_compare()
+	public static function data_test_string_compare()
 	{
 		return array(
 			array('foo', 'bar', false),
@@ -294,7 +294,7 @@ public function test_string_compare($a, $b, $expected)
 		$this->assertSame($expected, $this->driver_helper->string_compare($a, $b));
 	}
 
-	public function data_driver_interface_driver()
+	public static function data_driver_interface_driver()
 	{
 		return array(
 			array(false, false, false),
diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php
index a2abefb1088..e5459e10991 100644
--- a/tests/path_helper/path_helper_test.php
+++ b/tests/path_helper/path_helper_test.php
@@ -17,20 +17,20 @@ class phpbb_path_helper_test extends phpbb_test_case
 {
 	/** @var \phpbb\path_helper */
 	protected $path_helper;
-	protected $phpbb_root_path = '';
+	protected static $phpbb_root_path = '';
 
 	protected function setUp(): void
 	{
 		parent::setUp();
 
-		$this->set_phpbb_root_path();
+		self::set_phpbb_root_path();
 
 		$this->path_helper = new \phpbb\path_helper(
 			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
 			$this->createMock('\phpbb\request\request'),
-			$this->phpbb_root_path,
+			self::$phpbb_root_path,
 			'php',
 			'adm/'
 		);
@@ -44,17 +44,17 @@ protected function setUp(): void
 	*	any time we wish to use it in one of these functions (and
 	*	also in general for everything else)
 	*/
-	public function set_phpbb_root_path()
+	public static function set_phpbb_root_path()
 	{
-		$this->phpbb_root_path = filesystem_helper::clean_path(__DIR__ . '/../../phpBB/');
+		self::$phpbb_root_path = filesystem_helper::clean_path(__DIR__ . '/../../phpBB/');
 	}
 
 	public function test_get_web_root_path()
 	{
-		$this->assertEquals($this->phpbb_root_path, $this->path_helper->get_web_root_path());
+		$this->assertEquals(self::$phpbb_root_path, $this->path_helper->get_web_root_path());
 
 		// Second call will use class property
-		$this->assertEquals($this->phpbb_root_path, $this->path_helper->get_web_root_path());
+		$this->assertEquals(self::$phpbb_root_path, $this->path_helper->get_web_root_path());
 	}
 
 	public function test_get_adm_relative_path()
@@ -67,9 +67,9 @@ public function test_get_php_ext()
 		$this->assertSame('php', $this->path_helper->get_php_ext());
 	}
 
-	public function basic_update_web_root_path_data()
+	public static function basic_update_web_root_path_data()
 	{
-		$this->set_phpbb_root_path();
+		self::set_phpbb_root_path();
 
 		return [
 			[
@@ -78,16 +78,16 @@ public function basic_update_web_root_path_data()
 				'/',
 			],
 			[
-				$this->phpbb_root_path . 'test.php',
-				$this->phpbb_root_path . 'test.php',
+				self::$phpbb_root_path . 'test.php',
+				self::$phpbb_root_path . 'test.php',
 			],
 			[
 				'test.php',
 				'test.php',
 			],
 			[
-				$this->phpbb_root_path . $this->phpbb_root_path . 'test.php',
-				filesystem_helper::clean_path($this->phpbb_root_path . $this->phpbb_root_path . 'test.php'),
+				self::$phpbb_root_path . self::$phpbb_root_path . 'test.php',
+				filesystem_helper::clean_path(self::$phpbb_root_path . self::$phpbb_root_path . 'test.php'),
 			],
 		];
 	}
@@ -108,92 +108,92 @@ public function test_update_web_root_path_app()
 					new phpbb_mock_request()
 				),
 				$this->createMock('\phpbb\request\request'),
-				$this->phpbb_root_path,
+				self::$phpbb_root_path,
 				'php',
 				'adm/'
 			])
-			->setMethods(['get_web_root_path'])
+			->onlyMethods(['get_web_root_path'])
 			->getMock();
 		$path_helper->method('get_web_root_path')
-			->willReturn('/var/www/phpbb/app.php/');
-		$this->assertEquals('/var/www/phpbb/app.php/foo', $path_helper->update_web_root_path($this->phpbb_root_path . 'app.php/foo'));
+			->willReturn('/var/www/phpbb/index.php/');
+		$this->assertEquals('/var/www/phpbb/index.php/foo', $path_helper->update_web_root_path(self::$phpbb_root_path . 'index.php/foo'));
 	}
 
-	public function update_web_root_path_data()
+	public static function update_web_root_path_data()
 	{
-		$this->set_phpbb_root_path();
+		self::set_phpbb_root_path();
 
 		return array(
 			array(
-				$this->phpbb_root_path . 'test.php',
+				self::$phpbb_root_path . 'test.php',
 				'/',
 				'',
 				'',
 				'',
 			),
 			array(
-				$this->phpbb_root_path . 'test.php',
+				self::$phpbb_root_path . 'test.php',
 				'//',
 				'foo/bar.php',
 				'bar.php',
 				'./../',
 			),
 			array(
-				$this->phpbb_root_path . 'test.php',
+				self::$phpbb_root_path . 'test.php',
 				'/foo/template',
-				'/phpbb3-fork/phpBB/app.php/foo/template',
-				'/phpbb3-fork/phpBB/app.php',
+				'/phpbb-fork/phpBB/index.php/foo/template',
+				'/phpbb-fork/phpBB/index.php',
 				'./../../',
 			),
 			array(
-				$this->phpbb_root_path . 'test.php',
+				self::$phpbb_root_path . 'test.php',
 				'/foo/template',
-				'/phpbb3-fork/phpBB/foo/template',
-				'/phpbb3-fork/phpBB/app.php',
+				'/phpbb-fork/phpBB/foo/template',
+				'/phpbb-fork/phpBB/index.php',
 				'./../',
 			),
 			array(
-				$this->phpbb_root_path . 'test.php',
+				self::$phpbb_root_path . 'test.php',
 				'/',
-				'/phpbb3-fork/phpBB/app.php/',
-				'/phpbb3-fork/phpBB/app.php',
+				'/phpbb-fork/phpBB/index.php/',
+				'/phpbb-fork/phpBB/index.php',
 				'./../',
 			),
 
 			// No correction if the path is already prepend by the web root path
 			array(
-				'./../' . $this->phpbb_root_path . 'test.php',
+				'./../' . self::$phpbb_root_path . 'test.php',
 				'//',
 				'foo/bar.php',
 				'bar.php',
 				'',
 			),
 			array(
-				'./../../' . $this->phpbb_root_path . 'test.php',
+				'./../../' . self::$phpbb_root_path . 'test.php',
 				'/foo/template',
-				'/phpbb3-fork/phpBB/app.php/foo/template',
-				'/phpbb3-fork/phpBB/app.php',
+				'/phpbb-fork/phpBB/index.php/foo/template',
+				'/phpbb-fork/phpBB/index.php',
 				'',
 			),
 			array(
-				'./../' . $this->phpbb_root_path . 'test.php',
+				'./../' . self::$phpbb_root_path . 'test.php',
 				'/foo/template',
-				'/phpbb3-fork/phpBB/foo/template',
-				'/phpbb3-fork/phpBB/app.php',
+				'/phpbb-fork/phpBB/foo/template',
+				'/phpbb-fork/phpBB/index.php',
 				'',
 			),
 			array(
-				'./../'.$this->phpbb_root_path . 'test.php',
+				'./../'.self::$phpbb_root_path . 'test.php',
 				'/',
-				'/phpbb3-fork/phpBB/app.php/',
-				'/phpbb3-fork/phpBB/app.php',
+				'/phpbb-fork/phpBB/index.php/',
+				'/phpbb-fork/phpBB/index.php',
 				'',
 			),
 			array(
-				'./../'.$this->phpbb_root_path . 'test.php',
+				'./../'.self::$phpbb_root_path . 'test.php',
 				'',
-				'/phpbb3-fork/phpBB/foo',
-				'/phpbb3-fork/phpBB/app.php',
+				'/phpbb-fork/phpBB/foo',
+				'/phpbb-fork/phpBB/index.php',
 				'',
 			),
 		);
@@ -218,17 +218,16 @@ public function test_update_web_root_path($input, $getPathInfo, $getRequestUri,
 		$path_helper = new \phpbb\path_helper(
 			$symfony_request,
 			$this->createMock('\phpbb\request\request'),
-			$this->phpbb_root_path,
+			self::$phpbb_root_path,
 			'php'
 		);
 
 		$this->assertEquals($correction . $input, $path_helper->update_web_root_path($input));
 	}
 
-	public function remove_web_root_path_data()
+	public static function remove_web_root_path_data()
 	{
-		$filesystem = new \phpbb\filesystem\filesystem();
-		$this->set_phpbb_root_path($filesystem);
+		self::set_phpbb_root_path();
 
 		return [
 			[
@@ -237,7 +236,7 @@ public function remove_web_root_path_data()
 			],
 			[
 				'/var/www/phpbb/test.php',
-				$this->phpbb_root_path . 'test.php'
+				self::$phpbb_root_path . 'test.php'
 			]
 		];
 	}
@@ -253,11 +252,11 @@ public function test_remove_web_root_path($input, $expected)
 					new phpbb_mock_request()
 				),
 				$this->createMock('\phpbb\request\request'),
-				$this->phpbb_root_path,
+				self::$phpbb_root_path,
 				'php',
 				'adm/'
 			])
-			->setMethods(['get_web_root_path'])
+			->onlyMethods(['get_web_root_path'])
 			->getMock();
 		$path_helper->method('get_web_root_path')
 			->willReturn('/var/www/phpbb/');
@@ -265,7 +264,7 @@ public function test_remove_web_root_path($input, $expected)
 		$this->assertEquals($expected, $path_helper->remove_web_root_path($input));
 	}
 
-	public function clean_url_data()
+	public static function clean_url_data()
 	{
 		return array(
 			array('', ''),
@@ -288,7 +287,7 @@ public function test_clean_url($input, $expected)
 		$this->assertEquals($expected, $this->path_helper->clean_url($input));
 	}
 
-	public function glue_url_params_data()
+	public static function glue_url_params_data()
 	{
 		return array(
 			array(
@@ -326,7 +325,7 @@ public function test_glue_url_params($params, $expected)
 		$this->assertEquals($expected, $this->path_helper->glue_url_params($params));
 	}
 
-	public function get_url_parts_data()
+	public static function get_url_parts_data()
 	{
 		return array(
 			array(
@@ -390,7 +389,7 @@ public function test_get_url_parts($url, $is_amp, $expected)
 		$this->assertEquals($expected, $this->path_helper->get_url_parts($url, $is_amp));
 	}
 
-	public function strip_url_params_data()
+	public static function strip_url_params_data()
 	{
 		return array(
 			array(
@@ -428,7 +427,7 @@ public function test_strip_url_params($url, $strip, $is_amp, $expected)
 		$this->assertEquals($expected, $this->path_helper->strip_url_params($url, $strip, $is_amp));
 	}
 
-	public function append_url_params_data()
+	public static function append_url_params_data()
 	{
 		return array(
 			array(
@@ -462,11 +461,8 @@ public function test_get_web_root_path_ajax()
 	{
 		$symfony_request = $this->getMockBuilder('\phpbb\symfony_request')
 			->setConstructorArgs([new phpbb_mock_request()])
-			->setMethods(['get', 'getSchemeAndHttpHost', 'getBasePath', 'getPathInfo'])
+			->onlyMethods(['get', 'getSchemeAndHttpHost', 'getBasePath', 'getPathInfo'])
 			->getMock();
-		$symfony_request->method('get')
-			->with('_referer')
-			->willReturn('http://www.phpbb.com/community/route1/route2/');
 		$symfony_request->method('getSchemeAndHttpHost')
 			->willReturn('http://www.phpbb.com');
 		$symfony_request->method('getBasePath')
@@ -480,16 +476,19 @@ public function test_get_web_root_path_ajax()
 			->willReturn(true);
 		$request->method('escape')
 			->willReturnArgument(0);
+		$request->method('header')
+			->with('Referer')
+			->willReturn('http://www.phpbb.com/community/route1/route2/');
 
 		$path_helper = new \phpbb\path_helper(
 			$symfony_request,
 			$request,
-			$this->phpbb_root_path,
+			self::$phpbb_root_path,
 			'php',
 			'adm/'
 		);
 
-		$this->assertEquals($this->phpbb_root_path . '../../', $path_helper->get_web_root_path());
+		$this->assertEquals(self::$phpbb_root_path . '../../', $path_helper->get_web_root_path());
 	}
 
 	/**
@@ -500,7 +499,7 @@ public function test_append_url_params($url, $params, $is_amp, $expected)
 		$this->assertEquals($expected, $this->path_helper->append_url_params($url, $params, $is_amp));
 	}
 
-	public function get_web_root_path_from_ajax_referer_data()
+	public static function get_web_root_path_from_ajax_referer_data()
 	{
 		return [
 			[
@@ -581,10 +580,10 @@ public function get_web_root_path_from_ajax_referer_data()
 	*/
 	public function test_get_web_root_path_from_ajax_referer($referer_url, $board_url, $expected)
 	{
-		$this->assertEquals($this->phpbb_root_path . $expected, $this->path_helper->get_web_root_path_from_ajax_referer($referer_url, $board_url));
+		$this->assertEquals(self::$phpbb_root_path . $expected, $this->path_helper->get_web_root_path_from_ajax_referer($referer_url, $board_url));
 	}
 
-	public function data_get_valid_page()
+	public static function data_get_valid_page()
 	{
 		return array(
 			// array( current page , mod_rewrite setting , expected output )
@@ -592,12 +591,12 @@ public function data_get_valid_page()
 			array('index', false, 'index'),
 			array('foo/index', true, 'foo/index'),
 			array('foo/index', false, 'foo/index'),
-			array('app.php/foo', true, 'foo'),
-			array('app.php/foo', false, 'app.php/foo'),
-			array('/../app.php/foo', true, '../foo'),
-			array('/../app.php/foo', false, '../app.php/foo'),
-			array('/../example/app.php/foo/bar', true, '../example/foo/bar'),
-			array('/../example/app.php/foo/bar', false, '../example/app.php/foo/bar'),
+			array('index.php/foo', true, 'foo'),
+			array('index.php/foo', false, 'index.php/foo'),
+			array('/../index.php/foo', true, '../foo'),
+			array('/../index.php/foo', false, '../index.php/foo'),
+			array('/../example/index.php/foo/bar', true, '../example/foo/bar'),
+			array('/../example/index.php/foo/bar', false, '../example/index.php/foo/bar'),
 		);
 	}
 
@@ -606,18 +605,14 @@ public function data_get_valid_page()
 	 */
 	public function test_get_valid_page($page, $mod_rewrite, $expected)
 	{
-		$this->assertEquals($this->phpbb_root_path . $expected, $this->path_helper->get_valid_page($page, $mod_rewrite));
+		$this->assertEquals(self::$phpbb_root_path . $expected, $this->path_helper->get_valid_page($page, $mod_rewrite));
 	}
 
-	public function is_router_used_data()
+	public static function is_router_used_data()
 	{
 		return [
 			[
 				'index.php',
-				false,
-			],
-			[
-				'app.php',
 				true,
 			],
 		];
@@ -630,7 +625,7 @@ public function test_is_router_used($script_name, $expected)
 	{
 		$symfony_request = $this->getMockBuilder('\phpbb\symfony_request')
 			->setConstructorArgs([new phpbb_mock_request()])
-			->setMethods(['getScriptName'])
+			->onlyMethods(['getScriptName'])
 			->getMock();
 		$symfony_request->method('getScriptName')
 			->willReturn($script_name);
@@ -638,7 +633,7 @@ public function test_is_router_used($script_name, $expected)
 		$path_helper = new \phpbb\path_helper(
 			$symfony_request,
 			$this->createMock('\phpbb\request\request'),
-			$this->phpbb_root_path,
+			self::$phpbb_root_path,
 			'php',
 			'adm/'
 		);
diff --git a/tests/plupload/plupload_test.php b/tests/plupload/plupload_test.php
index 206029d8b88..4d020bbdbf7 100644
--- a/tests/plupload/plupload_test.php
+++ b/tests/plupload/plupload_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_plupload_test extends phpbb_test_case
 {
-	public function generate_resize_string_data()
+	public static function generate_resize_string_data()
 	{
 		return array(
 			array(
@@ -61,7 +61,7 @@ public function test_generate_resize_string($config_width, $config_height, $conf
 		$this->assertEquals($expected, $plupload->generate_resize_string());
 	}
 
-	public function data_get_chunk_size()
+	public static function data_get_chunk_size()
 	{
 		return [
 			[[
@@ -113,7 +113,7 @@ public function test_get_chunk_size($limits_ary, $expected)
 		$config = new \phpbb\config\config([]);
 
 		$ini_wrapper = $this->getMockBuilder('\bantu\IniGetWrapper\IniGetWrapper')
-			->setMethods(['getBytes'])
+			->onlyMethods(['getBytes'])
 			->getMock();
 		$ini_wrapper->method('getBytes')
 			->will($this->returnValueMap([
diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php
index a50240aae3b..e618d7c2e6a 100644
--- a/tests/privmsgs/delete_user_pms_test.php
+++ b/tests/privmsgs/delete_user_pms_test.php
@@ -97,7 +97,7 @@ public function test_delete_user_pms($delete_user, $remaining_privmsgs, $remaini
 		// Works as a workaround for tests
 		$phpbb_container->set('attachment.manager', new \phpbb\attachment\delete(new \phpbb\config\config(array()), $db, new \phpbb_mock_event_dispatcher(), new \phpbb\attachment\resync($db), $storage));
 
-		phpbb_delete_user_pms($delete_user);
+		phpbb_delete_users_pms([$delete_user]);
 
 		$sql = 'SELECT msg_id
 			FROM ' . PRIVMSGS_TABLE;
diff --git a/tests/profilefields/type_bool_test.php b/tests/profilefields/type_bool_test.php
index cfdec04eda2..f102badb31b 100644
--- a/tests/profilefields/type_bool_test.php
+++ b/tests/profilefields/type_bool_test.php
@@ -33,12 +33,12 @@ protected function setUp(): void
 			->will($this->returnCallback(array($this, 'return_callback_implode')));
 
 		$lang = $this->getMockBuilder('\phpbb\profilefields\lang_helper')
-			->setMethods(array('get_options_lang', 'is_set', 'get'))
+			->onlyMethods(array('load_option_lang', 'is_set', 'get'))
 			->setConstructorArgs(array($db, LANG_TABLE))
 			->getMock();
 
 		$lang->expects($this->any())
-			->method('get_options_lang');
+			->method('load_option_lang');
 
 		$lang->expects($this->any())
 			->method('is_set')
@@ -77,7 +77,7 @@ protected function setUp(): void
 		);
 	}
 
-	public function validate_profile_field_data()
+	public static function validate_profile_field_data()
 	{
 		return array(
 			array(
@@ -101,7 +101,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $
 		$this->assertSame($expected, $result, $description);
 	}
 
-	public function profile_value_data()
+	public static function profile_value_data()
 	{
 		return array(
 			array(
@@ -137,7 +137,7 @@ public function test_get_profile_value($value, $field_options, $expected, $descr
 		$this->assertSame($expected, $result, $description);
 	}
 
-	public function profile_value_raw_data()
+	public static function profile_value_raw_data()
 	{
 		return array(
 			array(
@@ -187,7 +187,7 @@ public function test_get_profile_value_raw($value, $field_options, $expected, $d
 
 	public function is_set_callback($field_id, $lang_id, $field_value)
 	{
-		return isset($this->options[$field_value]);
+		return isset($field_value, $this->options[$field_value]);
 	}
 
 	public function get($field_id, $lang_id, $field_value)
diff --git a/tests/profilefields/type_date_test.php b/tests/profilefields/type_date_test.php
index 75de0773d2e..679ce99256a 100644
--- a/tests/profilefields/type_date_test.php
+++ b/tests/profilefields/type_date_test.php
@@ -34,10 +34,11 @@ protected function setUp(): void
 			->will($this->returnCallback(array($this, 'create_datetime_callback')));
 
 		$this->user->timezone = new DateTimeZone('UTC');
-		$this->user->lang = array(
-			'datetime' => array(),
-			'DATE_FORMAT' => 'm/d/Y',
-		);
+		$this->user->expects($this->any())
+			->method('__get')->with('lang')->willReturn([
+				'datetime' => [],
+				'DATE_FORMAT' => 'm/d/Y',
+			]);
 
 		$request = $this->createMock('\phpbb\request\request');
 		$template = $this->createMock('\phpbb\template\template');
@@ -60,7 +61,7 @@ protected function setUp(): void
 		);
 	}
 
-	public function profile_value_data()
+	public static function profile_value_data()
 	{
 		return array(
 			array(
@@ -96,7 +97,7 @@ public function test_get_profile_value($value, $field_options, $expected, $descr
 		$this->assertSame($expected, $result, $description);
 	}
 
-	public function validate_profile_field_data()
+	public static function validate_profile_field_data()
 	{
 		return array(
 			array(
@@ -180,7 +181,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $
 		$this->assertSame($expected, $result, $description);
 	}
 
-	public function profile_value_raw_data()
+	public static function profile_value_raw_data()
 	{
 		return array(
 			array(
@@ -221,7 +222,7 @@ public function return_callback_implode()
 		return implode('-', func_get_args());
 	}
 
-	public function create_datetime_callback($time = 'now', \DateTimeZone $timezone = null)
+	public function create_datetime_callback($time = 'now', \DateTimeZone|null $timezone = null)
 	{
 		$timezone = $timezone ?: $this->user->timezone;
 		return new \phpbb\datetime($this->user, $time, $timezone);
diff --git a/tests/profilefields/type_dropdown_test.php b/tests/profilefields/type_dropdown_test.php
index 8919fbb6a41..9e979b80e26 100644
--- a/tests/profilefields/type_dropdown_test.php
+++ b/tests/profilefields/type_dropdown_test.php
@@ -35,12 +35,12 @@ protected function setUp(): void
 		$template = $this->createMock('\phpbb\template\template');
 
 		$lang = $this->getMockBuilder('\phpbb\profilefields\lang_helper')
-			->setMethods(array('get_options_lang', 'is_set', 'get'))
+			->onlyMethods(array('load_option_lang', 'is_set', 'get'))
 			->setConstructorArgs(array($db, LANG_TABLE))
 			->getMock();
 
 		$lang->expects($this->any())
-			 ->method('get_options_lang');
+			 ->method('load_option_lang');
 
 		$lang->expects($this->any())
 			 ->method('is_set')
@@ -78,7 +78,7 @@ protected function setUp(): void
 		);
 	}
 
-	public function validate_profile_field_data()
+	public static function validate_profile_field_data()
 	{
 		return array(
 			array(
@@ -132,7 +132,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $
 		$this->assertSame($expected, $result, $description);
 	}
 
-	public function profile_value_data()
+	public static function profile_value_data()
 	{
 		return array(
 			array(
@@ -175,7 +175,7 @@ public function test_get_profile_value($value, $field_options, $expected, $descr
 		$this->assertSame($expected, $result, $description);
 	}
 
-	public function profile_value_raw_data()
+	public static function profile_value_raw_data()
 	{
 		return array(
 			array(
@@ -225,7 +225,7 @@ public function test_get_profile_value_raw($value, $field_options, $expected, $d
 
 	public function is_set_callback($field_id, $lang_id, $field_value)
 	{
-		return isset($this->dropdown_options[$field_value]);
+		return isset($field_value, $this->dropdown_options[$field_value]);
 	}
 
 	public function get($field_id, $lang_id, $field_value)
diff --git a/tests/profilefields/type_int_test.php b/tests/profilefields/type_int_test.php
index a4161ce4129..1fb512e1a6a 100644
--- a/tests/profilefields/type_int_test.php
+++ b/tests/profilefields/type_int_test.php
@@ -51,7 +51,7 @@ protected function setUp(): void
 		);
 	}
 
-	public function profile_value_data()
+	public static function profile_value_data()
 	{
 		return array(
 			array(
@@ -118,7 +118,7 @@ public function test_get_profile_value($value, $field_options, $expected, $descr
 		$this->assertSame($expected, $result, $description);
 	}
 
-	public function validate_profile_field_data()
+	public static function validate_profile_field_data()
 	{
 		return array(
 			array(
@@ -172,7 +172,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $
 		$this->assertSame($expected, $result, $description);
 	}
 
-	public function profile_value_raw_data()
+	public static function profile_value_raw_data()
 	{
 		return array(
 			array(
diff --git a/tests/profilefields/type_string_test.php b/tests/profilefields/type_string_test.php
index a813cc248b2..351495069d0 100644
--- a/tests/profilefields/type_string_test.php
+++ b/tests/profilefields/type_string_test.php
@@ -56,7 +56,7 @@ protected function setUp(): void
 		);
 	}
 
-	public function validate_profile_field_data()
+	public static function validate_profile_field_data()
 	{
 		return array(
 			array(
@@ -243,7 +243,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $
 		$this->assertSame($expected, $result, $description);
 	}
 
-	public function profile_value_data()
+	public static function profile_value_data()
 	{
 		return array(
 			array(
@@ -298,7 +298,7 @@ public function test_get_profile_value($value, $field_options, $expected, $descr
 		$this->assertSame($expected, $result, $description);
 	}
 
-	public function profile_value_raw_data()
+	public static function profile_value_raw_data()
 	{
 		return array(
 			array(
diff --git a/tests/profilefields/type_url_test.php b/tests/profilefields/type_url_test.php
index 7a604ebbd44..177b3efbb12 100644
--- a/tests/profilefields/type_url_test.php
+++ b/tests/profilefields/type_url_test.php
@@ -59,7 +59,7 @@ protected function setUp(): void
 		);
 	}
 
-	public function validate_profile_field_data()
+	public static function validate_profile_field_data()
 	{
 		return array(
 			array(
@@ -152,7 +152,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $
 		$this->assertSame($expected, $result, $description);
 	}
 
-	public function profile_value_raw_data()
+	public static function profile_value_raw_data()
 	{
 		return array(
 			array(
@@ -184,7 +184,7 @@ public function profile_value_raw_data()
 		);
 	}
 
-	public function profile_value_data()
+	public static function profile_value_data()
 	{
 		return array(
 			array(
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php
index 6da6083e19d..8b1410ac7f0 100644
--- a/tests/regex/censor_test.php
+++ b/tests/regex/censor_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_regex_censor_test extends phpbb_test_case
 {
-	public function censor_test_data()
+	public static function censor_test_data()
 	{
 		return array(
 			array('bad*word', 'bad word'),
diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php
index b281941c491..ccb98558dc8 100644
--- a/tests/regex/email_test.php
+++ b/tests/regex/email_test.php
@@ -20,7 +20,7 @@ protected function setUp(): void
 		$this->regex = '#^' . get_preg_expression('email') . '$#i';
 	}
 
-	public function positive_match_data()
+	public static function positive_match_data()
 	{
 		return array(
 			array('nobody@phpbb.com'),
@@ -60,7 +60,7 @@ public function positive_match_data()
 		);
 	}
 
-	public function negative_match_data()
+	public static function negative_match_data()
 	{
 		return array(
 			array('foo.example.com'),			// @ is missing
diff --git a/tests/regex/ipv4_test.php b/tests/regex/ipv4_test.php
index 1bd8948b875..954f24bbcdb 100644
--- a/tests/regex/ipv4_test.php
+++ b/tests/regex/ipv4_test.php
@@ -20,7 +20,7 @@ protected function setUp(): void
 		$this->regex = get_preg_expression('ipv4');
 	}
 
-	public function positive_match_data()
+	public static function positive_match_data()
 	{
 		return array(
 			array('0.0.0.0'),
@@ -30,7 +30,7 @@ public function positive_match_data()
 		);
 	}
 
-	public function negative_match_data()
+	public static function negative_match_data()
 	{
 		return array(
 			// IPv6 addresses
diff --git a/tests/regex/ipv6_test.php b/tests/regex/ipv6_test.php
index 92e74a02208..720161ee8c3 100644
--- a/tests/regex/ipv6_test.php
+++ b/tests/regex/ipv6_test.php
@@ -20,7 +20,7 @@ protected function setUp(): void
 		$this->regex = get_preg_expression('ipv6');
 	}
 
-	public function positive_match_data()
+	public static function positive_match_data()
 	{
 		return array(
 			// Full length IPv6 address
@@ -97,7 +97,7 @@ public function positive_match_data()
 		);
 	}
 
-	public function negative_match_data()
+	public static function negative_match_data()
 	{
 		return array(
 			// Empty address
diff --git a/tests/regex/password_complexity_test.php b/tests/regex/password_complexity_test.php
index 37f3a0c53a3..2ee325e40dc 100644
--- a/tests/regex/password_complexity_test.php
+++ b/tests/regex/password_complexity_test.php
@@ -15,7 +15,7 @@
 
 class phpbb_password_complexity_test extends phpbb_test_case
 {
-	public function password_complexity_test_data_positive()
+	public static function password_complexity_test_data_positive()
 	{
 		return array(
 			array('12345', 'PASS_TYPE_ANY'),
@@ -33,7 +33,7 @@ public function password_complexity_test_data_positive()
 		);
 	}
 
-	public function password_complexity_test_data_negative()
+	public static function password_complexity_test_data_negative()
 	{
 		return array(
 			array('qwerty', 'PASS_TYPE_CASE'),
diff --git a/tests/regex/table_prefix_test.php b/tests/regex/table_prefix_test.php
index bf7b59ccc61..0fad1d0e1c7 100644
--- a/tests/regex/table_prefix_test.php
+++ b/tests/regex/table_prefix_test.php
@@ -13,11 +13,11 @@
 
 class phpbb_regex_table_prefix_test extends phpbb_test_case
 {
-	public function table_prefix_test_data()
+	public static function table_prefix_test_data()
 	{
 		return array(
 			array('phpbb_', 1),
-			array('phpBB3', 1),
+			array('phpBB', 1),
 			array('a', 1),
 
 			array('', 0),
diff --git a/tests/regex/url_test.php b/tests/regex/url_test.php
index 5e2a22bf73a..5e39a7ba36c 100644
--- a/tests/regex/url_test.php
+++ b/tests/regex/url_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_regex_url_test extends phpbb_test_case
 {
-	public function url_test_data()
+	public static function url_test_data()
 	{
 		return array(
 			array('http://www.phpbb.com/community/', 1),
diff --git a/tests/request/request_test.php b/tests/request/request_test.php
index d03253ceb98..3744d9b38e6 100644
--- a/tests/request/request_test.php
+++ b/tests/request/request_test.php
@@ -146,7 +146,7 @@ public function test_is_ajax_with_ajax()
 		$this->assertTrue($this->request->is_ajax());
 	}
 
-	public function data_is_secure()
+	public static function data_is_secure()
 	{
 		return array(
 			array(
diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php
index c95dce46d06..253b7abb735 100644
--- a/tests/request/request_var_test.php
+++ b/tests/request/request_var_test.php
@@ -13,15 +13,6 @@
 
 class phpbb_request_var_test extends phpbb_test_case
 {
-	/**
-	* Makes sure request_var has its standard behaviour.
-	*/
-	protected function setUp(): void
-	{
-		parent::setUp();
-		request_var(false, false, false, false, false);
-	}
-
 	/**
 	* @dataProvider request_variables
 	*/
@@ -33,7 +24,8 @@ public function test_post($variable_value, $default, $multibyte, $expected)
 		$_POST[$variable_name] = $variable_value;
 		$_REQUEST[$variable_name] = $variable_value;
 
-		$result = request_var($variable_name, $default, $multibyte);
+		$request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false);
+		$result = $request->variable($variable_name, $default, $multibyte);
 
 		$label = 'Requesting POST variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
 		$this->assertEquals($expected, $result, $label);
@@ -50,7 +42,8 @@ public function test_get($variable_value, $default, $multibyte, $expected)
 		$_GET[$variable_name] = $variable_value;
 		$_REQUEST[$variable_name] = $variable_value;
 
-		$result = request_var($variable_name, $default, $multibyte);
+		$request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false);
+		$result = $request->variable($variable_name, $default, $multibyte);
 
 		$label = 'Requesting GET variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
 		$this->assertEquals($expected, $result, $label);
@@ -69,7 +62,8 @@ public function test_cookie($variable_value, $default, $multibyte, $expected)
 		$_REQUEST[$variable_name] = false;
 		$_COOKIE[$variable_name] = $variable_value;
 
-		$result = request_var($variable_name, $default, $multibyte, true);
+		$request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false);
+		$result = $request->variable($variable_name, $default, $multibyte, \phpbb\request\request_interface::COOKIE);
 
 		$label = 'Requesting COOKIE variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
 		$this->assertEquals($expected, $result, $label);
@@ -109,11 +103,12 @@ public function test_deep_multi_dim_array_access($path, $default, $expected)
 			),
 		);
 
-		$result = request_var($path, $default);
+		$request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false);
+		$result = $request->variable($path, $default);
 		$this->assertEquals($expected, $result);
 	}
 
-	public function deep_access()
+	public static function deep_access()
 	{
 		return array(
 			// array(path, default, expected result)
@@ -124,7 +119,7 @@ public function deep_access()
 		);
 	}
 
-	public function request_variables()
+	public static function request_variables()
 	{
 		return array(
 			// strings
diff --git a/tests/request/type_cast_helper_test.php b/tests/request/type_cast_helper_test.php
index 745008ec3ae..87989646eb5 100644
--- a/tests/request/type_cast_helper_test.php
+++ b/tests/request/type_cast_helper_test.php
@@ -20,7 +20,7 @@ protected function setUp(): void
 		$this->type_cast_helper = new \phpbb\request\type_cast_helper();
 	}
 
-	public function type_cast_helper_test_data()
+	public static function type_cast_helper_test_data()
 	{
 		return [
 			[
diff --git a/tests/search/common_test_case.php b/tests/search/common_test_case.php
index fc4b461452f..f797d414f98 100644
--- a/tests/search/common_test_case.php
+++ b/tests/search/common_test_case.php
@@ -17,7 +17,7 @@ abstract class phpbb_search_common_test_case extends phpbb_search_test_case
 {
 	protected $search;
 
-	public function keywords()
+	public static function keywords()
 	{
 		return array(
 			// keywords
diff --git a/tests/search/mysql_test.php b/tests/search/mysql_test.php
index fe7326bb3e5..981d04d11ca 100644
--- a/tests/search/mysql_test.php
+++ b/tests/search/mysql_test.php
@@ -34,8 +34,10 @@ protected function setUp(): void
 		$user = $this->createMock('\phpbb\user');
 
 		//  set config values
-		$config['fulltext_mysql_min_word_len'] = 4;
-		$config['fulltext_mysql_max_word_len'] = 254;
+		$config = new \phpbb\config\config([
+			'fulltext_mysql_min_word_len' => 4,
+			'fulltext_mysql_max_word_len' => 254,
+		]);
 
 		$this->db = $this->new_dbal();
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
diff --git a/tests/search/native_test.php b/tests/search/native_test.php
index 234bfff47d3..8f74d23e6d1 100644
--- a/tests/search/native_test.php
+++ b/tests/search/native_test.php
@@ -17,6 +17,7 @@ class phpbb_search_native_test extends phpbb_search_test_case
 {
 	protected $db;
 	protected $db_tools;
+	protected $search;
 
 	public function getDataSet()
 	{
@@ -34,17 +35,24 @@ protected function setUp(): void
 		$language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 		$user = $this->createMock('\phpbb\user');
 
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
+
 		$this->db = $this->new_dbal();
 		$tools_factory = new \phpbb\db\tools\factory();
 		$this->db_tools = $tools_factory->get($this->new_doctrine_dbal());
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$class = self::get_search_wrapper('\phpbb\search\backend\fulltext_native');
-		$config['fulltext_native_min_chars'] = 2;
-		$config['fulltext_native_max_chars'] = 14;
+		$config = new \phpbb\config\config([
+			'fulltext_native_min_chars' => 2,
+			'fulltext_native_max_chars' => 14,
+			'max_num_search_keywords' => 10,
+		]);
 		$this->search = new $class($config, $this->db, $this->db_tools, $phpbb_dispatcher, $language, $user, SEARCH_RESULTS_TABLE, SEARCH_WORDLIST_TABLE, SEARCH_WORDMATCH_TABLE, $phpbb_root_path, $phpEx);
 	}
 
-	public function keywords()
+	public static function keywords()
 	{
 		return array(
 			// keywords
@@ -262,4 +270,78 @@ public function test_split_keywords($keywords, $terms, $ok, $must_contain, $must
 		}
 		$this->assert_array_content_equals($common, $this->search->get_common_words());
 	}
+
+	public static function data_split_keywords_max(): array
+	{
+		return [
+			'character count within limits separated by more spaces' => [
+				'foo    bar    baz    boo    far   faz    roo     rar    raz    zoo',
+				'all',
+				false,
+			],
+			'character count within limits separated by spaces' => [
+				'foo bar baz boo far faz roo rar raz zoo',
+				'all',
+				false,
+			],
+			'character count within limits separated by +, spaces after +' => [
+				'foo+ bar+ baz+ boo+ far+ faz+ roo+ rar+ raz+ zoo',
+				'all',
+				false,
+			],
+			'character count within limits separated by +, no spaces' => [
+				'foo+bar+baz+boo+far+faz+roo+rar+raz+zoo',
+				'all',
+				false,
+			],
+			'character count outside limits separated by +, no spaces' => [
+				'foo+bar+baz+boo+far+faz+roo+rar+raz+zoo+zar',
+				'all',
+				true,
+			],
+			'character count outside limits separated by + and spaces' => [
+				'foo +bar +baz +boo +far +faz +roo +rar +raz +zoo +zar',
+				'all',
+				true,
+			],
+			'character count outside limits separated by spaces' => [
+				'foo bar baz boo far faz roo rar raz zoo zar',
+				'all',
+				true,
+			],
+			'character count outside limits separated by -, no spaces' => [
+				'foo-bar-baz-boo-far-faz-roo-rar-raz-zoo-zar',
+				'all',
+				true,
+			],
+			'character count outside limits separated by - and spaces' => [
+				'foo -bar -baz -boo -far -faz -roo -rar -raz -zoo -zar',
+				'all',
+				true,
+			],
+			'character count outside limits separated by |, no spaces' => [
+				'foo|bar|baz|boo|far|faz|roo|rar|raz|zoo|zar',
+				'all',
+				true,
+			],
+			'character count outside limits separated by | and spaces' => [
+				'foo |bar |baz |boo |far |faz |roo |rar |raz |zoo |zar',
+				'all',
+				true,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider data_split_keywords_max
+	 */
+	public function test_split_max_keywords($keywords, $terms, $expect_error)
+	{
+		if ($expect_error)
+		{
+			$this->setExpectedTriggerError(E_USER_NOTICE, 'MAX_NUM_SEARCH_KEYWORDS_REFINE');
+		}
+
+		$this->assertTrue($this->search->split_keywords($keywords, $terms));
+	}
 }
diff --git a/tests/search/postgres_test.php b/tests/search/postgres_test.php
index 18c5a46f81e..3a699eda2c5 100644
--- a/tests/search/postgres_test.php
+++ b/tests/search/postgres_test.php
@@ -34,8 +34,10 @@ protected function setUp(): void
 		$user = $this->createMock('\phpbb\user');
 
 		//  set config values
-		$config['fulltext_postgres_min_word_len'] = 4;
-		$config['fulltext_postgres_max_word_len'] = 254;
+		$config = new \phpbb\config\config([
+			'fulltext_postgres_min_word_len' => 4,
+			'fulltext_postgres_max_word_len' => 254,
+		]);
 
 		$this->db = $this->new_dbal();
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php
index 0446673c608..f308468ce39 100644
--- a/tests/security/extract_current_page_test.php
+++ b/tests/security/extract_current_page_test.php
@@ -16,7 +16,7 @@
 
 class phpbb_security_extract_current_page_test extends phpbb_security_test_base
 {
-	public function security_variables()
+	public static function security_variables()
 	{
 		return array(
 			array('mark=forums&x="><script>alert(/XSS/);</script>', 'mark=forums&x=%22%3E%3Cscript%3Ealert%28%2FXSS%2F%29%3B%3C%2Fscript%3E'),
diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php
index 49eefa34116..203d142cb78 100644
--- a/tests/security/hash_test.php
+++ b/tests/security/hash_test.php
@@ -40,16 +40,26 @@ protected function setUp(): void
 
 	public function test_check_hash_with_phpass()
 	{
-		$this->assertTrue(phpbb_check_hash('test', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1'));
-		$this->assertTrue(phpbb_check_hash('test', '$P$9isfrtKXWqrz8PvztXlL3.daw4U0zI1'));
-		$this->assertFalse(phpbb_check_hash('foo', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1'));
+		global $phpbb_container;
+
+		/** @var \phpbb\passwords\manager $passwords_manager */
+		$passwords_manager = $phpbb_container->get('passwords.manager');
+
+		$this->assertTrue($passwords_manager->check('test', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1'));
+		$this->assertTrue($passwords_manager->check('test', '$P$9isfrtKXWqrz8PvztXlL3.daw4U0zI1'));
+		$this->assertFalse($passwords_manager->check('foo', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1'));
 	}
 
 	public function test_check_hash_with_large_input()
 	{
+		global $phpbb_container;
+
+		/** @var \phpbb\passwords\manager $passwords_manager */
+		$passwords_manager = $phpbb_container->get('passwords.manager');
+
 		// 16 MB password, should be rejected quite fast
 		$start_time = time();
-		$this->assertFalse(phpbb_check_hash(str_repeat('a', 1024 * 1024 * 16), '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1'));
+		$this->assertFalse($passwords_manager->check(str_repeat('a', 1024 * 1024 * 16), '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1'));
 		$this->assertLessThanOrEqual(5, time() - $start_time);
 	}
 }
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
index 74c5c2e03eb..b74c3d9d183 100644
--- a/tests/security/redirect_test.php
+++ b/tests/security/redirect_test.php
@@ -18,7 +18,7 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
 {
 	protected $path_helper;
 
-	public function provider()
+	public static function provider()
 	{
 		// array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false))
 		return array(
@@ -28,19 +28,19 @@ public function provider()
 			array("http://localhost/phpBB/memberlist.php\n\rConnection: close", false, 'INSECURE_REDIRECT', false),
 			array('javascript:test', false, false, 'http://localhost/phpBB/javascript:test'),
 			array('http://localhost/phpBB/index.php;url=', false, 'INSECURE_REDIRECT', false),
-			array('http://localhost/phpBB/app.php/foobar', false, false, 'http://localhost/phpBB/app.php/foobar'),
-			array('./app.php/foobar', false, false, 'http://localhost/phpBB/app.php/foobar'),
-			array('app.php/foobar', false, false, 'http://localhost/phpBB/app.php/foobar'),
-			array('./../app.php/foobar', false, false, 'http://localhost/app.php/foobar'),
-			array('./../app.php/foobar', true, false, 'http://localhost/app.php/foobar'),
-			array('./../app.php/foo/bar', false, false, 'http://localhost/app.php/foo/bar'),
-			array('./../app.php/foo/bar', true, false, 'http://localhost/app.php/foo/bar'),
+			array('http://localhost/phpBB/index.php/foobar', false, false, 'http://localhost/phpBB/index.php/foobar'),
+			array('./index.php/foobar', false, false, 'http://localhost/phpBB/index.php/foobar'),
+			array('index.php/foobar', false, false, 'http://localhost/phpBB/index.php/foobar'),
+			array('./../index.php/foobar', false, false, 'http://localhost/index.php/foobar'),
+			array('./../index.php/foobar', true, false, 'http://localhost/index.php/foobar'),
+			array('./../index.php/foo/bar', false, false, 'http://localhost/index.php/foo/bar'),
+			array('./../index.php/foo/bar', true, false, 'http://localhost/index.php/foo/bar'),
 			array('./../foo/bar', false, false, 'http://localhost/foo/bar'),
 			array('./../foo/bar', true, false, 'http://localhost/foo/bar'),
-			array('app.php/', false, false, 'http://localhost/phpBB/app.php/'),
-			array('app.php/a', false, false, 'http://localhost/phpBB/app.php/a'),
-			array('app.php/a/b', false, false, 'http://localhost/phpBB/app.php/a/b'),
-			array('./app.php/', false, false, 'http://localhost/phpBB/app.php/'),
+			array('index.php/', false, false, 'http://localhost/phpBB/index.php/'),
+			array('index.php/a', false, false, 'http://localhost/phpBB/index.php/a'),
+			array('index.php/a/b', false, false, 'http://localhost/phpBB/index.php/a/b'),
+			array('./index.php/', false, false, 'http://localhost/phpBB/index.php/'),
 			array('foobar', false, false, 'http://localhost/phpBB/foobar'),
 			array('./foobar', false, false, 'http://localhost/phpBB/foobar'),
 			array('foo/bar', false, false, 'http://localhost/phpBB/foo/bar'),
diff --git a/tests/session/append_sid_test.php b/tests/session/append_sid_test.php
index 4e5a2386445..4bd5dbdbdd3 100644
--- a/tests/session/append_sid_test.php
+++ b/tests/session/append_sid_test.php
@@ -14,7 +14,7 @@
 class phpbb_session_append_sid_test extends phpbb_test_case
 {
 
-	public function append_sid_data()
+	public static function append_sid_data()
 	{
 		return array(
 			array('viewtopic.php?t=1&amp;f=2', false, true, false, 'viewtopic.php?t=1&amp;f=2', 'parameters in url-argument'),
diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
index 44a4012d3b2..9efaaf0a42d 100644
--- a/tests/session/check_ban_test.php
+++ b/tests/session/check_ban_test.php
@@ -26,14 +26,22 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_banlist.xml');
 	}
 
-	static function check_banned_data()
+	static function check_banned_data(): array
 	{
-		return array(
-		    array('All false values, should not be banned',
-				 false, false, false, false, /* should be banned? -> */ false),
-			array('Matching values in the database, should be banned',
-				 4, '127.0.0.1', 'bar@example.org', true, /* should be banned? -> */ true),
-		);
+		return [
+			'not_banned' => [
+				'All false values, should not be banned',
+				false, false, false, false, /* should be banned? -> */ false
+			],
+			'banned' => [
+				'Matching values in the database, should be banned',
+				4, '127.0.0.1', 'bar@example.org', true, /* should be banned? -> */ true
+			],
+			'banned_with_trigger_error' => [
+				'Matching values in the database, should be banned',
+				4, '127.0.0.1', 'bar@example.org', false, /* should be banned? -> */ true
+			],
+		];
 	}
 
 	protected function setUp(): void
@@ -67,7 +75,7 @@ protected function setUp(): void
 		// the mock cache object does not hit the database as is needed
 		// for this test.
 		$cache = new \phpbb\cache\service(
-			new \phpbb\cache\driver\file(),
+			new \phpbb\cache\driver\dummy(),
 			$config,
 			$this->db,
 			$phpbb_dispatcher,
@@ -90,6 +98,17 @@ protected function setUp(): void
 
 		$ban_manager = new \phpbb\ban\manager($collection, $cache->get_driver(), $this->db, $language, $phpbb_log, $user, 'phpbb_bans', 'phpbb_users');
 		$phpbb_container->set('ban.manager', $ban_manager);
+
+		$phpbb_container->set(
+			'auth.provider.db',
+			new phpbb_mock_auth_provider()
+		);
+		$provider_collection = new \phpbb\auth\provider_collection($phpbb_container, $config);
+		$provider_collection->add('auth.provider.db');
+		$phpbb_container->set(
+			'auth.provider_collection',
+			$provider_collection
+		);
 	}
 
 	protected function tearDown(): void
@@ -103,16 +122,20 @@ protected function tearDown(): void
 	/** @dataProvider check_banned_data */
 	public function test_check_is_banned($test_msg, $user_id, $user_ips, $user_email, $return, $should_be_banned)
 	{
-		try
-		{
-			$ban = $this->session->check_ban($user_id, $user_ips, $user_email, $return);
-			$is_banned = !empty($ban);
-		}
-		catch (PHPUnit\Framework\Error\Notice $e)
-		{
-			// User error was triggered, user must have been banned
+		$is_banned = false;
+
+		// Set a custom handler to "catch" the notice
+		set_error_handler(function ($errno, $errstr) use (&$is_banned) {
 			$is_banned = true;
-		}
+			return true; // Stop PHP from handling the error further
+		}, E_USER_NOTICE);
+
+		$ban = $this->session->check_ban($user_id, $user_ips, $user_email, $return);
+
+		// Restore the default handler immediately after the call
+		restore_error_handler();
+
+		$is_banned = !empty($ban) || $is_banned;
 
 		$this->assertEquals($should_be_banned, $is_banned, $test_msg);
 	}
diff --git a/tests/session/extract_hostname_test.php b/tests/session/extract_hostname_test.php
index fe2032f547d..b55baff05ef 100644
--- a/tests/session/extract_hostname_test.php
+++ b/tests/session/extract_hostname_test.php
@@ -20,25 +20,27 @@ public function getDataSet()
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_empty.xml');
 	}
 
-	static public function extract_current_hostname_data()
+	static public function extract_current_hostname_data(): array
 	{
-		return array (
+		return [
 			// [Input] $host, $server_name_config, $cookie_domain_config, [Expected] $output
 			// If host is ip use that
 			//    ipv4
-			array('127.0.0.1', 'skipped.org', 'skipped.org', '127.0.0.1'),
+			'ipv4' => ['127.0.0.1', 'skipped.org', 'skipped.org', 'skipped.org'],
 			//    ipv6
-			array('::1', 'skipped.org', 'skipped.org', ':'),
-			array('2002::3235:51f9', 'skipped.org', 'skipped.org', '2002::3235'),
+			'ipv6' => ['::1', 'skipped.org', 'skipped.org', 'skipped.org'],
+			'ipv6_2' => ['2002::3235:51f9', 'skipped.org', 'skipped.org', 'skipped.org'],
 			// If no host but server name matches cookie_domain use that
-			array('', 'example.org', 'example.org', 'example.org'),
+			'no_host_both_configs' => ['', 'example.org', 'example.org', 'example.org'],
 			// If there is a host uri use that
-			array('example.org', false, false, 'example.org'),
+			'host_no_configs' => ['example.org', false, false, 'example.org'],
 			// 'best approach' guessing
-			array('', 'example.org', false, 'example.org'),
-			array('', false, '127.0.0.1', '127.0.0.1'),
-			array('', false, false, php_uname('n')),
-		);
+			'no_host_only_server_name' => ['', 'example.org', false, 'example.org'],
+			'no_host_only_cookie_domain' => ['', false, '127.0.0.1', '127.0.0.1'],
+			'no_host_no_config' => ['', false, false, php_uname('n')],
+			'host_is_server_config' => ['example.org', 'example.org', '.example.org', 'example.org'],
+			'host_is_cookie_domain' => ['example.org', 'foobar.org', 'example.org', 'foobar.org'],
+		];
 	}
 
 	/** @dataProvider extract_current_hostname_data */
diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index bfcd1838ef4..24e1a7166ac 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -106,17 +106,17 @@ static public function extract_current_page_data()
 			),
 			array(
 				'./',
-				'/phpBB/adm/app.php',
+				'/phpBB/adm/index.php',
 				'page=1&test=2',
 				'/phpBB/adm/',
 				'/foo/bar',
 				array(
-					'page_name' => 'app.php/foo/bar',
+					'page_name' => 'index.php/foo/bar',
 					//'page_dir' => '',
 					'query_string' => 'page=1&test=2',
 					'script_path' => '/phpBB/adm/',
 					//'root_script_path' => '/phpBB/adm/',
-					//'page' => 'app.php/foo/bar?page=1&test=2',
+					//'page' => 'index.php/foo/bar?page=1&test=2',
 					'forum' => 0,
 				),
 			),
@@ -138,17 +138,17 @@ static public function extract_current_page_data()
 			),
 			array(
 				'./community',
-				'/app.php',
+				'/index.php',
 				'',
 				'/',
 				'/kb',
 				array(
-					'page_name' => 'app.php/kb',
+					'page_name' => 'index.php/kb',
 					'page_dir' => '..',
 					'query_string' => '',
 					'script_path' => '/',
 					'root_script_path' => '/community/',
-					'page' => '../app.php/kb',
+					'page' => '../index.php/kb',
 					'forum' => 0,
 				),
 			),
diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php
index 9080478a285..e8117f08c57 100644
--- a/tests/session/garbage_collection_test.php
+++ b/tests/session/garbage_collection_test.php
@@ -30,14 +30,14 @@ protected function setUp(): void
 		global $phpbb_container;
 
 		$plugins = new \phpbb\di\service_collection($phpbb_container);
-		$plugins->add('core.captcha.plugins.nogd');
+		$plugins->add('core.captcha.plugins.recaptcha');
 		$phpbb_container->set(
 			'captcha.factory',
 			new \phpbb\captcha\factory($phpbb_container, $plugins)
 		);
 		$phpbb_container->set(
-			'core.captcha.plugins.nogd',
-			new \phpbb\captcha\plugins\nogd()
+			'core.captcha.plugins.recaptcha',
+			new \phpbb\captcha\plugins\recaptcha()
 		);
 	}
 
@@ -77,7 +77,7 @@ public function test_session_gc()
 		);
 
 		// There is an error unless the captcha plugin is set
-		$config['captcha_plugin'] = 'core.captcha.plugins.nogd';
+		$config['captcha_plugin'] = 'core.captcha.plugins.recaptcha';
 		$this->session->session_gc();
 		$this->check_expired_sessions_recent(
 			[],
@@ -132,7 +132,7 @@ public function test_cleanup_all()
 		global $config;
 		$config['session_length'] = 0;
 		// There is an error unless the captcha plugin is set
-		$config['captcha_plugin'] = 'core.captcha.plugins.nogd';
+		$config['captcha_plugin'] = 'core.captcha.plugins.recaptcha';
 		$this->session->session_gc();
 		$this->check_sessions_equals(
 			[],
diff --git a/tests/session/session_key_test.php b/tests/session/session_login_keys_test.php
similarity index 100%
rename from tests/session/session_key_test.php
rename to tests/session/session_login_keys_test.php
diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php
index 36e9fe6d3f6..a73a9eaf3dc 100644
--- a/tests/session/testable_factory.php
+++ b/tests/session/testable_factory.php
@@ -31,6 +31,7 @@ class phpbb_session_testable_factory
 	protected $config;
 	protected $cache;
 	protected $request;
+	protected $server_data;
 
 	/**
 	* Initialises the factory with a set of default config and cache values.
diff --git a/tests/storage/adapter/local_test.php b/tests/storage/adapter/local_test.php
index 2fee54b2f50..01a78845969 100644
--- a/tests/storage/adapter/local_test.php
+++ b/tests/storage/adapter/local_test.php
@@ -22,51 +22,6 @@ protected function setUp(): void
 		$this->adapter->configure(['path' => 'test_path']);
 	}
 
-	public function test_put_contents(): void
-	{
-		// When
-		$this->adapter->put_contents('file.txt', 'abc');
-
-		// Then
-		$this->assertFileExists($this->path . 'file.txt');
-		$this->assertFileContains($this->path . 'file.txt', 'abc');
-
-		// Clean test
-		unlink($this->path . 'file.txt');
-	}
-
-	public function test_get_contents(): void
-	{
-		// Given
-		file_put_contents($this->path . 'file.txt', 'abc');
-
-		// When
-		$content = $this->adapter->get_contents('file.txt');
-
-		// Then
-		$this->assertEquals('abc', $content);
-
-		// Clean test
-		unlink($this->path . 'file.txt');
-	}
-
-	public function test_exists(): void
-	{
-		// Given
-		touch($this->path . 'file.txt');
-
-		// When
-		$existent_file = $this->adapter->exists('file.txt');
-		$non_existent_file = $this->adapter->exists('noexist.txt');
-
-		// Then
-		$this->assertTrue($existent_file);
-		$this->assertFalse($non_existent_file);
-
-		// Clean test
-		unlink($this->path . 'file.txt');
-	}
-
 	public function test_delete_file(): void
 	{
 		// Given
@@ -80,48 +35,13 @@ public function test_delete_file(): void
 		$this->assertFileDoesNotExist($this->path . 'file.txt');
 	}
 
-	public function test_rename(): void
-	{
-		// Given
-		touch($this->path . 'file.txt');
-		$this->assertFileExists($this->path . 'file.txt');
-		$this->assertFileDoesNotExist($this->path . 'file2.txt');
-
-		// When
-		$this->adapter->rename('file.txt', 'file2.txt');
-
-		// Then
-		$this->assertFileDoesNotExist($this->path . 'file.txt');
-		$this->assertFileExists($this->path . 'file2.txt');
-
-		// Clean test
-		unlink($this->path . 'file2.txt');
-	}
-
-	public function test_copy(): void
-	{
-		// Given
-		file_put_contents($this->path . 'file.txt', 'abc');
-
-		// When
-		$this->adapter->copy('file.txt', 'file2.txt');
-
-		// Then
-		$this->assertFileContains($this->path . 'file.txt', 'abc');
-		$this->assertFileContains($this->path . 'file2.txt', 'abc');
-
-		// Clean test
-		unlink($this->path . 'file.txt');
-		unlink($this->path . 'file2.txt');
-	}
-
-	public function test_read_stream()
+	public function test_read()
 	{
 		// Given
 		file_put_contents($this->path . 'file.txt', 'abc');
 
 		// When
-		$stream = $this->adapter->read_stream('file.txt');
+		$stream = $this->adapter->read('file.txt');
 
 		// Then
 		$this->assertIsResource($stream);
@@ -132,14 +52,14 @@ public function test_read_stream()
 		unlink($this->path . 'file.txt');
 	}
 
-	public function test_write_stream()
+	public function test_write()
 	{
 		// Given
 		file_put_contents($this->path . 'file.txt', 'abc');
 		$stream = fopen($this->path . 'file.txt', 'rb');
 
 		// When
-		$this->adapter->write_stream('file2.txt', $stream);
+		$this->adapter->write('file2.txt', $stream);
 		fclose($stream);
 
 		// Then
diff --git a/tests/storage/adapter/local_test_case.php b/tests/storage/adapter/local_test_case.php
index 2c008120e70..dff331c694b 100644
--- a/tests/storage/adapter/local_test_case.php
+++ b/tests/storage/adapter/local_test_case.php
@@ -33,8 +33,6 @@ protected function setUp(): void
 
 		$this->adapter = new local(
 			$this->filesystem,
-			new FastImageSize(),
-			new guesser(array(new extension_guesser)),
 			$phpbb_root_path
 		);
 
diff --git a/tests/template/asset_test.php b/tests/template/asset_test.php
index 8467732bdaa..87000a0872d 100644
--- a/tests/template/asset_test.php
+++ b/tests/template/asset_test.php
@@ -15,7 +15,7 @@
 
 class phpbb_template_asset_test extends phpbb_test_case
 {
-	public function set_path_data()
+	public static function set_path_data()
 	{
 		return array(
 			// array(phpbb_root_path, given path, expected path),
@@ -35,7 +35,7 @@ public function test_set_path($phpbb_root_path, $path, $expected)
 	{
 		$path_helper = $this->getMockBuilder('\phpbb\path_helper')
 			->disableOriginalConstructor()
-			->setMethods(array())
+			->onlyMethods(['get_phpbb_root_path'])
 			->getMock();
 
 		$path_helper->method('get_phpbb_root_path')
diff --git a/tests/template/context_test.php b/tests/template/context_test.php
index a1be672f519..0f88b66a45c 100644
--- a/tests/template/context_test.php
+++ b/tests/template/context_test.php
@@ -43,7 +43,7 @@ protected function setUp(): void
 		}
 	}
 
-	public function retrieve_block_vars_data()
+	public static function retrieve_block_vars_data()
 	{
 		return array(
 			array('foo', array(), array()), // non-existent top-level block
diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php
index ea762f5b0f2..1d67cc21467 100644
--- a/tests/template/extension_test.php
+++ b/tests/template/extension_test.php
@@ -11,13 +11,11 @@
  *
  */
 
-use phpbb\controller\helper;
-
 require_once __DIR__ . '/template_test_case.php';
 
 class phpbb_template_extension_test extends phpbb_template_template_test_case
 {
-	protected function setup_engine(array $new_config = [])
+	protected function setup_engine(array $new_config = [], string $template_path = '')
 	{
 		global $config, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
 
@@ -34,13 +32,13 @@ protected function setup_engine(array $new_config = [])
 		$this->user->style['style_parent_id'] = 0;
 
 		global $auth, $request, $symfony_request, $user;
-		$user = new phpbb_mock_user();
+		$user = $this->createMock(\phpbb\user::class);
 		$user->optionset('user_id', 2);
 		$user->style['style_path'] = '';
 		$user->data['user_id'] = 2;
 		$auth = $this->getMockBuilder('phpbb\auth\auth')
 			->disableOriginalConstructor()
-			->setMethods(['acl_get'])
+			->onlyMethods(['acl_get'])
 			->getMock();
 		$auth->method('acl_get')
 			->willReturn(true);
@@ -68,9 +66,8 @@ protected function setup_engine(array $new_config = [])
 			->disableOriginalConstructor()
 			->getMock();
 
-		$controller_helper = $this->createMock(helper::class);
-		$controller_helper
-			->method('route')
+		$routing_helper = $this->createMock(\phpbb\routing\helper::class);
+		$routing_helper->method('route')
 			->willReturnCallback(function($route, $params) {
 				return 'download/avatar/' . $params['file'];
 			});
@@ -78,7 +75,7 @@ protected function setup_engine(array $new_config = [])
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$phpbb_container = new phpbb_mock_container_builder();
 		$files = new phpbb\files\factory($phpbb_container);
-		$upload_avatar_driver = new phpbb\avatar\driver\upload($config, $controller_helper, $phpbb_root_path, $phpEx, $storage, $phpbb_path_helper, $phpbb_dispatcher, $files, new \bantu\IniGetWrapper\IniGetWrapper());
+		$upload_avatar_driver = new phpbb\avatar\driver\upload($config, $phpbb_root_path, $phpEx, $storage, $phpbb_path_helper, $routing_helper, $phpbb_dispatcher, $files, new \bantu\IniGetWrapper\IniGetWrapper());
 		$upload_avatar_driver->set_name('avatar.driver.upload');
 		$phpbb_container->set('avatar.manager', new \phpbb\avatar\manager($config, $phpbb_dispatcher, [
 			$upload_avatar_driver,
@@ -87,8 +84,15 @@ protected function setup_engine(array $new_config = [])
 
 		$class = new ReflectionClass('\phpbb\avatar\manager');
 		$enabled_drivers = $class->getProperty('enabled_drivers');
-		$enabled_drivers->setAccessible(true);
 		$enabled_drivers->setValue($class, false);
+		$avatar_helper = new phpbb\avatar\helper(
+			$config,
+			$phpbb_dispatcher,
+			$lang,
+			$phpbb_container->get('avatar.manager'),
+			$phpbb_path_helper,
+			$user
+		);
 
 		$this->template_path = $this->test_path . '/templates';
 
@@ -122,7 +126,7 @@ protected function setup_engine(array $new_config = [])
 			$this->user,
 			[
 				new \phpbb\template\twig\extension($context, $twig, $this->lang),
-				new \phpbb\template\twig\extension\avatar(),
+				new \phpbb\template\twig\extension\avatar($avatar_helper),
 				new \phpbb\template\twig\extension\config($config),
 				new \phpbb\template\twig\extension\icon($this->user),
 				new \phpbb\template\twig\extension\username(),
@@ -137,51 +141,80 @@ protected function setup_engine(array $new_config = [])
 		]);
 	}
 
-	public function data_template_extensions()
+	public static function data_template_extensions()
 	{
 		return [
 			[
 				'avatar_user.html',
 				[
 					'row' => [
-						'user_avatar' => 'great_avatar.png',
-						'user_avatar_type' => 'avatar.driver.upload',
-						'user_avatar_width' => 90,
-						'user_avatar_height' => 90,
+						'src' => 'great_avatar.png',
+						'width' => 90,
+						'height' => 90,
+						'lazy' => false,
+						'title' => 'foo'
 					],
-					'alt' => 'foo'
 				],
 				[],
 				[],
-				'<img class="avatar" src="download/avatar/great_avatar.png" width="90" height="90" alt="foo" />',
+				'<img class="avatar" src="great_avatar.png" width="90" height="90" alt="foo">',
 				[]
 			],
 			[
 				'avatar_user.html',
 				[
 					'row' => [
-						'user_avatar' => 'great_avatar.png',
-						'user_avatar_type' => 'avatar.driver.upload',
-						'user_avatar_width' => 90,
-						'user_avatar_height' => 90,
+						'src' => 'great_avatar.png',
+						'width' => 90,
+						'height' => 90,
+						'title' => 'foo',
+						'lazy' => true,
 					],
-					'alt' => 'foo',
-					'ignore_config' => true,
-					'lazy' => true,
 				],
 				[],
 				[],
-				'<img class="avatar" src="phpBB/styles//theme/images/no_avatar.gif" data-src="download/avatar/great_avatar.png" width="90" height="90" alt="foo" />',
+				'<img class="avatar" src="phpBB/styles//theme/images/no_avatar.gif" data-src="great_avatar.png" width="90" height="90" alt="foo">',
 				[]
 			],
 			[
-				'avatar_user.html',
+				'avatar_group.html',
+				[
+					'row' => [
+						'src' => 'great_avatar.png',
+						'width' => 90,
+						'height' => 90,
+						'title' => 'foo',
+					],
+				],
+				[],
+				[],
+				'<img class="avatar" src="great_avatar.png" width="90" height="90" alt="foo">',
+				[]
+			],
+			[
+				'avatar_group.html',
+				[
+					'row' => [
+						'src' => 'great_avatar.png',
+						'width' => 90,
+						'height' => 90,
+						'title' => 'foo',
+						'lazy' => true,
+					],
+				],
+				[],
+				[],
+				'<img class="avatar" src="phpBB/styles//theme/images/no_avatar.gif" data-src="great_avatar.png" width="90" height="90" alt="foo">',
+				[]
+			],
+			[
+				'avatar_group.html',
 				[
 					'row' => [
-						'user_avatar' => 'foo@bar.com',
-						'user_avatar_type' => 'avatar.driver.gravatar',
-						'user_avatar_width' => 90,
-						'user_avatar_height' => 90,
+						'avatar' => 'foo@bar.com',
+						'avatar_type' => 'avatar.driver.gravatar',
+						'avatar_width' => 90,
+						'avatar_height' => 90,
 					],
 					'alt' => 'foo'
 				],
@@ -278,7 +311,7 @@ public function test_template_extensions($file, $vars, $block_vars, $destroy_arr
 		$this->run_template($file, $vars, $block_vars, $destroy_array, $expected, $lang_vars);
 	}
 
-	public function data_template_icon_extension()
+	public static function data_template_icon_extension()
 	{
 		return [
 			/** Font: default */
@@ -322,7 +355,7 @@ public function data_template_icon_extension()
 					'type'			=> 'font',
 					'icon'			=> [
 						'bullhorn'		=> false,
-						'star'			=> false,
+						'thumbtack'			=> false,
 						'lock'			=> true,
 						'fire'			=> false,
 						'file'			=> true,
@@ -344,7 +377,7 @@ public function data_template_icon_extension()
 					'type'			=> 'font',
 					'icon'			=> [
 						'bullhorn'		=> false,
-						'star'			=> false,
+						'thumbtack'			=> false,
 						'lock'			=> false,
 						'fire'			=> false,
 						'file',
diff --git a/tests/template/template_allfolder_test.php b/tests/template/template_allfolder_test.php
index a495f8aff81..6b76e97ae4c 100644
--- a/tests/template/template_allfolder_test.php
+++ b/tests/template/template_allfolder_test.php
@@ -15,6 +15,9 @@
 
 class phpbb_template_allfolder_test extends phpbb_template_template_test_case
 {
+	protected $extension_manager;
+	protected $ext_template_path;
+
 	public function test_allfolder()
 	{
 		$this->setup_engine_for_allfolder();
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php
index a9b1d394515..701c7f99ee6 100644
--- a/tests/template/template_events_test.php
+++ b/tests/template/template_events_test.php
@@ -15,7 +15,9 @@
 
 class phpbb_template_template_events_test extends phpbb_template_template_test_case
 {
-	public function template_data()
+	protected $extension_manager;
+
+	public static function template_data()
 	{
 		return array(
 			/*
diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php
index a11f627c6f1..209d8c5c385 100644
--- a/tests/template/template_includecss_test.php
+++ b/tests/template/template_includecss_test.php
@@ -21,7 +21,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
 	/** @var string */
 	protected $parent_template_path;
 
-	protected function setup_engine(array $new_config = array())
+	protected function setup_engine(array $new_config = array(), string $template_path = '')
 	{
 		global $phpbb_root_path, $phpEx, $user;
 
@@ -85,7 +85,7 @@ protected function setup_engine(array $new_config = array())
 		$this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path));
 	}
 
-	public function template_data()
+	public static function template_data()
 	{
 		return array(
 			/*
diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index 9886ced6adb..63458187129 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -15,10 +15,8 @@
 
 class phpbb_template_template_includejs_test extends phpbb_template_template_test_case_with_tree
 {
-	public function template_data()
+	public static function template_data()
 	{
-		$this->setup_engine();
-
 		return array(
 			/*
 			array(
diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php
index 51cc155c9e7..5a536a72e67 100644
--- a/tests/template/template_inheritance_test.php
+++ b/tests/template/template_inheritance_test.php
@@ -18,7 +18,7 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
 	/**
 	 * @todo put test data into templates/xyz.test
 	 */
-	public function template_data()
+	public static function template_data()
 	{
 		return array(
 			// First element of the array is test name - keep them distinct
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 8faa52d8acd..bb4fa6ad6ae 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -18,7 +18,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 	/**
 	 * @todo put test data into templates/xyz.test
 	 */
-	public function template_data()
+	public static function template_data()
 	{
 		return array(
 			/*
@@ -365,15 +365,15 @@ public function template_data()
 				array(),
 				array(),
 				array(),
-				"VARIABLE\n1_VARIABLE\nVARIABLE\n1_VARIABLE",
+				"VARIABLE\n1_VARIABLE\nVARIABLE\n1_VARIABLE\nVARIABLE\n1_VARIABLE\nARY_VARIABLE",
 			),
 			array(
 				'lang_twig.html',
 				array(),
 				array(),
 				array(),
-				"Value'\n1 O'Clock\nValue\\u0027\n1\\u0020O\\u0027Clock",
-				array('VARIABLE' => "Value'", '1_VARIABLE' => "1 O'Clock"),
+				"Value'\n1 O'Clock\nValue\\u0027\n1\\u0020O\\u0027Clock\nValue'\n1 O'Clock\nfoo|bar",
+				array('VARIABLE' => "Value'", '1_VARIABLE' => "1 O'Clock", 'ARY_VARIABLE' => ['foo', 'bar']),
 			),
 			array(
 				'loop_nested_multilevel_ref.html',
@@ -637,7 +637,7 @@ public function test_retrieve_data()
 		$this->assertEquals(array('POSITION' => 'O3M2', 'ONE' => true, 'TWO' => 'two', 'THREE' => 3), $this->template->retrieve_block_vars('outer[2].middle[1]', array()), 'Retrieve all vars from a block in the template');
 	}
 
-	public function alter_block_array_data()
+	public static function alter_block_array_data()
 	{
 		return array(
 			array(
@@ -1030,7 +1030,7 @@ public function test_indexed_assign_block_vars()
 		$this->assertEquals($expect, str_replace(array("\n", "\r", "\t"), '', $this->display('test')), 'Inserting another inner block in the same place');
 	}
 
-	public function assign_block_vars_array_data()
+	public static function assign_block_vars_array_data()
 	{
 		return array(
 			array(
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 5224e24b713..68a3a5985d7 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -1,4 +1,7 @@
 <?php
+
+use phpbb\template\twig\twig;
+
 /**
 *
 * This file is part of the phpBB Forum Software package.
@@ -14,6 +17,7 @@
 class phpbb_template_template_test_case extends phpbb_test_case
 {
 	protected $lang;
+	/** @var twig */
 	protected $template;
 	protected $template_path;
 	protected $user;
@@ -31,7 +35,6 @@ public static function setUpBeforeClass(): void
 
 		$reflection = new ReflectionClass('\phpbb\language\language');
 		self::$language_reflection_lang = $reflection->getProperty('lang');
-		self::$language_reflection_lang->setAccessible(true);
 	}
 
 	protected function display($handle)
@@ -68,7 +71,7 @@ protected function config_defaults()
 		return $defaults;
 	}
 
-	protected function setup_engine(array $new_config = array())
+	protected function setup_engine(array $new_config = array(), string $template_path = '')
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -90,7 +93,7 @@ protected function setup_engine(array $new_config = array())
 			$phpEx
 		);
 
-		$this->template_path = $this->test_path . '/templates';
+		$this->template_path = $template_path ?: $this->test_path . '/templates';
 
 		$cache_path = $phpbb_root_path . 'cache/twig';
 		$context = new \phpbb\template\context();
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
index 214d3503c86..8f200a40251 100644
--- a/tests/template/template_test_case_with_tree.php
+++ b/tests/template/template_test_case_with_tree.php
@@ -21,7 +21,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
 	/** @var string */
 	protected $parent_template_path;
 
-	protected function setup_engine(array $new_config = array())
+	protected function setup_engine(array $new_config = [], string $template_path = '')
 	{
 		global $phpbb_root_path, $phpEx, $user;
 
diff --git a/tests/template/templates/avatar_group.html b/tests/template/templates/avatar_group.html
new file mode 100644
index 00000000000..d7f114fb948
--- /dev/null
+++ b/tests/template/templates/avatar_group.html
@@ -0,0 +1 @@
+{{ avatar(row) }}
diff --git a/tests/template/templates/avatar_user.html b/tests/template/templates/avatar_user.html
index bd0b9606118..d7f114fb948 100644
--- a/tests/template/templates/avatar_user.html
+++ b/tests/template/templates/avatar_user.html
@@ -1 +1 @@
-{{ avatar('user', row, alt, ignore_config, lazy) }}
+{{ avatar(row) }}
diff --git a/tests/template/templates/lang_twig.html b/tests/template/templates/lang_twig.html
index bf31012819c..a331c7f5063 100644
--- a/tests/template/templates/lang_twig.html
+++ b/tests/template/templates/lang_twig.html
@@ -3,3 +3,7 @@
 
 {{ lang_js('VARIABLE') }}
 {{ lang_js('1_VARIABLE') }}
+
+{{ lang_raw('VARIABLE') }}
+{{ lang_raw('1_VARIABLE') }}
+{{ lang_raw('ARY_VARIABLE')|join('|') }}
diff --git a/tests/template/twig_test.php b/tests/template/twig_test.php
index 69280caa156..23a14b4b4f6 100644
--- a/tests/template/twig_test.php
+++ b/tests/template/twig_test.php
@@ -100,7 +100,7 @@ public function test_get_user_style_invalid_user()
 		$run_set_user_closure($this->user);
 	}
 
-	public function data_get_user_style(): array
+	public static function data_get_user_style(): array
 	{
 		return [
 			[['style_path' => 'prosilver', 'style_parent_id' => 0], ['prosilver']],
@@ -128,7 +128,6 @@ public function test_set_style()
 		// Get loader instance
 		$template_reflection = new \ReflectionObject($this->template);
 		$loader_reflection = $template_reflection->getProperty('loader');
-		$loader_reflection->setAccessible(true);
 		/** @var \phpbb\template\twig\loader $loader */
 		$loader = $loader_reflection->getValue($this->template);
 
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 030c8100eaf..0df91f9e83b 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -12,6 +12,7 @@
 */
 
 use PHPUnit\DbUnit\TestCase;
+use Symfony\Component\Yaml\Yaml;
 
 abstract class phpbb_database_test_case extends TestCase
 {
@@ -34,25 +35,6 @@ abstract class phpbb_database_test_case extends TestCase
 	 */
 	private $db_connections_doctrine;
 
-	public function __construct($name = NULL, array $data = [], $dataName = '')
-	{
-		parent::__construct($name, $data, $dataName);
-
-		$this->backupStaticAttributesExcludeList += [
-			'SebastianBergmann\CodeCoverage\CodeCoverage' => ['instance'],
-			'SebastianBergmann\CodeCoverage\Filter' => ['instance'],
-			'SebastianBergmann\CodeCoverage\Util' => ['ignoredLines', 'templateMethods'],
-			'SebastianBergmann\Timer\Timer' => ['startTimes'],
-			'PHP_Token_Stream' => ['customTokens'],
-			'PHP_Token_Stream_CachingFactory' => ['cache'],
-
-			'phpbb_database_test_case' => ['already_connected'],
-		];
-
-		$this->db_connections = [];
-		$this->db_connections_doctrine = [];
-	}
-
 	/**
 	* @return array List of extensions that should be set up
 	*/
@@ -85,9 +67,18 @@ public static function setUpBeforeClass(): void
 			global $table_prefix;
 
 			$db = new \phpbb\db\driver\sqlite3();
-			$doctrine = \phpbb\db\doctrine\connection_factory::get_connection(new phpbb_mock_config_php_file());
+			// Some local setups may not configure a DB driver. If the configured
+			// 'dbms' is null, skip this test instead of failing with a TypeError in
+			// the connection factory which expects a non-null driver name.
+			$mock_config = new phpbb_mock_config_php_file();
+			if ($mock_config->get('dbms') === null)
+			{
+				self::markTestSkipped('Skipping schema generator tests: dbms is not configured (null) in local environment.');
+			}
+			$doctrine = \phpbb\db\doctrine\connection_factory::get_connection($mock_config);
 			$factory = new \phpbb\db\tools\factory();
 			$db_tools = $factory->get($doctrine, true);
+			$db_tools->set_table_prefix($table_prefix);
 
 			$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix, self::get_core_tables());
 			file_put_contents(self::$schema_file, json_encode($schema_generator->get_schema()));
@@ -134,6 +125,20 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
+		$this->setBackupStaticPropertiesExcludeList([
+			'SebastianBergmann\CodeCoverage\CodeCoverage' => ['instance'],
+			'SebastianBergmann\CodeCoverage\Filter' => ['instance'],
+			'SebastianBergmann\CodeCoverage\Util' => ['ignoredLines', 'templateMethods'],
+			'SebastianBergmann\Timer\Timer' => ['startTimes'],
+			'PHP_Token_Stream' => ['customTokens'],
+			'PHP_Token_Stream_CachingFactory' => ['cache'],
+
+			'phpbb_database_test_case' => ['already_connected'],
+		]);
+
+		$this->db_connections = [];
+		$this->db_connections_doctrine = [];
+
 		// Resynchronise tables if a fixture was loaded
 		if (isset($this->fixture_xml_data))
 		{
@@ -286,7 +291,7 @@ public function getConnection()
 		return $this->createDefaultDBConnection($manager->get_pdo(), 'testdb');
 	}
 
-	public function new_dbal()
+	public function new_dbal() : \phpbb\db\driver\driver_interface
 	{
 		$config = $this->get_database_config();
 
@@ -388,7 +393,7 @@ public static function get_core_tables() : array
 
 		if (empty($core_tables))
 		{
-			$tables_yml_data = \Symfony\Component\Yaml\Yaml::parseFile($phpbb_root_path . '/config/default/container/tables.yml');
+			$tables_yml_data = Yaml::parseFile($phpbb_root_path . '/config/default/container/tables.yml', Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
 
 			foreach ($tables_yml_data['parameters'] as $parameter => $table)
 			{
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index db73248f6c5..8759a1f8c04 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -327,6 +327,8 @@ protected function ensure_connected($method_name)
 	*/
 	protected function load_schema_from_file($directory, \phpbb\db\driver\driver_interface $db, \Doctrine\DBAL\Connection $doctrine)
 	{
+		global $table_prefix;
+
 		$schema = $this->dbms['SCHEMA'];
 
 		if ($this->config['dbms'] == 'phpbb\db\driver\mysql')
@@ -363,7 +365,7 @@ protected function load_schema_from_file($directory, \phpbb\db\driver\driver_int
 		}
 		else
 		{
-			global $phpbb_root_path, $phpEx, $table_prefix;
+			global $phpbb_root_path, $phpEx;
 
 			$finder = new \phpbb\finder\finder(null, false, $phpbb_root_path, $phpEx);
 			$classes = $finder->core_path('phpbb/db/migration/data/')
@@ -373,6 +375,7 @@ protected function load_schema_from_file($directory, \phpbb\db\driver\driver_int
 			$doctrine = \phpbb\db\doctrine\connection_factory::get_connection(new phpbb_mock_config_php_file());
 			$factory = new \phpbb\db\tools\factory();
 			$db_tools = $factory->get($doctrine, true);
+			$db_tools->set_table_prefix($table_prefix);
 			$tables = phpbb_database_test_case::get_core_tables();
 
 			$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix, $tables);
@@ -381,6 +384,7 @@ protected function load_schema_from_file($directory, \phpbb\db\driver\driver_int
 
 		$factory = new \phpbb\db\tools\factory();
 		$db_tools = $factory->get($doctrine);
+		$db_tools->set_table_prefix($table_prefix);
 		foreach ($db_table_schema as $table_name => $table_data)
 		{
 			$db_tools->sql_create_table(
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index c0dd68ab147..b632e8c1a7b 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -30,7 +30,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 	protected static $install_success = false;
 
 	protected $cache = null;
-	protected $db = null;
 	protected $db_doctrine = null;
 	protected $extension_manager = null;
 
@@ -38,18 +37,39 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* Session ID for current test's session (each test makes its own)
 	* @var string
 	*/
-	protected $sid;
+	protected static $session_id;
 
 	/**
 	* Language array used by phpBB
 	* @var array
 	*/
-	protected $lang = array();
+	protected static $lang_ary = [];
 
 	protected static $config = array();
 	protected static $already_installed = false;
+	protected static $db_connection = null;
 
-	static public function setUpBeforeClass(): void
+    public function __get($property)
+    {
+        if ($property === 'sid')
+		{
+            return self::$session_id ??= null;
+        }
+
+        if ($property === 'db')
+		{
+            return self::$db_connection ??= null;
+        }
+
+        if ($property === 'lang')
+		{
+            return self::$lang_ary;
+        }
+
+        return null;
+    }
+
+	public static function setUpBeforeClass(): void
 	{
 		parent::setUpBeforeClass();
 
@@ -73,6 +93,16 @@ static public function setUpBeforeClass(): void
 			self::install_board();
 			self::$already_installed = true;
 		}
+
+		global $cache;
+		$cache = new phpbb_mock_null_cache;
+		self::get_db();
+
+		// Special flag for testing without possibility to run into lock scenario.
+		// Unset entry and add it back if lock behavior for posting should be tested.
+		// Unset ci_tests_no_lock_posting from config
+		$sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) VALUES ('ci_tests_no_lock_posting', '1')";
+		self::$db_connection->sql_query($sql);
 	}
 
 	/**
@@ -87,6 +117,10 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
+		$this->setBackupStaticPropertiesExcludeList([
+			'phpbb_functional_test_case' => ['config', 'already_installed'],
+		]);
+
 		if (!self::$install_success)
 		{
 			$this->fail('Installing phpBB has failed.');
@@ -95,43 +129,70 @@ protected function setUp(): void
 		$this->bootstrap();
 
 		self::$cookieJar = new CookieJar;
-		// Force native client on windows platform
-		self::$http_client = strtolower(substr(PHP_OS, 0, 3)) === 'win' ? new NativeHttpClient() : HttpClient::create();
+
+		// Configure SSL verification for local development with self-signed certificates
+		$http_options = [];
+		if (isset(self::$config['path_to_ssl_cert']))
+		{
+			if (self::$config['path_to_ssl_cert'] === false)
+			{
+				// Disable SSL verification
+				$http_options['verify_peer'] = false;
+				$http_options['verify_host'] = false;
+			}
+			else
+			{
+				// Use custom CA certificate
+				$http_options['verify_peer'] = true;
+				$http_options['verify_host'] = true;
+				$http_options['cafile'] = self::$config['path_to_ssl_cert'];
+			}
+		}
+
+		// Optimize HTTP client for Windows platform
+		if (stripos(PHP_OS_FAMILY, 'win') === 0)
+		{
+			self::$http_client = new NativeHttpClient(array_merge([
+				'timeout' => 30,
+				'max_duration' => 60,
+			], $http_options));
+		}
+		else
+		{
+			self::$http_client = HttpClient::create(array_merge([
+				'timeout' => 60,
+			], $http_options));
+		}
 		self::$client = new HttpBrowser(self::$http_client, null, self::$cookieJar);
 
 		// Clear the language array so that things
 		// that were added in other tests are gone
-		$this->lang = array();
-		$this->add_lang('common');
-
-		$db = $this->get_db();
+		self::$lang_ary = [];
+		self::add_lang('common');
 
 		foreach (static::setup_extensions() as $extension)
 		{
-			$this->purge_cache();
-
-			$sql = 'SELECT ext_active
-				FROM ' . EXT_TABLE . "
-				WHERE ext_name = '" . $db->sql_escape($extension). "'";
-			$result = $db->sql_query($sql);
-			$status = (bool) $db->sql_fetchfield('ext_active');
-			$db->sql_freeresult($result);
-
-			if (!$status)
-			{
-				$this->install_ext($extension);
-			}
+			self::install_ext($extension);
 		}
 	}
 
-	protected function tearDown(): void
+	public static function tearDownAfterClass(): void
 	{
-		parent::tearDown();
+		parent::tearDownAfterClass();
+
+		global $cache;
+		$cache = new phpbb_mock_null_cache;
 
-		if ($this->db instanceof \phpbb\db\driver\driver_interface)
+		if (self::$db_connection instanceof \phpbb\db\driver\driver_interface)
 		{
+			// Unset ci_tests_no_lock_posting from config
+			$sql = 'DELETE FROM ' . CONFIG_TABLE . "
+			WHERE config_name = 'ci_tests_no_lock_posting'";
+			self::$db_connection->sql_query($sql);
+
 			// Close the database connections again this test
-			$this->db->sql_close();
+			self::$db_connection->sql_close();
+			self::$db_connection = null;
 		}
 	}
 
@@ -144,7 +205,7 @@ protected function tearDown(): void
 	* @param bool	$assert_response_html	Should we perform standard assertions for a normal html page
 	* @return Symfony\Component\DomCrawler\Crawler
 	*/
-	static public function request($method, $path, $form_data = array(), $assert_response_html = true)
+	public static function request($method, $path, $form_data = array(), $assert_response_html = true)
 	{
 		$crawler = self::$client->request($method, self::$root_url . $path, $form_data);
 
@@ -164,7 +225,7 @@ static public function request($method, $path, $form_data = array(), $assert_res
 	* @param bool	$assert_response_html	Should we perform standard assertions for a normal html page
 	* @return Symfony\Component\DomCrawler\Crawler
 	*/
-	static public function submit(Symfony\Component\DomCrawler\Form $form, array $values = array(), $assert_response_html = true)
+	public static function submit(Symfony\Component\DomCrawler\Form $form, array $values = array(), $assert_response_html = true)
 	{
 		// Remove files from form if no file was submitted
 		// See: https://github.com/symfony/symfony/issues/49014
@@ -191,7 +252,7 @@ static public function submit(Symfony\Component\DomCrawler\Form $form, array $va
 	*
 	* @return string HTML page
 	*/
-	static public function get_content()
+	public static function get_content()
 	{
 		return (string) self::$client->getResponse()->getContent();
 	}
@@ -203,26 +264,21 @@ protected function bootstrap()
 	{
 	}
 
-	public function __construct($name = NULL, array $data = [], $dataName = '')
-	{
-		parent::__construct($name, $data, $dataName);
-
-		$this->backupStaticAttributesExcludeList += [
-			'phpbb_functional_test_case' => ['config', 'already_installed'],
-		];
-	}
-
-	protected function get_db()
+	/**
+	 * @return \phpbb\db\driver\driver_interface
+	 */
+	protected static function get_db()
 	{
 		global $phpbb_root_path, $phpEx;
 		// so we don't reopen an open connection
-		if (!($this->db instanceof \phpbb\db\driver\driver_interface))
+		if (!(self::$db_connection instanceof \phpbb\db\driver\driver_interface))
 		{
 			$dbms = self::$config['dbms'];
-			$this->db = new $dbms();
-			$this->db->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport']);
+			self::$db_connection = new $dbms();
+			self::$db_connection->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport'], true);
 		}
-		return $this->db;
+
+		return self::$db_connection;
 	}
 
 	protected function get_db_doctrine()
@@ -265,17 +321,18 @@ protected function get_extension_manager()
 		global $phpbb_root_path, $phpEx;
 
 		$config = new \phpbb\config\config(array('version' => PHPBB_VERSION));
-		$db = $this->get_db();
+		$this->get_db();
 		$db_doctrine = $this->get_db_doctrine();
 		$factory = new \phpbb\db\tools\factory();
 		$finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $phpEx);
 		$db_tools = $factory->get($db_doctrine);
+		$db_tools->set_table_prefix(self::$config['table_prefix']);
 
 		$container = new phpbb_mock_container_builder();
 		$migrator = new \phpbb\db\migrator(
 			$container,
 			$config,
-			$db,
+			$this->db,
 			$db_tools,
 			self::$config['table_prefix'] . 'migrations',
 			$phpbb_root_path,
@@ -290,14 +347,14 @@ protected function get_extension_manager()
 		$container->set('event_dispatcher', $phpbb_dispatcher);
 		$cache = $this->getMockBuilder('\phpbb\cache\service')
 			->setConstructorArgs([$this->get_cache_driver(), $config, $this->db, $phpbb_dispatcher, $phpbb_root_path, $phpEx])
-			->setMethods(['deferred_purge'])
+			->onlyMethods(['deferred_purge'])
 			->getMock();
 		$cache->method('deferred_purge')
 			->willReturnCallback([$cache, 'purge']);
 
 		$extension_manager = new \phpbb\extension\manager(
 			$container,
-			$db,
+			$this->db,
 			$config,
 			$finder_factory,
 			self::$config['table_prefix'] . 'ext',
@@ -308,6 +365,123 @@ protected function get_extension_manager()
 		return $extension_manager;
 	}
 
+	protected static function get_messenger_method_email($container)
+	{
+		global $phpbb_root_path, $phpEx;
+
+		$config = new \phpbb\config\config(
+			[
+				'version' => PHPBB_VERSION,
+				'email_enable' => false,
+				'email_package_size' => 0,
+				'smtp_delivery' => 0,
+				'default_lang' => 'en',
+			]
+		);
+
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
+		$container->set('user', $user);
+		$container->set('language', $lang);
+
+		$assets_bag = new \phpbb\template\assets_bag();
+		$container->set('assets.bag', $assets_bag);
+
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$container->set('dispatcher', $phpbb_dispatcher);
+
+		$core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/';
+		$container->setParameter('core.cache_dir', $core_cache_dir);
+
+		$core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx;
+		$container->setParameter('core.messenger_queue_file', $core_messenger_queue_file);
+
+		$messenger_method_collection = new \phpbb\di\service_collection($container);
+		$messenger_method_collection->add('messenger.method.email');
+		$container->set('messenger.method_collection', $messenger_method_collection);
+
+		$messenger_queue = new \phpbb\messenger\queue($config, $phpbb_dispatcher, $messenger_method_collection, $core_messenger_queue_file);
+		$container->set('messenger.queue', $messenger_queue);
+
+		$request = new phpbb_mock_request;
+		$container->set('request', $request);
+
+		$symfony_request = new \phpbb\symfony_request(
+			$request
+		);
+
+		$phpbb_path_helper = new \phpbb\path_helper(
+			$symfony_request,
+			$request,
+			$phpbb_root_path,
+			$phpEx
+		);
+		$container->set('path_helper', $phpbb_path_helper);
+
+		$dbms = self::$config['dbms'];
+		$db = new $dbms();
+		$db->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport']);
+
+		$extension_manager = new phpbb_mock_extension_manager($phpbb_root_path, [], $container);
+		$container->set('ext.manager', $extension_manager);
+
+		$context = new \phpbb\template\context();
+		$cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig';
+		$container->setParameter('core.template.cache_path', $cache_path);
+		$filesystem = new \phpbb\filesystem\filesystem();
+		$container->set('filesystem', $filesystem);
+
+		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
+			$config,
+			$filesystem,
+			$phpbb_path_helper,
+			$cache_path,
+			null,
+			new \phpbb\template\twig\loader(''),
+			$phpbb_dispatcher,
+			[
+				'cache'			=> false,
+				'debug'			=> false,
+				'auto_reload'	=> true,
+				'autoescape'	=> false,
+			]
+		);
+		$twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang);
+		$container->set('template.twig.extensions.phpbb', $twig_extension);
+
+		$twig_extensions_collection = new \phpbb\di\service_collection($container);
+		$twig_extensions_collection->add('template.twig.extensions.phpbb');
+		$container->set('template.twig.extensions.collection', $twig_extensions_collection);
+
+		$twig->addExtension($twig_extension);
+		$twig_lexer = new \phpbb\template\twig\lexer($twig);
+		$container->set('template.twig.lexer', $twig_lexer);
+
+		$auth = new \phpbb\auth\auth();
+		$log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
+		$container->set('log', $log);
+
+		$email_method = new \phpbb\messenger\method\email(
+			$assets_bag,
+			$config,
+			$phpbb_dispatcher,
+			$lang,
+			$messenger_queue,
+			$phpbb_path_helper,
+			$request,
+			$twig_extensions_collection,
+			$twig_lexer,
+			$user,
+			$phpbb_root_path,
+			$cache_path,
+			$extension_manager,
+			$log
+		);
+		$container->set('messenger.method.email', $email_method);
+	}
+
 	protected static function install_board()
 	{
 		global $phpbb_root_path, $phpEx;
@@ -358,6 +532,7 @@ protected static function install_board()
 		$container->set('installer.install_finish.notify_user', new phpbb_mock_null_installer_task());
 		$container->register('installer.install_finish.install_extensions')->setSynthetic(true);
 		$container->set('installer.install_finish.install_extensions', new phpbb_mock_null_installer_task());
+		self::get_messenger_method_email($container);
 		$container->compile();
 
 		$language = $container->get('language');
@@ -402,13 +577,12 @@ protected static function install_board()
 
 		$iohandler->set_input('email_enable', true);
 		$iohandler->set_input('smtp_delivery', '1');
-		$iohandler->set_input('smtp_host', 'nxdomain.phpbb.com');
-		$iohandler->set_input('smtp_auth', 'PLAIN');
+		$iohandler->set_input('smtp_host', '');
 		$iohandler->set_input('smtp_user', 'nxuser');
 		$iohandler->set_input('smtp_pass', 'nxpass');
 		$iohandler->set_input('submit_email', 'submit');
 
-		$iohandler->set_input('cookie_secure', '0');
+		$iohandler->set_input('cookie_secure', (strpos(self::$root_url, 'https://') === 0) ? '1' : '0');
 		$iohandler->set_input('server_protocol', '0');
 		$iohandler->set_input('force_server_vars', $parseURL['scheme'] . '://');
 		$iohandler->set_input('server_name', $parseURL['host']);
@@ -416,7 +590,15 @@ protected static function install_board()
 		$iohandler->set_input('script_path', $parseURL['path']);
 		$iohandler->set_input('submit_server', 'submit');
 
-		$installer->run();
+		try
+		{
+			$installer->run();
+		}
+		catch (\Throwable $e)
+		{
+			// Do nothing but catch the exception as PHPUnit here throws
+			// "PHPUnit\Event\Code\NoTestCaseObjectOnCallStackException: Cannot find TestCase object on call stack"
+		}
 
 		copy($config_file, $config_file_test);
 
@@ -434,7 +616,10 @@ protected static function install_board()
 		}
 
 		global $phpbb_container;
-		$phpbb_container->reset();
+		if (!empty($phpbb_container))
+		{
+			$phpbb_container->reset();
+		}
 
 		// Purge cache to remove cached files
 		$phpbb_container = new phpbb_mock_container_builder();
@@ -455,63 +640,74 @@ protected static function install_board()
 		}
 	}
 
-	public function install_ext($extension)
+	public static function install_ext($extension)
 	{
-		$this->add_lang('acp/extensions');
-
-		if ($this->get_logged_in_user())
+		self::get_db();
+		$sql = 'SELECT ext_active
+			FROM ' . EXT_TABLE . "
+			WHERE ext_name = '" . self::$db_connection->sql_escape($extension). "'";
+		$result = self::$db_connection->sql_query($sql);
+		$status = (bool) self::$db_connection->sql_fetchfield('ext_active');
+		self::$db_connection->sql_freeresult($result);
+
+		if (!$status)
 		{
-			$this->logout();
-		}
-		$this->login();
-		$this->admin_login();
+			self::add_lang('acp/extensions');
 
-		$ext_path = str_replace('/', '%2F', $extension);
+			if (self::get_logged_in_user())
+			{
+				self::logout();
+			}
+			self::login();
+			self::admin_login();
 
-		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=' . $ext_path . '&sid=' . $this->sid);
-		$this->assertGreaterThan(1, $crawler->filter('div.main fieldset.submit-buttons input')->count());
+			$ext_path = str_replace('/', '%2F', $extension);
 
-		$form = $crawler->selectButton($this->lang('EXTENSION_ENABLE'))->form();
-		$crawler = self::submit($form);
+			$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=' . $ext_path . '&sid=' . self::$session_id);
+			self::assertGreaterThan(1, $crawler->filter('div.main fieldset.submit-buttons input')->count());
 
-		$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');
+			$form = $crawler->selectButton(self::lang('EXTENSION_ENABLE'))->form();
+			$crawler = self::submit($form);
 
-		// Wait for extension to be fully enabled
-		while (count($meta_refresh))
-		{
-			preg_match('#url=.+/(adm+.+)#', $meta_refresh->attr('content'), $match);
-			$url = $match[1];
-			$crawler = self::request('POST', $url);
 			$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');
-		}
 
-		$this->assertContainsLang('EXTENSION_ENABLE_SUCCESS', $crawler->filter('div.successbox')->text());
+			// Wait for extension to be fully enabled
+			while (count($meta_refresh))
+			{
+				preg_match('#url=.+/(adm+.+)#', $meta_refresh->attr('content'), $match);
+				$url = $match[1];
+				$crawler = self::request('POST', $url);
+				$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');
+			}
 
-		$this->logout();
+			self::assertContainsLang('EXTENSION_ENABLE_SUCCESS', $crawler->filter('div.successbox')->text());
+
+			self::logout();
+		}
 	}
 
-	public function disable_ext($extension)
+	public static function disable_ext($extension)
 	{
-		$this->add_lang('acp/extensions');
+		self::add_lang('acp/extensions');
 
-		if ($this->get_logged_in_user())
+		if (self::get_logged_in_user())
 		{
-			$this->logout();
+			self::logout();
 		}
-		$this->login();
-		$this->admin_login();
+		self::login();
+		self::admin_login();
 
 		$ext_path = str_replace('/', '%2F', $extension);
 
-		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=' . $ext_path . '&sid=' . $this->sid);
-		$this->assertGreaterThan(1, $crawler->filter('div.main fieldset.submit-buttons input')->count());
+		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=' . $ext_path . '&sid=' . self::$session_id);
+		self::assertGreaterThan(1, $crawler->filter('div.main fieldset.submit-buttons input')->count());
 
-		$form = $crawler->selectButton($this->lang('EXTENSION_DISABLE'))->form();
+		$form = $crawler->selectButton(self::lang('EXTENSION_DISABLE'))->form();
 		$crawler = self::submit($form);
 
 		$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');
 
-		// Wait for extension to be fully enabled
+		// Wait for extension to be fully disabled
 		while (count($meta_refresh))
 		{
 			preg_match('#url=.+/(adm+.+)#', $meta_refresh->attr('content'), $match);
@@ -520,28 +716,28 @@ public function disable_ext($extension)
 			$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');
 		}
 
-		$this->assertContainsLang('EXTENSION_DISABLE_SUCCESS', $crawler->filter('div.successbox')->text());
+		self::assertContainsLang('EXTENSION_DISABLE_SUCCESS', $crawler->filter('div.successbox')->text());
 
-		$this->logout();
+		self::logout();
 	}
 
-	public function delete_ext_data($extension)
+	public static function delete_ext_data($extension)
 	{
-		$this->add_lang('acp/extensions');
+		self::add_lang('acp/extensions');
 
-		if ($this->get_logged_in_user())
+		if (self::get_logged_in_user())
 		{
-			$this->logout();
+			self::logout();
 		}
-		$this->login();
-		$this->admin_login();
+		self::login();
+		self::admin_login();
 
 		$ext_path = str_replace('/', '%2F', $extension);
 
-		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=delete_data_pre&ext_name=' . $ext_path . '&sid=' . $this->sid);
-		$this->assertGreaterThan(1, $crawler->filter('div.main fieldset.submit-buttons input')->count());
+		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=delete_data_pre&ext_name=' . $ext_path . '&sid=' . self::$session_id);
+		self::assertGreaterThan(1, $crawler->filter('div.main fieldset.submit-buttons input')->count());
 
-		$form = $crawler->selectButton($this->lang('EXTENSION_DELETE_DATA'))->form();
+		$form = $crawler->selectButton(self::lang('EXTENSION_DELETE_DATA'))->form();
 		$crawler = self::submit($form);
 
 		$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');
@@ -555,15 +751,15 @@ public function delete_ext_data($extension)
 			$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');
 		}
 
-		$this->assertContainsLang('EXTENSION_DELETE_DATA_SUCCESS', $crawler->filter('div.successbox')->text());
+		self::assertContainsLang('EXTENSION_DELETE_DATA_SUCCESS', $crawler->filter('div.successbox')->text());
 
-		$this->logout();
+		self::logout();
 	}
 
-	public function uninstall_ext($extension)
+	public static function uninstall_ext($extension)
 	{
-		$this->disable_ext($extension);
-		$this->delete_ext_data($extension);
+		self::disable_ext($extension);
+		self::delete_ext_data($extension);
 	}
 
 	private static function recreate_database($config)
@@ -584,10 +780,10 @@ protected function add_style($style_id, $style_path, $parent_style_id = 1, $pare
 	{
 		global $phpbb_root_path;
 
-		$db = $this->get_db();
+		$this->get_db();
 		if (version_compare(PHPBB_VERSION, '3.1.0-dev', '<'))
 		{
-			$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+			$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
 				'style_id' => $style_id,
 				'style_name' => $style_path,
 				'style_copyright' => '',
@@ -596,17 +792,17 @@ protected function add_style($style_id, $style_path, $parent_style_id = 1, $pare
 				'theme_id' => $style_id,
 				'imageset_id' => $style_id,
 			));
-			$db->sql_query($sql);
+			$this->db->sql_query($sql);
 
-			$sql = 'INSERT INTO ' . STYLES_IMAGESET_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+			$sql = 'INSERT INTO ' . STYLES_IMAGESET_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
 				'imageset_id' => $style_id,
 				'imageset_name' => $style_path,
 				'imageset_copyright' => '',
 				'imageset_path' => $style_path,
 			));
-			$db->sql_query($sql);
+			$this->db->sql_query($sql);
 
-			$sql = 'INSERT INTO ' . STYLES_TEMPLATE_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+			$sql = 'INSERT INTO ' . STYLES_TEMPLATE_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
 				'template_id' => $style_id,
 				'template_name' => $style_path,
 				'template_copyright' => '',
@@ -615,9 +811,9 @@ protected function add_style($style_id, $style_path, $parent_style_id = 1, $pare
 				'template_inherits_id' => $parent_style_id,
 				'template_inherit_path' => $parent_style_path,
 			));
-			$db->sql_query($sql);
+			$this->db->sql_query($sql);
 
-			$sql = 'INSERT INTO ' . STYLES_THEME_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+			$sql = 'INSERT INTO ' . STYLES_THEME_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
 				'theme_id' => $style_id,
 				'theme_name' => $style_path,
 				'theme_copyright' => '',
@@ -626,7 +822,7 @@ protected function add_style($style_id, $style_path, $parent_style_id = 1, $pare
 				'theme_mtime' => 0,
 				'theme_data' => '',
 			));
-			$db->sql_query($sql);
+			$this->db->sql_query($sql);
 
 			if ($style_path != 'prosilver')
 			{
@@ -636,7 +832,7 @@ protected function add_style($style_id, $style_path, $parent_style_id = 1, $pare
 		}
 		else
 		{
-			$db->sql_multi_insert(STYLES_TABLE, array(array(
+			$this->db->sql_multi_insert(STYLES_TABLE, array(array(
 				'style_name' => $style_path,
 				'style_copyright' => '',
 				'style_active' => 1,
@@ -658,13 +854,13 @@ protected function delete_style($style_id, $style_path)
 	{
 		global $phpbb_root_path;
 
-		$db = $this->get_db();
-		$db->sql_query('DELETE FROM ' . STYLES_TABLE . ' WHERE style_id = ' . $style_id);
+		$this->get_db();
+		$this->db->sql_query('DELETE FROM ' . STYLES_TABLE . ' WHERE style_id = ' . $style_id);
 		if (version_compare(PHPBB_VERSION, '3.1.0-dev', '<'))
 		{
-			$db->sql_query('DELETE FROM ' . STYLES_IMAGESET_TABLE . ' WHERE imageset_id = ' . $style_id);
-			$db->sql_query('DELETE FROM ' . STYLES_TEMPLATE_TABLE . ' WHERE template_id = ' . $style_id);
-			$db->sql_query('DELETE FROM ' . STYLES_THEME_TABLE . ' WHERE theme_id = ' . $style_id);
+			$this->db->sql_query('DELETE FROM ' . STYLES_IMAGESET_TABLE . ' WHERE imageset_id = ' . $style_id);
+			$this->db->sql_query('DELETE FROM ' . STYLES_TEMPLATE_TABLE . ' WHERE template_id = ' . $style_id);
+			$this->db->sql_query('DELETE FROM ' . STYLES_THEME_TABLE . ' WHERE theme_id = ' . $style_id);
 
 			if ($style_path != 'prosilver')
 			{
@@ -751,17 +947,33 @@ protected function create_user($username, $email = 'nobody@example.com')
 	 */
 	protected function get_group_id($group_name)
 	{
-		$db = $this->get_db();
 		$sql = 'SELECT group_id
 			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = '" . $db->sql_escape($group_name) . "'";
-		$result = $db->sql_query($sql);
-		$group_id = (int) $db->sql_fetchfield('group_id');
-		$db->sql_freeresult($result);
+			WHERE group_name = '" . $this->db->sql_escape($group_name) . "'";
+		$result = $this->db->sql_query($sql);
+		$group_id = (int) $this->db->sql_fetchfield('group_id');
+		$this->db->sql_freeresult($result);
 
 		return $group_id;
 	}
 
+	/**
+	 * Get current board's search type
+	 *
+	 * @return string Current search type setting
+	 */
+	protected function get_search_type()
+	{
+		$sql = 'SELECT config_value as search_type
+			FROM ' . CONFIG_TABLE . "
+			WHERE config_name = '" . $this->db->sql_escape('search_type') . "'";
+		$result = $this->db->sql_query($sql);
+		$search_type = $this->db->sql_fetchfield('search_type');
+		$this->db->sql_freeresult($result);
+
+		return $search_type;
+	}
+
 	protected function remove_user_group($group_name, $usernames)
 	{
 		global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $user, $phpbb_root_path, $phpEx;
@@ -772,10 +984,7 @@ protected function remove_user_group($group_name, $usernames)
 		$db = $this->get_db();
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 
-		$user = $this->createMock('\phpbb\user', array(), array(
-			new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
-			'\phpbb\datetime'
-		));
+		$user = $this->createMock('\phpbb\user');
 		$user->data['user_id'] = 2; // admin
 		$user->ip = '';
 
@@ -813,10 +1022,7 @@ protected function add_user_group($group_name, $usernames, $default = false, $le
 		$db = $this->get_db();
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 
-		$user = $this->createMock('\phpbb\user', array(), array(
-			new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
-			'\phpbb\datetime'
-		));
+		$user = $this->createMock('\phpbb\user');
 		$user->data['user_id'] = 2; // admin
 		$user->ip = '';
 
@@ -847,21 +1053,21 @@ protected function add_user_group($group_name, $usernames, $default = false, $le
 		return group_user_add($group_id, false, $usernames, $group_name, $default, $leader);
 	}
 
-	protected function login($username = 'admin', $autologin = false)
+	protected static function login($username = 'admin', $autologin = false)
 	{
-		$this->add_lang('ucp');
+		self::add_lang('ucp');
 
 		$crawler = self::request('GET', 'ucp.php?mode=login');
-		$button = $crawler->selectButton($this->lang('LOGIN'));
-		$this->assertGreaterThan(0, $button->count(), 'No login button found');
+		$button = $crawler->selectButton(self::lang('LOGIN'));
+		self::assertGreaterThan(0, $button->count(), 'No login button found');
 
-		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
+		$form = $crawler->selectButton(self::lang('LOGIN'))->form();
 		if ($autologin)
 		{
 			$form['autologin']->tick();
 		}
 		$crawler = self::submit($form, array('username' => $username, 'password' => $username . $username));
-		$this->assertStringNotContainsString($this->lang('LOGIN'), $crawler->filter('.navbar')->text());
+		self::assertStringNotContainsString(self::lang('LOGIN'), $crawler->filter('.navbar')->text());
 
 		$cookies = self::$cookieJar->all();
 
@@ -870,50 +1076,50 @@ protected function login($username = 'admin', $autologin = false)
 		{
 			if (substr($cookie->getName(), -4) == '_sid')
 			{
-				$this->sid = $cookie->getValue();
+				self::$session_id = $cookie->getValue();
 			}
 		}
 	}
 
-	protected function logout()
+	protected static function logout()
 	{
-		$this->add_lang('ucp');
+		self::add_lang('ucp');
 
 		$crawler = self::request('GET', 'index.php');
-		$logout_link = $crawler->filter('a[title="' . $this->lang('LOGOUT') . '"]')->attr('href');
+		$logout_link = $crawler->filter('a[title="' . self::lang('LOGOUT') . '"]')->attr('href');
 		self::request('GET', $logout_link);
 
 		$crawler = self::request('GET', $logout_link);
-		$this->assertStringContainsString($this->lang('REGISTER'), $crawler->filter('.navbar')->text());
-		unset($this->sid);
+		self::assertStringContainsString(self::lang('REGISTER'), $crawler->filter('.navbar')->text());
+		self::$session_id = null;
 	}
 
 	/**
 	* Login to the ACP
 	* You must run login() before calling this.
 	*/
-	protected function admin_login($username = 'admin')
+	protected static function admin_login($username = 'admin')
 	{
-		$this->add_lang('acp/common');
+		self::add_lang('acp/common');
 
 		// Requires login first!
-		if (empty($this->sid))
+		if (empty(self::$session_id))
 		{
-			$this->fail('$this->sid is empty. Make sure you call login() before admin_login()');
+			self::fail('$this->sid is empty. Make sure you call login() before admin_login()');
 			return;
 		}
 
-		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid);
-		$this->assertStringContainsString($this->lang('LOGIN_ADMIN_CONFIRM'), $crawler->filter('html')->text());
+		$crawler = self::request('GET', 'adm/index.php?sid=' . self::$session_id);
+		self::assertStringContainsString(self::lang('LOGIN_ADMIN_CONFIRM'), $crawler->filter('html')->text());
 
-		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
+		$form = $crawler->selectButton(self::lang('LOGIN'))->form();
 
 		foreach ($form->getValues() as $field => $value)
 		{
 			if (strpos($field, 'password_') === 0)
 			{
 				$crawler = self::submit($form, array('username' => $username, $field => $username . $username));
-				$this->assertStringContainsString($this->lang('ADMIN_PANEL'), $crawler->filter('h1')->text());
+				self::assertStringContainsString(self::lang('ADMIN_PANEL'), $crawler->filter('h1')->text());
 
 				$cookies = self::$cookieJar->all();
 
@@ -922,7 +1128,7 @@ protected function admin_login($username = 'admin')
 				{
 					if (substr($cookie->getName(), -4) == '_sid')
 					{
-						$this->sid = $cookie->getValue();
+						self::$session_id = $cookie->getValue();
 					}
 				}
 
@@ -931,13 +1137,13 @@ protected function admin_login($username = 'admin')
 		}
 	}
 
-	protected function add_lang($lang_file)
+	protected static function add_lang($lang_file)
 	{
 		if (is_array($lang_file))
 		{
 			foreach ($lang_file as $file)
 			{
-				$this->add_lang($file);
+				self::add_lang($file);
 			}
 
 			return;
@@ -945,23 +1151,23 @@ protected function add_lang($lang_file)
 
 		$lang_path = __DIR__ . "/../../phpBB/language/en/$lang_file.php";
 
-		$lang = array();
+		$lang = [];
 
 		if (file_exists($lang_path))
 		{
 			include($lang_path);
 		}
 
-		$this->lang = array_merge($this->lang, $lang);
+		self::$lang_ary = array_merge(self::$lang_ary, $lang);
 	}
 
-	protected function add_lang_ext($ext_name, $lang_file)
+	protected static function add_lang_ext($ext_name, $lang_file)
 	{
 		if (is_array($lang_file))
 		{
 			foreach ($lang_file as $file)
 			{
-				$this->add_lang_ext($ext_name, $file);
+				self::add_lang_ext($ext_name, $file);
 			}
 
 			return;
@@ -969,27 +1175,27 @@ protected function add_lang_ext($ext_name, $lang_file)
 
 		$lang_path = __DIR__ . "/../../phpBB/ext/{$ext_name}/language/en/$lang_file.php";
 
-		$lang = array();
+		$lang = [];
 
 		if (file_exists($lang_path))
 		{
 			include($lang_path);
 		}
 
-		$this->lang = array_merge($this->lang, $lang);
+		self::$lang_ary = array_merge(self::$lang_ary, $lang);
 	}
 
-	protected function lang()
+	protected static function lang()
 	{
 		$args = func_get_args();
 		$key = $args[0];
 
-		if (empty($this->lang[$key]))
+		if (empty(self::$lang_ary[$key]))
 		{
 			throw new RuntimeException('Language key "' . $key . '" could not be found.');
 		}
 
-		$args[0] = $this->lang[$key];
+		$args[0] = self::$lang_ary[$key];
 
 		return call_user_func_array('sprintf', $args);
 	}
@@ -1001,9 +1207,9 @@ protected function lang()
 	 * @param string $haystack	Search this
 	 * @param string $message	Optional failure message
 	 */
-	public function assertContainsLang($needle, $haystack, $message = '')
+	public static function assertContainsLang($needle, $haystack, $message = '')
 	{
-		$this->assertStringContainsString(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message);
+		self::assertStringContainsString(html_entity_decode(self::lang($needle), ENT_QUOTES), $haystack, $message);
 	}
 
 	/**
@@ -1013,9 +1219,9 @@ public function assertContainsLang($needle, $haystack, $message = '')
 	* @param string $haystack	Search this
 	* @param string $message	Optional failure message
 	*/
-	public function assertNotContainsLang($needle, $haystack, $message = '')
+	public static function assertNotContainsLang($needle, $haystack, $message = '')
 	{
-		$this->assertStringNotContainsString(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message);
+		self::assertStringNotContainsString(html_entity_decode(self::lang($needle), ENT_QUOTES), $haystack, $message);
 	}
 
 	/*
@@ -1026,7 +1232,7 @@ public function assertNotContainsLang($needle, $haystack, $message = '')
 	* @param mixed $status_code		Expected status code, false to disable check
 	* @return null
 	*/
-	static public function assert_response_html($status_code = 200)
+	public static function assert_response_html($status_code = 200)
 	{
 		// Any output before the doc type means there was an error
 		$content = self::get_content();
@@ -1047,7 +1253,7 @@ static public function assert_response_html($status_code = 200)
 	* @param mixed $status_code		Expected status code, false to disable check
 	* @return null
 	*/
-	static public function assert_response_xml($status_code = 200)
+	public static function assert_response_xml($status_code = 200)
 	{
 		// Any output before the xml opening means there was an error
 		$content = self::get_content();
@@ -1069,7 +1275,7 @@ static public function assert_response_xml($status_code = 200)
 	* @param int $status_code	Expected status code
 	* @return void
 	*/
-	static public function assert_response_status_code($status_code = 200)
+	public static function assert_response_status_code($status_code = 200)
 	{
 		if ($status_code != self::$client->getResponse()->getStatusCode() &&
 			preg_match('/^5[0-9]{2}/', self::$client->getResponse()->getStatusCode()))
@@ -1103,12 +1309,11 @@ public function assert_filter($crawler, $expr, $msg = null)
 	* @param string $name
 	* @param string $message
 	*
-	* @return null
+	* @return void
 	*/
 	public function assert_checkbox_is_checked($crawler, $name, $message = '')
 	{
-		$this->assertSame(
-			'checked',
+		$this->assertNotNull(
 			$this->assert_find_one_checkbox($crawler, $name)->attr('checked'),
 			$message ?: "Failed asserting that checkbox $name is checked."
 		);
@@ -1122,7 +1327,7 @@ public function assert_checkbox_is_checked($crawler, $name, $message = '')
 	* @param string $name
 	* @param string $message
 	*
-	* @return null
+	* @return void
 	*/
 	public function assert_checkbox_is_unchecked($crawler, $name, $message = '')
 	{
@@ -1493,14 +1698,14 @@ protected function get_hidden_fields($crawler, $url)
 	 *
 	 * @return string|bool username if logged in, false otherwise
 	 */
-	protected function get_logged_in_user()
+	protected static function get_logged_in_user()
 	{
 		$username_logged_in = false;
 		$crawler = self::request('GET', 'index.php');
 		$is_logged_in = strpos($crawler->filter('div[class="navbar"]')->text(), 'Login') === false;
 		if ($is_logged_in)
 		{
-			$username_logged_in = $crawler->filter('li[id="username_logged_in"] > div > a > span')->text();
+			$username_logged_in = $crawler->filter('li[id="username_logged_in"] > div > a > span:not(.avatar)')->text();
 		}
 		return $username_logged_in;
 	}
@@ -1551,9 +1756,9 @@ protected function set_flood_interval($flood_interval)
 	* @param string $username The username to check or empty if user_id is used
 	* @param int $user_id The user id to check or empty if username is used
 	*
-	* @return bool Returns true if a user exists, false otherwise
+	* @return array Returns user_id => username array or empty array if user does not exist
 	*/
-	protected function user_exists($username, $user_id = null)
+	protected function user_exists($username = '', $user_id = '')
 	{
 		global $db;
 
@@ -1568,6 +1773,8 @@ protected function user_exists($username, $user_id = null)
 			require_once(__DIR__ . '/../../phpBB/includes/functions_user.php');
 		}
 
-		return user_get_id_name($user_id, $username) ? false : true;
+		user_get_id_name($user_id, $username, false, true);
+
+		return $username;
 	}
 }
diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php
index 11f9020e4fe..8c4bf5c1d75 100644
--- a/tests/test_framework/phpbb_test_case.php
+++ b/tests/test_framework/phpbb_test_case.php
@@ -17,11 +17,9 @@ class phpbb_test_case extends TestCase
 {
 	protected $test_case_helpers;
 
-	public function __construct($name = NULL, array $data = array(), $dataName = '')
+	protected function setUp(): void
 	{
-		parent::__construct($name, $data, $dataName);
-
-		$this->backupStaticAttributesExcludeList += [
+		$this->setBackupStaticPropertiesExcludeList([
 			'SebastianBergmann\CodeCoverage\CodeCoverage' => ['instance'],
 			'SebastianBergmann\CodeCoverage\Filter' => ['instance'],
 			'SebastianBergmann\CodeCoverage\Util' => ['ignoredLines', 'templateMethods'],
@@ -30,7 +28,7 @@ public function __construct($name = NULL, array $data = array(), $dataName = '')
 			'PHP_Token_Stream_CachingFactory' => ['cache'],
 
 			'phpbb_database_test_case' => ['already_connected', 'last_post_timestamp'],
-		];
+		]);
 	}
 
 	public function get_test_case_helpers()
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index bed719c6bba..3b1c8d10885 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -104,7 +104,7 @@ public function restore_original_ext_dir()
 		}
 	}
 
-	public function setExpectedTriggerError($errno, $message = '')
+	public function setExpectedTriggerError($errno, $message = ''): void
 	{
 		set_error_handler(
 			static function ($errno, $errstr)
@@ -112,7 +112,7 @@ static function ($errno, $errstr)
 				restore_error_handler();
 				throw new Exception($errstr, $errno);
 			},
-			E_ALL
+			E_ALL ^ E_DEPRECATED
 		);
 
 		$this->expectedTriggerError = true;
@@ -136,7 +136,6 @@ static public function get_test_config()
 	{
 		$config = array();
 
-
 		if (extension_loaded('sqlite3'))
 		{
 			$config = array_merge($config, array(
@@ -181,6 +180,11 @@ static public function get_test_config()
 				$config['phpbb_functional_url'] = $phpbb_functional_url;
 			}
 
+			if (isset($path_to_ssl_cert))
+			{
+				$config['path_to_ssl_cert'] = $path_to_ssl_cert;
+			}
+
 			if (isset($phpbb_redis_host))
 			{
 				$config['redis_host'] = $phpbb_redis_host;
@@ -246,6 +250,11 @@ static public function get_test_config()
 			$config['memcached_port'] = $_SERVER['PHPBB_TEST_MEMCACHED_PORT'];
 		}
 
+		if (isset($_SERVER['PHPBB_TEST_SSL_CERT_PATH']))
+		{
+			$config['path_to_ssl_cert'] = $_SERVER['PHPBB_TEST_SSL_CERT_PATH'];
+		}
+
 		return $config;
 	}
 
@@ -347,7 +356,7 @@ public function empty_dir($path)
 	* @param  string             $styles_path Path to the styles dir
 	* @return ContainerInterface
 	*/
-	public function set_s9e_services(ContainerInterface $container = null, $fixture = null, $styles_path = null)
+	public function set_s9e_services(ContainerInterface|null $container = null, $fixture = null, $styles_path = null)
 	{
 		static $first_run;
 		global $config, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $request, $user;
@@ -435,7 +444,7 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture
 			->disallowMockingUnknownTypes()
 			->getMock();
 		$mb = $this->test_case->getMockBuilder('phpbb\\textformatter\\data_access');
-		$mb->setMethods(array('get_bbcodes', 'get_censored_words', 'get_smilies', 'get_styles'));
+		$mb->onlyMethods(array('get_bbcodes', 'get_censored_words', 'get_smilies', 'get_styles'));
 		$mb->setConstructorArgs(array(
 			$db_driver,
 			'phpbb_bbcodes',
@@ -489,7 +498,7 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture
 		{
 			$path_helper = $this->test_case->getMockBuilder('phpbb\\path_helper')
 				->disableOriginalConstructor()
-				->setMethods(array('get_web_root_path'))
+				->onlyMethods(array('get_web_root_path'))
 				->getMock();
 			$path_helper->expects($this->test_case->any())
 				->method('get_web_root_path')
@@ -579,7 +588,7 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture
 
 			$user = $this->test_case->getMockBuilder('\phpbb\user')
 					->setConstructorArgs(array($lang, '\phpbb\datetime'))
-					->setMethods(array('format_date'))
+					->onlyMethods(array('format_date'))
 					->getMock();
 			$user->expects($this->test_case->any())
 			     ->method('format_date')
@@ -646,7 +655,7 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture
 		$renderer->configure_quote_helper($quote_helper);
 		$renderer->configure_mention_helper($mention_helper);
 		$renderer->configure_smilies_path($config, $path_helper);
-		$renderer->configure_user($user, $config, $auth);
+		$renderer->configure_user($auth, $config, $user, 0);
 
 		$container->set('text_formatter.renderer', $renderer);
 		$container->set('text_formatter.s9e.renderer', $renderer);
diff --git a/tests/text_formatter/s9e/acp_utils_test.php b/tests/text_formatter/s9e/acp_utils_test.php
index 9d84924042e..597dde0f909 100644
--- a/tests/text_formatter/s9e/acp_utils_test.php
+++ b/tests/text_formatter/s9e/acp_utils_test.php
@@ -26,7 +26,7 @@ public function test_analyse_bbcode($definition, $template, $expected)
 		$this->assertEquals($expected, $actual);
 	}
 
-	public function get_analyse_bbcode_tests()
+	public static function get_analyse_bbcode_tests()
 	{
 		return [
 			[
diff --git a/tests/text_formatter/s9e/bbcode_merger_test.php b/tests/text_formatter/s9e/bbcode_merger_test.php
index 5ec0c919719..55f9bd6f132 100644
--- a/tests/text_formatter/s9e/bbcode_merger_test.php
+++ b/tests/text_formatter/s9e/bbcode_merger_test.php
@@ -34,7 +34,7 @@ public function test_merge_bbcodes($usage_without, $template_without, $usage_wit
 		$this->assertSame($expected_template, $merged['template']);
 	}
 
-	public function get_merge_bbcodes_tests()
+	public static function get_merge_bbcodes_tests()
 	{
 		return [
 			[
diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php
index 20127204b38..76b22a78454 100644
--- a/tests/text_formatter/s9e/default_formatting_test.php
+++ b/tests/text_formatter/s9e/default_formatting_test.php
@@ -45,7 +45,7 @@ public function test_default_formatting($original, $expected, $setup = null)
 		$this->assertSame($expected, $renderer->render($parsed_text));
 	}
 
-	public function get_default_formatting_tests()
+	public static function get_default_formatting_tests()
 	{
 		return array(
 			array(
@@ -283,7 +283,7 @@ public function get_default_formatting_tests()
 			),
 			array(
 				'[quote=Username post_id=123]...[/quote]',
-				'<blockquote cite="phpBB/viewtopic.php?p=123#p123"><div><cite>Username wrote: <a href="phpBB/viewtopic.php?p=123#p123" data-post-id="123" onclick="if(document.getElementById(hash.substr(1)))href=hash">↑</a></cite>...</div></blockquote>'
+				'<blockquote cite="phpBB/viewtopic.php?p=123#p123"><div><cite>Username wrote: <a href="phpBB/viewtopic.php?p=123#p123" aria-label="VIEW_QUOTED_POST" data-post-id="123" onclick="if(document.getElementById(hash.substr(1)))href=hash"><i class="icon fa-arrow-circle-up fa-fw fas" aria-hidden="true"></i></a></cite>...</div></blockquote>'
 			),
 			array(
 				// Users are not allowed to submit their own URL for the post
@@ -310,11 +310,11 @@ public function get_default_formatting_tests()
 			),
 			array(
 				"Emoji: \xF0\x9F\x98\x80",
-				'Emoji: <img alt="' . "\xF0\x9F\x98\x80" . '" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/1f600.svg">'
+				"Emoji: <span class=\"emoji\">\xF0\x9F\x98\x80</span>",
 			),
 			array(
 				"Emoji: \xF0\x9F\x98\x80",
-				"Emoji: \xF0\x9F\x98\x80",
+				"Emoji: <span class=\"emoji\">\xF0\x9F\x98\x80</span>",
 				function ($container)
 				{
 					$container->get('text_formatter.renderer')->set_viewsmilies(false);
diff --git a/tests/text_formatter/s9e/factory_test.php b/tests/text_formatter/s9e/factory_test.php
index 5300b4c52de..b62a21106e9 100644
--- a/tests/text_formatter/s9e/factory_test.php
+++ b/tests/text_formatter/s9e/factory_test.php
@@ -296,14 +296,19 @@ public function test_malformed_bbcodes()
 	public function test_configure_events()
 	{
 		$this->dispatcher = $this->createMock('phpbb\\event\\dispatcher_interface');
+		$matcher = $this->exactly(2);
 		$this->dispatcher
-			->expects($this->exactly(2))
+			->expects($matcher)
 			->method('trigger_event')
-			->withConsecutive(
-				['core.text_formatter_s9e_configure_before', $this->callback(array($this, 'configure_event_callback'))],
-				['core.text_formatter_s9e_configure_after', $this->callback(array($this, 'configure_event_callback'))]
-			)
-			->will($this->returnArgument(1));
+			->willReturnCallback(function($event, $vars) use ($matcher) {
+				$callNr = $matcher->numberOfInvocations();
+				match($callNr) {
+					1 => $this->assertEquals('core.text_formatter_s9e_configure_before', $event),
+					2 => $this->assertEquals('core.text_formatter_s9e_configure_after', $event),
+				};
+				$this->assertTrue($this->configure_event_callback($vars));
+				return $vars;
+			});
 		$this->get_factory()->get_configurator();
 	}
 
diff --git a/tests/text_formatter/s9e/mention_helper_test.php b/tests/text_formatter/s9e/mention_helper_test.php
index 26fc743841f..bebfd2c4aa9 100644
--- a/tests/text_formatter/s9e/mention_helper_test.php
+++ b/tests/text_formatter/s9e/mention_helper_test.php
@@ -52,10 +52,7 @@ public function setUp(): void
 		$lang = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 
 		// User
-		$user = $this->createMock('\phpbb\user', array(), array(
-			$lang,
-			'\phpbb\datetime'
-		));
+		$user = $this->createMock('\phpbb\user');
 		$user->ip = '';
 		$user->data = array(
 			'user_id'       => 2,
@@ -76,7 +73,7 @@ public function setUp(): void
 		$this->mention_helper = $phpbb_container->get('text_formatter.s9e.mention_helper');
 	}
 
-	public function inject_metadata_data()
+	public static function inject_metadata_data()
 	{
 		return [
 			[
@@ -99,7 +96,7 @@ public function test_inject_metadata($incoming_xml, $expected_profile_substring)
 		$this->assertStringContainsString($expected_profile_substring, $result);
 	}
 
-	public function get_mentioned_user_ids_data()
+	public static function get_mentioned_user_ids_data()
 	{
 		return [
 			[
diff --git a/tests/text_formatter/s9e/parser_test.php b/tests/text_formatter/s9e/parser_test.php
index ef9a1184eeb..61c4f340e26 100644
--- a/tests/text_formatter/s9e/parser_test.php
+++ b/tests/text_formatter/s9e/parser_test.php
@@ -101,20 +101,19 @@ public function test_regenerate_on_cache_miss()
 	public function test_options($adapter_method, $adapter_arg, $concrete_method, $concrete_arg)
 	{
 		$mock = $this->getMockBuilder('s9e\\TextFormatter\\Parser')
-		             ->setMethods([$concrete_method])
+		             ->onlyMethods([$concrete_method])
 		             ->disableOriginalConstructor()
 		             ->getMock();
 
 		$concrete_args = (array) $concrete_arg;
-		array_walk($concrete_args, function(&$value)
-			{
-				$value = (array) $value;
-			}
-		);
-		$mock->expects($this->exactly(count($concrete_args)))
+		$matcher = $this->exactly(count($concrete_args));
+		$mock->expects($matcher)
 			->method($concrete_method)
-			->withConsecutive(...$concrete_args);
-
+			->willReturnCallback(function ($arg) use ($concrete_args, $matcher) {
+				$callNr = $matcher->numberOfInvocations();
+				$this->assertEquals($arg, $concrete_args[$callNr - 1]);
+			});
+			
 		$cache = new phpbb_mock_cache;
 		$cache->put('_foo_parser', $mock);
 
@@ -132,7 +131,7 @@ public function test_options($adapter_method, $adapter_arg, $concrete_method, $c
 		call_user_func_array(array($parser, $adapter_method), (array) $adapter_arg);
 	}
 
-	public function get_options_tests()
+	public static function get_options_tests()
 	{
 		return array(
 			array(
@@ -219,15 +218,22 @@ public function test_parse_event()
 			$dispatcher
 		);
 
+		$matcher = $this->exactly(2);
 		$dispatcher
-			->expects($this->exactly(2))
+			->expects($matcher)
 			->method('trigger_event')
-			->withConsecutive(
-				['core.text_formatter_s9e_parse_before', $this->callback(array($this, 'parse_before_event_callback'))],
-				['core.text_formatter_s9e_parse_after', $this->callback(array($this, 'parse_after_event_callback'))]
-			)
-			->will($this->returnArgument(1));
-
+			->willReturnCallback(function($event, $vars) use ($matcher) {
+				$callNr = $matcher->numberOfInvocations();
+				match($callNr) {
+					1 => $this->assertEquals('core.text_formatter_s9e_parse_before', $event),
+					2 => $this->assertEquals('core.text_formatter_s9e_parse_after', $event),
+				};
+				match($callNr) {
+					1 => $this->assertTrue($this->parse_before_event_callback($vars)),
+					2 => $this->assertTrue($this->parse_after_event_callback($vars)),
+				};
+				return $vars;
+			});
 		$parser->parse('...');
 	}
 
diff --git a/tests/text_formatter/s9e/renderer_test.php b/tests/text_formatter/s9e/renderer_test.php
index 51f4f923b4f..b39a620931f 100644
--- a/tests/text_formatter/s9e/renderer_test.php
+++ b/tests/text_formatter/s9e/renderer_test.php
@@ -93,7 +93,7 @@ public function test_options($original, $expected, $calls)
 		$this->assertSame($expected, $renderer->render($original));
 	}
 
-	public function get_options_cases()
+	public static function get_options_cases()
 	{
 		return array(
 			array(
@@ -141,7 +141,7 @@ public function test_default_options($original, $expected, $setup = null)
 		$this->assertSame($expected, $container->get('text_formatter.renderer')->render($original));
 	}
 
-	public function get_default_options_cases()
+	public static function get_default_options_cases()
 	{
 		return array(
 			array(
@@ -278,7 +278,7 @@ public function test_get_option($option_name)
 		$this->assertTrue($renderer->{'get_' . $option_name}());
 	}
 
-	public function get_option_names()
+	public static function get_option_names()
 	{
 		return array(
 			array('viewcensors'),
@@ -421,15 +421,22 @@ public function test_render_event()
 			$dispatcher
 		);
 
+		$matcher = $this->exactly(2);
 		$dispatcher
-			->expects($this->exactly(2))
+			->expects($matcher)
 			->method('trigger_event')
-			->withConsecutive(
-				['core.text_formatter_s9e_render_before', $this->callback(array($this, 'render_before_event_callback'))],
-				['core.text_formatter_s9e_render_after', $this->callback(array($this, 'render_after_event_callback'))]
-			)
-			->will($this->returnArgument(1));
-
+			->willReturnCallback(function($event, $vars) use ($matcher) {
+				$callNr = $matcher->numberOfInvocations();
+				match($callNr) {
+					1 => $this->assertEquals('core.text_formatter_s9e_render_before', $event),
+					2 => $this->assertEquals('core.text_formatter_s9e_render_after', $event),
+				};
+				match($callNr) {
+					1 => $this->assertTrue($this->render_before_event_callback($vars)),
+					2 => $this->assertTrue($this->render_after_event_callback($vars)),
+				};
+				return $vars;
+			});
 		$renderer->render('<t>...</t>');
 	}
 
diff --git a/tests/text_formatter/s9e/utils_test.php b/tests/text_formatter/s9e/utils_test.php
index 2754574c27c..ecda57d8686 100644
--- a/tests/text_formatter/s9e/utils_test.php
+++ b/tests/text_formatter/s9e/utils_test.php
@@ -24,7 +24,7 @@ public function test_unparse($original, $expected)
 		$this->assertSame($expected, $utils->unparse($original));
 	}
 
-	public function get_unparse_tests()
+	public static function get_unparse_tests()
 	{
 		return array(
 			array(
@@ -53,7 +53,7 @@ public function test_clean_formatting($original, $expected)
 		$this->assertSame($expected, $utils->clean_formatting($original));
 	}
 
-	public function get_clean_formatting_tests()
+	public static function get_clean_formatting_tests()
 	{
 		return array(
 			array(
@@ -87,7 +87,7 @@ public function test_get_outermost_quote_authors($original, $expected)
 		$this->assertSame($expected, $utils->get_outermost_quote_authors($parser->parse($original)));
 	}
 
-	public function get_outermost_quote_authors_tests()
+	public static function get_outermost_quote_authors_tests()
 	{
 		return array(
 			array(
@@ -124,7 +124,7 @@ public function test_generate_quote($text, $params, $expected)
 		$this->assertSame($expected, $utils->generate_quote($text, $params));
 	}
 
-	public function get_generate_quote_tests()
+	public static function get_generate_quote_tests()
 	{
 		return array(
 			array(
@@ -248,7 +248,7 @@ public function test_remove_bbcode($original, $name, $depth, $expected)
 		$this->assertSame($expected, $actual);
 	}
 
-	public function get_remove_bbcode_tests()
+	public static function get_remove_bbcode_tests()
 	{
 		return array(
 			array(
diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php
index eda2bbb1b32..9398c42e6ab 100644
--- a/tests/text_processing/censor_text_test.php
+++ b/tests/text_processing/censor_text_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_text_processing_censor_text_test extends phpbb_test_case
 {
-	public function censor_text_data()
+	public static function censor_text_data()
 	{
 		global $cache, $user;
 		$cache = new phpbb_mock_cache;
diff --git a/tests/text_processing/decode_message_test.php b/tests/text_processing/decode_message_test.php
index 0d902c9130b..d948dd61483 100644
--- a/tests/text_processing/decode_message_test.php
+++ b/tests/text_processing/decode_message_test.php
@@ -33,7 +33,7 @@ public function test_legacy($original, $expected, $bbcode_uid = '')
 		$this->assertSame($expected, $actual);
 	}
 
-	public function get_legacy_tests()
+	public static function get_legacy_tests()
 	{
 		return array(
 			array(
@@ -86,7 +86,7 @@ public function test_text_formatter($original, $expected)
 		$this->assertSame($expected, $actual);
 	}
 
-	public function get_text_formatter_tests()
+	public static function get_text_formatter_tests()
 	{
 		return array(
 			array(
diff --git a/tests/text_processing/generate_text_for_display_test.php b/tests/text_processing/generate_text_for_display_test.php
index 9a909a007cb..45162ce9c36 100644
--- a/tests/text_processing/generate_text_for_display_test.php
+++ b/tests/text_processing/generate_text_for_display_test.php
@@ -21,7 +21,6 @@ protected function setUp(): void
 
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
 		$config = new \phpbb\config\config(array());
-		set_config(null, null, null, $config);
 	}
 
 	/**
@@ -47,7 +46,7 @@ public function test_legacy($original, $expected, $uid = '', $bitfield = '', $fl
 		$this->assertSame($expected, $actual);
 	}
 
-	public function get_legacy_tests()
+	public static function get_legacy_tests()
 	{
 		return array(
 			array(
@@ -133,7 +132,7 @@ public function test_text_formatter($original, $expected, $censor_text = true, $
 		$this->assertSame($expected, generate_text_for_display($original, '', '', 0, $censor_text));
 	}
 
-	public function get_text_formatter_tests()
+	public static function get_text_formatter_tests()
 	{
 		return array(
 			array(
diff --git a/tests/text_processing/generate_text_for_edit_test.php b/tests/text_processing/generate_text_for_edit_test.php
index 8258a196f5f..a6d08fe364c 100644
--- a/tests/text_processing/generate_text_for_edit_test.php
+++ b/tests/text_processing/generate_text_for_edit_test.php
@@ -31,7 +31,7 @@ public function test_legacy($original, $expected, $uid = '', $flags = 0)
 		$this->assertSame($expected, $return['text']);
 	}
 
-	public function get_legacy_tests()
+	public static function get_legacy_tests()
 	{
 		return array(
 			array(
@@ -69,7 +69,7 @@ public function test_text_formatter($original, $expected)
 		$this->assertSame($expected, $return['text']);
 	}
 
-	public function get_text_formatter_tests()
+	public static function get_text_formatter_tests()
 	{
 		return array(
 			array(
diff --git a/tests/text_processing/generate_text_for_storage_test.php b/tests/text_processing/generate_text_for_storage_test.php
index c47c9b9f5ef..c2aa7d2db6b 100644
--- a/tests/text_processing/generate_text_for_storage_test.php
+++ b/tests/text_processing/generate_text_for_storage_test.php
@@ -20,7 +20,6 @@ protected function setUp(): void
 		parent::setUp();
 
 		$config = new \phpbb\config\config(array());
-		set_config(null, null, null, $config);
 
 		$phpbb_container = new phpbb_mock_container_builder;
 		$phpbb_container->set('config', $config);
@@ -49,7 +48,7 @@ public function test_text_formatter($original, $expected, $allow_bbcode, $allow_
 		$this->assertSame($expected, $actual);
 	}
 
-	public function get_text_formatter_tests()
+	public static function get_text_formatter_tests()
 	{
 		return array(
 			array(
diff --git a/tests/text_processing/make_clickable_test.php b/tests/text_processing/make_clickable_test.php
index 3c8539c6121..e09d98bfdba 100644
--- a/tests/text_processing/make_clickable_test.php
+++ b/tests/text_processing/make_clickable_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_text_processing_make_clickable_test extends phpbb_test_case
 {
-	public function make_clickable_data()
+	public static function make_clickable_data()
 	{
 		// value => whether it should work
 		$prefix_texts = array(
@@ -101,7 +101,7 @@ public function test_make_clickable($input, $expected)
 		$this->assertEquals($expected, $result, $label);
 	}
 
-	public function make_clickable_mixed_serverurl_data()
+	public static function make_clickable_mixed_serverurl_data()
 	{
 		$urls = array(
 			'http://thisdomain.org' => array('tag' => 'm', 'url' => false, 'text' => false),
diff --git a/tests/text_processing/message_parser_test.php b/tests/text_processing/message_parser_test.php
index 0f74eacbe6a..35dcb4b5666 100644
--- a/tests/text_processing/message_parser_test.php
+++ b/tests/text_processing/message_parser_test.php
@@ -40,8 +40,6 @@ protected function prepare_s9e_services($setup = null)
 		$map = array(
 			array('MAX_FONT_SIZE_EXCEEDED', 120, 'You may only use fonts up to size 120.'),
 			array('MAX_FONT_SIZE_EXCEEDED', 200, 'You may only use fonts up to size 200.'),
-			array('MAX_IMG_HEIGHT_EXCEEDED', 12, 'Your images may only be up to 12 pixels high.'),
-			array('MAX_IMG_WIDTH_EXCEEDED', 34, 'Your images may only be up to 34 pixels wide.'),
 			array('TOO_MANY_SMILIES', 3, 'Your message contains too many smilies. The maximum number of smilies allowed is 3.'),
 			array('TOO_MANY_URLS', 2, 'Your message contains too many URLs. The maximum number of URLs allowed is 2.'),
 			array('UNAUTHORISED_BBCODE', '[img]', 'You cannot use certain BBCodes: [img].'),
@@ -62,14 +60,15 @@ protected function prepare_s9e_services($setup = null)
 		);
 		$user->style = array('style_id' => 1);
 
-		$user->lang = array(
-			'NO_POLL_TITLE' => 'You have to enter a poll title.',
-			'POLL_TITLE_TOO_LONG' => 'The poll title must contain fewer than 100 characters.',
-			'POLL_TITLE_COMP_TOO_LONG' => 'The parsed size of your poll title is too large, consider removing BBCodes or smilies.',
-			'TOO_FEW_POLL_OPTIONS' => 'You must enter at least two poll options.',
-			'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options.',
-			'TOO_MANY_USER_OPTIONS' => 'You cannot specify more options per user than existing poll options.',
-		);
+		$user->expects($this->any())
+			->method('__get')->with('lang')->willReturn([
+				'NO_POLL_TITLE' => 'You have to enter a poll title.',
+				'POLL_TITLE_TOO_LONG' => 'The poll title must contain fewer than 100 characters.',
+				'POLL_TITLE_COMP_TOO_LONG' => 'The parsed size of your poll title is too large, consider removing BBCodes or smilies.',
+				'TOO_FEW_POLL_OPTIONS' => 'You must enter at least two poll options.',
+				'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options.',
+				'TOO_MANY_USER_OPTIONS' => 'You cannot specify more options per user than existing poll options.',
+			]);
 
 		$phpbb_container = new phpbb_mock_container_builder;
 		$phpbb_container->set('user', $user);
@@ -115,7 +114,7 @@ public function test_parse_poll($poll, $expected, $warn_msg = array())
 		$this->assertSame($warn_msg, $message_parser->warn_msg);
 	}
 
-	public function get_test_polls()
+	public static function get_test_polls()
 	{
 		return array(
 			array(
@@ -185,7 +184,7 @@ public function test_options($original, $expected, array $args, $setup = null, $
 		$this->assertSame($warn_msg, $message_parser->warn_msg);
 	}
 
-	public function get_test_cases()
+	public static function get_test_cases()
 	{
 		return array(
 			array(
diff --git a/tests/text_processing/smilies_test.php b/tests/text_processing/smilies_test.php
index 3778e5f58ca..180d4c296e3 100644
--- a/tests/text_processing/smilies_test.php
+++ b/tests/text_processing/smilies_test.php
@@ -25,7 +25,7 @@ public function test_text_formatter($original, $expected)
 		$this->assertSame($expected, $renderer->render($parser->parse($original)));
 	}
 
-	public function get_text_formatter_tests()
+	public static function get_text_formatter_tests()
 	{
 		return array(
 			array(
diff --git a/tests/text_processing/strip_bbcode_test.php b/tests/text_processing/strip_bbcode_test.php
index 6eae1aa0ddd..2fdae3b5f02 100644
--- a/tests/text_processing/strip_bbcode_test.php
+++ b/tests/text_processing/strip_bbcode_test.php
@@ -14,7 +14,7 @@
 class phpbb_text_processing_strip_bbcode_test extends phpbb_test_case
 {
 
-	public function data_strip_bbcode()
+	public static function data_strip_bbcode()
 	{
 		return [
 			['[b:20m4ill1]bold[/b:20m4ill1]', ' bold '],
diff --git a/tests/text_processing/tickets_data/PHPBB3-15348.html b/tests/text_processing/tickets_data/PHPBB3-15348.html
index 33336083e33..564e6fda595 100644
--- a/tests/text_processing/tickets_data/PHPBB3-15348.html
+++ b/tests/text_processing/tickets_data/PHPBB3-15348.html
@@ -1 +1 @@
-<img class="smilies" src="phpBB/images/smilies/icon_e_surprised.gif" width="15" height="17" alt=":o" title="First half of :ok:"> <img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt="k:" title="Second half of :ok:"> <img alt=":ok:" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/1f197.svg">
\ No newline at end of file
+<img class="smilies" src="phpBB/images/smilies/icon_e_surprised.gif" width="15" height="17" alt=":o" title="First half of :ok:"> <img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt="k:" title="Second half of :ok:"> <span class="emoji">:ok:</span>
\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-16074.html b/tests/text_processing/tickets_data/PHPBB3-16074.html
index 8b2e5aad8af..04d72697b8b 100644
--- a/tests/text_processing/tickets_data/PHPBB3-16074.html
+++ b/tests/text_processing/tickets_data/PHPBB3-16074.html
@@ -1 +1 @@
-<img alt=":man_judge:" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/1f468-200d-2696-fe0f.svg"> <img alt="👨‍⚖️" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/1f468-200d-2696-fe0f.svg">
\ No newline at end of file
+<span class="emoji">:man_judge:</span> <span class="emoji">👨‍⚖️</span>
\ No newline at end of file
diff --git a/tests/text_processing/tickets_test.php b/tests/text_processing/tickets_test.php
index 6230191a699..36eec93b7e8 100644
--- a/tests/text_processing/tickets_test.php
+++ b/tests/text_processing/tickets_test.php
@@ -44,7 +44,7 @@ public function test_tickets($ticket_id, $original, $expected, $fixture, $before
 		}
 	}
 
-	public function get_tickets_data()
+	public static function get_tickets_data()
 	{
 		$tests = array();
 
diff --git a/tests/text_reparser/plugins/post_text_test.php b/tests/text_reparser/plugins/post_text_test.php
index 8ea71e65f50..0333afd95b1 100644
--- a/tests/text_reparser/plugins/post_text_test.php
+++ b/tests/text_reparser/plugins/post_text_test.php
@@ -23,4 +23,66 @@ protected function get_reparser()
 	{
 		return new \phpbb\textreparser\plugins\post_text($this->db, POSTS_TABLE);
 	}
+
+	public static function data_reparse_url(): array
+	{
+		return [
+			[ // Reparse the same
+				'<r><URL url="https://www.example.com">https://www.example.com</URL> and some more text test included</r>',
+				'<r><URL url="https://www.example.com">https://www.example.com</URL> and some more text test included</r>',
+			],
+			[ // Reparse without magic URL, shouldn't change
+				'https://www.example.com and some more text test included',
+				'<t>https://www.example.com and some more text test included</t>',
+			],
+			[ // Reparse new format without magic URL, shouldn't change
+				'<t>https://www.example.com and some more text test included</t>',
+				'<t>https://www.example.com and some more text test included</t>',
+			],
+			[ // Reparse with magic URL, should update to text formatter format
+				'Foo is <!-- m --><a class="postlink" href="https://symfony.com/doc/current/service_container.html">https://symfony.com/doc/current/service_container.html</a><!-- m --> good',
+				'<r>Foo is <URL url="https://symfony.com/doc/current/service_container.html">https://symfony.com/doc/current/service_container.html</URL> good</r>',
+			],
+			[ // Reparse new format with magic URL, shouldn't change
+				'<r>Foo is <URL url="https://symfony.com/doc/current/service_container.html">https://symfony.com/doc/current/service_container.html</URL> good</r>',
+				'<r>Foo is <URL url="https://symfony.com/doc/current/service_container.html">https://symfony.com/doc/current/service_container.html</URL> good</r>',
+			]
+		];
+	}
+
+	/**
+	 * @dataProvider data_reparse_url
+	 */
+	public function test_reparse_url(string $input_text, string $expected_text)
+	{
+		foreach ([true, false] as $enable_magic_url)
+		{
+			$record = [
+				'enable_bbcode'			=> true,
+				'enable_smilies'		=> true,
+				'enable_magic_url'		=> $enable_magic_url,
+				'post_text'					=> $input_text,
+				'bbcode_uid'			=> '',
+			];
+
+			$sql = 'INSERT INTO ' . POSTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', $record);
+			$this->db->sql_query($sql);
+
+			$record['id'] = $this->db->sql_last_inserted_id();
+			$record['text'] = $record['post_text'];
+
+			// Call reparse_record via reflection
+			$reparser = $this->get_reparser();
+			$reparser_reflection = new \ReflectionMethod($reparser, 'reparse_record');
+			$reparser_reflection->invoke($reparser, $record);
+
+			// Retrieve reparsed post text and compare with expectec
+			$sql = 'SELECT post_id, post_text FROM ' . POSTS_TABLE . ' WHERE post_id = ' . (int) $record['id'];
+			$result = $this->db->sql_query($sql);
+			$actual_text = $this->db->sql_fetchfield('post_text');
+			$this->db->sql_freeresult($result);
+
+			$this->assertSame($expected_text, $actual_text);
+		}
+	}
 }
diff --git a/tests/text_reparser/plugins/test_row_based_plugin.php b/tests/text_reparser/plugins/test_row_based_plugin.php
index 80fe85c8d39..425054f4c12 100644
--- a/tests/text_reparser/plugins/test_row_based_plugin.php
+++ b/tests/text_reparser/plugins/test_row_based_plugin.php
@@ -15,6 +15,7 @@
 
 abstract class phpbb_textreparser_test_row_based_plugin extends phpbb_database_test_case
 {
+	/** @var \phpbb\db\driver\driver_interface */
 	protected $db;
 
 	abstract protected function get_reparser();
@@ -26,7 +27,6 @@ protected function get_rows(array $ids)
 
 		$reflection_reparser = new ReflectionClass(get_class($reparser));
 		$table_property = $reflection_reparser->getProperty('table');
-		$table_property->setAccessible(true);
 
 		$sql = 'SELECT ' . $columns['id'] . ' AS id, ' . $columns['text'] . ' AS text
 			FROM ' . $table_property->getValue($reparser) . '
@@ -84,7 +84,7 @@ public function test_reparse($min_id, $max_id, $expected)
 		$this->assertEquals($expected, $this->get_rows($ids));
 	}
 
-	public function get_reparse_tests()
+	public static function get_reparse_tests()
 	{
 		return array(
 			array(
diff --git a/tests/tree/nestedset_forum_insert_delete_test.php b/tests/tree/nestedset_forum_add_remove_test.php
similarity index 97%
rename from tests/tree/nestedset_forum_insert_delete_test.php
rename to tests/tree/nestedset_forum_add_remove_test.php
index e58c1b8c684..863ff8e9969 100644
--- a/tests/tree/nestedset_forum_insert_delete_test.php
+++ b/tests/tree/nestedset_forum_add_remove_test.php
@@ -15,7 +15,7 @@
 
 class phpbb_tests_tree_nestedset_forum_add_remove_test extends phpbb_tests_tree_nestedset_forum_base
 {
-	public function delete_data()
+	public static function delete_data()
 	{
 		return array(
 			array(1, array(1, 2, 3), array(
@@ -56,7 +56,7 @@ public function test_delete($forum_id, $expected_deleted, $expected)
 		$this->assertEquals($expected, $this->db->sql_fetchrowset($result));
 	}
 
-	public function delete_throws_data()
+	public static function delete_throws_data()
 	{
 		return array(
 			array('Not an item', 0),
@@ -74,7 +74,7 @@ public function test_delete_throws($explain, $forum_id)
 		$this->set->delete($forum_id);
 	}
 
-	public function insert_data()
+	public static function insert_data()
 	{
 		return array(
 			array(array(
diff --git a/tests/tree/nestedset_forum_get_data_test.php b/tests/tree/nestedset_forum_get_data_test.php
index 90ef6b3dc3c..c8872317547 100644
--- a/tests/tree/nestedset_forum_get_data_test.php
+++ b/tests/tree/nestedset_forum_get_data_test.php
@@ -15,7 +15,7 @@
 
 class phpbb_tests_tree_nestedset_forum_get_data_test extends phpbb_tests_tree_nestedset_forum_base
 {
-	public function get_path_and_subtree_data_data()
+	public static function get_path_and_subtree_data_data()
 	{
 		return array(
 			array(1, true, true, array(1, 2, 3)),
@@ -43,7 +43,7 @@ public function test_get_path_and_subtree_data($forum_id, $order_asc, $include_i
 		$this->assertEquals($expected, array_keys($this->set->get_path_and_subtree_data($forum_id, $order_asc, $include_item)));
 	}
 
-	public function get_path_data_data()
+	public static function get_path_data_data()
 	{
 		return array(
 			array(1, true, true, array(1)),
@@ -71,7 +71,7 @@ public function test_get_path_data($forum_id, $order_asc, $include_item, $expect
 		$this->assertEquals($expected, array_keys($this->set->get_path_data($forum_id, $order_asc, $include_item)));
 	}
 
-	public function get_subtree_data_data()
+	public static function get_subtree_data_data()
 	{
 		return array(
 			array(1, true, true, array(1, 2, 3)),
@@ -99,7 +99,7 @@ public function test_get_subtree_data($forum_id, $order_asc, $include_item, $exp
 		$this->assertEquals($expected, array_keys($this->set->get_subtree_data($forum_id, $order_asc, $include_item)));
 	}
 
-	public function get_path_basic_data_data()
+	public static function get_path_basic_data_data()
 	{
 		return array(
 			array(1, '', array()),
@@ -121,7 +121,7 @@ public function test_get_path_basic_data($forum_id, $forum_parents, $expected)
 		$this->assertEquals($expected, array_keys($this->set->get_path_basic_data($forum_data)));
 	}
 
-	public function get_all_tree_data_data()
+	public static function get_all_tree_data_data()
 	{
 		return array(
 			array(true, array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)),
diff --git a/tests/tree/nestedset_forum_move_test.php b/tests/tree/nestedset_forum_move_test.php
index b738a0f6a86..e841daf8431 100644
--- a/tests/tree/nestedset_forum_move_test.php
+++ b/tests/tree/nestedset_forum_move_test.php
@@ -15,7 +15,7 @@
 
 class phpbb_tests_tree_nestedset_forum_move_test extends phpbb_tests_tree_nestedset_forum_base
 {
-	public function move_data()
+	public static function move_data()
 	{
 		return array(
 			array('Move first item up',
@@ -132,7 +132,7 @@ public function test_move($explain, $forum_id, $delta, $expected_moved, $expecte
 		$this->assertEquals($expected, $this->db->sql_fetchrowset($result));
 	}
 
-	public function move_down_data()
+	public static function move_down_data()
 	{
 		return array(
 			array('Move last item down',
@@ -179,7 +179,7 @@ public function test_move_down($explain, $forum_id, $expected_moved, $expected)
 		$this->assertEquals($expected, $this->db->sql_fetchrowset($result));
 	}
 
-	public function move_up_data()
+	public static function move_up_data()
 	{
 		return array(
 			array('Move first item up',
@@ -226,7 +226,7 @@ public function test_move_up($explain, $forum_id, $expected_moved, $expected)
 		$this->assertEquals($expected, $this->db->sql_fetchrowset($result));
 	}
 
-	public function move_children_data()
+	public static function move_children_data()
 	{
 		return array(
 			array('Item has no children',
@@ -376,7 +376,7 @@ public function test_move_children($explain, $forum_id, $target_id, $expected_mo
 		$this->assertEquals($expected, $this->db->sql_fetchrowset($result));
 	}
 
-	public function move_children_throws_item_data()
+	public static function move_children_throws_item_data()
 	{
 		return array(
 			array('Item 0 does not exist', 0, 5),
@@ -394,7 +394,7 @@ public function test_move_children_throws_item($explain, $forum_id, $target_id)
 		$this->set->move_children($forum_id, $target_id);
 	}
 
-	public function move_children_throws_parent_data()
+	public static function move_children_throws_parent_data()
 	{
 		return array(
 			array('New parent is child', 4, 5),
@@ -413,7 +413,7 @@ public function test_move_children_throws_parent($explain, $forum_id, $target_id
 		$this->set->move_children($forum_id, $target_id);
 	}
 
-	public function change_parent_data()
+	public static function change_parent_data()
 	{
 		return array(
 			array('Move single child up',
@@ -530,7 +530,7 @@ public function test_change_parent($explain, $forum_id, $target_id, $expected_mo
 		$this->assertEquals($expected, $this->db->sql_fetchrowset($result));
 	}
 
-	public function change_parent_throws_item_data()
+	public static function change_parent_throws_item_data()
 	{
 		return array(
 			array('Item 0 does not exist', 0, 5),
@@ -548,7 +548,7 @@ public function test_change_parent_throws_item($explain, $forum_id, $target_id)
 		$this->set->change_parent($forum_id, $target_id);
 	}
 
-	public function change_parent_throws_parent_data()
+	public static function change_parent_throws_parent_data()
 	{
 		return array(
 			array('New parent is child', 4, 5),
diff --git a/tests/tree/nestedset_forum_regenerate_test.php b/tests/tree/nestedset_forum_regenerate_test.php
index 487237dedaa..b5bc806fd33 100644
--- a/tests/tree/nestedset_forum_regenerate_test.php
+++ b/tests/tree/nestedset_forum_regenerate_test.php
@@ -31,7 +31,7 @@ class phpbb_tests_tree_nestedset_forum_regenerate_test extends phpbb_tests_tree_
 		array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => ''),
 	);
 
-	public function regenerate_left_right_ids_data()
+	public static function regenerate_left_right_ids_data()
 	{
 		return array(
 			array('UPDATE phpbb_forums
diff --git a/tests/tree/nestedset_forum_test.php b/tests/tree/nestedset_forum_test.php
index bffceb73efc..973af358365 100644
--- a/tests/tree/nestedset_forum_test.php
+++ b/tests/tree/nestedset_forum_test.php
@@ -15,7 +15,7 @@
 
 class pphpbb_tests_tree_nestedset_forum_test extends phpbb_tests_tree_nestedset_forum_base
 {
-	public function forum_constructor_data()
+	public static function forum_constructor_data()
 	{
 		return array(
 			array(array(
@@ -47,7 +47,7 @@ public function test_forum_constructor($expected)
 		$this->assertEquals($expected, $this->db->sql_fetchrowset($result));
 	}
 
-	public function get_sql_where_data()
+	public static function get_sql_where_data()
 	{
 		return array(
 			array('SELECT forum_id
diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php
new file mode 100644
index 00000000000..1fc63d4ed4c
--- /dev/null
+++ b/tests/ucp/controller_webpush_test.php
@@ -0,0 +1,673 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\exception\http_exception;
+use phpbb\notification\type\quote;
+use phpbb\request\request_interface;
+use phpbb\ucp\controller\webpush;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+
+class test_ucp_controller_webpush_test extends phpbb_database_test_case
+{
+	protected $auth;
+	protected $avatar_helper;
+	protected $config;
+	protected $controller;
+	protected $controller_helper;
+	protected $db;
+	protected $dispatcher;
+	protected $form_helper;
+	protected $language;
+	protected $notification_manager;
+	protected $path_helper;
+	protected $phpbb_root_path;
+	protected $php_ext;
+	protected $request;
+	protected $template;
+	protected $user;
+	protected $user_loader;
+
+	protected function getDataSet()
+	{
+		return $this->createXMLDataSet(__DIR__ . '/fixtures/webpush.xml');
+	}
+
+	protected function setUp(): void
+	{
+		global $auth, $config, $phpbb_dispatcher, $user, $phpbb_root_path, $phpEx;
+
+		parent::setUp();
+
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+
+		$this->auth = $this->createMock(\phpbb\auth\auth::class);
+		$auth = $this->auth;
+		$this->avatar_helper = $this->createMock(\phpbb\avatar\helper::class);
+		$this->config = new \phpbb\config\config([
+			'allow_nocensors'	=> false,
+			'sitename'			=> 'yourdomain.com',
+		]);
+		$config = $this->config;
+		$this->controller_helper = $this->createMock(\phpbb\controller\helper::class);
+		$this->db = $this->new_dbal();
+		$this->dispatcher = $this->createMock(\phpbb\event\dispatcher::class);
+		$this->form_helper = $this->createMock(\phpbb\form\form_helper::class);
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$this->language = new \phpbb\language\language($lang_loader);
+		$this->notification_manager = $this->createMock(\phpbb\notification\manager::class);
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $phpEx;
+		$symfony_request = $this->createMock(\phpbb\symfony_request::class);
+		$this->request = $this->createMock(\phpbb\request\request_interface::class);
+		$this->template = $this->createMock(\Twig\Environment::class);
+		$this->user = new \phpbb\user($this->language, '\phpbb\datetime');
+
+		$user = $this->user;
+		$this->user_loader = new \phpbb\user_loader($this->avatar_helper, $this->db, $this->phpbb_root_path, $this->php_ext, 'phpbb_users');
+		$this->path_helper = new \phpbb\path_helper($symfony_request, $this->request, $phpbb_root_path, $phpEx);
+
+		$this->controller = new webpush(
+			$this->config,
+			$this->controller_helper,
+			$this->db,
+			$this->dispatcher,
+			$this->form_helper,
+			$this->language,
+			$this->notification_manager,
+			$this->path_helper,
+			$this->request,
+			$this->user_loader,
+			$this->user,
+			$this->template,
+			'phpbb_notification_push',
+			'phpbb_push_subscriptions'
+		);
+	}
+
+	public static function data_notification_exceptions(): array
+	{
+		return [
+			'not_ajax' => [
+				false,
+				false,
+				USER_NORMAL,
+				2,
+				[],
+				'NO_AUTH_OPERATION',
+			],
+			'is_bot' => [
+				true,
+				true,
+				USER_NORMAL,
+				2,
+				[],
+				'NO_AUTH_OPERATION',
+			],
+			'inactive_user' => [
+				true,
+				false,
+				USER_INACTIVE,
+				2,
+				[],
+				'NO_AUTH_OPERATION',
+			],
+			'ignore_user' => [
+				true,
+				false,
+				USER_IGNORE,
+				2,
+				[],
+				'NO_AUTH_OPERATION',
+			],
+			'no_notification' => [
+				true,
+				false,
+				USER_NORMAL,
+				2,
+				[],
+				'AJAX_ERROR_TEXT',
+			],
+			'no_notification_anonymous' => [
+				true,
+				false,
+				USER_NORMAL,
+				ANONYMOUS,
+				[
+					['token', '', false, request_interface::REQUEST, 'foobar'],
+				],
+				'AJAX_ERROR_TEXT',
+			],
+			'no_notification_anonymous_no_token' => [
+				true,
+				false,
+				USER_NORMAL,
+				ANONYMOUS,
+				[],
+				'NO_AUTH_OPERATION',
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider data_notification_exceptions
+	 */
+	public function test_notification_no_data($is_ajax, $is_bot, $user_type, $user_id, $request_data, $expected_message)
+	{
+		$this->request->method('is_ajax')->willReturn($is_ajax);
+		$this->request->expects($this->any())
+			->method('variable')
+			->willReturnMap($request_data);
+		$this->user->data = [
+			'is_bot'		=> $is_bot,
+			'user_type'		=> $user_type,
+			'user_id'		=> $user_id,
+		];
+
+		$this->expectException(http_exception::class);
+		$this->expectExceptionMessage($expected_message);
+
+		$this->controller->notification();
+	}
+
+	public function test_get_user_notification()
+	{
+		global $cache;
+		$cache = $this->createMock(\phpbb\cache\service::class);
+		$cache->method('obtain_word_list')->willReturn([]);
+
+		$this->auth->method('acl_get')->willReturn(true);
+
+		$this->notification_manager->method('get_item_type_class')
+			->willReturnCallback(function(string $type_name, array $row_data) {
+				$notification_type = new quote(
+					$this->avatar_helper,
+					$this->controller_helper,
+					$this->db,
+					$this->language,
+					$this->user,
+					$this->auth,
+					$this->phpbb_root_path,
+					$this->php_ext,
+					'phpbb_notifications'
+				);
+
+				$notification_type->set_user_loader($this->user_loader);
+				$notification_type->set_initial_data($row_data);
+
+				return $notification_type;
+			});
+
+		$this->request->method('is_ajax')->willReturn(true);
+		$this->request->expects($this->any())
+			->method('variable')
+			->willReturnMap([
+				['token', '', false, request_interface::REQUEST, 'foobar'],
+				['item_id', 0, false, request_interface::REQUEST, 1],
+				['type_id', 0, false, request_interface::REQUEST, 4],
+			]);
+		$this->user->data = [
+			'is_bot'		=> false,
+			'user_type'		=> USER_NORMAL,
+			'user_id'		=> 2,
+			'user_options'	=> 230271,
+		];
+
+		$json_response = $this->controller->notification();
+
+		$response_data = json_decode($json_response->getContent(), true);
+
+		$this->assertEquals([
+			'heading' => 'yourdomain.com',
+			'title' => 'Quoted by Guest in:',
+			'text' => '"Welcome to phpBB"',
+			'url' => 'phpBB/viewtopic.php?p=1#p1',
+			'avatar' => [],
+		], $response_data);
+	}
+
+	public function test_get_user_notification_anonymous()
+	{
+		global $cache;
+		$cache = $this->createMock(\phpbb\cache\service::class);
+		$cache->method('obtain_word_list')->willReturn([]);
+
+		$this->auth->method('acl_get')->willReturn(true);
+
+		$this->notification_manager->method('get_item_type_class')
+			->willReturnCallback(function(string $type_name, array $row_data) {
+				$notification_type = new quote(
+					$this->avatar_helper,
+					$this->controller_helper,
+					$this->db,
+					$this->language,
+					$this->user,
+					$this->auth,
+					$this->phpbb_root_path,
+					$this->php_ext,
+					'phpbb_notifications'
+				);
+
+				$notification_type->set_user_loader($this->user_loader);
+				$notification_type->set_initial_data($row_data);
+
+				return $notification_type;
+			});
+
+		$this->request->method('is_ajax')->willReturn(true);
+		$this->request->expects($this->any())
+			->method('variable')
+			->willReturnMap([
+				['token', '', false, request_interface::REQUEST, '0ccf8fcd96a66297b77b66109cbe9870e1a6fa66e42b9bf36d1f2c7263240058'],
+				['item_id', 0, false, request_interface::REQUEST, 1],
+				['type_id', 0, false, request_interface::REQUEST, 4],
+				['user_id', 0, false, request_interface::REQUEST, 2],
+			]);
+		$this->user->data = [
+			'is_bot'		=> false,
+			'user_type'		=> USER_NORMAL,
+			'user_id'		=> ANONYMOUS,
+			'user_options'	=> 230271,
+		];
+
+		$json_response = $this->controller->notification();
+
+		$response_data = json_decode($json_response->getContent(), true);
+
+		$this->assertEquals([
+			'heading' => 'yourdomain.com',
+			'title' => 'Quoted by Guest in:',
+			'text' => '"Welcome to phpBB"',
+			'url' => 'phpBB/viewtopic.php?p=1#p1',
+			'avatar' => [],
+		], $response_data);
+	}
+
+	public function test_get_user_notification_anonymous_invalid_token()
+	{
+		global $cache;
+		$cache = $this->createMock(\phpbb\cache\service::class);
+		$cache->method('obtain_word_list')->willReturn([]);
+
+		$this->auth->method('acl_get')->willReturn(true);
+
+		$this->notification_manager->method('get_item_type_class')
+			->willReturnCallback(function(string $type_name, array $row_data) {
+				$notification_type = new quote(
+					$this->avatar_helper,
+					$this->controller_helper,
+					$this->db,
+					$this->language,
+					$this->user,
+					$this->auth,
+					$this->phpbb_root_path,
+					$this->php_ext,
+					'phpbb_notifications'
+				);
+
+				$notification_type->set_user_loader($this->user_loader);
+				$notification_type->set_initial_data($row_data);
+
+				return $notification_type;
+			});
+
+		$this->request->method('is_ajax')->willReturn(true);
+		$this->request->expects($this->any())
+			->method('variable')
+			->willReturnMap([
+				['token', '', false, request_interface::REQUEST, '488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967'],
+				['item_id', 0, false, request_interface::REQUEST, 1],
+				['type_id', 0, false, request_interface::REQUEST, 4],
+				['user_id', 0, false, request_interface::REQUEST, 2],
+			]);
+		$this->user->data = [
+			'is_bot'		=> false,
+			'user_type'		=> USER_NORMAL,
+			'user_id'		=> ANONYMOUS,
+			'user_options'	=> 230271,
+		];
+
+		$this->expectException(http_exception::class);
+		$this->expectExceptionMessage('NO_AUTH_OPERATION');
+
+		$this->controller->notification();
+	}
+
+	public function test_get_user_notification_legacy()
+	{
+		global $cache;
+		$cache = $this->createMock(\phpbb\cache\service::class);
+		$cache->method('obtain_word_list')->willReturn([]);
+
+		$this->auth->method('acl_get')->willReturn(true);
+
+		$this->notification_manager->method('get_item_type_class')
+			->willReturnCallback(function(string $type_name, array $row_data) {
+				$notification_type = new quote(
+					$this->avatar_helper,
+					$this->controller_helper,
+					$this->db,
+					$this->language,
+					$this->user,
+					$this->auth,
+					$this->phpbb_root_path,
+					$this->php_ext,
+					'phpbb_notifications'
+				);
+
+				$notification_type->set_user_loader($this->user_loader);
+				$notification_type->set_initial_data($row_data);
+
+				return $notification_type;
+			});
+
+		$this->request->method('is_ajax')->willReturn(true);
+		$this->request->expects($this->any())
+			->method('variable')
+			->willReturnMap([
+				['token', '', false, request_interface::REQUEST, 'foobar'],
+				['item_id', 0, false, request_interface::REQUEST, 2],
+				['type_id', 0, false, request_interface::REQUEST, 4],
+			]);
+		$this->user->data = [
+			'is_bot'		=> false,
+			'user_type'		=> USER_NORMAL,
+			'user_id'		=> 2,
+			'user_options'	=> 230271,
+		];
+
+		$json_response = $this->controller->notification();
+
+		$response_data = json_decode($json_response->getContent(), true);
+
+		$this->assertEquals([
+			'heading' => 'yourdomain.com',
+			'title' => 'Quoted by Guest in:',
+			'text' => '"Welcome to phpBB"',
+			'url' => 'phpBB/viewtopic.php?p=1#p1',
+			'avatar' => [],
+		], $response_data);
+	}
+
+	public function test_worker()
+	{
+		$this->template->method('render')->willReturn('rendered_content');
+		$this->controller_helper->method('route')->willReturn('test_route');
+		$this->config['assets_version'] = '1.0';
+
+		$response = $this->controller->worker();
+
+		$this->assertInstanceOf(Response::class, $response);
+		$this->assertEquals('text/javascript; charset=UTF-8', $response->headers->get('Content-Type'));
+		$this->assertEquals('rendered_content', $response->getContent());
+		$this->assertNull($response->headers->get('X-PHPBB-IS-BOT'));
+	}
+
+	public function test_worker_bot()
+	{
+		$this->template->method('render')->willReturn('rendered_content');
+		$this->controller_helper->method('route')->willReturn('test_route');
+		$this->config['assets_version'] = '1.0';
+		$this->user->data['is_bot'] = true;
+
+		$response = $this->controller->worker();
+
+		$this->assertEquals('yes', $response->headers->get('X-PHPBB-IS-BOT'));
+	}
+
+	public function test_check_subscribe_requests_invalid_form_token()
+	{
+		$this->form_helper->method('check_form_tokens')->willReturn(false);
+
+		$this->expectException(http_exception::class);
+		$this->expectExceptionMessage('FORM_INVALID');
+
+		$check_subscribe_reflection = new ReflectionMethod($this->controller, 'check_subscribe_requests');
+		$check_subscribe_reflection->invoke($this->controller);
+	}
+
+	public function test_check_subscribe_requests_anonymous_user()
+	{
+		$this->form_helper->method('check_form_tokens')->willReturn(true);
+		$this->request->method('is_ajax')->willReturn(true);
+		$this->user->data['user_id'] = ANONYMOUS;
+
+		$this->expectException(http_exception::class);
+		$this->expectExceptionMessage('NO_AUTH_OPERATION');
+
+		$check_subscribe_reflection = new ReflectionMethod($this->controller, 'check_subscribe_requests');
+		$check_subscribe_reflection->invoke($this->controller);
+	}
+
+	public function test_subscribe_success()
+	{
+		$this->dispatcher->method('trigger_event')
+			->with(
+				$this->equalTo('core.ucp_webpush_controller_verify_endpoint'),
+				$this->anything()
+			)
+			->willReturnCallback(function($event_name, $args) {
+				return $args;
+			});
+		$this->form_helper->method('check_form_tokens')->willReturn(true);
+		$this->request->method('is_ajax')->willReturn(true);
+		$this->user->data['user_id'] = 2;
+		$this->user->data['is_bot'] = false;
+		$this->user->data['user_type'] = USER_NORMAL;
+
+		$symfony_request = $this->createMock(\phpbb\symfony_request::class);
+		$symfony_request->attributes = $this->createMock(\Symfony\Component\HttpFoundation\ParameterBag::class);
+		$symfony_request->attributes->method('get')->willReturn(json_encode([
+			'endpoint' => 'https://fcm.googleapis.com/fcm/send/test_endpoint',
+			'expiration_time' => 0,
+			'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth']
+		]));
+
+		$response = $this->controller->subscribe($symfony_request);
+
+		$this->assertInstanceOf(JsonResponse::class, $response);
+		$this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true));
+
+		// Get subscription data from database
+		$sql = 'SELECT *
+				FROM phpbb_push_subscriptions
+				WHERE user_id = 2';
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEquals([
+			'user_id' => '2',
+			'endpoint' => 'https://fcm.googleapis.com/fcm/send/test_endpoint',
+			'p256dh' => 'test_p256dh',
+			'auth' => 'test_auth',
+			'expiration_time' => 0,
+			'subscription_id' => '1',
+		], $row);
+	}
+
+	public function test_subscribe_unsupported_endpoint()
+	{
+		$this->form_helper->method('check_form_tokens')->willReturn(true);
+		$this->request->method('is_ajax')->willReturn(true);
+		$this->user->data['user_id'] = 2;
+		$this->user->data['is_bot'] = false;
+		$this->user->data['user_type'] = USER_NORMAL;
+
+		$symfony_request = $this->createMock(\phpbb\symfony_request::class);
+		$symfony_request->attributes = $this->createMock(\Symfony\Component\HttpFoundation\ParameterBag::class);
+		$symfony_request->attributes->method('get')->willReturn(json_encode([
+			'endpoint' => 'test_endpoint',
+			'expiration_time' => 0,
+			'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth']
+		]));
+
+		$this->expectException(http_exception::class);
+		$this->expectExceptionMessage('NOTIFY_WEB_PUSH_UNSUPPORTED_SERVICE');
+
+		$this->controller->subscribe($symfony_request);
+	}
+	public static function data_provider_subscribe_supported_endpoint(): array
+	{
+		return [
+			'fcm' => ['https://fcm.googleapis.com/fcm/send/test_endpoint'],
+			'apns' => ['https://api.push.apple.com/3/device/test_endpoint'],
+			'apns_sandbox' => ['https://api.sandbox.push.apple.com/3/device/test_endpoint'],
+		];
+	}
+
+	/**
+	 * @dataProvider data_provider_subscribe_supported_endpoint
+	 */
+	public function test_subscribe_supported_endpoint($data_provider)
+	{
+		$this->dispatcher->method('trigger_event')
+			->with(
+				$this->equalTo('core.ucp_webpush_controller_verify_endpoint'),
+				$this->anything()
+			)
+			->willReturnCallback(function($event_name, $args) {
+				return $args;
+			});
+		$this->form_helper->method('check_form_tokens')->willReturn(true);
+		$this->request->method('is_ajax')->willReturn(true);
+		$this->user->data['user_id'] = 2;
+		$this->user->data['is_bot'] = false;
+		$this->user->data['user_type'] = USER_NORMAL;
+
+		$symfony_request = $this->createMock(\phpbb\symfony_request::class);
+		$symfony_request->attributes = $this->createMock(\Symfony\Component\HttpFoundation\ParameterBag::class);
+		$symfony_request->attributes->method('get')->willReturn(json_encode([
+			'endpoint' => $data_provider,
+			'expiration_time' => 0,
+			'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth']
+		]));
+
+		$response = $this->controller->subscribe($symfony_request);
+
+		$this->assertInstanceOf(JsonResponse::class, $response);
+	}
+
+	public function test_subscribe_success_event_endpoint()
+	{
+		// Mock triggering of expected event and add new valid endpoint
+		$this->dispatcher->method('trigger_event')
+			->with(
+				$this->equalTo('core.ucp_webpush_controller_verify_endpoint'),
+				$this->anything()
+			)
+			->willReturnCallback(function($event_name, $args) {
+				$args['allowed_services'][] = 'test.endpoint.com';
+				return $args;
+			});
+		$this->form_helper->method('check_form_tokens')->willReturn(true);
+		$this->request->method('is_ajax')->willReturn(true);
+		$this->user->data['user_id'] = 2;
+		$this->user->data['is_bot'] = false;
+		$this->user->data['user_type'] = USER_NORMAL;
+
+		$symfony_request = $this->createMock(\phpbb\symfony_request::class);
+		$symfony_request->attributes = $this->createMock(\Symfony\Component\HttpFoundation\ParameterBag::class);
+		$symfony_request->attributes->method('get')->willReturn(json_encode([
+			'endpoint' => 'https://test.endpoint.com/send/candy/test_endpoint',
+			'expiration_time' => 0,
+			'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth']
+		]));
+
+		$response = $this->controller->subscribe($symfony_request);
+
+		$this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true));
+
+		// Get subscription data from database
+		$sql = 'SELECT *
+				FROM phpbb_push_subscriptions
+				WHERE user_id = 2
+				ORDER BY subscription_id DESC';
+		$result = $this->db->sql_query_limit($sql, 1);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEquals([
+			'user_id' => '2',
+			'endpoint' => 'https://test.endpoint.com/send/candy/test_endpoint',
+			'p256dh' => 'test_p256dh',
+			'auth' => 'test_auth',
+			'expiration_time' => 0,
+			'subscription_id' => $row['subscription_id'] ?? 0, // will have to take ID from database
+		], $row);
+	}
+
+	public function test_unsubscribe_success()
+	{
+		$this->dispatcher->method('trigger_event')
+			->with(
+				$this->equalTo('core.ucp_webpush_controller_verify_endpoint'),
+				$this->anything()
+			)
+			->willReturnCallback(function($event_name, $args) {
+				return $args;
+			});
+		$this->form_helper->method('check_form_tokens')->willReturn(true);
+		$this->request->method('is_ajax')->willReturn(true);
+		$this->user->data['user_id'] = 2;
+		$this->user->data['is_bot'] = false;
+		$this->user->data['user_type'] = USER_NORMAL;
+
+		$symfony_request = $this->createMock(\phpbb\symfony_request::class);
+		$symfony_request->attributes = $this->createMock(\Symfony\Component\HttpFoundation\ParameterBag::class);
+		$symfony_request->attributes->method('get')->willReturn(json_encode([
+			'endpoint' => 'https://fcm.googleapis.com/fcm/send/test_endpoint',
+			'expiration_time' => 0,
+			'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth']
+		]));
+
+		$response = $this->controller->subscribe($symfony_request);
+
+		$this->assertInstanceOf(JsonResponse::class, $response);
+		$this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true));
+
+		// Get subscription data from database
+		$sql = 'SELECT *
+				FROM phpbb_push_subscriptions
+				WHERE user_id = 2';
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEquals([
+			'user_id' => '2',
+			'endpoint' => 'https://fcm.googleapis.com/fcm/send/test_endpoint',
+			'p256dh' => 'test_p256dh',
+			'auth' => 'test_auth',
+			'expiration_time' => 0,
+			'subscription_id' => '1',
+		], $row);
+
+		// Now unsubscribe
+		$response = $this->controller->unsubscribe($symfony_request);
+
+		$this->assertInstanceOf(JsonResponse::class, $response);
+		$this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true));
+
+		// Get subscription data from database
+		$sql = 'SELECT *
+				FROM phpbb_push_subscriptions
+				WHERE user_id = 2
+				  AND subscription_id = 1';
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEmpty($row);
+	}
+}
diff --git a/tests/ucp/fixtures/webpush.xml b/tests/ucp/fixtures/webpush.xml
new file mode 100644
index 00000000000..a94086b9c32
--- /dev/null
+++ b/tests/ucp/fixtures/webpush.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_notification_push">
+		<column>item_id</column>
+		<column>push_data</column>
+		<column>push_token</column>
+		<column>user_id</column>
+		<column>notification_type_id</column>
+		<column>notification_time</column>
+		<row>
+			<value>1</value>
+			<value><![CDATA[{"item_id":1,"notification_type_id":4,"item_parent_id":1,"notification_time":1738437884,"notification_read":false,"notification_data":"a:6:{s:9:\"poster_id\";i:3;s:11:\"topic_title\";s:16:\"Welcome to phpBB\";s:12:\"post_subject\";s:20:\"Re: Welcome to phpBB\";s:13:\"post_username\";s:0:\"\";s:8:\"forum_id\";i:2;s:10:\"forum_name\";s:16:\"Your first forum\";}","user_id":2,"notification_type_name":"notification.type.quote"}]]></value>
+			<value>488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967</value>
+			<value>2</value>
+			<value>4</value>
+			<value>1738437884</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value><![CDATA[{"heading":"yourdomain.com","title":"Quoted by Guest in:","text":"\"Welcome to phpBB\"","url":"phpBB\/viewtopic.php?p=1#p1","avatar":[]}]]></value>
+			<value>488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967</value>
+			<value>2</value>
+			<value>4</value>
+			<value>1738437884</value>
+		</row>
+	</table>
+	<table name="phpbb_notification_types">
+		<column>notification_type_id</column>
+		<column>notification_type_name</column>
+		<column>notification_type_enabled</column>
+		<row>
+			<value>4</value>
+			<value>notification.type.quote</value>
+			<value>1</value>
+		</row>
+	</table>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_form_salt</column>
+		<row>
+			<value>1</value>
+			<value>Anonymous</value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>poster</value>
+			<value></value>
+			<value></value>
+			<value>sua0m6f0ektt1g9z</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>test</value>
+			<value></value>
+			<value></value>
+			<value>abcdef</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/update/controller_test.php b/tests/update/controller_test.php
new file mode 100644
index 00000000000..bba0186b7f7
--- /dev/null
+++ b/tests/update/controller_test.php
@@ -0,0 +1,351 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use phpbb\update\controller;
+use phpbb\update\get_updates;
+use phpbb\filesystem\filesystem;
+use phpbb\language\language;
+
+class phpbb_update_controller_test extends \phpbb_test_case
+{
+	private $filesystem;
+	private $filesystem_mock;
+	private $updater_mock;
+	private $language_mock;
+	private $phpbb_root_path;
+
+	protected function setUp(): void
+	{
+		global $phpbb_root_path;
+
+		$this->filesystem = new filesystem();
+		$this->filesystem_mock = $this->createMock(filesystem::class);
+		$this->updater_mock = $this->createMock(get_updates::class);
+		$this->language_mock = $this->createMock(language::class);
+		$this->phpbb_root_path = $phpbb_root_path;
+	}
+
+	protected function tearDown(): void
+	{
+		$this->filesystem->remove([
+			$this->phpbb_root_path . 'store/update.zip',
+			$this->phpbb_root_path . 'store/update.zip.sig',
+			$this->phpbb_root_path . 'store/update',
+		]);
+	}
+
+	public function test_download_fails(): void
+	{
+		$this->updater_mock->expects($this->once())
+			->method('download')
+			->willReturn(false);
+
+		$this->language_mock->expects($this->once())
+			->method('lang')
+			->with('UPDATE_PACKAGE_DOWNLOAD_FAILURE')
+			->willReturnArgument(0);
+
+		$controller = new controller(
+			$this->filesystem_mock,
+			$this->updater_mock,
+			$this->language_mock,
+			$this->phpbb_root_path
+		);
+
+		$response = $controller->handle('https://example.com/update.zip');
+		$this->assertEquals(['status' => 'error', 'error' => 'UPDATE_PACKAGE_DOWNLOAD_FAILURE'], $response);
+	}
+
+	public function test_download_success(): void
+	{
+		$this->updater_mock->expects($this->once())
+			->method('download')
+			->willReturn(true);
+
+		$controller = new controller(
+			$this->filesystem_mock,
+			$this->updater_mock,
+			$this->language_mock,
+			$this->phpbb_root_path
+		);
+
+		$response = $controller->handle('https://example.com/update.zip');
+		$this->assertEquals(['status' => 'continue'], $response);
+	}
+
+	public function test_download_signature_fails(): void
+	{
+		$update_path = $this->phpbb_root_path . 'store/update.zip';
+
+		$this->filesystem_mock->expects($this->any())
+			->method('exists')
+			->willReturnMap([
+				[$update_path, true],
+				[$update_path . '.sig', false],
+				[$this->phpbb_root_path . 'store/update', false],
+				[$this->phpbb_root_path . 'install', false],
+			]);
+
+		$this->updater_mock->expects($this->once())
+			->method('download')
+			->with('https://example.com/update.zip.sig', $update_path . '.sig')
+			->willReturn(false);
+
+		$this->language_mock->expects($this->once())
+			->method('lang')
+			->with('UPDATE_SIGNATURE_DOWNLOAD_FAILURE')
+			->willReturnArgument(0);
+
+		$controller = new controller(
+			$this->filesystem_mock,
+			$this->updater_mock,
+			$this->language_mock,
+			$this->phpbb_root_path
+		);
+
+		$response = $controller->handle('https://example.com/update.zip');
+		$this->assertEquals(['status' => 'error', 'error' => 'UPDATE_SIGNATURE_DOWNLOAD_FAILURE'], $response);
+	}
+
+	public function test_download_signature_success(): void
+	{
+		$update_path = $this->phpbb_root_path . 'store/update.zip';
+
+		$this->filesystem_mock->expects($this->any())
+			->method('exists')
+			->willReturnMap([
+				[$update_path, true],
+				[$update_path . '.sig', false],
+				[$this->phpbb_root_path . 'store/update', false],
+				[$this->phpbb_root_path . 'install', false],
+			]);
+
+		$this->updater_mock->expects($this->once())
+			->method('download')
+			->with('https://example.com/update.zip.sig', $update_path . '.sig')
+			->willReturn(true);
+
+		$controller = new controller(
+			$this->filesystem_mock,
+			$this->updater_mock,
+			$this->language_mock,
+			$this->phpbb_root_path
+		);
+
+		$response = $controller->handle('https://example.com/update.zip');
+		$this->assertEquals(['status' => 'continue'], $response);
+	}
+
+	public function test_signature_validation_fails(): void
+	{
+		$update_path = $this->phpbb_root_path . 'store/update.zip';
+
+		$this->filesystem_mock->expects($this->any())
+			->method('exists')
+			->willReturnMap([
+				[$update_path, true],
+				[$update_path . '.sig', true],
+				[$this->phpbb_root_path . 'store/update', false],
+				[$this->phpbb_root_path . 'install', false],
+			]);
+
+		$this->updater_mock->expects($this->once())
+			->method('validate')
+			->willReturn(false);
+
+		$this->language_mock->expects($this->once())
+			->method('lang')
+			->with('UPDATE_SIGNATURE_INVALID')
+			->willReturnArgument(0);
+
+		$controller = new controller(
+			$this->filesystem_mock,
+			$this->updater_mock,
+			$this->language_mock,
+			$this->phpbb_root_path
+		);
+
+		$response = $controller->handle('https://example.com/update.zip');
+		$this->assertEquals(['status' => 'error', 'error' => 'UPDATE_SIGNATURE_INVALID'], $response);
+	}
+
+	public function test_extract_fails(): void
+	{
+		$update_path = $this->phpbb_root_path . 'store/update.zip';
+
+		$this->filesystem_mock->expects($this->any())
+			->method('exists')
+			->willReturnMap([
+				[$update_path, true],
+				[$update_path . '.sig', true],
+				[$this->phpbb_root_path . 'store/update', false],
+				[$this->phpbb_root_path . 'install', false],
+			]);
+
+		$this->updater_mock->expects($this->once())
+			->method('validate')
+			->willReturn(true);
+
+		$this->updater_mock->expects($this->once())
+			->method('extract')
+			->willReturn(false);
+
+		$this->language_mock->expects($this->once())
+			->method('lang')
+			->with('UPDATE_PACKAGE_EXTRACT_FAILURE')
+			->willReturnArgument(0);
+
+		$controller = new controller(
+			$this->filesystem_mock,
+			$this->updater_mock,
+			$this->language_mock,
+			$this->phpbb_root_path
+		);
+
+		$response = $controller->handle('https://example.com/update.zip');
+		$this->assertEquals(['status' => 'error', 'error' => 'UPDATE_PACKAGE_EXTRACT_FAILURE'], $response);
+	}
+
+	public function test_extract_success(): void
+	{
+		$update_path = $this->phpbb_root_path . 'store/update.zip';
+
+		$this->filesystem_mock->expects($this->any())
+			->method('exists')
+			->willReturnMap([
+				[$update_path, true],
+				[$update_path . '.sig', true],
+				[$this->phpbb_root_path . 'store/update', false],
+				[$this->phpbb_root_path . 'install', false],
+			]);
+
+		$this->updater_mock->expects($this->once())
+			->method('validate')
+			->willReturn(true);
+
+		$this->updater_mock->expects($this->once())
+			->method('extract')
+			->willReturn(true);
+
+		$controller = new controller(
+			$this->filesystem_mock,
+			$this->updater_mock,
+			$this->language_mock,
+			$this->phpbb_root_path
+		);
+
+		$response = $controller->handle('https://example.com/update.zip');
+		$this->assertEquals(['status' => 'continue'], $response);
+	}
+
+	public function test_copy_fails(): void
+	{
+		$update_path = $this->phpbb_root_path . 'store/update.zip';
+		$this->filesystem->touch($update_path); // Simulate existing update file
+		$this->filesystem->touch($update_path . '.sig'); // Simulate existing signature file
+		$this->filesystem->mkdir($this->phpbb_root_path . 'store/update');
+
+		$this->filesystem_mock->expects($this->any())
+			->method('exists')
+			->willReturnMap([
+				[$update_path, true],
+				[$update_path . '.sig', true],
+				[$this->phpbb_root_path . 'store/update', true],
+				[$this->phpbb_root_path . 'install', false],
+			]);
+
+		$this->updater_mock->expects($this->once())
+			->method('copy')
+			->willReturn(false);
+
+		$this->language_mock->expects($this->once())
+			->method('lang')
+			->with('UPDATE_FILES_COPY_FAILURE')
+			->willReturnArgument(0);
+
+		$controller = new controller(
+			$this->filesystem_mock,
+			$this->updater_mock,
+			$this->language_mock,
+			$this->phpbb_root_path
+		);
+
+		$response = $controller->handle('https://example.com/update.zip');
+		$this->assertEquals(['status' => 'error', 'error' => 'UPDATE_FILES_COPY_FAILURE'], $response);
+	}
+
+	public function test_copy_success(): void
+	{
+		$update_path = $this->phpbb_root_path . 'store/update.zip';
+		$this->filesystem->touch($update_path); // Simulate existing update file
+		$this->filesystem->touch($update_path . '.sig'); // Simulate existing signature file
+		$this->filesystem->mkdir($this->phpbb_root_path . 'store/update');
+
+		$this->filesystem_mock->expects($this->any())
+			->method('exists')
+			->willReturnMap([
+				[$update_path, true],
+				[$update_path . '.sig', true],
+				[$this->phpbb_root_path . 'store/update', true],
+				[$this->phpbb_root_path . 'install', false],
+			]);
+
+		$this->updater_mock->expects($this->once())
+			->method('copy')
+			->willReturn(true);
+
+		$controller = new controller(
+			$this->filesystem_mock,
+			$this->updater_mock,
+			$this->language_mock,
+			$this->phpbb_root_path
+		);
+
+		$response = $controller->handle('https://example.com/update.zip');
+		$this->assertEquals(['status' => 'continue'], $response);
+	}
+
+	public function test_successful_update_process(): void
+	{
+		$update_path = $this->phpbb_root_path . 'store/update.zip';
+		$signature_path = $update_path . '.sig';
+		$update_dir = $this->phpbb_root_path . 'store/update';
+
+		$this->filesystem->touch($update_path);
+		$this->filesystem->touch($signature_path);
+		$this->filesystem->mkdir($update_dir);
+
+		$this->filesystem_mock->expects($this->any())
+			->method('exists')
+			->willReturnMap([
+				[$update_path, true],
+				[$update_path . '.sig', true],
+				[$this->phpbb_root_path . 'store/update', true],
+				[$this->phpbb_root_path . 'install', true],
+			]);
+
+		$this->filesystem_mock->expects($this->once())
+			->method('remove')
+			->with([$update_dir, $update_path, $signature_path]);
+
+		$controller = new controller(
+			$this->filesystem_mock,
+			$this->updater_mock,
+			$this->language_mock,
+			$this->phpbb_root_path
+		);
+
+		$response = $controller->handle('https://example.com/update.zip');
+		$this->assertEquals(['status' => 'done'], $response);
+	}
+}
\ No newline at end of file
diff --git a/tests/update/get_updates_test.php b/tests/update/get_updates_test.php
new file mode 100644
index 00000000000..c756972ae7e
--- /dev/null
+++ b/tests/update/get_updates_test.php
@@ -0,0 +1,322 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Psr7\Response;
+use phpbb\filesystem\exception\filesystem_exception;
+use phpbb\filesystem\filesystem_interface;
+use phpbb\update\get_updates;
+
+class phpbb_update_get_updates_test extends phpbb_test_case
+{
+	private $filesystem;
+	private $http_client;
+	private $zipper;
+	private $update;
+	private $public_key = 'atest_public_keyatest_public_keyatest_public_keyatest_public_key';
+
+	private $file_path = __DIR__ . '/../tmp/download.zip';
+
+	private $signature_path = __DIR__ . '/../tmp/signature.sig';
+
+	private $phpbb_root_path;
+
+	public function setUp(): void
+	{
+		global $phpbb_root_path;
+
+		parent::setUp();
+
+		$this->filesystem = $this->createMock(filesystem_interface::class);
+		$this->http_client = $this->createMock(Client::class);
+		$this->zipper = $this->createMock(ZipArchive::class);
+		$this->phpbb_root_path = $phpbb_root_path;
+
+		// Set up the `get_updates` instance with injected mocks.
+		$this->update = new get_updates($this->filesystem, base64_encode($this->public_key), $this->phpbb_root_path);
+	}
+
+	public function tearDown(): void
+	{
+		if (file_exists($this->file_path))
+		{
+			unlink($this->file_path);
+		}
+
+		if (file_exists($this->signature_path))
+		{
+			unlink($this->signature_path);
+		}
+
+		parent::tearDown();
+	}
+
+	public function test_download_success()
+	{
+		$response_mock = $this->createMock(Response::class);
+		$this->http_client->expects($this->once())
+			->method('request')
+			->with('GET', 'http://example.com/update.zip', [
+				'sink' => '/path/to/storage',
+				'allow_redirects' => false
+			])
+			->willReturn($response_mock);
+
+		$client_reflection = new \ReflectionProperty($this->update, 'http_client');
+		$client_reflection->setValue($this->update, $this->http_client);
+
+		$result = $this->update->download('http://example.com/update.zip', '/path/to/storage');
+		$this->assertTrue($result);
+	}
+
+	public function test_download_failure()
+	{
+		$this->http_client->expects($this->once())
+			->method('request')
+			->willReturnCallback(function ($method, $url, $options)
+			{
+				throw new ClientException('bad client', new \GuzzleHttp\Psr7\Request($method, $url), new \GuzzleHttp\Psr7\Response());
+			});
+		$client_reflection = new \ReflectionProperty($this->update, 'http_client');
+		$client_reflection->setValue($this->update, $this->http_client);
+
+		$result = $this->update->download('http://example.com/update.zip', '/path/to/storage');
+		$this->assertFalse($result);
+	}
+
+	public function test_validate_success()
+	{
+		$keypair = sodium_crypto_sign_keypair();
+
+		$secret_key = sodium_crypto_sign_secretkey($keypair);
+		$public_key = base64_encode(sodium_crypto_sign_publickey($keypair));
+
+		file_put_contents($this->file_path, 'test file content');
+
+		$hash = hash_file('sha384', $this->file_path, true);
+		file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key)));
+
+		$client_reflection = new \ReflectionProperty($this->update, 'public_key');
+		$client_reflection->setValue($this->update, $public_key);
+
+		$this->assertTrue($this->update->validate($this->file_path, $this->signature_path));
+	}
+
+	public function test_validate_file_not_exist()
+	{
+		$file_path = __DIR__ . '/../tmp/download.zip';
+		$signature_path = __DIR__ . '/../tmp/signature.sig';
+
+		$keypair = sodium_crypto_sign_keypair();
+
+		$public_key = base64_encode(sodium_crypto_sign_publickey($keypair));
+
+		$client_reflection = new \ReflectionProperty($this->update, 'public_key');
+		$client_reflection->setValue($this->update, $public_key);
+
+		$this->assertFalse($this->update->validate($file_path, $signature_path));
+	}
+
+	public function test_validate_sig_not_exist()
+	{
+		$keypair = sodium_crypto_sign_keypair();
+
+		$public_key = base64_encode(sodium_crypto_sign_publickey($keypair));
+
+		file_put_contents($this->file_path, 'test file content');
+
+		$client_reflection = new \ReflectionProperty($this->update, 'public_key');
+		$client_reflection->setValue($this->update, $public_key);
+
+		$this->assertFalse($this->update->validate($this->file_path, $this->signature_path));
+	}
+
+	public function test_validate_file_not_accessible()
+	{
+		if (strtolower(substr(PHP_OS, 0, 3)) === 'win')
+		{
+			$this->markTestSkipped('Unable to test unreadable files on Windows');
+		}
+
+		$keypair = sodium_crypto_sign_keypair();
+
+		$public_key = base64_encode(sodium_crypto_sign_publickey($keypair));
+
+		file_put_contents($this->file_path, 'test file content');
+
+		chmod($this->file_path, 0000);
+
+		$client_reflection = new \ReflectionProperty($this->update, 'public_key');
+		$client_reflection->setValue($this->update, $public_key);
+
+		$this->assertFalse($this->update->validate($this->file_path, $this->signature_path));
+
+		chmod($this->file_path, 0666);
+	}
+
+	public function test_validate_sig_not_accessible()
+	{
+		if (strtolower(substr(PHP_OS, 0, 3)) === 'win')
+		{
+			$this->markTestSkipped('Unable to test unreadable files on Windows');
+		}
+
+		$keypair = sodium_crypto_sign_keypair();
+
+		$secret_key = sodium_crypto_sign_secretkey($keypair);
+		$public_key = base64_encode(sodium_crypto_sign_publickey($keypair));
+
+		file_put_contents($this->file_path, 'test file content');
+
+		$hash = hash_file('sha384', $this->file_path, true);
+		file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key)));
+
+		chmod($this->signature_path, 0000);
+
+		$client_reflection = new \ReflectionProperty($this->update, 'public_key');
+		$client_reflection->setValue($this->update, $public_key);
+
+		$this->assertFalse($this->update->validate($this->file_path, $this->signature_path));
+
+		chmod($this->signature_path, 0666);
+	}
+
+	public function test_validate_sig_not_base64()
+	{
+		$keypair = sodium_crypto_sign_keypair();
+
+		$public_key = base64_encode(sodium_crypto_sign_publickey($keypair));
+
+		file_put_contents($this->file_path, 'test file content');
+
+		file_put_contents($this->signature_path, 'SGVsbG8gV29ybGQ===');
+
+		$client_reflection = new \ReflectionProperty($this->update, 'public_key');
+		$client_reflection->setValue($this->update, $public_key);
+
+		$this->assertFalse($this->update->validate($this->file_path, $this->signature_path));
+	}
+
+	public function test_validate_invalid_pub_key()
+	{
+		$keypair = sodium_crypto_sign_keypair();
+
+		$secret_key = sodium_crypto_sign_secretkey($keypair);
+
+		file_put_contents($this->file_path, 'test file content');
+
+		$hash = hash_file('sha384', $this->file_path, true);
+		file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key)));
+
+		$client_reflection = new \ReflectionProperty($this->update, 'public_key');
+		$client_reflection->setValue($this->update, '!not!base64');
+
+		$this->assertFalse($this->update->validate($this->file_path, $this->signature_path));
+	}
+
+	public function test_validate_fail()
+	{
+		$keypair = sodium_crypto_sign_keypair();
+
+		$secret_key = sodium_crypto_sign_secretkey($keypair);
+
+		// Recreate keypair for different public key
+		$keypair = sodium_crypto_sign_keypair();
+		$public_key = base64_encode(sodium_crypto_sign_publickey($keypair));
+
+		file_put_contents($this->file_path, 'test file content');
+
+		$hash = hash_file('sha384', $this->file_path, true);
+		file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key)));
+
+		$client_reflection = new \ReflectionProperty($this->update, 'public_key');
+		$client_reflection->setValue($this->update, $public_key);
+
+		$this->assertFalse($this->update->validate($this->file_path, $this->signature_path));
+	}
+
+	public function test_validate_invalid_pub_key_length()
+	{
+		$keypair = sodium_crypto_sign_keypair();
+
+		$secret_key = sodium_crypto_sign_secretkey($keypair);
+		$public_key = base64_encode(sodium_crypto_sign_publickey($keypair) . 'Foo=');
+
+		file_put_contents($this->file_path, 'test file content');
+
+		$hash = hash_file('sha384', $this->file_path, true);
+		file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key)));
+
+		$client_reflection = new \ReflectionProperty($this->update, 'public_key');
+		$client_reflection->setValue($this->update, $public_key);
+
+		$this->assertFalse($this->update->validate($this->file_path, $this->signature_path));
+	}
+
+	public function test_extract_success()
+	{
+		$this->zipper->expects($this->once())
+			->method('open')
+			->with('/path/to/zipfile.zip')
+			->willReturn(true);
+
+		$this->zipper->expects($this->once())
+			->method('extractTo')
+			->with('/path/to/extract')
+			->willReturn(true);
+
+		$this->zipper->expects($this->once())
+			->method('close');
+
+		$zipperReflection = new \ReflectionProperty($this->update, 'zipper');
+		$zipperReflection->setValue($this->update, $this->zipper);
+
+		$result = $this->update->extract('/path/to/zipfile.zip', '/path/to/extract');
+		$this->assertTrue($result);
+	}
+
+	public function test_extract_failure()
+	{
+		$this->zipper->expects($this->once())
+			->method('open')
+			->with('/path/to/zipfile.zip')
+			->willReturn(false);
+
+		$zipperReflection = new \ReflectionProperty($this->update, 'zipper');
+		$zipperReflection->setValue($this->update, $this->zipper);
+
+		$result = $this->update->extract('/path/to/zipfile.zip', '/path/to/extract');
+		$this->assertFalse($result);
+	}
+
+	public function test_copy_success()
+	{
+		$this->filesystem->expects($this->once())
+			->method('mirror')
+			->with('/source/dir', $this->phpbb_root_path);
+
+		$result = $this->update->copy('/source/dir');
+		$this->assertTrue($result);
+	}
+
+	public function test_copy_failure()
+	{
+		$this->filesystem->expects($this->once())
+			->method('mirror')
+			->willThrowException(new filesystem_exception());
+
+		$result = $this->update->copy('/source/dir');
+		$this->assertFalse($result);
+	}
+}
diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 887cfdee415..ed202757831 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -83,7 +83,6 @@ protected function setUp(): void
 	private function set_reflection_property($class, $property_name, $value)
 	{
 		$property = new ReflectionProperty($class, $property_name);
-		$property->setAccessible(true);
 		$property->setValue($class, $value);
 	}
 
@@ -124,7 +123,7 @@ public function test_empty_upload_ary()
 		$this->assertTrue($filespec->init_error());
 	}
 
-	public function additional_checks_variables()
+	public static function additional_checks_variables()
 	{
 		// False here just indicates the file is too large and fails the
 		// filespec::additional_checks method because of it. All other code
@@ -165,7 +164,7 @@ public function test_additional_checks_dimensions()
 		$this->assertSame(array('WRONG_SIZE'), $filespec->error);
 	}
 
-	public function check_content_variables()
+	public static function check_content_variables()
 	{
 		// False here indicates that a file is non-binary and contains
 		// disallowed content that makes IE report the mimetype incorrectly.
@@ -190,7 +189,7 @@ public function test_check_content($filename, $expected)
 		$this->assertEquals(true, $filespec->check_content(array()));
 	}
 
-	public function clean_filename_variables()
+	public static function clean_filename_variables()
 	{
 		$chunks = str_split('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\'\\" /:*?<>|[];(){},#+=-_`', 8);
 		return array(
@@ -252,7 +251,7 @@ public function test_clean_filename_unique_ext()
 		}
 	}
 
-	public function data_clean_filename_avatar()
+	public static function data_clean_filename_avatar()
 	{
 		return array(
 			array(false, false, ''),
@@ -285,7 +284,7 @@ public function test_clean_filename_avatar($filename, $expected, $mode, $prefix
 		$this->assertSame($expected, $filespec->get('realname'));
 	}
 
-	public function get_extension_variables()
+	public static function get_extension_variables()
 	{
 		return array(
 			array('file.png', 'png'),
@@ -305,7 +304,7 @@ public function test_get_extension($filename, $expected)
 		$this->assertEquals($expected, \phpbb\files\filespec::get_extension($filename));
 	}
 
-	public function is_image_variables()
+	public static function is_image_variables()
 	{
 		return array(
 			array('gif', 'image/gif', true),
@@ -328,7 +327,7 @@ public function test_is_image($filename, $mimetype, $expected)
 		$this->assertEquals($expected, $filespec->is_image());
 	}
 
-	public function is_image_get_mimetype()
+	public static function is_image_get_mimetype()
 	{
 		return array(
 			array('gif', 'image/gif', true),
@@ -357,7 +356,7 @@ public function test_is_image_get_mimetype($filename, $mimetype, $expected)
 		$this->assertEquals($expected, $filespec->is_image());
 	}
 
-	public function move_file_variables()
+	public static function move_file_variables()
 	{
 		return array(
 			array('gif_copy', 'gif_moved', 'image/gif', 'gif', false, true),
@@ -408,7 +407,7 @@ public function test_move_file_error()
 		$this->assertFalse($filespec->move_file('foo'));
 	}
 
-	public function data_move_file_copy()
+	public static function data_move_file_copy()
 	{
 		return array(
 			array('gif_copy', true, false, array()),
@@ -451,7 +450,7 @@ public function test_move_file_copy($tmp_name, $move_success, $open_basedir_on,
 		$this->assertSame($expected_error, $filespec->error);
 	}
 
-	public function data_move_file_imagesize()
+	public static function data_move_file_imagesize()
 	{
 		return array(
 			array(
@@ -538,7 +537,6 @@ public function test_is_uploaded()
 		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \FastImageSize\FastImageSize(), $this->phpbb_root_path, null);
 		$reflection_filespec = new ReflectionClass($filespec);
 		$plupload_property = $reflection_filespec->getProperty('plupload');
-		$plupload_property->setAccessible(true);
 		$plupload_mock = $this->getMockBuilder('\phpbb\plupload\plupload')
 			->disableOriginalConstructor()
 			->getMock();
diff --git a/tests/upload/imagesize_test.php b/tests/upload/imagesize_test.php
index 654e32054a8..502fc1797e8 100644
--- a/tests/upload/imagesize_test.php
+++ b/tests/upload/imagesize_test.php
@@ -27,50 +27,50 @@ protected function setUp(): void
 		$this->path = __DIR__ . '/fixture/';
 	}
 
-	public function data_get_imagesize()
+	public static function data_get_imagesize()
 	{
 		return array(
 			array('foobar', 'image/bmp', false),
 			array('png', 'image/png', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
-			array('gif', 'image/png', false),
+			array('gif', 'image/png', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_GIF)),
 			array('png', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
 			array('gif', 'image/gif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_GIF)),
-			array('jpg', 'image/gif', false),
+			array('jpg', 'image/gif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
 			array('gif', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_GIF)),
 			array('jpg', 'image/jpg', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
 			array('jpg', 'image/jpeg', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
-			array('png', 'image/jpg', false),
+			array('png', 'image/jpg', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
 			array('jpg', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
 			array('psd', 'image/psd', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)),
 			array('psd', 'image/photoshop', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)),
-			array('jpg', 'image/psd', false),
+			array('jpg', 'image/psd', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
 			array('psd', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)),
 			array('bmp', 'image/bmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_BMP)),
-			array('png', 'image/bmp', false),
+			array('png', 'image/bmp', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
 			array('bmp', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_BMP)),
 			array('tif', 'image/tif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
-			array('png', 'image/tif', false),
+			array('png', 'image/tif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
 			array('tif', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
 			array('tif_compressed', 'image/tif', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
-			array('png', 'image/tiff', false),
+			array('png', 'image/tiff', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
 			array('tif_compressed', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
 			array('tif_msb', 'image/tif', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_MM)),
 			array('tif_msb', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_MM)),
 			array('wbmp', 'image/wbmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)),
 			array('wbmp', 'image/vnd.wap.wbmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)),
-			array('png', 'image/vnd.wap.wbmp', false),
+			array('png', 'image/vnd.wap.wbmp', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
 			array('wbmp', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)),
 			array('iff', 'image/iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
 			array('iff', 'image/x-iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
 			array('iff_maya', 'iamge/iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
-			array('png', 'image/iff', false),
-			array('png', 'image/x-iff', false),
+			array('png', 'image/iff', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
+			array('png', 'image/x-iff', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
 			array('iff', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
 			array('iff_maya', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
 			array('jp2', 'image/jp2', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
 			array('jp2', 'image/jpx', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
 			array('jp2', 'image/jpm', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
-			array('jpg', 'image/jp2', false),
+			array('jpg', 'image/jp2', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
 			array('jpx', 'image/jpx', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
 			array('jp2', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
 			array('jpx', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php
index 4b3c8a5a25a..9b1c6fc4cc5 100644
--- a/tests/utf/utf8_clean_string_test.php
+++ b/tests/utf/utf8_clean_string_test.php
@@ -13,7 +13,7 @@
 
 class phpbb_utf_utf8_clean_string_test extends phpbb_test_case
 {
-	public function cleanable_strings()
+	public static function cleanable_strings()
 	{
 		return array(
 			array('MiXed CaSe', 'mixed case', 'Checking case folding'),
diff --git a/tests/version/fixture/30x.txt b/tests/version/fixture/30x.txt
new file mode 100644
index 00000000000..f138ad0c83b
--- /dev/null
+++ b/tests/version/fixture/30x.txt
@@ -0,0 +1,4 @@
+3.0.14
+https://www.phpbb.com/community/viewtopic.php?f=14&t=2313941
+3.3.12
+https://www.phpbb.com/community/viewtopic.php?t=2653732
diff --git a/tests/version/version_fetch_test.php b/tests/version/version_fetch_test.php
index e9c5a22cf09..b138ff4aff8 100644
--- a/tests/version/version_fetch_test.php
+++ b/tests/version/version_fetch_test.php
@@ -14,7 +14,7 @@
 /*
 * @group slow
 */
-class phpbb_version_helper_fetch_test extends phpbb_test_case
+class phpbb_version_fetch_test extends phpbb_test_case
 {
 	protected $cache, $version_helper;
 
diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php
index de88c281ffb..abc5475ad3a 100644
--- a/tests/version/version_helper_remote_test.php
+++ b/tests/version/version_helper_remote_test.php
@@ -1,4 +1,7 @@
 <?php
+
+use GuzzleHttp\Exception\RequestException;
+
 /**
  *
  * This file is part of the phpBB Forum Software package.
@@ -18,6 +21,11 @@ class version_helper_remote_test extends \phpbb_test_case
 	protected $version_helper;
 	protected $user;
 
+	// Guzzle mock data
+	protected $guzzle_status = 200; // Default to 200 status
+	protected $guzzle_data;
+	protected $guzzle_mock;
+
 	protected function setUp(): void
 	{
 		parent::setUp();
@@ -33,15 +41,37 @@ protected function setUp(): void
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$db = new \phpbb\db\driver\factory($container);
 		$this->cache = $this->getMockBuilder('\phpbb\cache\service')
-			->setMethods(array('get'))
+			->addMethods(array('get'))
 			->setConstructorArgs(array(new \phpbb\cache\driver\dummy(), $config, $db, $phpbb_dispatcher, '../../', 'php'))
 			->getMock();
 
 		$this->cache->expects($this->any())
 			->method('get')
-			->with($this->anything())
+			->withAnyParameters()
 			->will($this->returnValue(false));
-		$this->file_downloader = new phpbb_mock_file_downloader();
+
+		$this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client')
+			->addMethods(['set_data'])
+			->onlyMethods(['request'])
+			->getMock();
+		$this->guzzle_mock->method('set_data')
+			->will($this->returnCallback(function($data)
+				{
+					$this->guzzle_data = $data;
+				}
+			));
+		$this->guzzle_mock->method('request')
+			->will($this->returnCallback(function()
+				{
+					return new \GuzzleHttp\Psr7\Response($this->guzzle_status, [], $this->guzzle_data);
+				}
+			));
+
+		$this->file_downloader = $this->getMockBuilder('\phpbb\file_downloader')
+			->onlyMethods(['create_client'])
+			->getMock();
+		$this->file_downloader->method('create_client')
+			->will($this->returnValue($this->guzzle_mock));
 
 		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
 
@@ -54,7 +84,7 @@ protected function setUp(): void
 		$this->user->add_lang('acp/common');
 	}
 
-	public function provider_get_versions()
+	public static function provider_get_versions()
 	{
 		return array(
 			array('', false, '', 'VERSIONCHECK_FAIL'),
@@ -203,7 +233,7 @@ public function provider_get_versions()
 	 */
 	public function test_get_versions($input, $valid_data, $expected_return = '', $expected_exception = '')
 	{
-		$this->file_downloader->set($input);
+		$this->guzzle_mock->set_data($input);
 
 		// version_helper->get_versions() doesn't return a value on VERSIONCHECK_FAIL but only throws exception
 		// so the $return is undefined. Define it here
@@ -214,7 +244,7 @@ public function test_get_versions($input, $valid_data, $expected_return = '', $e
 			try {
 				$return = $this->version_helper->get_versions();
 			} catch (\phpbb\exception\runtime_exception $e) {
-				$this->assertEquals((string)$e->getMessage(), $expected_exception);
+				$this->assertEquals($expected_exception, $e->getMessage());
 			}
 		}
 		else
@@ -224,4 +254,206 @@ public function test_get_versions($input, $valid_data, $expected_return = '', $e
 
 		$this->assertEquals($expected_return, $return);
 	}
+
+	public function test_version_phpbb_com()
+	{
+		$guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client')
+			->onlyMethods(['request'])
+			->getMock();
+
+		$guzzle_mock->method('request')
+			->will($this->returnCallback(function()
+				{
+					return new \GuzzleHttp\Psr7\Response(200, [], file_get_contents(__DIR__ . '/fixture/30x.txt'));
+				}
+			));
+
+		$file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class)
+			->onlyMethods(['create_client'])
+			->getMock();
+
+		$file_downloader->method('create_client')
+			->willReturn($guzzle_mock);
+
+		$hostname = 'version.phpbb.com';
+
+		$file = $file_downloader->get($hostname, '/phpbb', '30x.txt');
+		$errstr = $file_downloader->get_error_string();
+		$errno = $file_downloader->get_error_number();
+
+		$this->assertNotEquals(
+			0,
+			strlen($file),
+			'Failed asserting that the response is not empty.'
+		);
+
+		$this->assertSame(
+			'',
+			$errstr,
+			'Failed asserting that the error string is empty.'
+		);
+
+		$this->assertSame(
+			0,
+			$errno,
+			'Failed asserting that the error number is 0 (i.e. no error occurred).'
+		);
+
+		$lines = explode("\n", $file);
+
+		$this->assertGreaterThanOrEqual(
+			2,
+			count($lines),
+			'Failed asserting that the version file has at least two lines.'
+		);
+
+		$this->assertStringStartsWith(
+			'3.',
+			$lines[0],
+			"Failed asserting that the first line of the version file starts with '3.'"
+		);
+
+		$this->assertNotSame(
+			false,
+			filter_var($lines[1], FILTER_VALIDATE_URL),
+			'Failed asserting that the second line of the version file is a valid URL.'
+		);
+
+		$this->assertStringContainsString('http', $lines[1]);
+		$this->assertStringContainsString('phpbb.com', $lines[1], '', true);
+	}
+
+	public function test_file_downloader_file_not_found()
+	{
+		$this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client')
+			->onlyMethods(['request'])
+			->getMock();
+
+		$this->guzzle_mock->method('request')
+			->will($this->returnCallback(function()
+				{
+					return new \GuzzleHttp\Psr7\Response(404, [], '');
+				}
+			));
+
+		$file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class)
+			->onlyMethods(['create_client'])
+			->getMock();
+
+		$file_downloader->method('create_client')
+			->willReturn($this->guzzle_mock);
+
+		$this->expectException(\phpbb\exception\runtime_exception::class);
+		$this->expectExceptionMessage('FILE_NOT_FOUND');
+
+		$file_downloader->get('foo.com', 'bar', 'foo.txt');
+	}
+
+	public function test_file_downloader_exception_not_found()
+	{
+		$this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client')
+			->onlyMethods(['request'])
+			->getMock();
+
+		$this->guzzle_mock->method('request')
+			->will($this->returnCallback(function($method, $uri)
+				{
+					$request = new \GuzzleHttp\Psr7\Request('GET', $uri);
+					$response = new \GuzzleHttp\Psr7\Response(404, [], '');
+					throw new RequestException('FILE_NOT_FOUND', $request, $response);
+				}
+			));
+
+		$file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class)
+			->onlyMethods(['create_client'])
+			->getMock();
+
+		$file_downloader->method('create_client')
+			->willReturn($this->guzzle_mock);
+
+		$this->expectException(\phpbb\exception\runtime_exception::class);
+		$this->expectExceptionMessage('FILE_NOT_FOUND');
+
+		$file_downloader->get('foo.com', 'bar', 'foo.txt');
+	}
+
+	public function test_file_downloader_exception_moved()
+	{
+		$this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client')
+			->onlyMethods(['request'])
+			->getMock();
+
+		$this->guzzle_mock->method('request')
+			->will($this->returnCallback(function($method, $uri)
+			{
+				$request = new \GuzzleHttp\Psr7\Request('GET', $uri);
+				$response = new \GuzzleHttp\Psr7\Response(302, [], '');
+				throw new RequestException('FILE_MOVED', $request, $response);
+			}
+			));
+
+		$file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class)
+			->onlyMethods(['create_client'])
+			->getMock();
+
+		$file_downloader->method('create_client')
+			->willReturn($this->guzzle_mock);
+
+		$this->assertFalse($file_downloader->get('foo.com', 'bar', 'foo.txt'));
+		$this->assertEquals(302, $file_downloader->get_error_number());
+		$this->assertEquals('FILE_MOVED', $file_downloader->get_error_string());
+	}
+
+	public function test_file_downloader_exception_timeout()
+	{
+		$this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client')
+			->onlyMethods(['request'])
+			->getMock();
+
+		$this->guzzle_mock->method('request')
+			->will($this->returnCallback(function($method, $uri)
+				{
+					$request = new \GuzzleHttp\Psr7\Request('GET', $uri);
+					throw new RequestException('FILE_NOT_FOUND', $request);
+				}
+			));
+
+		$file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class)
+			->onlyMethods(['create_client'])
+			->getMock();
+
+		$file_downloader->method('create_client')
+			->willReturn($this->guzzle_mock);
+
+		$this->expectException(\phpbb\exception\runtime_exception::class);
+		$this->expectExceptionMessage('FSOCK_TIMEOUT');
+
+		$file_downloader->get('foo.com', 'bar', 'foo.txt');
+	}
+
+	public function test_file_downloader_exception_other()
+	{
+		$this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client')
+			->onlyMethods(['request'])
+			->getMock();
+
+		$this->guzzle_mock->method('request')
+			->will($this->returnCallback(function($method, $uri)
+				{
+					throw new \RuntimeException('FSOCK_NOT_SUPPORTED');
+				}
+			));
+
+		$file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class)
+			->onlyMethods(['create_client'])
+			->getMock();
+
+		$file_downloader->method('create_client')
+			->willReturn($this->guzzle_mock);
+
+		$this->expectException(\phpbb\exception\runtime_exception::class);
+		$this->expectExceptionMessage('FSOCK_DISABLED');
+
+		$file_downloader->get('foo.com', 'bar', 'foo.txt');
+	}
 }
diff --git a/tests/version/version_test.php b/tests/version/version_helper_test.php
similarity index 73%
rename from tests/version/version_test.php
rename to tests/version/version_helper_test.php
index f162d12d44a..270ebf4e18c 100644
--- a/tests/version/version_test.php
+++ b/tests/version/version_helper_test.php
@@ -37,7 +37,7 @@ protected function setUp(): void
 		);
 	}
 
-	public function is_stable_data()
+	public static function is_stable_data()
 	{
 		return array(
 			array(
@@ -87,113 +87,113 @@ public function test_is_stable($version, $expected)
 		$this->assertSame($expected, $this->version_helper->is_stable($version));
 	}
 
-	public function get_suggested_updates_data()
+	public static function get_suggested_updates_data()
 	{
-		return array(
-			array(
+		return [
+			[
 				'1.0.0',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
-					),
-				),
-				array(
-					'1.0'	=> array(
+					],
+				],
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
-					),
-				),
-			),
-			array(
+					],
+				],
+			],
+			[
 				'1.0.1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
-					),
-				),
-				array(
-					'1.1'	=> array(
+					],
+				],
+				[
+					'1.1'	=> [
 						'current'		=> '1.1.1',
-					),
-				),
-			),
-			array(
+					],
+				],
+			],
+			[
 				'1.0.1-a1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1-a2',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.0',
-					),
-				),
-				array(
-					'1.0'	=> array(
+					],
+				],
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1-a2',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.0',
-					),
-				),
-			),
-			array(
+					],
+				],
+			],
+			[
 				'1.1.0',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
-					),
-				),
-				array(
-					'1.1'	=> array(
+					],
+				],
+				[
+					'1.1'	=> [
 						'current'		=> '1.1.1',
-					),
-				),
-			),
-			array(
+					],
+				],
+			],
+			[
 				'1.1.1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
-					),
-				),
-				array(),
-			),
-			array(
+					],
+				],
+				[],
+			],
+			[
 				'1.1.0-a1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.0-a2',
-					),
-				),
-				array(
-					'1.1'	=> array(
+					],
+				],
+				[
+					'1.1'	=> [
 						'current'		=> '1.1.0-a2',
-					),
-				),
-			),
-			array(
+					],
+				],
+			],
+			[
 				'1.1.0',
-				array(),
-				array(),
-			),
-		);
+				[],
+				[],
+			],
+		];
 	}
 
 	/**
@@ -208,7 +208,7 @@ public function test_get_suggested_updates($current_version, $versions, $expecte
 
 		$version_helper = $this
 			->getMockBuilder('\phpbb\version_helper')
-			->setMethods(array(
+			->onlyMethods(array(
 				'get_versions_matching_stability',
 			))
 			->setConstructorArgs(array(
@@ -229,87 +229,142 @@ public function test_get_suggested_updates($current_version, $versions, $expecte
 		$this->assertSame($expected, $version_helper->get_suggested_updates());
 	}
 
-	public function get_latest_on_current_branch_data()
+	public static function get_latest_on_current_branch_data(): array
 	{
-		return array(
-			array(
+		return [
+			'stable1.0_update_same_branch' => [
 				'1.0.0',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
-					),
-				),
+					],
+				],
 				'1.0.1',
-			),
-			array(
+			],
+			'stable1.0_no_update_same_branch' => [
 				'1.0.1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
-					),
-				),
+					],
+				],
 				'1.0.1',
-			),
-			array(
+			],
+			'stable1.0_eol_branch' => [
+				'1.0.1',
+				[
+					'1.0'	=> [
+						'current'		=> '1.0.1',
+						'eol'			=> true,
+					],
+					'1.1'	=> [
+						'current'		=> '1.1.1',
+					],
+				],
+				'1.1.1',
+			],
+			'stable1.0_security_update' => [
+				'1.0.1',
+				[
+					'1.0'	=> [
+						'current'		=> '1.0.2',
+						'eol'			=> false,
+						'security'		=> '1.0.2'
+					],
+					'1.1'	=> [
+						'current'		=> '1.1.1',
+					],
+				],
+				'1.0.2',
+			],
+			'stable1.0_security_update_newer_branch' => [
+				'1.0.1',
+				[
+					'1.0'	=> [
+						'current'		=> '1.0.2',
+						'eol'			=> false,
+						'security'		=> '1.1.1'
+					],
+					'1.1'	=> [
+						'current'		=> '1.1.1',
+					],
+				],
+				// Special case: Latest on current branch is still 1.0.2, the update will be recommended
+				// as update either way by get_update_on_branch
+				'1.0.2',
+			],
+			'unstable1.0_update_same_branch' => [
 				'1.0.1-a1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1-a2',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.0',
-					),
-				),
+					],
+				],
 				'1.0.1-a2',
-			),
-			array(
+			],
+			'stable1.1_update_same_branch' => [
 				'1.1.0',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
-					),
-				),
+					],
+				],
 				'1.1.1',
-			),
-			array(
+			],
+			'stable1.1_no_update_same_branch' => [
 				'1.1.1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
-					),
-				),
+					],
+				],
 				'1.1.1',
-			),
-			array(
+			],
+			'unstable1.1_update_same_branch' => [
 				'1.1.0-a1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.0-a2',
-					),
-				),
+					],
+				],
 				'1.1.0-a2',
-			),
-			array(
+			],
+			'unstable1.0_update_newer_branch' => [
+				'1.0.2-a1',
+				[
+					'1.0'	=> [
+						'current'		=> '1.0.1',
+					],
+					'1.1'	=> [
+						'current'		=> '1.1.0-a2',
+					],
+				],
+				'1.0.1',
+			],
+			'no_update_data' => [
 				'1.1.0',
-				array(),
-				null,
-			),
-		);
+				[],
+				'',
+			],
+		];
 	}
 
 	/**
@@ -324,7 +379,7 @@ public function test_get_latest_on_current_branch($current_version, $versions, $
 
 		$version_helper = $this
 			->getMockBuilder('\phpbb\version_helper')
-			->setMethods(array(
+			->onlyMethods(array(
 				'get_versions_matching_stability',
 			))
 			->setConstructorArgs(array(
@@ -345,228 +400,304 @@ public function test_get_latest_on_current_branch($current_version, $versions, $
 		$this->assertSame($expected, $version_helper->get_latest_on_current_branch());
 	}
 
-	public function get_update_on_branch_data()
+	public static function get_update_on_branch_data(): array
 	{
-		return array(
-			array(
+		return [
+			'1.0_with_in_branch_update' => [
 				'1.0.0',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-				),
-				array(
+					],
+				],
+				[
 					'current'		=> '1.0.1',
 					'eol'		=> false,
 					'security'	=> false,
-				),
-			),
-			array(
+				],
+			],
+			'1.0_without_update' => [
 				'1.0.1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-				),
-				array(),
-			),
-			array(
+					],
+				],
+				[],
+			],
+			'1.0_eol' => [
+				'1.0.1',
+				[
+					'1.0'	=> [
+						'current'		=> '1.0.1',
+						'eol'		=> true,
+						'security'	=> false,
+					],
+					'1.1'	=> [
+						'current'		=> '1.1.1',
+						'eol'		=> false,
+						'security'	=> false,
+					],
+				],
+				[
+					'current' => '1.1.1',
+					'eol' => false,
+					'security' => false,
+				],
+			],
+			'1.0_security_update' => [
+				'1.0.1',
+				[
+					'1.0'	=> [
+						'current'		=> '1.0.3',
+						'eol'		=> false,
+						'security'	=> '1.0.3',
+					],
+					'1.1'	=> [
+						'current'		=> '1.1.1',
+						'eol'		=> false,
+						'security'	=> false,
+					],
+				],
+				[
+					'current' => '1.0.3',
+					'eol' => false,
+					'security' => '1.0.3',
+				],
+			],
+			'1.0_security_update_with_1.1' => [
+				'1.0.1',
+				[
+					'1.0'	=> [
+						'current'		=> '1.0.1',
+						'eol'		=> false,
+						'security'	=> '1.1.0',
+					],
+					'1.1'	=> [
+						'current'		=> '1.1.1',
+						'eol'		=> false,
+						'security'	=> false,
+					],
+				],
+				[
+					'current' => '1.1.1',
+					'eol' => false,
+					'security' => false,
+				],
+			],
+			'1.0_with_alpha_update' => [
 				'1.0.1-a1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1-a2',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.0',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-				),
-				array(
+					],
+				],
+				[
 					'current'		=> '1.0.1-a2',
 					'eol'		=> false,
 					'security'	=> false,
-				),
-			),
-			array(
+				],
+			],
+			'1.0rc1_update_on_newer_branch' => [
+				'1.0.2-RC1',
+				[
+					'1.0'	=> [
+						'current'		=> '1.0.1',
+						'eol'		=> false,
+						'security'	=> false,
+					],
+					'1.1'	=> [
+						'current'		=> '1.1.0',
+						'eol'		=> false,
+						'security'	=> false,
+					],
+				],
+				[],
+			],
+			'1.1_with_in_branch_update' => [
 				'1.1.0',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-				),
-				array(
+					],
+				],
+				[
 					'current'		=> '1.1.1',
 					'eol'		=> false,
 					'security'	=> false,
-				),
-			),
-			array(
+				],
+			],
+			'1.1_without_update' => [
 				'1.1.1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-				),
-				array(),
-			),
-			array(
+					],
+				],
+				[],
+			],
+			'1.1_with_alpha_update' => [
 				'1.1.0-a1',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.0-a2',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-				),
-				array(
+					],
+				],
+				[
 					'current'		=> '1.1.0-a2',
 					'eol'		=> false,
 					'security'	=> false,
-				),
-			),
-			array(
+				],
+			],
+			[
 				'1.1.0',
-				array(),
-				array(),
-			),
+				[],
+				[],
+			],
 			// Latest safe release is 1.0.1
-			array(
+			[
 				'1.0.0',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
 						'eol'			=> false,
 						'security'		=> '1.0.1',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-				),
-				array(
+					],
+				],
+				[
 					'current'		=> '1.0.1',
 					'eol'			=> false,
 					'security'		=> '1.0.1',
-				),
-			),
+				],
+			],
 			// Latest safe release is 1.0.0
-			array(
+			[
 				'1.0.0',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
 						'eol'			=> false,
 						'security'		=> '1.0.0',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-				),
-				array(
+					],
+				],
+				[
 					'current'		=> '1.0.1',
 					'eol'			=> false,
 					'security'		=> '1.0.0',
-				),
-			),
+				],
+			],
 			// Latest safe release is 1.1.0
-			array(
+			[
 				'1.0.0',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
 						'eol'			=> false,
 						'security'		=> '1.1.0',
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-				),
-				array(
+					],
+				],
+				[
 					'current'		=> '1.1.1',
 					'eol'		=> false,
 					'security'	=> false,
-				),
-			),
+				],
+			],
 			// Latest 1.0 release is EOL
-			array(
+			[
 				'1.0.0',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
 						'eol'			=> true,
 						'security'	=> false,
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
 						'eol'		=> false,
 						'security'	=> false,
-					),
-				),
-				array(
+					],
+				],
+				[
 					'current'		=> '1.1.1',
 					'eol'		=> false,
 					'security'	=> false,
-				),
-			),
+				],
+			],
 			// All are EOL -- somewhat undefined behavior
-			array(
+			[
 				'1.0.0',
-				array(
-					'1.0'	=> array(
+				[
+					'1.0'	=> [
 						'current'		=> '1.0.1',
 						'eol'			=> true,
 						'security'		=> false,
-					),
-					'1.1'	=> array(
+					],
+					'1.1'	=> [
 						'current'		=> '1.1.1',
 						'eol'			=> true,
 						'security'		=> false,
-					),
-				),
-				array(),
-			),
-		);
+					],
+				],
+				[],
+			],
+		];
 	}
 
 	/**
@@ -581,7 +712,7 @@ public function test_get_update_on_branch($current_version, $versions, $expected
 
 		$version_helper = $this
 			->getMockBuilder('\phpbb\version_helper')
-			->setMethods(array(
+			->onlyMethods(array(
 				'get_versions_matching_stability',
 			))
 			->setConstructorArgs(array(
@@ -602,7 +733,7 @@ public function test_get_update_on_branch($current_version, $versions, $expected
 		$this->assertSame($expected, $version_helper->get_update_on_branch());
 	}
 
-	public function get_ext_update_on_branch_data()
+	public static function get_ext_update_on_branch_data()
 	{
 		return array(
 			// Single branch, check version for current branch
@@ -958,7 +1089,7 @@ public function test_get_ext_update_on_branch($phpbb_version, $ext_version, $ver
 
 		$version_helper = $this
 			->getMockBuilder('\phpbb\version_helper')
-			->setMethods(array(
+			->onlyMethods(array(
 				'get_versions_matching_stability',
 			))
 			->setConstructorArgs(array(
diff --git a/tests/viewonline/helper_test.php b/tests/viewonline/helper_test.php
index 5d1eef3f857..65d5fd70156 100644
--- a/tests/viewonline/helper_test.php
+++ b/tests/viewonline/helper_test.php
@@ -14,19 +14,76 @@
 class phpbb_viewonline_helper_test extends phpbb_test_case
 {
 	protected $viewonline_helper;
+	private $auth;
 
 	protected function setUp(): void
 	{
+		global $phpbb_dispatcher;
+
 		parent::setUp();
 
-		$db = $this->getMockBuilder('\phpbb\db\driver\mysqli')
+		$phpbb_root_path = __DIR__ . '/../../phpBB/';
+		$phpEx = 'php';
+
+		$db = $this->getMockBuilder('\phpbb\db\driver\driver_interface')
+			->disableOriginalConstructor()
+			->getMock();
+
+		// Mock database to return forum data
+		$forum_data = [
+			'forum_id' => 1,
+			'forum_name' => 'Test Forum',
+			'parent_id' => 0,
+			'forum_type' => FORUM_POST,
+			'left_id' => 1,
+			'right_id' => 2,
+		];
+
+		$db->method('sql_fetchrow')->willReturnOnConsecutiveCalls($forum_data, false);
+
+		$config = new \phpbb\config\config([]);
+
+		$dispatcher = new phpbb_mock_event_dispatcher();
+		$phpbb_dispatcher = $dispatcher;
+
+
+		$container = new phpbb_mock_container_builder();
+		$container->setParameter('core.environment', PHPBB_ENVIRONMENT);
+
+		$loader = new \Symfony\Component\Routing\Loader\YamlFileLoader(
+			new \phpbb\routing\file_locator($phpbb_root_path)
+		);
+
+		$extension_manager = new phpbb_mock_extension_manager($phpbb_root_path);
+		$resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(
+			$phpbb_root_path,
+			PHPBB_ENVIRONMENT,
+			$extension_manager
+		);
+
+		// Create router
+		$router = new phpbb_mock_router($container, $resources_locator, $loader, $phpEx, './', '', '');
+
+		// Mock controller helper to use the real router for generating route URLs
+		$controller_helper = $this->getMockBuilder('\phpbb\controller\helper')
+			->disableOriginalConstructor()
+			->getMock();
+		$controller_helper->method('route')
+			->willReturnCallback(function($route) use ($router) {
+				// Use the real router to generate the actual URL for the route
+				return '.' . $router->generate($route);
+			});
+
+		$language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
+
+		$this->auth = $this->getMockBuilder('\phpbb\auth\auth')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->viewonline_helper = new \phpbb\viewonline_helper($db);
+		$this->viewonline_helper = new \phpbb\members\viewonline_helper($db, $config, $dispatcher, $router, $controller_helper, $language, $this->auth, './', $phpEx, 'adm/', '%tables.users%', '%tables.sessions%', '%tables.topics%', '%tables.forums%');
 	}
 
-	public function session_pages_data()
+	public static function session_pages_data()
 	{
 		return array(
 			array('index.php', 'index'),
@@ -49,4 +106,80 @@ public function test_get_user_page($session_page, $expected)
 		$this->assertArrayHasKey(1, $on_page);
 		$this->assertSame($expected, $on_page[1]);
 	}
+
+	public static function get_location_data()
+	{
+		return array(
+			// Route-based pages - routes have prefixes as defined in routing.yml
+			// index
+			array('', 0, true, 'Index page', './'),
+			array('/', 0, true, 'Index page', './'),
+			array('/index.php/', 0, true, 'Index page', './'),
+			array('index.php', 0, true, 'Index page', './index.php'),
+			array('./index.php', 0, true, 'Index page', './index.php'),
+			// help.yml routes have prefix /help
+			array('/help/bbcode', 0, true, 'Viewing FAQ', './help/faq'),
+			array('/help/faq', 0, true, 'Viewing FAQ', './help/faq'),
+			// members.yml routes have prefix /members
+			array('/members/online', 0, true, 'Viewing who is online', './members/online'),
+			array('/members/online/whois/abc123', 0, true, 'Viewing who is online', './members/online'),
+			array('/members/team', 0, true, 'Viewing member details', './memberlist.php'),
+			// report.yml routes have no prefix
+			array('/pm/5/report', 0, true, 'Reporting post', './index.php'),
+			array('/post/10/report', 0, true, 'Reporting post', './index.php'),
+
+			// Legacy pages - admin
+			array('adm/index.php', 0, true, 'Administration Control Panel', './index.php'),
+
+			// Legacy pages - search
+			array('search.php', 0, true, 'Searching forums', './search.php'),
+
+			// Legacy pages - memberlist
+			array('memberlist.php', 0, true, 'Viewing member details', './memberlist.php'),
+			array('memberlist.php?mode=viewprofile&u=2', 0, true, 'Viewing member profile', './memberlist.php'),
+			array('memberlist.php?mode=contactadmin', 0, true, 'Viewing contact page', './memberlist.php?mode=contactadmin'),
+
+			// Legacy pages - MCP
+			array('mcp.php', 0, true, 'Viewing moderator control panel', './index.php'),
+
+			// Legacy pages - UCP
+			array('ucp.php', 0, true, 'Viewing user control panel', './index.php'),
+			array('ucp.php?mode=register', 0, true, 'Registering account', './index.php'),
+			array('ucp.php?i=pm&mode=compose', 0, true, 'Composing private message', './index.php'),
+			array('ucp.php?i=pm&mode=view', 0, true, 'Viewing private messages', './index.php'),
+			array('ucp.php?i=prefs&mode=view', 0, true, 'Changing board preferences', './index.php'),
+			array('ucp.php?i=profile&mode=edit', 0, true, 'Changing profile settings', './index.php'),
+
+			// Forum-based pages with forum access
+			array('posting.php?f=1&mode=reply', 1, true, 'Replying to message in Test Forum', './viewforum.php?f=1'),
+			array('posting.php?f=1&mode=quote', 1, true, 'Replying to message in Test Forum', './viewforum.php?f=1'),
+			array('posting.php?f=1&mode=post', 1, true, 'Posting message in Test Forum', './viewforum.php?f=1'),
+			array('viewtopic.php?f=1&t=1', 1, true, 'Reading topic in Test Forum', './viewforum.php?f=1'),
+			array('viewforum.php?f=1', 1, true, 'Viewing topics in Test Forum', './viewforum.php?f=1'),
+
+			// Forum-based pages without forum access - should redirect to index
+			array('posting.php?f=1&mode=reply', 1, false, 'Index page', './index.php'),
+			array('viewtopic.php?f=1&t=1', 1, false, 'Index page', './index.php'),
+			array('viewforum.php?f=1', 1, false, 'Index page', './index.php'),
+
+			// Unknown route
+			array('/unknown/route', 0, true, 'Index page', './index.php'),
+		);
+	}
+
+	/**
+	 * @dataProvider get_location_data
+	 */
+	public function test_get_location($session_page, $forum_id, $has_access, $expected_location, $expected_url)
+	{
+		$this->auth->method('acl_get')->willReturn($has_access);
+
+		list($location, $location_url) = $this->viewonline_helper->get_location($session_page, $forum_id);
+
+		$this->assertIsString($location);
+		$this->assertIsString($location_url);
+
+		$this->assertEquals($expected_location, $location, "Location mismatch for page: {$session_page}");
+		$this->assertEquals($expected_url, $location_url, "URL mismatch for page: {$session_page}");
+	}
 }
diff --git a/tests/wrapper/gmgetdate_test.php b/tests/wrapper/gmgetdate_test.php
index 08ee491c0f1..8ef3991e2eb 100644
--- a/tests/wrapper/gmgetdate_test.php
+++ b/tests/wrapper/gmgetdate_test.php
@@ -13,15 +13,15 @@
 
 class phpbb_wrapper_gmgetdate_test extends phpbb_test_case
 {
-	public static function phpbb_gmgetdate_data()
+	public static function phpbb_gmgetdate_data(): array
 	{
-		return array(
-			array(''),
-			array('UTC'),
-			array('Europe/Berlin'),
-			array('America/Los_Angeles'),
-			array('Antarctica/South_Pole'),
-		);
+		return [
+			[''],
+			['UTC'],
+			['Europe/Berlin'],
+			['America/Los_Angeles'],
+			['Pacific/Auckland'],
+		];
 	}
 
 	/**
diff --git a/tests/wrapper/version_compare_test.php b/tests/wrapper/version_compare_test.php
index ee23fe779cd..a12d0e50acb 100644
--- a/tests/wrapper/version_compare_test.php
+++ b/tests/wrapper/version_compare_test.php
@@ -97,7 +97,7 @@ public function test_equality($version1, $version2)
 		);
 	}
 
-	public function equality_test_data()
+	public static function equality_test_data()
 	{
 		return array(
 			array('1.1.0-A2', '1.1.0-a2'),
@@ -118,7 +118,7 @@ public function test_alpha_beta($expected, $version1, $version2)
 		
 	}
 
-	public function alpha_beta_test_data()
+	public static function alpha_beta_test_data()
 	{
 		return array(
 			array(-1, '1.1.0-A2', '1.1.0-B1'),
diff --git a/Vagrantfile b/vagrant/Vagrantfile
similarity index 56%
rename from Vagrantfile
rename to vagrant/Vagrantfile
index ab225c9ad91..419c533335e 100644
--- a/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -2,24 +2,24 @@ require 'json'
 require 'yaml'
 
 VAGRANTFILE_API_VERSION ||= "2"
-confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__))
+confDir = $confDir ||= File.expand_path("vendor/svpernova09/homestead", File.dirname(__FILE__))
 
-homesteadYamlPath = "vagrant/bootstrap.yaml"
-afterScriptPath = "vagrant/after.sh"
-aliasesPath = "vagrant/aliases"
+homesteadYamlPath = "bootstrap.yaml"
+afterScriptPath = "after.sh"
+aliasesPath = "aliases"
 
 require File.expand_path(confDir + '/scripts/homestead.rb')
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-    if File.exists? aliasesPath then
+    if File.exist? aliasesPath then
         config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases"
     end
 
-    if File.exists? homesteadYamlPath then
+    if File.exist? homesteadYamlPath then
         Homestead.configure(config, YAML::load(File.read(homesteadYamlPath)))
     end
 
-    if File.exists? afterScriptPath then
+    if File.exist? afterScriptPath then
         config.vm.provision "shell", path: afterScriptPath
     end
 end
diff --git a/vagrant/after.sh b/vagrant/after.sh
index 829a28a25dd..c4ef00e922e 100755
--- a/vagrant/after.sh
+++ b/vagrant/after.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PHP_VERSION="8.1"
+PHP_VERSION="8.2"
 PHPBB_PATH="/home/vagrant/phpbb"
 PHPBB_CONFIG="${PHPBB_PATH}/phpBB/config.php"
 PHPBB_INSTALL="${PHPBB_PATH}/vagrant/phpbb-install-config.yml"
@@ -28,7 +28,7 @@ sed -i '/^.*PHPBB_ENVIRONMENT.*$/s/production/development/' ${PHPBB_CONFIG}
 # Update the PHP memory limits (enough to allow phpunit tests to run)
 sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/${PHP_VERSION}/fpm/php.ini
 
-# Fix for urls with app.php
+# Fix for urls with index.php
 sed -i "s/cgi.fix_pathinfo=.*/cgi.fix_pathinfo=1/" /etc/php/${PHP_VERSION}/fpm/php.ini
 
 # Restart php-fpm to apply php.ini changes
diff --git a/vagrant/bootstrap.yaml b/vagrant/bootstrap.yaml
index 0924206cd53..f7166bda2ea 100644
--- a/vagrant/bootstrap.yaml
+++ b/vagrant/bootstrap.yaml
@@ -12,13 +12,13 @@ keys:
     - ~/.ssh/id_rsa
 
 folders:
-    - map: "."
+    - map: ".."
       to: "/home/vagrant/phpbb"
 sites:
     - map: phpbb.app
       to: "/home/vagrant/phpbb/phpBB"
       type: apache
-      php: "8.1"
+      php: "8.2"
 
 # blackfire:
 #     - id: foo
diff --git a/vagrant/composer.json b/vagrant/composer.json
new file mode 100644
index 00000000000..c2cd51c5a54
--- /dev/null
+++ b/vagrant/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "svpernova09/homestead": "dev-main"
+    }
+}
diff --git a/vagrant/phpbb-install-config.yml b/vagrant/phpbb-install-config.yml
index db7b525b9f6..0b899582997 100644
--- a/vagrant/phpbb-install-config.yml
+++ b/vagrant/phpbb-install-config.yml
@@ -38,7 +38,6 @@ installer:
         enabled: false
         smtp_delivery : ~
         smtp_host: ~
-        smtp_auth: ~
         smtp_user: ~
         smtp_pass: ~