2025-06-28 06:08:52 +00:00
2103 changed files with 48718 additions and 104949 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -0,0 +1,146 @@
+build: false
+clone_folder: c:\projects\phpbb
+version: '{build}'
+
+services:
+  - iis
+
+environment:
+  matrix:
+  - db: mssql
+    db_version: sql2012sp1
+    php: 7.1
+  - db: mssql
+    db_version: sql2014
+    php: 7.1
+  - db: mssql
+    db_version: sql2016
+    php: 7.2
+#  - db: mssql
+#    db_version: sql2017
+#    php: 7.1
+#  - db: mariadb
+#    php: 7.1
+#  - db: mysqli
+#    php: 7.1
+#  - db: sqlite
+#    php: 7.1
+#  - db: postgresql
+#    php: 7.1
+
+hosts:
+  phpbb.test: 127.0.0.1
+
+init:
+  - SET PATH=%systemroot%\system32\inetsrv\;C:\Program Files\OpenSSL;C:\tools\php;c:\php;%PATH%
+  - SET ANSICON=121x90 (121x90)
+  - REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
+
+before_test:
+  - ps: |
+      Set-Service wuauserv -StartupType Manual
+      choco install chocolatey -y --version 0.10.13 --allow-downgrade
+      choco install php -y --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+      Get-ChildItem -Path "c:\tools\php$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1$2')" -Recurse |
+          Move-Item -destination "c:\tools\php"
+      cd c:\tools\php
+      cat php.ini-development | %{$_ -replace "memory_limit = 128M","memory_limit = 1024M"} | Out-File -Encoding "Default" php.ini
+      Add-Content php.ini "`n date.timezone=UTC"
+      Add-Content php.ini "`n display_errors=On"
+      Add-Content php.ini "`n extension_dir=ext"
+      Add-Content php.ini "`n extension=php_openssl.dll"
+      Add-Content php.ini "`n extension=php_mbstring.dll"
+      Add-Content php.ini "`n extension=php_curl.dll"
+      Add-Content php.ini "`n extension=php_gd2.dll"
+      Add-Content php.ini "`n extension=php_tidy.dll"
+      Add-Content php.ini "`n extension=php_fileinfo.dll"
+      Add-Content php.ini "`n extension=php_pdo_sqlite.dll"
+      Add-Content php.ini "`n extension=php_sqlite3.dll"
+      Add-Content php.ini "`n extension=php_pdo_mysql.dll"
+      Add-Content php.ini "`n extension=php_mysqli.dll"
+      Add-Content php.ini "`n extension=php_pdo_pgsql.dll"
+      Add-Content php.ini "`n extension=php_pgsql.dll"
+
+      # Get MSSQL driver
+      if ($env:db -eq "mssql") {
+        cd c:\tools\php\ext
+        $DLLVersion = "5.3.0"
+        $VCVersion = If ([System.Version]"$($env:php)" -ge [System.Version]"7.2") {"vc15"} Else {"vc14"}
+        curl -o php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip https://windows.php.net/downloads/pecl/releases/sqlsrv/$($:DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-$($VCVersion)-x64.zip
+        7z x -y php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip > $null
+        curl -o php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip https://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-$($VCVersion)-x64.zip
+        7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip > $null
+        Remove-Item c:\tools\php\* -include .zip
+        cd c:\tools\php
+        Add-Content php.ini "`nextension=php_sqlsrv.dll"
+        Add-Content php.ini "`nextension=php_pdo_sqlsrv.dll"
+        Add-Content php.ini "`n"
+
+        $instanceName = $env:db_version.ToUpper()
+        Start-Service "MSSQL`$$instanceName"
+        Set-Variable -Name "sqlServerPath" -Value "(local)\$($env:db_version.ToUpper())"
+
+        # Create database write test config
+        sqlcmd -S $sqlServerPath -Q "Use [master]; CREATE DATABASE [phpbb_test] COLLATE Latin1_General_CI_AS"
+        $data = "<?php`n`n`$dbms = 'phpbb\\db\\driver\\mssqlnative';`n`$dbhost = '.\\$env:db_version';`n`$dbport = '';`n`$dbname = 'phpbb_test';`n`$dbuser = 'sa';`n`$dbpasswd = 'Password12!';`n`$phpbb_functional_url = 'http://phpbb.test/';"; $data | Out-File -Encoding "Default" "c:\\projects\\phpbb\\tests\\test_config.php"
+      }
+      elseif ($env:db -eq "mysqli") {
+        Start-Service MySQL57
+        $env:MYSQL_PWD="Password12!"
+        $cmd = '"C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -e "create database phpbb_test;" --user=root'
+        iex "& $cmd"
+        $data = "<?php`n`n`$dbms = 'phpbb\\db\\driver\\mysqli';`n`$dbhost = 'localhost';`n`$dbport = '';`n`$dbname = 'phpbb_test';`n`$dbuser = 'root';`n`$dbpasswd = 'Password12!';`n`$phpbb_functional_url = 'http://phpbb.test/';"; $data | Out-File -Encoding "Default" "c:\\projects\\phpbb\\tests\\test_config.php"
+      }
+      elseif ($env:db -eq "postgresql") {
+        Start-Service postgresql-x64-9.5
+        $env:PGUSER="postgres"
+        $env:PGPASSWORD="Password12!"
+        $Env:Path="C:\Program Files\PostgreSQL\9.6\bin\;$($Env:Path)"
+        createdb phpbb_test
+        $data = "<?php`n`n`$dbms = 'phpbb\\db\\driver\\postgres';`n`$dbhost = 'localhost';`n`$dbport = '';`n`$dbname = 'phpbb_test';`n`$dbuser = 'postgres';`n`$dbpasswd = 'Password12!';`n`$phpbb_functional_url = 'http://phpbb.test/';"; $data | Out-File -Encoding "Default" "c:\\projects\\phpbb\\tests\\test_config.php"
+      }
+      elseif ($env:db -eq "mariadb") {
+        appveyor-retry choco install mariadb -y --force
+        $env:MYSQL_PWD=""
+        $cmd = '"C:\Program Files\MariaDB 10.2\bin\mysql" -e "create database phpbb_test;" --user=root'
+        iex "& $cmd"
+        $data = "<?php`n`n`$dbms = 'phpbb\\db\\driver\\mysqli';`n`$dbhost = 'localhost';`n`$dbport = '';`n`$dbname = 'phpbb_test';`n`$dbuser = 'root';`n`$dbpasswd = '';`n`$phpbb_functional_url = 'http://phpbb.test/';"; $data | Out-File -Encoding "Default" "c:\\projects\\phpbb\\tests\\test_config.php"
+      }
+      elseif ($env:db -eq "sqlite") {
+        # install sqlite
+        appveyor-retry choco install sqlite -y
+        sqlite3 c:\projects\test.db "create table aTable(field1 int); drop table aTable;"
+        $data = "<?php`n`n`$dbms = 'phpbb\\db\\driver\\sqlite3';`n`$dbhost = 'c:\\projects\\test.db';`n`$dbport = '';`n`$dbname = '';`n`$dbuser = '';`n`$dbpasswd = '';`n`$phpbb_functional_url = 'http://phpbb.test/';"; $data | Out-File -Encoding "Default" "c:\\projects\\phpbb\\tests\\test_config.php"
+      }
+
+      # Install PhantomJS
+      choco install phantomjs -y
+      Start-Process "phantomjs" "--webdriver=8910" | Out-Null
+  - ps: |
+      cd c:\projects\phpbb\phpBB
+      (Get-Content c:\projects\phpbb\phpBB\web.config).replace("<configuration>", "<configuration>`n`t<system.web>`n`t`t<customErrors mode=`"Off`"/>`n`t</system.web>") | Set-Content c:\projects\phpbb\phpBB\web.config
+      (Get-Content c:\projects\phpbb\phpBB\web.config).replace("`t</system.webServer>", "`t`t<httpErrors errorMode=`"Detailed`" />`n`t</system.webServer>") | Set-Content c:\projects\phpbb\phpBB\web.config
+  - cd c:\projects\phpbb\phpBB
+  - php ..\composer.phar install
+  - choco install urlrewrite -y
+  - ps: New-WebSite -Name 'phpBBTest' -PhysicalPath 'c:\projects\phpbb\phpBB' -Force
+  - ps: Import-Module WebAdministration; Set-ItemProperty 'IIS:\Sites\phpBBTest' -name Bindings -value @{protocol='http';bindingInformation='*:80:phpbb.test'}
+  - echo Change default anonymous user AUTH to ApplicationPool
+  - appcmd set config -section:anonymousAuthentication /username:"" --password
+  - echo Setup FAST-CGI configuration
+  - appcmd set config /section:system.webServer/fastCGI /+[fullPath='C:\tools\php\php-cgi.exe']
+  - echo Setup FACT-CGI handler
+  - appcmd set config /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='C:\tools\php\php-cgi.exe',resourceType='Either']
+  - iisreset
+  - NET START W3SVC
+  - mkdir "C:\projects\phpbb\phpBB\cache\test"
+  - mkdir "C:\projects\phpbb\phpBB\cache\installer"
+  - icacls "C:\projects\phpbb\phpBB\cache" /grant Users:F /T
+  - icacls "C:\projects\phpbb\phpBB\files" /grant Users:F /T
+  - icacls "C:\projects\phpbb\phpBB\store" /grant Users:F /T
+  - icacls "C:\projects\phpbb\phpBB\images\avatars\upload" /grant Users:F /T
+
+test_script:
+  - cd c:\projects\phpbb
+  - php -e phpBB\vendor\phpunit\phpunit\phpunit --verbose
+
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@ -1,20 +0,0 @@
-# Debian version
-ARG VARIANT="buster"
-FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
-
-# Install PHP
-RUN apt-get -y update
-RUN apt-get -y install php php-xml php-mbstring php-curl php-zip php-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
-
-# Xdebug
-ADD resources/xdebug.ini /etc/php/8.1/apache2/conf.d/xdebug.ini
-
-# Configure Apache
-RUN echo "Listen 8080" >> /etc/apache2/ports.conf && \
-    a2enmod rewrite
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -1,37 +0,0 @@
-// 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",
-	"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" }
-	},
-
-	// 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/resources/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"
-	}
-}
--- a/.devcontainer/resources/phpbb-config.yml
+++ b/.devcontainer/resources/phpbb-config.yml
@ -1,38 +0,0 @@
-installer:
-    admin:
-        name: admin
-        password: adminadmin
-        email: admin@example.org
-
-    board:
-        lang: en
-        name: My Board
-        description: My amazing new phpBB board
-
-    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_auth: ~
-        smtp_user: ~
-        smtp_pass: ~
-
-    server:
-        cookie_secure: false
-        server_protocol: http://
-        force_server_vars: true
-        server_name: localhost
-        server_port: 80
-        script_path: /
-
-    extensions: []
--- a/.devcontainer/resources/setup.sh
+++ b/.devcontainer/resources/setup.sh
@ -1,52 +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
-
-# 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
-    echo "[Codespaces] Set the phpBB server name using default environment variables"
-    codespaces_url="${CODESPACE_NAME}-80.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
-    sed -i "s/localhost/$codespaces_url/g" /workspaces/phpbb/phpBB/install/install-config.yml
-fi
-
-# 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"
--- a/.devcontainer/resources/xdebug.ini
+++ b/.devcontainer/resources/xdebug.ini
@ -1,10 +0,0 @@
-zend_extension=xdebug.so
-
-[xdebug]
-xdebug.mode=develop,debug
-xdebug.discover_client_host=1
-xdebug.client_port=9003
-xdebug.start_with_request=yes
-xdebug.log='/var/log/xdebug/xdebug.log'
-xdebug.connect_timeout_ms=2000
-xdebug.idekey=VSCODE
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -1,10 +1,10 @@
 Checklist:

- [ ] Correct branch: master for new features; 3.3.x for fixes
+- [ ] Correct branch: master for new features; 3.3.x & 3.2.x for fixes
 - [ ] Tests pass
- [ ] Code follows coding guidelines: [master](https://area51.phpbb.com/docs/master/coding-guidelines.html) and [3.3.x](https://area51.phpbb.com/docs/dev/3.3.x/development/coding_guidelines.html)
+- [ ] Code follows coding guidelines: [master](https://area51.phpbb.com/docs/dev/master/development/coding_guidelines.html), [3.3.x](https://area51.phpbb.com/docs/dev/3.3.x/development/coding_guidelines.html) and [3.2.x](https://area51.phpbb.com/docs/dev/3.2.x/development/coding_guidelines.html)
 - [ ] Commit follows commit message [format](https://area51.phpbb.com/docs/dev/3.3.x/development/git.html)

-Tracker ticket:
+Tracker ticket (set the ticket ID to **your ticket ID**):

-https://tracker.phpbb.com/browse/PHPBB-12345
+https://tracker.phpbb.com/browse/PHPBB3-12345
--- a/.github/check-doctum-parse-errors.sh
+++ b/.github/check-doctum-parse-errors.sh
@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-
-if [ ! -f doctum.phar ]; then
-	# Download the latest (5.x.x) release if the file does not exist
-	# Remove it to update your phar
-	curl -O https://doctum.long-term.support/releases/5/doctum.phar
-	rm -f doctum.phar.sha256
-	curl -O https://doctum.long-term.support/releases/5/doctum.phar.sha256
-	sha256sum --strict --check doctum.phar.sha256
-	rm -f doctum.phar.sha256
-	chmod +x ./doctum.phar
-	# You can fetch the latest (5.x.x) version code here:
-	# https://doctum.long-term.support/releases/5/VERSION
-fi
-# Show the version to inform users of the script
-./doctum.phar version --text
-./doctum.phar parse build/doctum-checkout.conf.php -v
--- a/.github/check-executable-files.sh
+++ b/.github/check-executable-files.sh
@ -1,63 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-
-root="$1"
-path="${root}phpBB/"
-
-# Check the permissions of the files
-
-# The following variables MUST NOT contain any wildcard
-# Directories to skip
-directories_skipped="-path ${path}develop -o -path ${path}vendor"
-
-# Files to skip
-files_skipped="-false"
-
-# Files which have to be executable
-executable_files="-path ${path}bin/* -o -path ${path}install/phpbbcli.php"
-
-incorrect_files=$( 								\
-	find ${path}								\
-		'('										\
-			'('									\
-				${directories_skipped}			\
-			')'									\
-			-a -type d -prune -a -type f		\
-		')' -o 									\
-		'('										\
-			-type f -a							\
-			-not '('							\
-				${files_skipped}				\
-			')' -a								\
-			'('									\
-				'('								\
-					'('							\
-						${executable_files}		\
-					')' -a						\
-					-not -perm /100				\
-				')' -o							\
-				'('								\
-					-not '('					\
-						${executable_files}		\
-					')' -a						\
-					-perm /111					\
-				')'								\
-			')'									\
-		')'										\
-	)
-
-if [ "${incorrect_files}" != '' ]
-then
-	echo "The following files do not have proper permissions:";
-	ls -la ${incorrect_files}
-	exit 1;
-fi
--- a/.github/check-stylesheet.sh
+++ b/.github/check-stylesheet.sh
@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-set +x
-
-sudo npm install -g > /dev/null
-npm ci > /dev/null
-set -x
-node_modules/stylelint/bin/stylelint.js "phpBB/styles/prosilver/theme/*.css"
-node_modules/stylelint/bin/stylelint.js "phpBB/adm/style/*.css"
--- a/.github/ext-check-executable-files.sh
+++ b/.github/ext-check-executable-files.sh
@ -1,64 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-
-root="$1"
-extname="$2"
-path="${root}phpBB/ext/${extname}/"
-
-# Check the permissions of the files
-
-# The following variables MUST NOT contain any wildcard
-# Directories to skip
-directories_skipped="-path ${path}develop -o -path ${path}vendor -o -path ${path}.git"
-
-# Files to skip
-files_skipped="-false"
-
-# Files which have to be executable
-executable_files="-path ${path}bin/* -o -path ${path}install/phpbbcli.php"
-
-incorrect_files=$( 								\
-	find ${path}								\
-		'('										\
-			'('									\
-				${directories_skipped}			\
-			')'									\
-			-a -type d -prune -a -type f		\
-		')' -o 									\
-		'('										\
-			-type f -a							\
-			-not '('							\
-				${files_skipped}				\
-			')' -a								\
-			'('									\
-				'('								\
-					'('							\
-						${executable_files}		\
-					')' -a						\
-					-not -perm /100				\
-				')' -o							\
-				'('								\
-					-not '('					\
-						${executable_files}		\
-					')' -a						\
-					-perm /111					\
-				')'								\
-			')'									\
-		')'										\
-	)
-
-if [ "${incorrect_files}" != '' ]
-then
-	echo "The following files do not have proper permissions:";
-	ls -la ${incorrect_files}
-	exit 1;
-fi
--- a/.github/phpunit-psql-windows-github.xml
+++ b/.github/phpunit-psql-windows-github.xml
@ -1,41 +0,0 @@
-<?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="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>
--- a/.github/phpunit-sqlite3-github.xml
+++ b/.github/phpunit-sqlite3-github.xml
@ -1,35 +0,0 @@
-<?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>
--- a/.github/setup-ldap.sh
+++ b/.github/setup-ldap.sh
@ -1,19 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-set -x
-
-sudo apt-get -y install ldap-utils slapd
-mkdir /var/tmp/slapd
-cp .github/ldap/slapd.conf /var/tmp/slapd/slapd.conf
-slapd -d 256 -d 128 -f /var/tmp/slapd/slapd.conf -h ldap://localhost:3389 &
-sleep 3
-ldapadd -H ldap://localhost:3389 -D "cn=admin,dc=example,dc=com" -w adminadmin -f .github/ldap/base.ldif
--- a/.github/setup-sphinx.sh
+++ b/.github/setup-sphinx.sh
@ -1,143 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-set -x
-
-sudo apt-get install -q -y sphinxsearch
-
-DIR=$(dirname "$0")
-
-SPHINX_DAEMON_HOST="localhost"
-SPHINX_DAEMON_PORT="9312"
-SPHINX_CONF="$DIR/sphinx.conf"
-SPHINX_DATA_DIR="/var/run/sphinxsearch"
-SPHINX_LOG="$SPHINX_DATA_DIR/log/searchd.log"
-SPHINX_QUERY_LOG="$SPHINX_DATA_DIR/log/sphinx-query.log"
-ID="saw9zf2fdhp1goue" # Randomly generated via phpBB unique_id()
-
-PHPBB_TEST_DBHOST="0.0.0.0"
-PHPBB_TEST_DBNAME="phpbb_tests"
-PHPBB_TEST_DBUSER="root"
-PHPBB_TEST_DBPASSWD=""
-
-sudo service sphinxsearch stop
-sudo mkdir -p "$SPHINX_DATA_DIR/log"
-sudo chown "sphinxsearch" "$SPHINX_DATA_DIR/log"
-
-# Generate configuration file for Sphinx
-echo "
-source source_phpbb_${ID}_main 
-{
-	type = mysql # mysql or pgsql
-	sql_host =  $PHPBB_TEST_DBHOST
-	sql_user = $PHPBB_TEST_DBUSER
-	sql_pass = $PHPBB_TEST_DBPASSWD
-	sql_db = $PHPBB_TEST_DBNAME
-	sql_port =
-	sql_query_pre = SET NAMES 'utf8'
-	sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = (SELECT MAX(post_id) FROM phpbb_posts) WHERE counter_id = 1
-	sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts
-	sql_range_step = 5000
-	sql_query = SELECT \
-						p.post_id AS id, \
-						p.forum_id, \
-						p.topic_id, \
-						p.poster_id, \
-						p.post_visibility, \
-						CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \
-						p.post_time, \
-						p.post_subject, \
-						p.post_subject as title, \
-						p.post_text as data, \
-						t.topic_last_post_time, \
-						0 as deleted \
-					FROM phpbb_posts p, phpbb_topics t \
-					WHERE \
-						p.topic_id = t.topic_id \
-						AND p.post_id >= \$start AND p.post_id <= \$end
-	sql_query_post =
-	sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = \$maxid WHERE counter_id = 1
-	sql_attr_uint = forum_id
-	sql_attr_uint = topic_id
-	sql_attr_uint = poster_id
-	sql_attr_uint = post_visibility
-	sql_attr_bool = topic_first_post
-	sql_attr_bool = deleted
-	sql_attr_timestamp = post_time
-	sql_attr_timestamp = topic_last_post_time
-	sql_attr_string = post_subject
-}
-source source_phpbb_${ID}_delta : source_phpbb_${ID}_main
-{
-	sql_query_pre = SET NAMES 'utf8'
-	sql_query_range =
-	sql_range_step =
-	sql_query = SELECT \
-						p.post_id AS id, \
-						p.forum_id, \
-						p.topic_id, \
-						p.poster_id, \
-						p.post_visibility, \
-						CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \
-						p.post_time, \
-						p.post_subject, \
-						p.post_subject as title, \
-						p.post_text as data, \
-						t.topic_last_post_time, \
-						0 as deleted \
-					FROM phpbb_posts p, phpbb_topics t \
-					WHERE \
-						p.topic_id = t.topic_id \
-						AND p.post_id >=  ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 )
-	sql_query_post_index =
-}
-index index_phpbb_${ID}_main
-{
-	path = $SPHINX_DATA_DIR/index_phpbb_${ID}_main
-	source = source_phpbb_${ID}_main
-	docinfo = extern
-	morphology = none
-	stopwords =
-	wordforms =
-	exceptions =
-	min_word_len = 2
-	charset_table = U+FF10..U+FF19->0..9, 0..9, U+FF41..U+FF5A->a..z, U+FF21..U+FF3A->a..z, A..Z->a..z, a..z, U+0149, U+017F, U+0138, U+00DF, U+00FF, U+00C0..U+00D6->U+00E0..U+00F6, U+00E0..U+00F6, U+00D8..U+00DE->U+00F8..U+00FE, U+00F8..U+00FE, U+0100->U+0101, U+0101, U+0102->U+0103, U+0103, U+0104->U+0105, U+0105, U+0106->U+0107, U+0107, U+0108->U+0109, U+0109, U+010A->U+010B, U+010B, U+010C->U+010D, U+010D, U+010E->U+010F, U+010F, U+0110->U+0111, U+0111, U+0112->U+0113, U+0113, U+0114->U+0115, U+0115, U+0116->U+0117, U+0117, U+0118->U+0119, U+0119, U+011A->U+011B, U+011B, U+011C->U+011D, U+011D, U+011E->U+011F, U+011F, U+0130->U+0131, U+0131, U+0132->U+0133, U+0133, U+0134->U+0135, U+0135, U+0136->U+0137, U+0137, U+0139->U+013A, U+013A, U+013B->U+013C, U+013C, U+013D->U+013E, U+013E, U+013F->U+0140, U+0140, U+0141->U+0142, U+0142, U+0143->U+0144, U+0144, U+0145->U+0146, U+0146, U+0147->U+0148, U+0148, U+014A->U+014B, U+014B, U+014C->U+014D, U+014D, U+014E->U+014F, U+014F, U+0150->U+0151, U+0151, U+0152->U+0153, U+0153, U+0154->U+0155, U+0155, U+0156->U+0157, U+0157, U+0158->U+0159, U+0159, U+015A->U+015B, U+015B, U+015C->U+015D, U+015D, U+015E->U+015F, U+015F, U+0160->U+0161, U+0161, U+0162->U+0163, U+0163, U+0164->U+0165, U+0165, U+0166->U+0167, U+0167, U+0168->U+0169, U+0169, U+016A->U+016B, U+016B, U+016C->U+016D, U+016D, U+016E->U+016F, U+016F, U+0170->U+0171, U+0171, U+0172->U+0173, U+0173, U+0174->U+0175, U+0175, U+0176->U+0177, U+0177, U+0178->U+00FF, U+00FF, U+0179->U+017A, U+017A, U+017B->U+017C, U+017C, U+017D->U+017E, U+017E, U+0410..U+042F->U+0430..U+044F, U+0430..U+044F, U+4E00..U+9FFF
-	ignore_chars = U+0027, U+002C
-	min_prefix_len = 3
-	min_infix_len = 0
-	html_strip = 1
-	index_exact_words = 0
-	blend_chars = U+23, U+24, U+25, U+26, U+40
-}
-index index_phpbb_${ID}_delta : index_phpbb_${ID}_main
-{
-	path = $SPHINX_DATA_DIR/index_phpbb_${ID}_delta
-	source = source_phpbb_${ID}_delta
-}
-indexer
-{
-	mem_limit = 512M
-}
-searchd
-{
-	listen = $SPHINX_DAEMON_PORT
-	log = $SPHINX_LOG
-	query_log = $SPHINX_QUERY_LOG
-	read_timeout = 5
-	max_children = 30
-	pid_file = $SPHINX_DATA_DIR/searchd.pid
-	binlog_path = $SPHINX_DATA_DIR
-}
-" > $SPHINX_CONF
-
-sudo mv "$SPHINX_CONF" "/etc/sphinxsearch/sphinx.conf"
-sudo sed -i "s/START=no/START=yes/g" "/etc/default/sphinxsearch"
-sudo chmod 777 "/var/run/sphinxsearch"
--- a/.github/setup-webserver.sh
+++ b/.github/setup-webserver.sh
@ -1,80 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-set -x
-
-sudo apt-get install -y nginx coreutils
-
-sudo service nginx stop
-
-DIR=$(dirname "$0")
-USER=$(whoami)
-PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB")
-NGINX_SITE_CONF="/etc/nginx/sites-enabled/default"
-NGINX_CONF="/etc/nginx/nginx.conf"
-APP_SOCK=$(realpath "$DIR")/php-app.sock
-NGINX_PHP_CONF="$DIR/nginx-php.conf"
-
-# php-fpm
-PHP_FPM_BIN="/usr/sbin/php-fpm$PHP_VERSION"
-PHP_FPM_CONF="$DIR/php-fpm.conf"
-
-if [ ! -f $PHP_FPM_BIN ] && [ -f "/usr/bin/php-fpm" ]
-then
-	PHP_FPM_BIN="/usr/bin/php-fpm"
-fi
-
-if [ ! -f $PHP_FPM_BIN ]
-then
-	sudo apt-get install php$PHP_VERSION-fpm php$PHP_VERSION-cli \
-						php$PHP_VERSION-curl php$PHP_VERSION-xml php$PHP_VERSION-mbstring \
-						php$PHP_VERSION-zip php$PHP_VERSION-mysql php$PHP_VERSION-sqlite3 \
-						php$PHP_VERSION-intl php$PHP_VERSION-gd php$PHP_VERSION-pgsql
-	sudo service php$PHP_VERSION-fpm start
-	sudo service php$PHP_VERSION-fpm status
-fi
-
-echo "
-	[global]
-
-	[ci]
-	user = $USER
-	group = $USER
-	listen = $APP_SOCK
-	listen.mode = 0666
-	pm = static
-	pm.max_children = 2
-
-	php_admin_value[memory_limit] = 128M
-" > $PHP_FPM_CONF
-
-sudo $PHP_FPM_BIN \
-	--fpm-config "$DIR/php-fpm.conf"
-
-# nginx
-sudo sed -i "s/user www-data;/user $USER;/g" $NGINX_CONF
-sudo cp "$DIR/../phpBB/docs/nginx.sample.conf" "$NGINX_SITE_CONF"
-sudo sed -i \
-	-e "s/example\.com/localhost/g" \
-	-e "s|root /path/to/phpbb;|root $PHPBB_ROOT_PATH;|g" \
-	$NGINX_SITE_CONF
-
-# Generate FastCGI configuration for Nginx
-echo "
-upstream php {
-	server unix:$APP_SOCK;
-}
-" > $NGINX_PHP_CONF
-
-sudo mv "$NGINX_PHP_CONF" /etc/nginx/conf.d/php.conf
-
-sudo nginx -T
-sudo service nginx start
--- a/.github/workflows/check_merge_to_master.yml
+++ b/.github/workflows/check_merge_to_master.yml
@ -1,70 +0,0 @@
-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."
--- a/.github/workflows/merge_3.3.x_to_master.yml
+++ b/.github/workflows/merge_3.3.x_to_master.yml
@ -1,60 +0,0 @@
-name: Merge 3.3.x into master
-
-on:
-    push:
-        branches:
-            - 3.3.x
-
-jobs:
-    merge-branch:
-        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@v4
-              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 }}
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -1,613 +0,0 @@
-name: Tests
-
-on:
-    push:
-        branches:
-            - 3.3.x
-            - master
-            - 'prep-release-*'
-        tags:
-            - 'release-*'
-    pull_request:
-        branches:
-            - 3.3.x
-            - master
-            - 'prep-release-*'
-
-jobs:
-    # Basic checks, e.g. parse errors, commit messages, etc.
-    basic-checks:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                include:
-                    - db: 'none'
-                      php: '8.1'
-                      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@v4
-              with:
-                  fetch-depth: 100
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  DB: ${{ matrix.db }}
-                  PHP_VERSION: ${{ matrix.php }}
-                  NOTESTS: '1'
-              run: |
-                  .github/setup-phpbb.sh $DB $PHP_VERSION $NOTESTS
-
-            - name: Phing sniff
-              run: |
-                  .github/phing-sniff.sh
-
-            - name: Check doctum parse errors
-              run: |
-                  .github/check-doctum-parse-errors.sh
-
-            - name: Check code with psalm
-              run: |
-                  phpBB/vendor/bin/psalm --output-format=github
-
-            - name: Check image ICC profiles
-              run: |
-                  .github/check-image-icc-profiles.sh
-
-            - name: Check executable files
-              run: |
-                  .github/check-executable-files.sh ./
-
-            - name: Check stylesheets
-              run: |
-                  .github/check-stylesheet.sh
-
-            - name: Lint JavaScript files
-              run: |
-                  .github/check-js.sh
-
-            - name: Check commit message
-              if: github.event_name == 'pull_request'
-              run: |
-                  git fetch origin $GITHUB_BASE_REF &> /dev/null
-                  git-tools/commit-msg-hook-range.sh $(git rev-parse origin/$GITHUB_BASE_REF)..$GITHUB_SHA
-
-    # Tests for MySQL and MariaDB
-    mysql-tests:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                include:
-                    - php: '8.1'
-                      db: "mariadb:10.2"
-                    - php: '8.1'
-                      db: "mariadb:10.3"
-                    - php: '8.1'
-                      db: "mariadb:10.4"
-                    - php: '8.1'
-                      db: "mariadb:10.6"
-                    - php: '8.1'
-                      db: "mariadb:10.9"
-                    - php: '8.1'
-                      db: "mariadb:10.10"
-                    - php: '8.1'
-                      db: "mariadb:10.11"
-                    - php: '8.1'
-                      db: "mysql:5.7"
-                      db_alias: "MySQL Slow Tests"
-                      SLOWTESTS: 1
-                    - php: '8.1'
-                      db: "mysql:5.7"
-                      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"
-                    - php: '8.3'
-                      db: "mariadb:10.2"
-                    - php: '8.4'
-                      db: "mysql:8.0"
-                    - php: '8.4'
-                      db: "mariadb:10.3"
-
-        name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
-
-        services:
-            mysql:
-                image: ${{ matrix.db }}
-                env:
-                    MYSQL_ALLOW_EMPTY_PASSWORD: yes
-                    MYSQL_DATABASE: phpbb_tests
-                ports:
-                    - 3306:3306
-                options: >-
-                    --health-cmd="mysqladmin ping"
-                    --health-interval=10s
-                    --health-timeout=5s
-                    --health-retries=3
-
-            redis:
-                image: redis
-                options: >-
-                    --health-cmd "redis-cli ping"
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-                ports:
-                    - 6379:6379
-
-        steps:
-            - name: Update Ubuntu package lists
-              run: |
-                  sudo apt-get update -y  --allow-releaseinfo-change
-
-            - name: Checkout repository
-              uses: actions/checkout@v4
-
-            - id: database-type
-              env:
-                  MATRIX_DB: ${{ matrix.db }}
-              run: |
-                  db=$(echo "${MATRIX_DB%%:*}")
-                  echo "db=$db" >> $GITHUB_OUTPUT
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, mysqli, pdo, pdo_mysql, ldap
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              env:
-                  PHP_VERSION: ${{ matrix.php }}
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  PHP_VERSION: ${{ matrix.php }}
-                  NOTESTS: '0'
-              run: |
-                  .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0}
-
-            - name: Setup database
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  MYISAM: ${{ matrix.MYISAM != 1 && '0' || '1' }}
-              run: |
-                  .github/setup-database.sh $DB $MYISAM
-
-            - name: Setup LDAP
-              if: ${{ matrix.SLOWTESTS == 1 }}
-              run: |
-                  .github/setup-ldap.sh
-
-            - name: Setup node
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-            - name: Setup node dependencies
-              run: npm ci
-
-            - name: Setup SPHINX
-              run: |
-                  .github/setup-sphinx.sh
-
-            - name: Lint tests
-              if: ${{ matrix.SLOWTESTS != 1 && steps.database-type.outputs.db == 'mysql' }}
-              run: phpBB/vendor/bin/phpunit tests/lint_test.php
-
-            - name: Run unit tests
-              env:
-                  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
-
-            - name: Slow tests
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-              if: ${{ matrix.SLOWTESTS == 1 }}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --group slow
-
-    # Tests for PostgreSQL
-    postgres-tests:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                include:
-                    - php: '8.1'
-                      db: "postgres:9.5"
-                    - php: '8.1'
-                      db: "postgres:9.6"
-                    - php: '8.1'
-                      db: "postgres:10"
-                    - php: '8.1'
-                      db: "postgres:11"
-                    - php: '8.1'
-                      db: "postgres:12"
-                    - php: '8.1'
-                      db: "postgres:13"
-                    - php: '8.1'
-                      db: "postgres:14"
-                    - php: '8.1'
-                      db: "postgres:15"
-                    - php: '8.2'
-                      db: "postgres:9.5"
-                    - php: '8.3'
-                      db: "postgres:9.5"
-                    - php: '8.4'
-                      db: "postgres:9.5"
-
-        name: PHP ${{ matrix.php }} - ${{ matrix.db }}
-
-        services:
-            postgres:
-                image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && matrix.db != 'postgres:14' && matrix.db != 'postgres:15' && 'postgres:10' || matrix.db }}
-                env:
-                    POSTGRES_HOST: localhost
-                    POSTGRES_USER: postgres
-                    POSTGRES_PASSWORD: postgres
-                ports:
-                    - 5432:5432
-                options: >-
-                    -v /var/run/postgresql:/var/run/postgresql
-                    --health-cmd pg_isready
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-
-            redis:
-                image: redis
-                options: >-
-                    --health-cmd "redis-cli ping"
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-                ports:
-                    - 6379:6379
-
-        steps:
-            - name: Update Ubuntu package lists
-              run: |
-                  sudo apt-get update -y  --allow-releaseinfo-change
-
-            - name: Checkout repository
-              uses: actions/checkout@v4
-
-            - id: database-type
-              env:
-                  MATRIX_DB: ${{ matrix.db }}
-              run: |
-                  db=$(echo "${MATRIX_DB%%:*}")
-                  echo "db=$db" >> $GITHUB_OUTPUT
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, pgsql, pdo, pdo_pgsql
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              env:
-                  PHP_VERSION: ${{ matrix.php }}
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  PHP_VERSION: ${{ matrix.php }}
-                  NOTESTS: '0'
-              run: |
-                  .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0}
-
-            - name: Setup database
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  MYISAM: '0'
-              run: |
-                  .github/setup-database.sh $DB $MYISAM
-
-            - name: Setup node
-              uses: actions/setup-node@v4
-              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
-
-    # Other database types, namely sqlite3 and mssql
-    other-tests:
-        runs-on: ubuntu-22.04
-        strategy:
-            matrix:
-                include:
-                    - php: '8.1'
-                      db: "sqlite3"
-                    - php: '8.1'
-                      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-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: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"
-                ports:
-                    - 1433:1433
-                options: >-
-                    --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Pssw0rd_12' -Q \"Use [master]; CREATE DATABASE [phpbb_tests] COLLATE Latin1_General_CI_AS\" || exit 1"
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-                    --health-start-period 10s
-
-            redis:
-                image: redis
-                options: >-
-                    --health-cmd "redis-cli ping"
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-                ports:
-                    - 6379:6379
-
-
-        steps:
-            - name: Update Ubuntu package lists
-              run: |
-                  sudo apt-get update -y  --allow-releaseinfo-change
-
-            - name: Checkout repository
-              uses: actions/checkout@v4
-
-            - id: database-type
-              env:
-                  MATRIX_DB: ${{ matrix.db }}
-              run: |
-                  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
-                      db=$(echo "${MATRIX_DB%%:*}")
-                  fi
-                  echo "db=$db" >> $GITHUB_OUTPUT
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, sqlsrv, pdo, pdo_sqlsrv
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              env:
-                  PHP_VERSION: ${{ matrix.php }}
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  PHP_VERSION: ${{ matrix.php }}
-                  NOTESTS: '0'
-              run: |
-                  .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0}
-
-            - name: Setup database
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  MYISAM: '0'
-              run: |
-                  .github/setup-database.sh $DB $MYISAM
-
-            - name: Setup node
-              uses: actions/setup-node@v4
-              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
-
-    # Test with IIS & PostgreSQL on Windows
-    windows-tests:
-        runs-on: windows-latest
-        strategy:
-            matrix:
-                type: ['unit', 'functional']
-                php: ['8.1', '8.2', '8.3']
-                db: ['postgres']
-
-        name: Windows - ${{ matrix.type }} - PHP ${{ matrix.php }} - ${{ matrix.db }}
-
-        steps:
-            - name: Prepare git for Windows
-              run: |
-                  git config --system core.autocrlf false
-                  git config --system core.eol lf
-            - name: Checkout repository
-              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, sodium
-                  ini-values: upload_tmp_dir=${{ runner.temp }}, sys_temp_dir=${{ runner.temp }}
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $env:GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  GITHUB_WORKSPACE: ${{ github.workspace }}
-                  TEMP_DIR: ${{ runner.temp }}
-              run: |
-                  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
-                  (Get-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config).replace("`t</system.webServer>", "`t`t<httpErrors errorMode=`"Detailed`" />`n`t</system.webServer>") | Set-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config
-                  choco install urlrewrite -y
-                  Import-Module WebAdministration
-                  New-WebSite -Name 'phpBBTest' -PhysicalPath "${env:GITHUB_WORKSPACE}\phpBB" -Force
-                  $session = Get-PSSession -Name WinPSCompatSession
-                  $sb = {Set-ItemProperty 'IIS:\Sites\phpBBTest' -name Bindings -value @{protocol='http';bindingInformation='*:80:phpbb.test'}}
-                  Invoke-Command -Scriptblock $sb -Session $session
-                  $sb = {Set-WebConfigurationProperty -filter /system.WebServer/security/authentication/AnonymousAuthentication -name enabled -value true -location "IIS:\Sites\phpBBTest"}
-                  Invoke-Command -Scriptblock $sb -Session $session
-                  Add-Content -Path $env:windir\System32\drivers\etc\hosts -Value "`r`n127.0.0.1`tphpbb.test" -Force
-                  [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";%windir%\system32\inetsrv")
-                  echo Setup FAST-CGI configuration
-                  Add-WebConfiguration -Filter /system.webServer/fastCgi -PSPath IIS:\ -Value @{fullpath="C:\tools\php\php-cgi.exe"}
-                  echo Setup FACT-CGI handler
-                  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
-                  $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule("IIS_IUSRS", "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow")
-                  $acl = Get-ACL "${env:TEMP_DIR}"
-                  $acl.AddAccessRule($accessRule)
-                  Set-ACL -Path "${env:TEMP_DIR}" -ACLObject $acl
-                  cd ${env:GITHUB_WORKSPACE}\phpBB
-                  php ..\composer.phar install
-                  cd ..
-            - name: Setup database
-              run: |
-                  $postgreSqlSvc = Get-Service "postgresql*"
-                  Set-Service $postgreSqlSvc.Name -StartupType manual
-                  $runningStatus = [System.ServiceProcess.ServiceControllerStatus]::Running
-                  $maxStartTimeout = New-TimeSpan -Seconds 30
-                  try {
-                    $postgreSqlSvc.Start()
-                    $postgreSqlSvc.WaitForStatus($runningStatus, $maxStartTimeout)
-                  } catch  {
-                    $_ | select *
-                  }
-                  [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
-                  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@v4
-              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
--- a/.gitignore
+++ b/.gitignore
@ -1,59 +1,30 @@
-# Excludes cache
+*~
+/phpunit.xml
 /phpBB/cache/*
 !/phpBB/cache/.htaccess
 !/phpBB/cache/index.html
-
-# Excludes user data
+/phpBB/composer.phar
 /phpBB/config*.php*
 /phpBB/ext/*
 /phpBB/files/*
 /phpBB/images/avatars/gallery/*
 /phpBB/images/avatars/upload/*
 /phpBB/images/ranks/*
-/phpBB/store/*
-
-# Excludes all custom langages
+/phpBB/install/schemas/schema.json
 /phpBB/language/*
 !/phpBB/language/en
-
-# Excludes all custom styles
+/phpBB/store/*
 /phpBB/styles/*
 !/phpBB/styles/prosilver
+/phpBB/styles/prosilver/theme/*/
 !/phpBB/styles/prosilver/theme/en
 !/phpBB/styles/prosilver/theme/images
 !/phpBB/styles/all
-
-# Excludes all custom env
-/phpBB/config/*
-!/phpBB/config/default
-!/phpBB/config/development
-!/phpBB/config/installer
-!/phpBB/config/production
-!/phpBB/config/test
-!/phpBB/config/.htaccess
-
-# Excludes vendors
 /phpBB/vendor
-/phpBB/vendor-ext/*
-!/phpBB/vendor-ext/.git-keep
-/phpBB/composer-ext.json
-/phpBB/composer-ext.lock
-
-# 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
-node_modules
-/build/package_signature
-
-# Excludes IDE / editors files
-*~
-.idea
 *.DS_Store*
-/.vscode
--- a/.jscsrc
+++ b/.jscsrc
@ -0,0 +1,78 @@
+
+{
+  "excludeFiles": ["node_modules/**", "**/build/**"],
+  "requireCurlyBraces": [
+    "if", "else", "for", "while", "do", "try", "catch"
+  ],
+  "requireSpaceBeforeKeywords": [
+    "else", "while", "catch"
+  ],
+  "requireSpaceAfterKeywords": [
+    "do", "for", "if", "else", "switch", "case", "try", "catch", "while", "return", "typeof"
+  ],
+  "requireSpaceBeforeBlockStatements": true,
+  "requireParenthesesAroundIIFE": true,
+  "requireSpacesInConditionalExpression": {
+    "afterTest": true,
+    "beforeConsequent": true,
+    "afterConsequent": true,
+    "beforeAlternate": true
+  },
+  "requireSpacesInAnonymousFunctionExpression": {
+    "beforeOpeningCurlyBrace": true
+  },
+  "disallowSpacesInNamedFunctionExpression": {
+    "beforeOpeningRoundBrace": true
+  },
+  "requireSpacesInFunction": {
+    "beforeOpeningCurlyBrace": true
+  },
+  "disallowSpacesInCallExpression": true,
+  "requireBlocksOnNewline": true,
+  "requirePaddingNewlinesBeforeKeywords": ["case"],
+  "disallowEmptyBlocks": true,
+  "disallowSpacesInsideArrayBrackets": "nested",
+  "disallowSpacesInsideParentheses": true,
+  "requireSpacesInsideObjectBrackets": "all",
+  "disallowQuotedKeysInObjects": "allButReserved",
+  "disallowSpaceAfterObjectKeys": true,
+  "requireSpaceBeforeObjectValues": true,
+  "requireCommaBeforeLineBreak": true,
+  "requireOperatorBeforeLineBreak": [
+    "?", "=", "+", "-", "/", "*", "===", "!==", ">", ">=", "<", "<="
+  ],
+  "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
+  "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+  "requireSpaceBeforeBinaryOperators": [
+    "=", "+", "+=", "-", "-=", "/", "/=", "*", "*=", "===", "!==", "<", "<=", ">", ">="
+  ],
+  "requireSpaceAfterBinaryOperators": [
+    "=", "+", "+=", "-", "-=", "/", "/=", "*", "*=", "===", "!==", "<", "<=", ">", ">="
+  ],
+  "disallowKeywords": ["with"],
+  "disallowMultipleLineStrings": true,
+  "disallowMixedSpacesAndTabs": "smart",
+  "disallowTrailingWhitespace": true,
+  "disallowTrailingComma": true,
+  "disallowKeywordsOnNewLine": ["else"],
+  "requireLineFeedAtFileEnd": true,
+  "maximumLineLength": {
+    "value": 120,
+    "tabSize": 4,
+    "allowUrlComments": true,
+    "allowRegex": true
+  },
+  "requireCapitalizedConstructors": true,
+  "requireDotNotation": true,
+  "disallowYodaConditions": true,
+  "requireSpaceAfterLineComment": {
+    "allExcept": ["#", "="]
+  },
+  "disallowNewlineBeforeBlockStatements": true,
+  "validateQuoteMarks": {
+    "mark": "'",
+    "escape": true
+  },
+  "validateParameterSeparator": ", ",
+  "safeContextKeyword": ["that"]
+}
--- a/.jshintrc
+++ b/.jshintrc
@ -0,0 +1,25 @@
+
+{
+  "bitwise": true,
+  "curly": true,
+  "eqeqeq": true,
+  "es3": true,
+  "forin": false,
+  "freeze": true,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "nonbsp": true,
+  "undef": true,
+  "unused": true,
+  "strict": true,
+
+  "browser": true,
+  "devel": true,
+  "jquery": true,
+
+  "globals": {
+    "JSON": true,
+    "phpbb": true
+  }
+}
--- a/.postcss-sorting.json
+++ b/.postcss-sorting.json
@ -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"
-}
--- a/.stylelintrc
+++ b/.stylelintrc
@ -1,397 +0,0 @@
-{
-	"plugins": [
-		"stylelint-order"
-	],
-	"ignoreFiles": [
-		"./phpBB/styles/prosilver/theme/normalize.css"
-	],
-	"rules": {
-		"at-rule-name-case": "lower",
-		"at-rule-name-newline-after": "always-multi-line",
-		"at-rule-name-space-after": "always-single-line",
-		"at-rule-no-vendor-prefix": true,
-		"at-rule-semicolon-newline-after": "always",
-
-		"block-closing-brace-newline-after": [
-			"always", {
-				"ignoreAtRules": ["if", "else"]
-			}
-		],
-		"block-closing-brace-newline-before": "always-multi-line",
-		"block-closing-brace-space-before": "always-single-line",
-
-		"block-no-empty": true,
-
-		"block-opening-brace-newline-after": "always-multi-line",
-		"block-opening-brace-space-after": "always-single-line",
-		"block-opening-brace-space-before": "always",
-
-		"color-hex-case": "lower",
-		"color-hex-length": "long",
-		"color-named": "never",
-		"color-no-invalid-hex": true,
-
-		"comment-empty-line-before": [
-			"always", {
-				"except": ["first-nested"],
-				"ignore": ["stylelint-commands"]
-			}
-		],
-		"comment-whitespace-inside": "always",
-
-		"declaration-bang-space-after": "never",
-		"declaration-bang-space-before": "always",
-
-		"declaration-block-no-shorthand-property-overrides": true,
-		"declaration-block-semicolon-newline-after": "always-multi-line",
-		"declaration-block-semicolon-newline-before": "never-multi-line",
-		"declaration-block-semicolon-space-after": "always-single-line",
-		"declaration-block-semicolon-space-before": "never",
-		"declaration-block-trailing-semicolon": "always",
-		"declaration-block-single-line-max-declarations": 1,
-		"declaration-block-no-duplicate-properties": [
-			true, {
-				"ignore": ["consecutive-duplicates-with-different-values"]
-			}
-		],
-
-		"declaration-colon-newline-after": "always-multi-line",
-		"declaration-colon-space-after": "always-single-line",
-		"declaration-colon-space-before": "never",
-
-		"declaration-empty-line-before": "never",
-
-		"declaration-property-unit-disallowed-list": {
-			"line-height": ["rem", "em", "%"]
-		},
-		"declaration-property-unit-allowed-list": {
-			"height": ["px", "%", "vh"],
-			"width": ["px", "%", "vw"],
-			"font-size": ["px", "rem", "%"],
-			"margin-left": ["px", "rem", "%"],
-			"margin-right": ["px", "rem", "%"],
-			"margin-top": ["px", "rem", "%"],
-			"margin-bottom": ["px", "rem", "%"],
-			"padding-left": ["px", "rem"],
-			"padding-right": ["px", "rem"],
-			"padding-top": ["px", "rem"],
-			"padding-bottom": ["px", "rem"],
-			"letter-spacing": ["em"],
-			"word-spacing": ["em"]
-		},
-
-		"font-family-name-quotes": "always-where-recommended",
-		"function-calc-no-unspaced-operator": true,
-
-		"function-comma-newline-after": "never-multi-line",
-		"function-comma-newline-before": "never-multi-line",
-		"function-comma-space-after": "always-single-line",
-		"function-comma-space-before": "never-single-line",
-
-		"function-linear-gradient-no-nonstandard-direction": true,
-		"function-max-empty-lines": 5,
-
-		"function-name-case": "lower",
-		"function-parentheses-newline-inside": "always-multi-line",
-		"function-parentheses-space-inside": "never-single-line",
-		"function-url-quotes": "always",
-		"function-whitespace-after": "always",
-
-		"indentation": "tab",
-
-		"length-zero-no-unit": true,
-
-		"max-empty-lines": 10,
-		"max-line-length": 180,
-		"max-nesting-depth": 4,
-
-		"media-feature-colon-space-after": "always",
-		"media-feature-colon-space-before": "never",
-		"media-feature-name-case": "lower",
-		"media-feature-parentheses-space-inside": "never",
-		"media-feature-range-operator-space-after": "always",
-		"media-feature-range-operator-space-before": "always",
-		"media-query-list-comma-newline-after": "always-multi-line",
-		"media-query-list-comma-newline-before": "never-multi-line",
-		"media-query-list-comma-space-after": "always-single-line",
-		"media-query-list-comma-space-before": "never",
-
-		"no-duplicate-selectors": true,
-		"no-empty-source": true,
-		"no-eol-whitespace": true,
-		"no-extra-semicolons": true,
-		"no-missing-end-of-source-newline": true,
-		"no-unknown-animations": true,
-
-		"number-leading-zero": "always",
-		"number-max-precision": 10,
-		"number-no-trailing-zeros": true,
-
-		"property-case": "lower",
-		"property-no-unknown": true,
-
-		"rule-empty-line-before": ["always-multi-line", {
-			"ignore": ["after-comment"],
-			"except": ["first-nested"]
-		}],
-
-		"selector-attribute-brackets-space-inside": "never",
-		"selector-attribute-operator-space-after": "never",
-		"selector-attribute-operator-space-before": "never",
-		"selector-attribute-quotes": "always",
-
-		"selector-combinator-space-after": "always",
-		"selector-combinator-space-before": "always",
-
-		"selector-list-comma-newline-after": "always",
-		"selector-list-comma-space-before": "never",
-
-		"selector-max-empty-lines": 5,
-		"selector-max-compound-selectors": 5,
-
-		"selector-pseudo-class-case": "lower",
-		"selector-pseudo-class-no-unknown": true,
-		"selector-pseudo-class-parentheses-space-inside": "never",
-
-		"selector-pseudo-element-case": "lower",
-		"selector-pseudo-element-colon-notation": "single",
-		"selector-pseudo-element-no-unknown": true,
-
-		"selector-type-case": "lower",
-		"selector-type-no-unknown": true,
-
-		"selector-descendant-combinator-no-non-space": true,
-		"selector-max-id": 0,
-		"selector-no-qualifying-type": [
-			true, {
-				"ignore": ["attribute"]
-			}
-		],
-
-		"shorthand-property-no-redundant-values": true,
-
-		"string-no-newline": true,
-		"string-quotes": "double",
-
-		"unit-case": "lower",
-		"unit-no-unknown": true,
-
-		"value-list-comma-newline-after": "always-multi-line",
-		"value-list-comma-newline-before": "never-multi-line",
-		"value-list-comma-space-after": "always-single-line",
-		"value-list-comma-space-before": "never",
-		"order/order": [
-			"custom-properties",
-			"dollar-variables",
-			{
-				"type": "at-rule",
-				"name": "include",
-				"parameter": "type"
-			},
-			"declarations",
-			"rules",
-			{
-				"type": "at-rule",
-				"name": "include",
-				"parameter": "fluid"
-			},
-			{
-				"type": "at-rule",
-				"name": "media"
-			}
-		],
-		"order/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-basis",
-				"flex-grow",
-				"flex-shrink",
-				"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": "bottomAlphabetical" }
-		]
-	}
-}
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,52 @@
+language: php
+dist: xenial
+
+matrix:
+  include:
+    - php: 7.1
+      env: DB=none;NOTESTS=1
+    - php: 7.1
+      env: DB=mariadb
+    - php: 7.1
+      env: DB=postgres
+    - php: 7.1
+      env: DB=sqlite3
+    - php: 7.1
+      env: DB=mysqli;SLOWTESTS=1
+    - php: 7.1
+      env: DB=mysqli # MyISAM
+    - php: 7.2
+      env: DB=mysqli
+    - php: 7.3
+      env: DB=mysqli
+    - php: 7.4snapshot
+      env: DB=mysqli
+    - php: nightly
+      env: DB=mysqli
+  allow_failures:
+    - php: nightly
+  fast_finish: true
+
+services:
+  - redis-server
+  - postgresql
+  - mysql
+  - memcached
+
+install:
+  - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+
+before_script:
+  - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - travis/setup-ldap.sh $SLOWTESTS
+  - phantomjs --webdriver=8910 > /dev/null &
+
+script:
+  - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./
+  - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/lint_test.php; fi"
+  - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --verbose --stop-on-error; fi"
+  - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
+  - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git remote set-branches --add origin $TRAVIS_BRANCH && git fetch && git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA; fi"
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -1,18 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Debug phpBB",
-            "type": "php",
-            "request": "launch",
-            "port": 9003,
-            "pathMappings": {
-                "/var/www/html": "${workspaceRoot}/phpBB/"
-            },
-            "log": true
-        }
-    ]
-}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,3 +0,0 @@
-{
-    "php.debug.ideKey": "VSCODE"
-}
--- a/README.md
+++ b/README.md
@ -1,50 +1,42 @@
-[<img src="phpBB/styles/all/imgs/svg/phpbb_logo_large_cosmic.svg" alt="phpBB" style="max-width:40%" width="400">](https://www.phpbb.com)
+[![phpBB](https://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com)
+
+## ABOUT

 phpBB is a free open-source bulletin board written in PHP.

-## 🧑🏻‍🤝🏻🧑🏽 Community
+## COMMUNITY

-Get your copy of phpBB, find support and lots more on [phpBB.com](https://www.phpbb.com). Discuss the development on [area51](https://area51.phpbb.com/phpBB/index.php).
+Get your copy of phpBB, find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the development on [area51](http://area51.phpbb.com/phpBB/index.php).

-## 👨‍💻 Contribute
+## INSTALLING DEPENDENCIES

-1. [Create an account on phpBB.com](https://www.phpbb.com/community/ucp.php?mode=register)
-2. [Create a ticket (unless there already is one)](https://tracker.phpbb.com/secure/CreateIssue!default.jspa)
+To be able to run an installation from the repo (and not from a pre-built package) you need to run the following commands to install phpBB's dependencies.
+
+	cd phpBB
+	php ../composer.phar install
+
+
+## CONTRIBUTE
+
+1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register)
+2. [Create a ticket (unless there already is one)](http://tracker.phpbb.com/secure/CreateIssue!default.jspa)
 3. Read our [Coding guidelines](https://area51.phpbb.com/docs/dev/development/coding_guidelines.html) and [Git Contribution Guidelines](https://area51.phpbb.com/docs/dev/development/git.html)
 4. Send us a pull request

-### 🏗️ Setting up a development build of phpBB
+## VAGRANT

-To run an installation from the repo (and not from a pre-built package) on a local server, run the following commands:
+Read our [Vagrant documentation](phpBB/docs/vagrant.md) to find out how to use Vagrant to develop and contribute to phpBB.

- Fork phpbb/phpbb to your GitHub account, then create a local clone of it:
-  ```
-  git clone https://github.com/your_github_name/phpbb.git
-  ```
- Install phpBB's dependencies (from the root of your phpbb repo):
-  ```
-  cd phpBB
-  php ../composer.phar install
-  ```
+## AUTOMATED TESTING

-Alternatively, you can read:
+We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](https://bamboo.phpbb.com) or check our travis builds below:

-* Our [Vagrant documentation](phpBB/docs/vagrant.md) to find out how to use Vagrant to develop and contribute to phpBB.
-* Our [GitHub Codespaces documentation](phpBB/docs/codespaces.md) to learn about phpBB's cloud-based development environment.
+Travis CI  | AppVeyor | Branch  | Description
+---------- | -------- | ------- | -----------
+[![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=master)](http://travis-ci.org/phpbb/phpbb) | [![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/master?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/master) | **master** | Latest development version
+[![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.3.x)](http://travis-ci.org/phpbb/phpbb) | [![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/3.3.x?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/3.3.x) | **3.3.x** | Development of version 3.3.x
+[![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.2.x)](http://travis-ci.org/phpbb/phpbb) | [![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/3.2.x?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/3.2.x) | **3.2.x** | Development of version 3.2.x

-## 📓 Documentation
-
-phpBB's [Development Documentation](https://area51.phpbb.com/docs/dev/index.html) contains all the information you'll need to learn about developing for phpBB's core, extensions and automated testing.
-
-## 🔬 Automated Testing
-
-We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](https://bamboo.phpbb.com) or check our GitHub Actions below:
-
-Branch  | Description | GitHub Actions |
------- | ----------- | -------------- |
-**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
+## LICENSE

 [GNU General Public License v2](http://opensource.org/licenses/gpl-2.0.php)
--- a/SECURITY.md
+++ b/SECURITY.md
@ -1,13 +0,0 @@
-# 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.
--- a/6
+++ b/6
@ -11,15 +11,15 @@ aliasesPath = "vagrant/aliases"
 require File.expand_path(confDir + '/scripts/homestead.rb')

 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-    if File.exist? aliasesPath then
+    if File.exists? aliasesPath then
        config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases"
    end

-    if File.exist? homesteadYamlPath then
+    if File.exists? homesteadYamlPath then
        Homestead.configure(config, YAML::load(File.read(homesteadYamlPath)))
    end

-    if File.exist? afterScriptPath then
+    if File.exists? afterScriptPath then
        config.vm.provision "shell", path: afterScriptPath
    end
 end
--- 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.15" />
-	<property name="olderversions" value="3.1.12, 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, 3.3.11, 3.3.12, 3.3.13, 3.3.14" />
+	<property name="newversion" value="3.3.0-RC1" />
+	<property name="prevversion" value="3.2.8" />
+	<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-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 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.3.0-b1, 3.3.0-b2" />
 	<!-- no configuration should be needed beyond this point -->

 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@ -128,13 +128,13 @@
 	<!-- Builds docs for current branch into build/api/output/master -->
 	<target name="docs">
 		<exec dir="."
-			command="./doctum.phar update build/doctum-checkout.conf.php"
+			command="phpBB/vendor/bin/sami.php update build/sami-checkout.conf.php"
 			passthru="true" />
 	</target>
 	<!-- Builds docs for multiple branches/tags into build/api/output/$branch -->
 	<target name="docs-all">
 		<exec dir="."
-			command="./doctum.phar update build/doctum-all.conf.php"
+			command="phpBB/vendor/bin/sami.php update build/sami-all.conf.php"
 			passthru="true" />
 	</target>

@ -166,32 +166,31 @@

 	<target name="prepare-new-version">
 		<!-- select the currently checked out commit (HEAD) for packaging -->
-		<mkdir dir="build/new_version/phpBB" />
+		<mkdir dir="build/new_version/phpBB3" />
 		<phingcall target="export">
 			<property name="revision" value="HEAD" />
-			<property name="dir" value="build/new_version/phpBB" />
+			<property name="dir" value="build/new_version/phpBB3" />
 		</phingcall>

 		<!-- copy into directory for diffs -->
-		<exec dir="build" command="cp -rp new_version/phpBB old_versions/release-${newversion}" />
+		<exec dir="build" command="cp -rp new_version/phpBB3 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/phpBB/config.php" />
-		<copy file="build/new_version/phpBB/vendor-ext/.htaccess" tofile="build/new_version/phpBB/vendor/.htaccess" />
+		<touch file="build/new_version/phpBB3/config.php" />

 	</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/phpBB/language >
+			command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/language new_version/phpBB3/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/phpBB/styles/prosilver >
+			command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver >
 				save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />

 		<exec dir="build" escape="false"
@ -204,12 +203,6 @@
 		<phingcall target="checksum-dir">
 			<property name="dir" value="build/new_version/release_files" />
 		</phingcall>
-
-		<phingcall target="sign-packages">
-			<property name="dir" value="build/new_version/release_files" />
-		</phingcall>
-
-		<exec dir="build" command="php generate_package_json.php > new_version/packages.json"/>
 	</target>

 	<target name="checksum-dir">
@ -226,31 +219,6 @@
 		<exec dir="${dir}" command="sha256sum ${filename} > ${filename}.sha256" />
 	</target>

-	<target name="sign-packages">
-		<property name="packageSignatureExists" value="false" />
-		<exec command="if [ -f 'build/package_signature' ]; then echo 'true'; else echo 'false'; fi;" outputProperty="packageSignatureExists" />
-		<if>
-			<equals arg1="${packageSignatureExists}" arg2="true" />
-			<then>
-				<foreach param="filename" absparam="absfilename" target="sign-file">
-					<fileset dir="${dir}">
-						<type type="file" />
-						<include name="*.tar.bz2"/>
-						<include name="*.zip"/>
-					</fileset>
-				</foreach>
-			</then>
-			<else>
-				<echo msg="Skipping signing of packages due to missing build/package_signature"/>
-			</else>
-		</if>
-	</target>
-
-	<target name="sign-file">
-		<echo msg="Creating signature file for ${absfilename}" />
-		<exec command="php build/generate_signature.php `cat build/package_signature` ${absfilename}" />
-	</target>
-
 	<target name="announcement" depends="prepare">
 		<echo msg="Writing download links and checksums for email announcement to save/announcement_email_${newversion}.txt" />
 		<exec dir="build" escape="false"
@ -394,8 +362,6 @@
 		<chmod mode="0777" file="${dir}/store" />
 		<chmod mode="0777" file="${dir}/files" />
 		<chmod mode="0777" file="${dir}/images/avatars/upload" />
-		<!-- set permissions of executable scripts to 755 -->
-		<chmod mode="0755" file="${dir}/bin/phpbbcli.php" />
 	</target>

 	<target name="clean-vendor-dir">
--- a/build/build_changelog.php
+++ b/build/build_changelog.php
@ -1,16 +1,16 @@
 #!/usr/bin/env php
 <?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.
+*
+*/

 if ($_SERVER['argc'] != 2)
 {
@ -18,54 +18,40 @@ if ($_SERVER['argc'] != 2)
 	exit(1);
 }

-if ($_SERVER['argv'][1] == '--stdin')
-{
-	$stdIn = file_get_contents('php://stdin');
-	// XML output from tracker can be directly piped to this script using:
-	// cat tracker_output.xml | php build/build_changelog.php --stdin
-	$xml = simplexml_load_string($stdIn);
-}
-else
-{
-	$fixVersion = $_SERVER['argv'][1];
+$fixVersion = $_SERVER['argv'][1];

-	$query = 'project IN (PHPBB, PHPBB3, SECURITY)
-		AND resolution = Fixed
-		AND fixVersion = "' . $fixVersion . '"
-		AND status IN ("Unverified Fix", Closed)';
+$query = 'project IN (PHPBB3, SECURITY)
+	AND resolution = Fixed
+	AND fixVersion = "' . $fixVersion . '"
+	AND status IN ("Unverified Fix", Closed)';

-	$url = 'https://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000';
-	$xml = simplexml_load_string(file_get_contents($url));
-}
+$url = 'http://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000';
+$xml = simplexml_load_string(file_get_contents($url));

-$types = [];
 foreach ($xml->xpath('//item') as $item)
 {
 	$key = (string) $item->key;

-	$keyUrl = 'https://tracker.phpbb.com/browse/' . $key;
+	$keyUrl = 'http://tracker.phpbb.com/browse/' . $key;
 	$keyLink = '<a href="' . $keyUrl . '">' . $key . '</a>';

-	$value = str_replace($key, $keyLink, htmlspecialchars($item->title, ENT_COMPAT));
+	$value = str_replace($key, $keyLink, htmlspecialchars($item->title));
 	$value = str_replace(']', '] -', $value);

 	$types[(string) $item->type][$key] = $value;
 }

-if (count($types))
+ksort($types);
+foreach ($types as $type => $tickets)
 {
-	ksort($types);
-	foreach ($types as $type => $tickets)
+	echo "<h4>$type</h4>\n";
+	echo "<ul>\n";
+
+	uksort($tickets, 'strnatcasecmp');
+
+	foreach ($tickets as $ticket)
 	{
-		echo "<h4>$type</h4>\n";
-		echo "<ul>\n";
-
-		uksort($tickets, 'strnatcasecmp');
-
-		foreach ($tickets as $ticket)
-		{
-			echo "<li>$ticket</li>\n";
-		}
-		echo "</ul>\n";
+		echo "<li>$ticket</li>\n";
 	}
+	echo "</ul>\n";
 }
--- a/build/build_helper.php
+++ b/build/build_helper.php
@ -43,14 +43,14 @@ class build_package
 		$_before = $this->versions[count($this->versions) - 2];

 		$this->locations = array(
-			'new_version'	=> dirname(__DIR__) . '/phpBB/',
-			'old_versions'	=> __DIR__ . '/old_versions/',
-			'root'			=> __DIR__ . '/',
-			'package_dir'	=> __DIR__ . '/new_version/'
+			'new_version'	=> dirname(dirname(__FILE__)) . '/phpBB/',
+			'old_versions'	=> dirname(__FILE__) . '/old_versions/',
+			'root'			=> dirname(__FILE__) . '/',
+			'package_dir'	=> dirname(__FILE__) . '/new_version/'
 		);

 		$this->package_infos = array(
-			'package_name'			=> 'phpBB',
+			'package_name'			=> 'phpBB3',
 			'name_prefix'			=> 'phpbb',
 			'simple_name'			=> 'release-' . $_latest,
 			'new_version_number'	=> $_latest,
--- a/build/code_sniffer/phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php
@ -1,116 +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\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);
-				}
-			}
-		}
-	}
-}
--- a/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php
@ -11,8 +11,6 @@
 *
 */

-namespace phpbb\Sniffs\Commenting;
-
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;

@ -23,7 +21,7 @@ use PHP_CodeSniffer\Sniffs\Sniff;
 * @package code_sniffer
 * @author Manuel Pichler <mapi@phpundercontrol.org>
 */
-class FileCommentSniff implements Sniff
+class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 {
 	/**
 	* Returns an array of tokens this test wants to listen for.
--- a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php
@ -11,8 +11,6 @@
 *
 */

-namespace phpbb\Sniffs\ControlStructures;
-
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;

@ -20,7 +18,7 @@ use PHP_CodeSniffer\Sniffs\Sniff;
 * Checks that the opening brace of a control structures is on the line after.
 * From Generic_Sniffs_Functions_OpeningFunctionBraceBsdAllmanSniff
 */
-class OpeningBraceBsdAllmanSniff implements Sniff
+class phpbb_Sniffs_ControlStructures_OpeningBraceBsdAllmanSniff implements Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.
--- a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php
@ -10,7 +10,6 @@
 * the docs/CREDITS.txt file.
 *
 */
-namespace phpbb\Sniffs\ControlStructures;

 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
@ -19,7 +18,7 @@ use PHP_CodeSniffer\Sniffs\Sniff;
 * Checks that there is exactly one space between the keyword and the opening
 * parenthesis of a control structures.
 */
-class OpeningParenthesisSniff implements Sniff
+class phpbb_Sniffs_ControlStructures_OpeningParenthesisSniff implements Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.
--- a/build/code_sniffer/phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php
@ -1,59 +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\Sniffs\ControlStructures;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-/**
- * Checks that the visibility qualifiers are placed after the static keyword
- * according to the coding guidelines
- */
-class StaticKeywordSniff implements Sniff
-{
-	/**
-	 * Registers the tokens that this sniff wants to listen for.
-	 */
-	public function register()
-	{
-		return [
-			T_STATIC,
-		];
-	}
-
-	/**
-	 * Processes this test, when one of its tokens is encountered.
-	 *
-	 * @param File $phpcsFile The file being scanned.
-	 * @param int $stackPtr  The position of the current token in the stack passed in $tokens.
-	 *
-	 * @return void
-	 */
-	public function process(File $phpcsFile, $stackPtr)
-	{
-		$tokens = $phpcsFile->getTokens();
-
-		$disallowed_after_tokens = [
-			T_PUBLIC,
-			T_PROTECTED,
-			T_PRIVATE,
-		];
-
-		if (in_array($tokens[$stackPtr + 2]['code'], $disallowed_after_tokens))
-		{
-			$error = 'Access specifier (e.g. public) should not follow static scope attribute. Encountered "' . $tokens[$stackPtr + 2]['content'] . '" after static';
-			$phpcsFile->addError($error, $stackPtr, 'InvalidStaticFunctionDeclaration');
-		}
-	}
-}
--- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php
@ -11,60 +11,34 @@
 *
 */

-namespace phpbb\Sniffs\Namespaces;
-
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;

 /**
 * Checks that each use statement is used.
 */
-class UnusedUseSniff implements Sniff
+class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 {
-	const FIND = [
-		T_NS_SEPARATOR,
-		T_STRING,
-		T_WHITESPACE,
-	];
-
 	/**
 	* {@inheritdoc}
 	*/
 	public function register()
 	{
-		return [T_USE];
+		return array(T_USE);
 	}

-	protected function check(File $phpcsFile, $found_name, $full_name, $short_name, $stack_pointer)
+	protected function check(File $phpcsFile, $found_name, $full_name, $short_name, $line)
 	{
-		$found_name_normalized = ltrim($found_name, '\\');
-		$full_name = ltrim($full_name, '\\');

-		$is_global = ($full_name === $short_name);
-		$unnecessarily_fully_qualified = ($is_global)
-			? ($found_name_normalized !== $found_name && $found_name_normalized === $short_name)
-			: ($found_name_normalized === $full_name);
-
-		if ($unnecessarily_fully_qualified)
+		if ($found_name === $full_name)
 		{
 			$error = 'Either use statement or full name must be used.';
-			$phpcsFile->addError($error, $stack_pointer, 'FullName');
+			$phpcsFile->addError($error, $line, 'FullName');
 		}

-		/* 
-		 * 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)
+		if ($found_name === $short_name)
 		{
-			// Nullable type syntax
-			$type = (strpos($type, '?') === 0) ? substr($type, 1) : $type;
-
-			if ($short_name === $type)
-			{
-				return true;
-			}
+			return true;
 		}

 		return false;
@ -84,50 +58,27 @@ class UnusedUseSniff implements Sniff

 		$class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($stackPtr + 1));

-		$class_name_end = $phpcsFile->findNext(self::FIND, ($stackPtr + 1), null, true);
+		$find = array(
+			T_NS_SEPARATOR,
+			T_STRING,
+			T_WHITESPACE,
+		);
+
+		$class_name_end = $phpcsFile->findNext($find, ($stackPtr + 1), null, true);

 		$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'];
-			$name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1));
+			$class_name_short = $tokens[$alias_position]['content'];
+			$class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1));
 		}
 		else
 		{
-			$name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start));
-			$name_short = $tokens[$class_name_end - 1]['content'];
+			$class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start));
+			$class_name_short = $tokens[$class_name_end - 1]['content'];
 		}

-		if ($tokens[$class_name_start]['content'] === 'function'
-			&& $tokens[$class_name_start + 1]['code'] === T_WHITESPACE)
-		{
-			$class_name_start += 2;
-			$name_full = $phpcsFile->getTokensAsString(
-				$class_name_start,
-				($class_name_end - $class_name_start - (int) ($aliasing_as_position !== false))
-			);
-			$ok = $this->findFunctionUsage($phpcsFile, $stackPtr, $tokens, $name_full, $name_short);
-		}
-		else
-		{
-			$ok = $this->findClassUsage($phpcsFile, $stackPtr, $tokens, $name_full, $name_short);
-		}
-
-		if ($name_full[0] === '\\')
-		{
-			$phpcsFile->addError("There must not be a leading '\\' in use statements.", $stackPtr, 'Malformed');
-		}
-
-		if (!$ok)
-		{
-			$error = 'There must not be unused USE statements.';
-			$phpcsFile->addError($error, $stackPtr, 'Unused');
-		}
-	}
-
-	private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name_full, $class_name_short)
-	{
 		$ok = false;

 		// Checks in simple statements (new, instanceof and extends)
@ -144,11 +95,11 @@ class UnusedUseSniff implements Sniff
 					continue;
 				}

-				$simple_class_name_end = $phpcsFile->findNext(self::FIND, ($simple_statement + 1), null, true);
+				$simple_class_name_end = $phpcsFile->findNext($find, ($simple_statement + 1), null, true);

 				$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;
+				$ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) ? true : $ok;
 			}
 		}

@ -158,12 +109,12 @@ class UnusedUseSniff implements Sniff
 		{
 			$old_paamayim_nekudotayim = $paamayim_nekudotayim;

-			$paamayim_nekudotayim_class_name_start = $phpcsFile->findPrevious(self::FIND, $paamayim_nekudotayim - 1, null, true);
+			$paamayim_nekudotayim_class_name_start = $phpcsFile->findPrevious($find, $paamayim_nekudotayim - 1, null, true);
 			$paamayim_nekudotayim_class_name_end = $paamayim_nekudotayim - 1;

 			$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;
+			$ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) ? true : $ok;
 		}

 		// Checks in implements
@ -178,11 +129,11 @@ class UnusedUseSniff implements Sniff
 				$old_implemented_class = $implemented_class;

 				$implements_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($implemented_class - 1));
-				$implements_class_name_end = $phpcsFile->findNext(self::FIND, ($implemented_class - 1), null, true);
+				$implements_class_name_end = $phpcsFile->findNext($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;
+				$ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) ? true : $ok;
 			}
 		}

@ -190,12 +141,12 @@ class UnusedUseSniff implements Sniff
 		while (($docblock = $phpcsFile->findNext(T_DOC_COMMENT_CLOSE_TAG, ($old_docblock + 1))) !== false)
 		{
 			$old_docblock = $docblock;
-			$ok = $this->checkDocblock($phpcsFile, $docblock, $tokens, $class_name_full, $class_name_short) || $ok;
+			$ok = $this->checkDocblock($phpcsFile, $docblock, $tokens, $class_name_full, $class_name_short) ? true : $ok;
 		}

 		// Checks in type hinting
 		$old_function_declaration = $stackPtr;
-		while (($function_declaration = $phpcsFile->findNext([T_FUNCTION, T_CLOSURE], ($old_function_declaration + 1))) !== false)
+		while (($function_declaration = $phpcsFile->findNext(T_FUNCTION, ($old_function_declaration + 1))) !== false)
 		{
 			$old_function_declaration = $function_declaration;

@ -203,11 +154,8 @@ class UnusedUseSniff implements Sniff
 			$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;
+				$ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) ? true : $ok;
 			}
-
-			$method_properties = $phpcsFile->getMethodProperties($function_declaration);
-			$ok = $this->check($phpcsFile, $method_properties['return_type'], $class_name_full, $class_name_short, $function_declaration) || $ok;
 		}

 		// Checks in catch blocks
@ -217,106 +165,18 @@ class UnusedUseSniff implements Sniff
 			$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);
+			$caught_class_name_end = $phpcsFile->findNext($find, $caught_class_name_start + 1, null, true);

 			$caught_class_name = trim($phpcsFile->getTokensAsString($caught_class_name_start, ($caught_class_name_end - $caught_class_name_start)));

-			$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) ? true : $ok;
 		}

-		$old_use = $stackPtr;
-		while (($use = $phpcsFile->findNext(T_USE, ($old_use + 1))) !== false)
+		if (!$ok)
 		{
-			$old_use = $use;
-
-			// Needs to be inside a class and must not be inside a function scope.
-			if (!$phpcsFile->hasCondition($use, [T_CLASS, T_TRAIT]) || $phpcsFile->hasCondition($use, T_FUNCTION))
-			{
-				continue;
-			}
-
-			$next = $phpcsFile->findNext(T_WHITESPACE, ($use + 1), null, true, null, true);
-			if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS)
-			{
-				continue;
-			}
-
-			$class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $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;
+			$error = 'There must not be unused USE statements.';
+			$phpcsFile->addError($error, $stackPtr, 'Unused');
 		}
-
-		return $ok;
-	}
-
-	private function findFunctionUsage(File $phpcsFile, $stackPtr, $tokens, $name_full, $name_short)
-	{
-		$ok = false;
-		$position = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr + 1);
-		while ($position !== false)
-		{
-			$function_name_end = $position;
-			$found_start = 1 + $phpcsFile->findPrevious(
-				[T_NS_SEPARATOR, T_STRING, T_WHITESPACE],
-				$function_name_end - 1,
-				null,
-				true
-			);
-
-			$position = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $position + 1);
-			if ($found_start === null)
-			{
-				continue;
-			}
-
-			$function_name_start = $found_start;
-
-			// Trim the output.
-			while ($tokens[$function_name_start]['code'] === T_WHITESPACE && $function_name_start < $function_name_end)
-			{
-				++$function_name_start;
-			}
-
-			while ($tokens[$function_name_end]['code'] === T_WHITESPACE && $function_name_end > $function_name_start)
-			{
-				--$function_name_end;
-			}
-
-			$function_name_length = $function_name_end - $function_name_start;
-
-			// Filter out control structures, built in type constructors, etc.
-			if ($function_name_length <= 0)
-			{
-				continue;
-			}
-
-			// This doesn't seem to be valid PHP, where is the opening tag?
-			if ($found_start === 0)
-			{
-				continue;
-			}
-
-			$previous_token = $found_start - 1;
-			$filter = [
-				T_FUNCTION, // Function declaration
-				T_OBJECT_OPERATOR, // Method call
-				T_DOUBLE_COLON, // Static method call
-				T_NEW, // Constructors
-			];
-
-			// Filter out calls to methods and function declarations.
-			if (in_array($tokens[$previous_token]['code'], $filter))
-			{
-				continue;
-			}
-
-			$function_name = $phpcsFile->getTokensAsString($function_name_start, $function_name_length);
-			$ok = $this->check($phpcsFile, $function_name, $name_full, $name_short, $function_name_start) || $ok;
-		}
-
-		return $ok;
 	}

 	/**
@ -387,7 +247,7 @@ class UnusedUseSniff implements Sniff
 			$classes = explode('|', str_replace('[]', '', $classes));
 			foreach ($classes as $class)
 			{
-				$ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tag + 2) || $ok;
+				$ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tokens[$tag + 2]['line']) ? true : $ok;
 			}
 		}

--- a/build/code_sniffer/ruleset-php-legacy.xml
+++ b/build/code_sniffer/ruleset-php-legacy.xml
@ -17,6 +17,9 @@
 <!-- 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" />

@ -86,7 +89,4 @@
 <!-- There MUST be one space between control structure and opening parenthesis -->
 <rule ref="./phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php" />

- <!-- Static qualifier MUST be placed before the visibility qualifiers. -->
- <rule ref="./phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php" />
-
 </ruleset>
--- a/build/code_sniffer/ruleset-php-strict.xml
+++ b/build/code_sniffer/ruleset-php-strict.xml
@ -45,8 +45,4 @@
 <!-- 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>
--- a/build/compare.sh
+++ b/build/compare.sh
@ -19,9 +19,9 @@ do

 	$command "$1.$ext"

-	for file in `find phpBB -name '.svn' -prune -o -type f -print`
+	for file in `find phpBB3 -name '.svn' -prune -o -type f -print`
 	do
-		orig_file="${file/#phpBB/$orig_dir}"
+		orig_file="${file/#phpBB3/$orig_dir}"
 		diff_result=`diff $orig_file $file`

 		if [ -n "$diff_result" ]
@ -31,7 +31,7 @@ do
 		fi
 	done

-	rm -rf phpBB
+	rm -rf phpBB3
 done

 cd ..
--- a/build/doctum-checkout.conf.php
+++ b/build/doctum-checkout.conf.php
@ -1,31 +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.
-*
-*/
-
-$iterator = Symfony\Component\Finder\Finder::create()
-	->files()
-	->name('*.php')
-	->in(__DIR__ . '/../phpBB/')
-	->notPath('#^cache/#')
-	->notPath('#^develop/#')
-	->notPath('#^ext/#')
-	->notPath('#^vendor/#')
-	->notPath('data');
-
-// This variable will be used and changed in doctum-all.conf.php
-$config = [
-	'title'                => 'phpBB API Documentation',
-	'build_dir'            => __DIR__ . '/api/output/%version%',
-	'cache_dir'            => __DIR__ . '/api/cache/%version%',
-];
-
-return new Doctum\Doctum($iterator, $config);
--- a/build/generate_package_json.php
+++ b/build/generate_package_json.php
@ -84,7 +84,7 @@ foreach ($older_verions as $version)
 		'phpBB ' . $version . ' to ' . $current_version . ' Update Package',
 		'phpBB-' . $version . '_to_' . $current_version,
 		'update',
-		'advanced_update',
+		'update',
 		$version
 	);
 }
@ -120,12 +120,6 @@ function phpbb_add_package_file(array &$package_list, $name, $file_name, $type,
 		$filedata->filesize = filesize($file_path);
 		$filedata->checksum = trim(preg_replace('/(^\w+)(.+)/', '$1', file_get_contents($file_path . '.sha256')));
 		$filedata->filetype = $extension;
-
-		if (file_exists($file_path . '.sig'))
-		{
-			$filedata->signature = trim(file_get_contents($file_path . '.sig'));
-		}
-
 		$package_file->files[] = $filedata;
 	}

--- a/build/generate_signature.php
+++ b/build/generate_signature.php
@ -1,52 +0,0 @@
-#!/usr/bin/env php
-<?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.
- *
- */
-
-if ($_SERVER['argc'] != 3)
-{
-	echo "Please specify the secret key and filename for which the signature should be created, e.g. generate_signature.php mySecretSecret path/to/file\n";
-	exit(1);
-}
-
-$secret_key = base64_decode($_SERVER['argv'][1]);
-$file_path = $_SERVER['argv'][2];
-
-if (!extension_loaded('sodium'))
-{
-	die('Required sodium extension not loaded');
-}
-
-if (!file_exists($file_path))
-{
-	die('File does not exist');
-}
-
-$hash = hash_file('sha384', $file_path, true);
-try
-{
-	$signature = sodium_crypto_sign_detached($hash, $secret_key);
-}
-catch (SodiumException $e)
-{
-	$keypair = sodium_crypto_sign_keypair();
-
-	$secret_key = base64_encode(sodium_crypto_sign_secretkey($keypair));
-	$public_key = base64_encode(sodium_crypto_sign_publickey($keypair));
-	echo 'Unable to create the signature: ' . $e->getMessage() . "\n";
-	echo "Maybe use these keys:\nPublic key: {$public_key}\nSecret key: {$secret_key}\n";
-	die();
-}
-
-$signature = base64_encode($signature);
-
-file_put_contents($file_path . '.sig', $signature);
--- a/build/psalm/stubs/apcu.php
+++ b/build/psalm/stubs/apcu.php
@ -1,35 +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 APCUIterator implements Iterator
-{
-	public function current()
-	{
-	}
-
-	public function next()
-	{
-	}
-
-	public function key()
-	{
-	}
-
-	public function valid()
-	{
-	}
-
-	public function rewind()
-	{
-	}
-}
--- a/build/psalm/stubs/gd.php
+++ b/build/psalm/stubs/gd.php
@ -1,15 +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.
- *
- */
-
-/** @link https://www.php.net/manual/en/image.constants.php */
-define('IMG_COLOR_STYLED', -2);
--- a/build/psalm/stubs/ldap.php
+++ b/build/psalm/stubs/ldap.php
@ -1,16 +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.
- *
- */
-
-/** @link https://www.php.net/manual/en/ldap.constants.php */
-define('LDAP_OPT_PROTOCOL_VERSION', 17);
-define('LDAP_OPT_REFERRALS', 8);
--- a/build/psalm/stubs/memcached.php
+++ b/build/psalm/stubs/memcached.php
@ -1,20 +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.
- *
- */
-
-/** @link https://www.php.net/manual/en/memcached.constants.php */
-class Memcached
-{
-	public const OPT_COMPRESSION = -1001;
-
-	public const OPT_BINARY_PROTOCOL = 18;
-}
--- a/build/psalm/stubs/oci8.php
+++ b/build/psalm/stubs/oci8.php
@ -1,19 +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.
- *
- */
-
-/** @link https://php.net/manual/en/oci8.constants.php */
-define('OCI_DEFAULT', 0);
-
-define('OCI_ASSOC', 1);
-
-define('OCI_RETURN_NULLS', 4);
--- a/build/psalm/stubs/pgsql.php
+++ b/build/psalm/stubs/pgsql.php
@ -1,15 +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.
- *
- */
-
-/** @link https://www.php.net/manual/en/pgsql.constants.php */
-define('PGSQL_CONNECT_FORCE_NEW', 2);
--- a/build/psalm/stubs/redis.php
+++ b/build/psalm/stubs/redis.php
@ -1,19 +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.
- *
- */
-
-/** @link https://phpredis.github.io/phpredis/Redis.html */
-class Redis
-{
-	public const OPT_PREFIX = 2;
-	public const SERIALIZER_PHP = 1;
-}
--- a/build/psalm/stubs/sqlite3.php
+++ b/build/psalm/stubs/sqlite3.php
@ -1,33 +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 SQLite3
-{
-	public function query(string $query) {}
-}
-
-class SQLite3Result
-{
-	public function fetchArray(int $mode = SQLITE3_BOTH) {}
-}
-
-/**
- * @link https://www.php.net/manual/en/sqlite3.constants.php
- */
-define('SQLITE3_ASSOC', 1);
-define('SQLITE3_NUM', 2);
-define('SQLITE3_BOTH', 3);
-
-define('SQLITE3_OPEN_READONLY', 1);
-define('SQLITE3_OPEN_READWRITE', 2);
-define('SQLITE3_OPEN_CREATE', 4);
--- a/build/psalm/stubs/sqlsrv.php
+++ b/build/psalm/stubs/sqlsrv.php
@ -1,17 +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.
- *
- */
-
-/** @link https://www.php.net/manual/en/sqlsrv.constants.php */
-define('SQLSRV_ERR_ERRORS', 0);
-define('SQLSRV_FETCH_ASSOC', 2);
-define('SQLSRV_CURSOR_STATIC', 'static');
--- a/build/psalm_bootstrap.php
+++ b/build/psalm_bootstrap.php
@ -1,55 +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.
-*
-*/
-
-define('IN_PHPBB', true);
-define('PHPBB_ENVIRONMENT', 'test');
-
-$phpbb_root_path = 'phpBB/';
-$phpEx = 'php';
-
-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/acp/acp_database.' . $phpEx;
-require_once $phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx;
-require_once $phpbb_root_path . 'includes/functions.' . $phpEx;
-require_once $phpbb_root_path . 'includes/functions_acp.' . $phpEx;
-require_once $phpbb_root_path . 'includes/functions_admin.' . $phpEx;
-require_once $phpbb_root_path . 'includes/functions_compatibility.' . $phpEx;
-require_once $phpbb_root_path . 'includes/functions_compress.' . $phpEx;
-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_module.' . $phpEx;
-require_once $phpbb_root_path . 'includes/functions_posting.' . $phpEx;
-require_once $phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx;
-require_once $phpbb_root_path . 'includes/functions_transfer.' . $phpEx;
-require_once $phpbb_root_path . 'includes/functions_user.' . $phpEx;
-require_once $phpbb_root_path . 'includes/sphinxapi.' . $phpEx;
-require_once $phpbb_root_path . 'includes/diff/diff.' . $phpEx;
-require_once $phpbb_root_path . 'includes/diff/engine.' . $phpEx;
-require_once $phpbb_root_path . 'includes/compatibility_globals.' . $phpEx;
-
-$phpbb_class_loader = new \phpbb\class_loader('phpbb\\', $phpbb_root_path . 'phpbb/', "php");
-$phpbb_class_loader->register();
-
-// Include files that require class loader to be initialized
-require_once $phpbb_root_path . 'includes/acp/auth.' . $phpEx;
-require_once $phpbb_root_path . 'includes/acp/acp_captcha.' . $phpEx;
-
-class phpbb_cache_container extends \Symfony\Component\DependencyInjection\Container
-{
-}
--- a/build/sami-all.conf.php
+++ b/build/sami-all.conf.php
@ -0,0 +1,32 @@
+<?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 __DIR__ . '/sami-checkout.conf.php';
+
+$config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../')
+	/*
+	This would be nice, but currently causes various problems that need
+	debugging.
+	->addFromTags('release-3.0.*')
+	->add('3.0.x', '3.0-next (olympus)')
+	->addFromTags('release-3.1.*')
+	->add('3.1.x', '3.1-next (ascraeus)')
+	->add('master')
+	*/
+	->add('3.0.x')
+	->add('3.1.x')
+	->add('3.2.x')
+	->add('master')
+;
+
+return new Sami\Sami($iterator, $config);
--- a/build/sami-checkout.conf.php
+++ b/build/sami-checkout.conf.php
@ -0,0 +1,44 @@
+<?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.
+*
+*/
+
+// Prevent 'Class "acm" does not exist.' exception on removeClass().
+class PhpbbArrayStore extends Sami\Store\ArrayStore
+{
+	public function removeClass(Sami\Project $project, $name)
+	{
+		unset($this->classes[$name]);
+	}
+}
+
+$iterator = Symfony\Component\Finder\Finder::create()
+	->files()
+	->name('*.php')
+	->in(__DIR__ . '/../phpBB/')
+	->notPath('#^cache/#')
+	->notPath('#^develop/#')
+	->notPath('#^ext/#')
+	->notPath('#^vendor/#')
+	->notPath('data')
+;
+
+$config = array(
+	'theme'                => 'enhanced',
+	'title'                => 'phpBB API Documentation',
+	'build_dir'            => __DIR__.'/api/output/%version%',
+	'cache_dir'            => __DIR__.'/api/cache/%version%',
+	'default_opened_level' => 2,
+	// Do not use JsonStore. See https://github.com/fabpot/Sami/issues/79
+	'store'                => new PhpbbArrayStore,
+);
+
+return new Sami\Sami($iterator, $config);
--- a/build/update_stylesheet_querystrings.php
+++ b/build/update_stylesheet_querystrings.php
@ -1,54 +0,0 @@
-<?php declare(strict_types=1);
-/**
-*
-* 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.
-*
-*/
-
-if (php_sapi_name() !== 'cli')
-{
-	die("This program must be run from the command line.\n");
-}
-
-if (version_compare(PHP_VERSION, '7.1.3', '<'))
-{
-	die('update_stylesheet_querystrings.php requires at least PHP 7.1.3');
-}
-
-// Usage: "$ php build/update_stylesheet_querystrings.php"
-$targets = [dirname(dirname(__FILE__)) . '/phpBB/styles/prosilver/theme/stylesheet.css'];
-
-array_map('patch_glob', $targets);
-
-function patch_glob($glob): void
-{
-	array_map('patch_file', glob($glob));
-}
-
-function patch_file(string $filepath): void
-{
-	$file	= file_get_contents($filepath);
-	$old	= $file;
-	$new	= preg_replace_callback(
-		'(^@import\\s+url\\([\'"](?<basename>\\w++\\.css)\\?\\K(?:hash|v)=[^\'"]++)m',
-		function ($match) use ($filepath)
-		{
-			$path = dirname($filepath) . DIRECTORY_SEPARATOR . $match['basename'];
-			$hash = sprintf('%08x', crc32(file_get_contents($path)));
-
-			return 'hash=' . $hash;
-		},
-		$old
-	);
-
-	if ($new !== $old)
-	{
-		file_put_contents($filepath, $new);
-	}
-}
--- a/build/verify_signature.php
+++ b/build/verify_signature.php
@ -1,56 +0,0 @@
-#!/usr/bin/env php
-<?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.
- *
- */
-
-if ($_SERVER['argc'] != 4)
-{
-	echo "Please specify the public key, filename for which the signature should be check, and the signature file, e.g. verify_signature.php superPublicKey path/to/file path/to/signature\n";
-	exit(1);
-}
-
-$public_key = base64_decode($_SERVER['argv'][1]);
-$file_path = $_SERVER['argv'][2];
-$signature_path = $_SERVER['argv'][3];
-
-if (!extension_loaded('sodium'))
-{
-	die('Required sodium extension not loaded');
-}
-
-if (!file_exists($file_path))
-{
-	die('File does not exist');
-}
-
-if (!file_exists($signature_path))
-{
-	die('Signature file does not exist');
-}
-
-$hash = hash_file('sha384', $file_path, true);
-$signature = base64_decode(file_get_contents($signature_path));
-
-try
-{
-	if (sodium_crypto_sign_verify_detached($signature, $hash, $public_key))
-	{
-		echo 'Signature is valid!';
-	}
-	else
-	{
-		echo 'Signature is not valid!';
-	}
-} catch (SodiumException $e)
-{
-	die('Unable to verify the signature: ' . $e->getMessage() . "\n");
-}
--- a/composer.phar
+++ b/composer.phar
--- a/doctum.phar
+++ b/doctum.phar
--- a/git-tools/commit-msg-hook-range.sh
+++ b/git-tools/commit-msg-hook-range.sh
@ -24,17 +24,7 @@ COMMIT_MSG_HOOK_FATAL=$(git config --bool phpbb.hooks.commit-msg.fatal 2> /dev/n
 git config phpbb.hooks.commit-msg.fatal true

 EXIT_STATUS=0
-
-COMMIT_HASHES=$(git rev-list --no-merges "$COMMIT_RANGE")
-
-# If any message have been returned instead of commit hashes list
-# send a non-zero exit status upstream.
-if ! [[ "$COMMIT_HASHES" =~ ^[0-9a-f]{5,40} ]]
-then
-	EXIT_STATUS=1
-fi
-
-for COMMIT_HASH in $COMMIT_HASHES
+for COMMIT_HASH in $(git rev-list --no-merges "$COMMIT_RANGE")
 do
 	echo "Inspecting commit message of commit $COMMIT_HASH"

--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# A hook to check syntax of a phpBB commit message, per:
-# * <https://area51.phpbb.com/docs/dev/master/development/git.html>
+# A hook to check syntax of a phpBB3 commit message, per:
+# * <http://wiki.phpbb.com/display/DEV/Git>
 # * <http://area51.phpbb.com/phpBB/viewtopic.php?p=209919#p209919>
 #
 # This is a commit-msg hook.
@ -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;
@ -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;
--- a/git-tools/hooks/prepare-commit-msg
+++ b/git-tools/hooks/prepare-commit-msg
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # A hook to add [$branch] to the beginning of a commit message
 # if certain conditions are met.
@ -31,25 +31,12 @@ branch="$(echo "$branch" | sed "s/refs\/heads\///g")"
 if [ "$2" = "" ]
 then
 	tail="";
-	ticket_id=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\3/gm;t;d' <<< "$branch");
-	branch_title=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\1\2\3/gm;t;d' <<< "$branch");

-	# Fall back to branch name if no ticket ID
-	if [ -z "$branch_title" ];
+	# Branch is prefixed with 'ticket/', append ticket ID to message
+	if [ "$branch" != "${branch##ticket/}" ];
 	then
-		branch_title="$branch";
+		tail="$(printf "\n\nPHPBB3-${branch##ticket/}")";
 	fi

-	if [ "security/" = "$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\2/gm;t;d' <<< "$branch")" ];
-	then
-		tail="$(printf '\n\nSECURITY-%s' "$ticket_id")";
-	else
-		# Branch is prefixed with 'ticket/', append ticket ID to message
-		if [ "$branch" != "${branch##ticket/}" ];
-		then
-			tail="$(printf '\n\nPHPBB-%s' "$ticket_id")";
-		fi
-	fi
-
-	echo "[$branch_title] $tail$(cat "$1")" > "$1"
+	echo "[$branch] $tail$(cat "$1")" > "$1"
 fi
--- a/git-tools/merge.php
+++ b/git-tools/merge.php
@ -56,7 +56,7 @@ catch (RuntimeException $e)
 function work($pull_id, $remote)
 {
 	// Get some basic data
-	$pull = get_pull('phpbb', 'phpbb', $pull_id);
+	$pull = get_pull('phpbb', 'phpbb3', $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, 'phpbb');
+			add_remote($pull_user, 'phpbb3');
 			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, 'phpbb');
+			add_remote($pull_user, 'phpbb3');
 			run("git fetch $pull_user");
 			run("git merge --no-ff $pull_user/$pull_branch");
 			run("phpBB/vendor/bin/phpunit");
--- a/gulpfile.js
+++ b/gulpfile.js
@ -1,69 +0,0 @@
-'use strict';
-
-const gulp = require('gulp');
-const rename = require('gulp-rename');
-const concat = require('gulp-concat');
-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, { sourcemaps: true })
-		.pipe(
-			postcss([
-				autoprefixer(),
-				sorting(sortOrder),
-			]),
-		)
-		.pipe(gulp.dest(paths.styles.css, { sourcemaps: './' }));
-}
-
-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',
-	], { sourcemaps: true })
-		.pipe(concat('stylesheet.css'))
-		.pipe(
-			postcss([
-				cssnano(),
-			]),
-		)
-		.pipe(rename({
-			suffix: '.min',
-			extname: '.css',
-		}))
-		.pipe(gulp.dest(paths.styles.css, { sourcemaps: './' }));
-}
-
-function watch() {
-	gulp.watch(paths.styles.src, styles);
-}
-
-exports.style = styles;
-exports.minify = minify;
-exports.watch = watch;
-
-exports.default = gulp.series(styles, minify, watch);
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,116 +0,0 @@
-{
-	"name": "phpbb",
-	"version": "4.0.0-dev",
-	"description": "phpBB Forum Software application",
-	"main": " ",
-	"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",
-		"not samsung 10.1",
-		"not and_uc 12.12",
-		"not op_mini all",
-		"edge >= 18",
-		"ff >= 72",
-		"chrome >= 79",
-		"safari >= 13",
-		"ios >= 12.4"
-	],
-	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/phpbb/phpbb.git"
-	},
-	"keywords": [
-		"phpBB",
-		"phpbb",
-		"forum",
-		"php",
-		"software",
-		"community"
-	],
-	"author": "",
-	"license": "GPL-2.0",
-	"bugs": {
-		"url": "https://tracker.phpbb.com"
-	},
-	"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": "^5.0.0",
-		"gulp-concat": "^2.6.1",
-		"gulp-postcss": "^9.0.1",
-		"gulp-rename": "^2.0.0",
-		"postcss": "^8.4.31",
-		"postcss-sorting": "^7.0.1",
-		"stylelint": "^14.7.0",
-		"stylelint-order": "^5.0.0",
-		"web-push-testing": "^1.1.1"
-	}
-}
--- a/phpBB/adm/images/alert_close.png
+++ b/phpBB/adm/images/alert_close.png
--- a/phpBB/adm/images/arrow_down.gif
+++ b/phpBB/adm/images/arrow_down.gif
--- a/phpBB/adm/images/arrow_left.gif
+++ b/phpBB/adm/images/arrow_left.gif
--- a/phpBB/adm/images/arrow_right.gif
+++ b/phpBB/adm/images/arrow_right.gif
--- a/phpBB/adm/images/arrow_up.gif
+++ b/phpBB/adm/images/arrow_up.gif
--- a/phpBB/adm/images/bg_button.gif
+++ b/phpBB/adm/images/bg_button.gif
--- a/phpBB/adm/images/bg_hash1.gif
+++ b/phpBB/adm/images/bg_hash1.gif
--- a/phpBB/adm/images/bg_hash2.gif
+++ b/phpBB/adm/images/bg_hash2.gif
--- a/phpBB/adm/images/bg_hash3.gif
+++ b/phpBB/adm/images/bg_hash3.gif
--- a/phpBB/adm/images/bg_hash4.gif
+++ b/phpBB/adm/images/bg_hash4.gif
--- a/phpBB/adm/images/bg_header.gif
+++ b/phpBB/adm/images/bg_header.gif
--- a/phpBB/adm/images/bg_header.jpg
+++ b/phpBB/adm/images/bg_header.jpg
--- a/phpBB/adm/images/bg_tabs_alt1.gif
+++ b/phpBB/adm/images/bg_tabs_alt1.gif
--- a/phpBB/adm/images/bg_tabs_alt2.gif
+++ b/phpBB/adm/images/bg_tabs_alt2.gif
--- a/phpBB/adm/images/cellpic3.gif
+++ b/phpBB/adm/images/cellpic3.gif
--- a/phpBB/adm/images/file_conflict.gif
+++ b/phpBB/adm/images/file_conflict.gif
--- a/phpBB/adm/images/file_modified.gif
+++ b/phpBB/adm/images/file_modified.gif
--- a/phpBB/adm/images/file_new.gif
+++ b/phpBB/adm/images/file_new.gif
--- a/phpBB/adm/images/file_new_conflict.gif
+++ b/phpBB/adm/images/file_new_conflict.gif
--- a/phpBB/adm/images/file_not_modified.gif
+++ b/phpBB/adm/images/file_not_modified.gif
--- a/phpBB/adm/images/file_up_to_date.gif
+++ b/phpBB/adm/images/file_up_to_date.gif
--- a/phpBB/adm/images/gradient2b.gif
+++ b/phpBB/adm/images/gradient2b.gif
--- a/phpBB/adm/images/icon_delete.gif
+++ b/phpBB/adm/images/icon_delete.gif
--- a/phpBB/adm/images/icon_delete_disabled.gif
+++ b/phpBB/adm/images/icon_delete_disabled.gif
--- a/phpBB/adm/images/icon_down.gif
+++ b/phpBB/adm/images/icon_down.gif
--- a/phpBB/adm/images/icon_down_disabled.gif
+++ b/phpBB/adm/images/icon_down_disabled.gif
--- a/phpBB/adm/images/icon_edit.gif
+++ b/phpBB/adm/images/icon_edit.gif
--- a/phpBB/adm/images/icon_edit_disabled.gif
+++ b/phpBB/adm/images/icon_edit_disabled.gif
--- a/phpBB/adm/images/icon_folder.gif
+++ b/phpBB/adm/images/icon_folder.gif
--- a/phpBB/adm/images/icon_folder_link.gif
+++ b/phpBB/adm/images/icon_folder_link.gif
--- a/phpBB/adm/images/icon_folder_lock.gif
+++ b/phpBB/adm/images/icon_folder_lock.gif
--- a/phpBB/adm/images/icon_subfolder.gif
+++ b/phpBB/adm/images/icon_subfolder.gif
--- a/Show more
+++ b/Show more