Merge branch 'prep-release-3.0.12'

* prep-release-3.0.12: (443 commits) [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources. [prep-release-3.0.12] Bumping version number for 3.0.12 final. [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11769] Allow '0' as username in notification mails [ticket/11769] Fix language issues in the doc blocks [ticket/11769] Correctly supply the post author's username in posting.php [ticket/11802] replace $browser with $user->browser [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. ...
Merge branch 'prep-release-3.0.11'
2025-09-29 01:09:15 +02:00 · 2013-09-28 15:40:10 +02:00 · 2012-08-20 17:09:18 +02:00
3355 changed files with 123413 additions and 335958 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,22 +0,0 @@
-# Debian version
-ARG VARIANT="bookworm"
-FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
-
-# Install PHP
-RUN apt-get -y update && apt-get -y install software-properties-common 
-RUN add-apt-repository ppa:ondrej/php
-RUN apt-get -y update
-RUN apt-get -y install php8.4 php8.4-xml php8.4-mbstring php8.4-curl php8.4-zip php8.4-xdebug
-
-# Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Install MySQL
-RUN apt-get -y install mysql-server php8.4-mysql
-
-# Xdebug
-ADD resources/xdebug.ini /etc/php/8.4/apache2/conf.d/xdebug.ini
-
-# Configure Apache
-RUN echo "Listen 8080" >> /etc/apache2/ports.conf && \
-    a2enmod rewrite
--- a/.devcontainer/customisations-team/devcontainer.json
+++ b/.devcontainer/customisations-team/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": "phpBB (Customisations Team)",
-	"build": {
-		"dockerfile": "../Dockerfile",
-		"args": { 
-			"VARIANT": "ubuntu-22.04"
-		}
-	},
-
-	// Configure tool-specific properties.
-	"customizations": {
-		// Configure properties specific to VS Code.
-		"vscode": {
-			"settings": {
-				// Allow Xdebug to listen to requests from remote (or container)
-				"remote.localPortHost": "allInterfaces"
-			},
-			//"devPort": {},
-			// Specify which VS Code extensions to install (List of IDs)
-			"extensions": ["xdebug.php-debug"]
-			}
-		},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [80, 9003],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postStartCommand": "bash .devcontainer/customisations-team/setup.sh",
-
-	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode",
-	"features": {
-		"github-cli": "latest"
-	}
-}
--- a/.devcontainer/customisations-team/phpbb-config.yml
+++ b/.devcontainer/customisations-team/phpbb-config.yml
@@ -1,37 +0,0 @@
-installer:
-    admin:
-        name: admin
-        password: adminadmin
-        email: admin@example.org
-
-    board:
-        lang: en
-        name: My Board (with Titania)
-        description: My amazing new phpBB board (with Titania)
-
-    database:
-        dbms: mysqli
-        dbhost: 127.0.0.1
-        dbport: 3306
-        dbuser: phpbb
-        dbpasswd: phpbb
-        dbname: phpbb
-        table_prefix: phpbb_
-
-    email:
-        enabled: false
-        smtp_delivery : ~
-        smtp_host: ~
-        smtp_port: ~
-        smtp_user: ~
-        smtp_pass: ~
-
-    server:
-        cookie_secure: false
-        server_protocol: http://
-        force_server_vars: true
-        server_name: localhost
-        server_port: 80
-        script_path: /
-
-    extensions: ["phpbb/titania"]
--- a/.devcontainer/customisations-team/setup.sh
+++ b/.devcontainer/customisations-team/setup.sh
@@ -1,81 +0,0 @@
-# setup.sh - Customisations Team
-# Commands to install and configure phpBB
-echo "[Codespaces] Customisations Team configuration..."
-
-# Start MySQL
-echo "[Codespaces] Start MySQL"
-sudo service mysql start
-
-# Start Apache
-echo "[Codespaces] Start Apache"
-sudo apache2ctl start
-
-# Create a MySQL user to use
-echo "[Codespaces] Create MySQL user"
-sudo mysql -u root<<EOFMYSQL
-    CREATE USER 'phpbb'@'localhost' IDENTIFIED BY 'phpbb';
-    GRANT ALL PRIVILEGES ON *.* TO 'phpbb'@'localhost' WITH GRANT OPTION;
-    CREATE DATABASE IF NOT EXISTS phpbb;
-EOFMYSQL
-
-# Symlink the webroot so it can be viewed
-echo "[Codespaces] Create Symlink of webroot"
-sudo rm -rf /var/www/html
-sudo ln -s /workspaces/phpbb/phpBB /var/www/html
-
-# Force the server URL to reflect the Codespace
-# https://docs.github.com/en/codespaces/developing-in-a-codespace/default-environment-variables-for-your-codespace
-if [ "$CODESPACES" = true ] ; then
-    cp /workspaces/phpbb/.devcontainer/customisations-team/phpbb-config.yml /tmp/phpbb-config.yml
-    CODESPACES_URL="${CODESPACE_NAME}-80.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
-    echo "[Codespaces] Set the phpBB server name using default environment variables: $CODESPACES_URL"
-    sed -i "s/localhost/$CODESPACES_URL/g" /tmp/phpbb-config.yml
-fi
-
-URL_EPV="https://github.com/phpbb/epv"
-URL_TV="https://github.com/phpbb/phpbb-translation-validator"
-URL_TITANIA="https://github.com/phpbb/customisation-db.git"
-
-# Install Titania
-echo "[Codespaces] Install Titania"
-cd /workspaces/
-git clone -b oberon $URL_TITANIA titania
-cd /workspaces/titania
-chmod 755 files store
-composer install --no-interaction
-chmod 755 /workspaces/phpbb/phpBB/ext
-mkdir /workspaces/phpbb/phpBB/ext/phpbb
-sudo ln -s /workspaces/titania /workspaces/phpbb/phpBB/ext/phpbb/titania
-
-# Install EPV
-echo "[Codespaces] Install EPV"
-cd /workspaces/
-git clone -b master $URL_EPV epv
-cd /workspaces/epv
-composer install --no-interaction
-rm -rf /workspaces/phpbb/phpBB/ext/phpbb/titania/vendor/phpbb/epv
-sudo ln -s /workspaces/epv /workspaces/phpbb/phpBB/ext/phpbb/titania/vendor/phpbb/epv
-
-# Install Translation Validator
-echo "[Codespaces] Install Translation Validator"
-cd /workspaces/
-git clone -b master $URL_TV translation-validator
-cd /workspaces/translation-validator
-composer install --no-interaction
-rm -rf /workspaces/phpbb/phpBB/ext/phpbb/titania/vendor/phpbb/translation-validator
-sudo ln -s /workspaces/translation-validator /workspaces/phpbb/phpBB/ext/phpbb/titania/vendor/phpbb/translation-validator
-
-# Install phpBB (last so that the extension is auto-installed)
-echo "[Codespaces] Run phpBB CLI installation"
-cd /workspaces/phpbb/phpBB && composer install --no-interaction
-sudo php /workspaces/phpbb/phpBB/install/phpbbcli.php install /tmp/phpbb-config.yml
-rm -rf /workspaces/phpbb/phpBB/install
-
-# Set to debug mode
-sed -i \
-  -e "s|@define('PHPBB_ENVIRONMENT', 'production');|@define('PHPBB_ENVIRONMENT', 'development');|" \
-  -e "s|// *@define('DEBUG_CONTAINER', true);|@define('DEBUG_CONTAINER', true);|" \
-  /workspaces/phpbb/phpBB/config.php
-
-# Finished
-echo "[Codespaces] phpBB (Customisation Team) installation completed"
--- a/.devcontainer/development-team/devcontainer.json
+++ b/.devcontainer/development-team/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": "phpBB (Development Team)",
-	"build": {
-		"dockerfile": "../Dockerfile",
-		"args": { 
-			"VARIANT": "ubuntu-22.04"
-		}
-	},
-
-	// Configure tool-specific properties.
-	"customizations": {
-		// Configure properties specific to VS Code.
-		"vscode": {
-			"settings": {
-				// Allow Xdebug to listen to requests from remote (or container)
-				"remote.localPortHost": "allInterfaces"
-			},
-			//"devPort": {},
-			// Specify which VS Code extensions to install (List of IDs)
-			"extensions": ["xdebug.php-debug"]
-			}
-		},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [80, 9003],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postStartCommand": "bash .devcontainer/development-team/setup.sh",
-
-	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode",
-	"features": {
-		"github-cli": "latest"
-	}
-}
--- a/.devcontainer/development-team/phpbb-config.yml
+++ b/.devcontainer/development-team/phpbb-config.yml
@@ -1,37 +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_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/development-team/setup.sh
+++ b/.devcontainer/development-team/setup.sh
@@ -1,50 +0,0 @@
-# setup.sh - Development Team
-# Commands to install and configure phpBB
-echo "[Codespaces] Development Team configuration..."
-
-# Start MySQL
-echo "[Codespaces] Start MySQL"
-sudo service mysql start
-
-# Start Apache
-echo "[Codespaces] Start Apache"
-sudo apache2ctl start
-
-# Create a MySQL user to use
-echo "[Codespaces] Create MySQL user"
-sudo mysql -u root<<EOFMYSQL
-    CREATE USER 'phpbb'@'localhost' IDENTIFIED BY 'phpbb';
-    GRANT ALL PRIVILEGES ON *.* TO 'phpbb'@'localhost' WITH GRANT OPTION;
-    CREATE DATABASE IF NOT EXISTS phpbb;
-EOFMYSQL
-
-# Download dependencies
-echo "[Codespaces] Install Composer dependencies"
-composer install --no-interaction
-
-# Symlink the webroot so it can be viewed
-echo "[Codespaces] Create Symlink of webroot"
-sudo rm -rf /var/www/html
-sudo ln -s /workspaces/phpbb/phpBB /var/www/html
-
-# Force the server URL to reflect the Codespace
-# https://docs.github.com/en/codespaces/developing-in-a-codespace/default-environment-variables-for-your-codespace
-if [ "$CODESPACES" = true ] ; then
-    cp /workspaces/phpbb/.devcontainer/development-team/phpbb-config.yml /tmp/phpbb-config.yml
-    CODESPACES_URL="${CODESPACE_NAME}-80.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
-    echo "[Codespaces] Set the phpBB server name using default environment variables: $CODESPACES_URL"
-    sed -i "s/localhost/$CODESPACES_URL/g" /tmp/phpbb-config.yml
-fi
-
-# Copy phpBB config
-# echo "[Codespaces] Copy phpBB configuration"
-# cp /workspaces/phpbb/.devcontainer/resources/phpbb-config.yml /workspaces/phpbb/phpBB/install/install-config.yml
-
-# Install phpBB
-echo "[Codespaces] Run phpBB CLI installation"
-cd /workspaces/phpbb/phpBB && composer install --no-interaction
-sudo php /workspaces/phpbb/phpBB/install/phpbbcli.php install /tmp/phpbb-config.yml
-rm -rf /workspaces/phpbb/phpBB/install
-
-# Finished
-echo "[Codespaces] phpBB (Development Team) installation completed"
--- 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/.editorconfig
+++ b/.editorconfig
@@ -1,18 +0,0 @@
-# This file is for standardising the coding style between different editors
-# http://editorconfig.org/
-
-root = true
-
-[*]
-end_of_line = lf
-indent_size = 4
-indent_style = tab
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[*.yml]
-indent_size = 4
-indent_style = space
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,6 +0,0 @@
-## 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/master/development/coding_guidelines.html) and [Git Contribution Guidelines](https://area51.phpbb.com/docs/dev/master/development/git.html)
-4. Send us a pull request
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +0,0 @@
-Checklist:
-
- [ ] Correct branch: master for new features; 3.3.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)
- [ ] Commit follows commit message [format](https://area51.phpbb.com/docs/dev/3.3.x/development/git.html)
-
-Tracker ticket:
-
-https://tracker.phpbb.com/browse/PHPBB-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-image-icc-profiles.sh
+++ b/.github/check-image-icc-profiles.sh
@@ -1,14 +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
-
-find . -type f -a -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' -a -not -wholename '*vendor/*' | \
-	parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}'
--- a/.github/check-js.sh
+++ b/.github/check-js.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 npm install -g > /dev/null
-npm ci > /dev/null
-set -x
-node_modules/eslint/bin/eslint.js "phpBB/**/*.js" --ignore-pattern "phpBB/ext/"
-node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig" --ignore-pattern "phpBB/ext/"
-node_modules/eslint/bin/eslint.js "gulpfile.js"
--- 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/ext-sniff.sh
+++ b/.github/ext-sniff.sh
@@ -1,25 +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
-
-EXTNAME=$1
-NOTESTS=$2
-
-if [ "$NOTESTS" == "1" ]
-then
-	phpBB/vendor/bin/phpcs 											\
-		-s															\
-		--extensions=php											\
-		--standard=build/code_sniffer/ruleset-php-extensions.xml	\
-		--ignore=*/"$EXTNAME"/tests/*,*/"$EXTNAME"/vendor/*			\
-		phpBB/ext/"$EXTNAME"
-fi
--- a/.github/ldap/base.ldif
+++ b/.github/ldap/base.ldif
@@ -1,41 +0,0 @@
-dn: dc=example,dc=com
-objectClass: top
-objectClass: dcObject
-objectClass: organization
-o: example
-dc: example
-
-dn: ou=foo,dc=example,dc=com
-objectClass: organizationalUnit
-ou: foo
-
-dn: cn=admin,dc=example,dc=com
-objectClass: simpleSecurityObject
-objectClass: organizationalRole
-cn: admin
-description: LDAP administrator
-userPassword:: e1NTSEF9NytMR2gveUxTMzdsc3RRd1V1dENZSVA0TWdYdm9SdDY=
-
-dn: ou=group,dc=example,dc=com
-objectClass: organizationalUnit
-ou: group
-
-dn: cn=admin,ou=foo,dc=example,dc=com
-objectClass: posixAccount
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-objectClass: person
-loginShell: /bin/bash
-homeDirectory: /home/admin
-uid: admin
-cn: admin
-uidNumber: 10000
-gidNumber: 10000
-sn: admin
-mail: admin@example.com
-userPassword:: e1NTSEF9WHpueGZURHZZc21JSkl6czdMVXBjdCtWYTA1dlMzVlQ=
-
-dn: cn=admin,ou=group,dc=example,dc=com
-objectClass: posixGroup
-gidNumber: 10000
-cn: admin
--- a/.github/ldap/slapd.conf
+++ b/.github/ldap/slapd.conf
@@ -1,17 +0,0 @@
-# See slapd.conf(5) for details on configuration options.
-include   /etc/ldap/schema/core.schema
-include   /etc/ldap/schema/cosine.schema
-include   /etc/ldap/schema/inetorgperson.schema
-include   /etc/ldap/schema/nis.schema
-
-pidfile         /var/tmp/slapd/slapd.pid
-argsfile        /var/tmp/slapd/slapd.args
-
-modulepath     /usr/lib/openldap
-
-database  ldif
-directory /var/tmp/slapd
-
-suffix    "dc=example,dc=com"
-rootdn    "cn=admin,dc=example,dc=com"
-rootpw    adminadmin
--- a/.github/phing-sniff.sh
+++ b/.github/phing-sniff.sh
@@ -1,16 +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
-
-cd build
-../phpBB/vendor/bin/phing sniff
-cd ..
--- a/.github/phpunit-mariadb-github.xml
+++ b/.github/phpunit-mariadb-github.xml
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		backupGlobals="true"
-		colors="true"
-		processIsolation="false"
-		stopOnFailure="false"
-		bootstrap="../tests/bootstrap.php"
-		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-		cacheDirectory=".phpunit.cache"
-		backupStaticProperties="false">
-  <testsuites>
-    <testsuite name="phpBB Test Suite">
-      <directory suffix="_test.php">../tests</directory>
-      <exclude>../tests/functional</exclude>
-      <exclude>../tests/lint_test.php</exclude>
-    </testsuite>
-    <testsuite name="phpBB Functional Tests">
-      <directory suffix="_test.php">../tests/functional</directory>
-    </testsuite>
-  </testsuites>
-  <groups>
-    <exclude>
-      <group>slow</group>
-    </exclude>
-  </groups>
-  <source restrictDeprecations="true">
-    <include>
-      <directory suffix=".php">../phpBB/</directory>
-      <directory suffix=".php">../tests/</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">../phpBB/vendor/</directory>
-      <directory suffix=".php">../phpBB/cache/</directory>
-      <directory suffix=".php">../phpBB/develop/</directory>
-      <directory suffix=".php">../phpBB/store/</directory>
-    </exclude>
-  </source>
-  <php>
-    <server name="PHPBB_TEST_DBMS" value="mysqli"/>
-    <server name="PHPBB_TEST_DBHOST" value="0.0.0.0"/>
-    <server name="PHPBB_TEST_DBPORT" value="3306"/>
-    <server name="PHPBB_TEST_DBNAME" value="phpbb_tests"/>
-    <server name="PHPBB_TEST_DBUSER" value="root"/>
-    <server name="PHPBB_TEST_DBPASSWD" value=""/>
-    <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-    <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/"/>
-  </php>
-</phpunit>
--- a/.github/phpunit-mssql-github.xml
+++ b/.github/phpunit-mssql-github.xml
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		backupGlobals="true"
-		colors="true"
-		processIsolation="false"
-		stopOnFailure="false"
-		bootstrap="../tests/bootstrap.php"
-		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-		cacheDirectory=".phpunit.cache"
-		backupStaticProperties="false">
-  <testsuites>
-    <testsuite name="phpBB Test Suite">
-      <directory suffix="_test.php">../tests</directory>
-      <exclude>../tests/functional</exclude>
-      <exclude>../tests/lint_test.php</exclude>
-    </testsuite>
-    <testsuite name="phpBB Functional Tests">
-      <directory suffix="_test.php">../tests/functional</directory>
-    </testsuite>
-  </testsuites>
-  <groups>
-    <exclude>
-      <group>slow</group>
-    </exclude>
-  </groups>
-  <source restrictDeprecations="true">
-    <include>
-      <directory suffix=".php">../phpBB/</directory>
-      <directory suffix=".php">../tests/</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">../phpBB/vendor/</directory>
-      <directory suffix=".php">../phpBB/cache/</directory>
-      <directory suffix=".php">../phpBB/develop/</directory>
-      <directory suffix=".php">../phpBB/store/</directory>
-    </exclude>
-  </source>
-  <php>
-    <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mssqlnative"/>
-    <server name="PHPBB_TEST_DBHOST" value="127.0.0.1"/>
-    <server name="PHPBB_TEST_DBPORT" value=""/>
-    <server name="PHPBB_TEST_DBNAME" value="phpbb_tests"/>
-    <server name="PHPBB_TEST_DBUSER" value="sa"/>
-    <server name="PHPBB_TEST_DBPASSWD" value="Pssw0rd_12"/>
-    <server name="PHPBB_TEST_REDIS_HOST" value="localhost"/>
-    <server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost"/>
-    <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-    <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/"/>
-  </php>
-</phpunit>
--- a/.github/phpunit-mysql-github.xml
+++ b/.github/phpunit-mysql-github.xml
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		backupGlobals="true"
-		colors="true"
-		processIsolation="false"
-		stopOnFailure="false"
-		bootstrap="../tests/bootstrap.php"
-		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-		cacheDirectory=".phpunit.cache"
-		backupStaticProperties="false">
-  <testsuites>
-    <testsuite name="phpBB Test Suite">
-      <directory suffix="_test.php">../tests</directory>
-      <exclude>../tests/functional</exclude>
-      <exclude>../tests/lint_test.php</exclude>
-    </testsuite>
-    <testsuite name="phpBB Functional Tests">
-      <directory suffix="_test.php">../tests/functional</directory>
-    </testsuite>
-  </testsuites>
-  <groups>
-    <exclude>
-      <group>slow</group>
-    </exclude>
-  </groups>
-  <source restrictDeprecations="true">
-    <include>
-      <directory suffix=".php">../phpBB/</directory>
-      <directory suffix=".php">../tests/</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">../phpBB/vendor/</directory>
-      <directory suffix=".php">../phpBB/cache/</directory>
-      <directory suffix=".php">../phpBB/develop/</directory>
-      <directory suffix=".php">../phpBB/store/</directory>
-    </exclude>
-  </source>
-  <php>
-    <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysqli"/>
-    <server name="PHPBB_TEST_DBHOST" value="0.0.0.0"/>
-    <server name="PHPBB_TEST_DBPORT" value="3306"/>
-    <server name="PHPBB_TEST_DBNAME" value="phpbb_tests"/>
-    <server name="PHPBB_TEST_DBUSER" value="root"/>
-    <server name="PHPBB_TEST_DBPASSWD" value=""/>
-    <server name="PHPBB_TEST_REDIS_HOST" value="localhost"/>
-    <server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost"/>
-    <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-    <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/"/>
-  </php>
-</phpunit>
--- a/.github/phpunit-postgres-github.xml
+++ b/.github/phpunit-postgres-github.xml
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		backupGlobals="true"
-		colors="true"
-		processIsolation="false"
-		stopOnFailure="false"
-		bootstrap="../tests/bootstrap.php"
-		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-		cacheDirectory=".phpunit.cache"
-		backupStaticProperties="false">
-  <testsuites>
-    <testsuite name="phpBB Test Suite">
-      <directory suffix="_test.php">../tests</directory>
-      <exclude>../tests/functional</exclude>
-      <exclude>../tests/lint_test.php</exclude>
-    </testsuite>
-    <testsuite name="phpBB Functional Tests">
-      <directory suffix="_test.php">../tests/functional</directory>
-    </testsuite>
-  </testsuites>
-  <groups>
-    <exclude>
-      <group>slow</group>
-    </exclude>
-  </groups>
-  <source restrictDeprecations="true">
-    <include>
-      <directory suffix=".php">../phpBB/</directory>
-      <directory suffix=".php">../tests/</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">../phpBB/vendor/</directory>
-      <directory suffix=".php">../phpBB/cache/</directory>
-      <directory suffix=".php">../phpBB/develop/</directory>
-      <directory suffix=".php">../phpBB/store/</directory>
-    </exclude>
-  </source>
-  <php>
-    <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
-    <server name="PHPBB_TEST_DBHOST" value="localhost"/>
-    <server name="PHPBB_TEST_DBPORT" value="5432"/>
-    <server name="PHPBB_TEST_DBNAME" value="phpbb_tests"/>
-    <server name="PHPBB_TEST_DBUSER" value="postgres"/>
-    <server name="PHPBB_TEST_DBPASSWD" value="postgres"/>
-    <server name="PHPBB_TEST_REDIS_HOST" value="localhost"/>
-    <server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost"/>
-    <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-    <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/"/>
-  </php>
-</phpunit>
--- a/.github/phpunit-psql-windows-github.xml
+++ b/.github/phpunit-psql-windows-github.xml
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		backupGlobals="true"
-		colors="true"
-		processIsolation="false"
-		stopOnFailure="false"
-		bootstrap="../tests/bootstrap.php"
-		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-		cacheDirectory=".phpunit.cache"
-		backupStaticProperties="false">
-  <testsuites>
-    <testsuite name="phpBB Test Suite">
-      <directory suffix="_test.php">../tests</directory>
-      <exclude>../tests/functional</exclude>
-      <exclude>../tests/lint_test.php</exclude>
-    </testsuite>
-    <testsuite name="phpBB Functional Tests">
-      <directory suffix="_test.php">../tests/functional</directory>
-    </testsuite>
-  </testsuites>
-  <groups>
-    <exclude>
-      <group>slow</group>
-    </exclude>
-  </groups>
-  <source restrictDeprecations="true">
-    <include>
-      <directory suffix=".php">../phpBB/</directory>
-      <directory suffix=".php">../tests/</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">../phpBB/vendor/</directory>
-      <directory suffix=".php">../phpBB/cache/</directory>
-      <directory suffix=".php">../phpBB/develop/</directory>
-      <directory suffix=".php">../phpBB/store/</directory>
-    </exclude>
-  </source>
-  <php>
-    <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
-    <server name="PHPBB_TEST_DBHOST" value="localhost"/>
-    <server name="PHPBB_TEST_DBPORT" value="5432"/>
-    <server name="PHPBB_TEST_DBNAME" value="phpbb_tests"/>
-    <server name="PHPBB_TEST_DBUSER" value="postgres"/>
-    <server name="PHPBB_TEST_DBPASSWD" value="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,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		backupGlobals="true"
-		colors="true"
-		processIsolation="false"
-		stopOnFailure="false"
-		bootstrap="../tests/bootstrap.php"
-		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-		cacheDirectory=".phpunit.cache"
-		backupStaticProperties="false">
-  <testsuites>
-    <testsuite name="phpBB Test Suite">
-      <directory suffix="_test.php">../tests</directory>
-      <exclude>../tests/functional</exclude>
-      <exclude>../tests/lint_test.php</exclude>
-    </testsuite>
-    <testsuite name="phpBB Functional Tests">
-      <directory suffix="_test.php">../tests/functional</directory>
-    </testsuite>
-  </testsuites>
-  <groups>
-    <exclude>
-      <group>slow</group>
-    </exclude>
-  </groups>
-  <source restrictDeprecations="true">
-    <include>
-      <directory suffix=".php">../phpBB/</directory>
-      <directory suffix=".php">../tests/</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">../phpBB/vendor/</directory>
-      <directory suffix=".php">../phpBB/cache/</directory>
-      <directory suffix=".php">../phpBB/develop/</directory>
-      <directory suffix=".php">../phpBB/store/</directory>
-    </exclude>
-  </source>
-  <php>
-    <server name="PHPBB_TEST_REDIS_HOST" value="0.0.0.0"/>
-    <server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost"/>
-    <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-    <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/"/>
-  </php>
-</phpunit>
--- a/.github/prepare-extension.sh
+++ b/.github/prepare-extension.sh
@@ -1,22 +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
-
-EXTNAME=$1
-
-# Move the extension in place
-mkdir --parents phpBB/ext/$EXTNAME
-cp -R ../tmp/* phpBB/ext/$EXTNAME
-
-# Move the test files for extensions in place
-cp -R .github/*.xml phpBB/ext/$EXTNAME/.github
-cp -R .github/*.sh phpBB/ext/$EXTNAME/.github
--- a/.github/setup-database.sh
+++ b/.github/setup-database.sh
@@ -1,26 +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
-
-DB=$1
-MYISAM=$2
-
-if [ "$DB" == "postgres" ]
-then
-	psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres
-	psql -c 'create database phpbb_tests;' -U postgres
-fi
-
-if [ "$MYISAM" == '1' ]
-then
-	mysql -h 127.0.0.1 -u root -e 'SET GLOBAL default_storage_engine=MyISAM;'
-fi
--- a/.github/setup-exiftool.sh
+++ b/.github/setup-exiftool.sh
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# 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
-
-sudo apt-get install -y parallel libimage-exiftool-perl
--- 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-phpbb.sh
+++ b/.github/setup-phpbb.sh
@@ -1,31 +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
-
-DB=$1
-PHP_VERSION=$2
-NOTESTS=$3
-
-if [ "$NOTESTS" == '1' ]
-then
-	.github/setup-exiftool.sh
-	.github/setup-unbuffer.sh
-fi
-
-if [ "$NOTESTS" != '1' ]
-then
-	.github/setup-webserver.sh
-fi
-
-cd phpBB
-php ../composer.phar install --dev --no-interaction
-cd ..
--- 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-unbuffer.sh
+++ b/.github/setup-unbuffer.sh
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# 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
-
-sudo apt-get install -y expect-dev
--- 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,619 +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"
-                    - php: '8.5'
-                      db: "mysql:8.0"
-                    - php: '8.5'
-                      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 --display-all-issues --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"
-                    - php: '8.5'
-                      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 --display-all-issues --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 --display-all-issues --stop-on-error
-
-    # Test with IIS & PostgreSQL on Windows
-    windows-tests:
-        runs-on: windows-2025
-        strategy:
-            matrix:
-                type: ['unit', 'functional']
-                php: ['8.4']
-                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, bz2, fileinfo
-                  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 --display-all-issues --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 --display-all-issues --stop-on-error --group functional
--- a/.gitignore
+++ b/.gitignore
@@ -1,59 +1,18 @@
-# Excludes cache
-/phpBB/cache/*
-!/phpBB/cache/.htaccess
-!/phpBB/cache/index.html
-
-# Excludes user data
-/phpBB/config*.php*
+*~
+/phpunit.xml
+/phpBB/cache/*.html
+/phpBB/cache/*.php
+/phpBB/cache/*.lock
+/phpBB/composer.phar
+/phpBB/config.php
+/phpBB/config_dev.php
+/phpBB/config_test.php
 /phpBB/ext/*
 /phpBB/files/*
 /phpBB/images/avatars/gallery/*
 /phpBB/images/avatars/upload/*
-/phpBB/images/ranks/*
 /phpBB/store/*
-
-# Excludes all custom langages
-/phpBB/language/*
-!/phpBB/language/en
-
-# Excludes all custom styles
-/phpBB/styles/*
-!/phpBB/styles/prosilver
-!/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/phpbb_unit_tests.sqlite2
+/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/.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,31 @@
+language: php
+php:
+  - 5.2
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+
+env:
+  - DB=mysql
+  - DB=postgres
+
+before_script:
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; phpenv rehash; fi"
+  - cd phpBB
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev --no-interaction --prefer-source; fi"
+  - cd ..
+  - sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"
+
+script:
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then phpunit --configuration travis/phpunit-$DB-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
+  
+notifications:
+  email:
+    recipients:
+      - dev-team@phpbb.com
+    on_success: change
+    on_failure: change
--- 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,26 @@
-[<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)

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

-## 🧑🏻‍🤝🏻🧑🏽 Community
+phpBB is a free bulletin board written in PHP.

-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).
+## COMMUNITY

-## 👨‍💻 Contribute
+Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the development on [area51](http://area51.phpbb.com/phpBB/index.php).

-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)
-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)
+## 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 Git Contribution Guidelines](http://wiki.phpbb.com/Git); if you're new to git, also read [the introduction guide](http://wiki.phpbb.com/display/DEV/Working+with+Git)
 4. Send us a pull request

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

-To run an installation from the repo (and not from a pre-built package) on a local server, run the following commands:
+We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis build below.
+develop - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop)](http://travis-ci.org/phpbb/phpbb3)
+develop-olympus - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop-olympus)](http://travis-ci.org/phpbb/phpbb3)

- 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
-  ```
-
-Alternatively, you can read:
-
-* 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.
-
-## 📓 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/25
+++ b/25
@@ -1,25 +0,0 @@
-require 'json'
-require 'yaml'
-
-VAGRANTFILE_API_VERSION ||= "2"
-confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__))
-
-homesteadYamlPath = "vagrant/bootstrap.yaml"
-afterScriptPath = "vagrant/after.sh"
-aliasesPath = "vagrant/aliases"
-
-require File.expand_path(confDir + '/scripts/homestead.rb')
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-    if File.exist? aliasesPath then
-        config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases"
-    end
-
-    if File.exist? homesteadYamlPath then
-        Homestead.configure(config, YAML::load(File.read(homesteadYamlPath)))
-    end
-
-    if File.exist? 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" />
-	<property name="prevversion" value="3.3.15" />
-	<property name="olderversions" value="3.1.12, 3.2.11, 3.3.14" />
+	<property name="newversion" value="3.0.12" />
+	<property name="prevversion" value="3.0.11" />
+	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.12-RC1, 3.0.12-RC2, 3.0.12-RC3" />
 	<!-- no configuration should be needed beyond this point -->

 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -49,7 +49,7 @@
 	-->
 	<target name="composer">
 		<exec dir="phpBB"
-			command="php ../composer.phar install --ignore-platform-reqs"
+			command="php ../composer.phar install --dev"
 			checkreturn="true"
 			passthru="true" />
 	</target>
@@ -67,74 +67,22 @@
 		<exec dir="."
 			command="phpBB/vendor/bin/phpunit
 			--log-junit build/logs/phpunit.xml
+			--configuration phpunit.xml.all
 			--group slow
 			--coverage-clover build/logs/clover-slow.xml
 			--coverage-html build/coverage-slow"
 			passthru="true" />
 	</target>

-	<target name="sniff">
-		<exec command="phpBB/vendor/bin/phpcs
-				-s -p
-				--extensions=php
-				--standard=build/code_sniffer/ruleset-php-strict-core.xml
-				--ignore=${project.basedir}/phpBB/phpbb/db/migration/data/v30x/*
-				phpBB/phpbb"
-			dir="." returnProperty="retval-php-strict" passthru="true" />
-		<php function="preg_replace" returnProperty="sniffIgnoreList">
-			<param value="/\s+/"/>
-			<param value=""/>
-			<param value="${project.basedir}/phpBB/cache/*,
-				${project.basedir}/phpBB/develop/*,
-				${project.basedir}/phpBB/ext/*,
-				${project.basedir}/phpBB/includes/diff/*.php,
-				${project.basedir}/phpBB/includes/sphinxapi.php,
-					${project.basedir}/phpBB/includes/utf/data/*,
-					${project.basedir}/phpBB/install/data/*,
-					${project.basedir}/phpBB/install/database_update.php,
-					${project.basedir}/phpBB/phpbb/*,
-					${project.basedir}/phpBB/vendor/*,
-					${project.basedir}/phpBB/vendor-ext/*,
-					${project.basedir}/phpBB/config.php,
-					${project.basedir}/phpBB/config_dev.php,
-					${project.basedir}/phpBB/config_test.php"/>
-		</php>
-		<exec command="phpBB/vendor/bin/phpcs
-				-s -p
-				--extensions=php
-				--standard=build/code_sniffer/ruleset-php-legacy-core.xml
-				--ignore=${sniffIgnoreList}
-				phpBB"
-			dir="." returnProperty="retval-php-legacy" passthru="true" />
-		<exec command="phpBB/vendor/bin/phpcs
-				-s -p
-				--extensions=php
-				--standard=build/code_sniffer/ruleset-php-extensions.xml
-				--ignore=${project.basedir}/phpBB/ext/*/tests/*,${project.basedir}/phpBB/ext/*/vendor/*
-				phpBB/ext"
-			dir="." returnProperty="retval-php-ext" passthru="true" />
-		<if>
-			<or>
-				<not><equals arg1="${retval-php-strict}" arg2="0" /></not>
-				<not><equals arg1="${retval-php-legacy}" arg2="0" /></not>
-				<not><equals arg1="${retval-php-ext}" arg2="0" /></not>
-			</or>
-			<then>
-				<fail message="PHP Code Sniffer failed." />
-			</then>
-		</if>
-	</target>
-
-	<!-- Builds docs for current branch into build/api/output/master -->
 	<target name="docs">
-		<exec dir="."
-			command="./doctum.phar update build/doctum-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"
+		<!-- only works if you setup phpdoctor:
+                     git clone https://github.com/peej/phpdoctor.git
+                     and then create an executable phpdoctor in your path containing
+                     #!/bin/sh
+                     php -f /path/to/phpdoctor/phpdoc.php $@
+                -->
+		<exec dir="build"
+			command="phpdoctor phpdoc-phpbb.ini"
 			passthru="true" />
 	</target>

@@ -150,117 +98,57 @@

 		<phingcall target="export">
 			<property name="revision" value="release-${version}" />
-			<property name="version" value="${version}" />
 			<property name="dir" value="build/old_versions/release-${version}" />
-			<property name="skip-composer" value="true" />
 		</phingcall>

 		<phingcall target="clean-diff-dir">
 			<property name="dir" value="build/old_versions/release-${version}" />
 		</phingcall>

-		<exec dir="build/old_versions" command="LC_ALL=C diff -crNEBZbd release-${version} release-${newversion} >
+		<exec dir="build/old_versions" command="diff -crNEBwd release-${version} release-${newversion} >
 			../new_version/patches/phpBB-${version}_to_${newversion}.patch" escape="false" />
-		<exec dir="build/old_versions" command="LC_ALL=C diff -qr release-${version} release-${newversion} | grep 'Only in release-${version}' > ../new_version/patches/phpBB-${version}_to_${newversion}.deleted" escape="false" />
 	</target>

 	<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" command="php -f build_diff.php '${prevversion}' '${newversion}' > logs/build_diff.log" escape="false" />
+
 		<exec dir="build" escape="false"
-			command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/language new_version/phpBB/language >
-				save/phpbb-${prevversion}_to_${newversion}_language.patch" />
+			command="diff -crNEBwd old_versions/release-${prevversion}/language new_version/phpBB3/language >
+				save/save_${prevversion}_to_${newversion}/language/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 >
-				save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />
+			command="diff -crNEBwd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver >
+				save/save_${prevversion}_to_${newversion}/prosilver/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />
+		<exec dir="build" escape="false"
+			command="diff -crNEBwd old_versions/release-${prevversion}/styles/subsilver2 new_version/phpBB3/styles/subsilver2 >
+				save/save_${prevversion}_to_${newversion}/subsilver2/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" />

 		<exec dir="build" escape="false"
 			command="git shortlog --summary --numbered release-${prevversion}...HEAD >
-				save/phpbb-${prevversion}_to_${newversion}_git_shortlog.txt" />
+				save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_shortlog.txt" />
 		<exec dir="build" escape="false"
 			command="git diff --stat release-${prevversion}...HEAD >
-				save/phpbb-${prevversion}_to_${newversion}_git_diffstat.txt" />
-
-		<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">
-		<foreach param="filename" absparam="absfilename" target="checksum-file">
-			<fileset dir="${dir}">
-				<type type="file" />
-			</fileset>
-		</foreach>
-	</target>
-
-	<target name="checksum-file">
-		<echo msg="Creating checksum file for ${absfilename}" />
-		<php function="dirname" returnProperty="dir"><param value="${absfilename}"/></php>
-		<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"
-			command="php -f build_announcement.php email '${newversion}' 'new_version/release_files' sha256 >
-				save/announcement_email_${newversion}.txt"  />
-
-		<echo msg="Writing download links and checksums for bbcode announcement to save/announcement_bbcode_${newversion}.txt" />
-		<exec dir="build" escape="false"
-			command="php -f build_announcement.php bbcode '${newversion}' 'new_version/release_files' sha256 >
-				save/announcement_bbcode_${newversion}.txt"  />
+				save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_diffstat.txt" />
 	</target>

 	<target name="changelog" depends="prepare">
@@ -282,43 +170,34 @@
 			checkreturn="true" />

 		<!-- Install composer dependencies, if there are any. -->
-		<exec dir="${dir}"
-			command='php -r "\$j = json_decode(file_get_contents(\"composer.json\")); echo isset(\$j->require);"'
+		<exec dir="."
+			command='php -r "\$j = json_decode(file_get_contents("composer.json")); echo isset(\$j->require);"'
 			checkreturn="true"
 			outputProperty='composer-has-dependencies' />
 		<if>
 			<equals arg1="${composer-has-dependencies}" arg2="1" trim="true" />
 			<then>
 				<!-- We have non-dev composer dependencies -->
+				<exec dir="."
+					command="git ls-tree ${revision} composer.phar"
+					checkreturn="true"
+					outputProperty='composer-ls-tree-output' />
 				<if>
-					<not><isset property="skip-composer" /></not>
+					<equals arg1="${composer-ls-tree-output}" arg2="" trim="true" />
 					<then>
-						<exec dir="."
-							command="git ls-tree ${revision} composer.phar"
-							checkreturn="true"
-							outputProperty='composer-ls-tree-output' />
-						<if>
-							<equals arg1="${composer-ls-tree-output}" arg2="" trim="true" />
-							<then>
-								<fail message="There are composer dependencies, but composer.phar is missing." />
-							</then>
-							<else>
-								<!-- Export the phar, install dependencies, delete phar. -->
-								<exec dir="."
-									command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
-									checkreturn="true" />
-								<exec dir="${dir}"
-									command="php composer.phar install --no-dev --optimize-autoloader --ignore-platform-reqs"
-									checkreturn="true"
-									passthru="true" />
-								<delete file="${dir}/composer.phar" />
-
-								<phingcall target="clean-vendor-dir">
-									<property name="dir" value="${dir}" />
-								</phingcall>
-							</else>
-						</if>
+						<fail message="There are composer dependencies, but composer.phar is missing." />
 					</then>
+					<else>
+						<!-- Export the phar, install dependencies, delete phar. -->
+						<exec dir="."
+							command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
+							checkreturn="true" />
+						<exec dir="${dir}"
+							command="php composer.phar install"
+							checkreturn="true"
+							passthru="true" />
+						<delete file="${dir}/composer.phar" />
+					</else>
 				</if>
 			</then>
 			<else>
@@ -328,62 +207,9 @@
 			</else>
 		</if>

-		<!-- Checkout latest viglink to ext folder -->
-		<available file="${dir}/ext" type="dir" property="add-viglink-ext" />
-		<exec dir="${dir}"
-			command='php -r "echo version_compare(&apos;${version}&apos;, &apos;3.2.0-RC2&apos;, &apos;>=&apos;) ? &apos;true&apos; : &apos;false&apos;;"'
-			checkreturn="true"
-			outputProperty='viglink-available' />
-		<if>
-			<and>
-				<equals arg1="${add-viglink-ext}" arg2="1" trim="true" />
-				<or>
-					<equals arg1="${revision}" arg2="HEAD" trim="true" />
-					<equals arg1="${viglink-available}" arg2="1" trim="true" />
-				</or>
-			</and>
-			<then>
-				<exec dir="${dir}/ext" command="mkdir phpbb" passthru="true" />
-
-				<exec dir="${dir}/ext/phpbb" command="git clone https://github.com/phpbb-extensions/viglink.git viglink" passthru="true" checkreturn="true" />
-				<if>
-					<equals arg1="${revision}" arg2="HEAD" trim="true" />
-					<then>
-						<exec dir="${dir}/ext/phpbb/viglink"
-							command="git rev-parse release-phpbb-${version}"
-							returnProperty='viglink_head_tag_exists' />
-						<if>
-							<equals arg1="${viglink_head_tag_exists}" arg2="0" trim="true" />
-							<then>
-								<exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" />
-							</then>
-							<else>
-								<exec dir="${dir}/ext/phpbb/viglink" command="git checkout master" passthru="true" />
-							</else>
-						</if>
-					</then>
-					<else>
-						<exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" />
-					</else>
-				</if>
-				<delete dir="${dir}/ext/phpbb/viglink/.git" />
-				<delete dir="${dir}/ext/phpbb/viglink/tests" />
-				<delete dir="${dir}/ext/phpbb/viglink/travis" />
-				<delete file="${dir}/ext/phpbb/viglink/.gitattributes" />
-				<delete file="${dir}/ext/phpbb/viglink/.travis.yml" />
-				<delete file="${dir}/ext/phpbb/viglink/phpunit.xml.dist" />
-				<delete file="${dir}/ext/phpbb/viglink/README.md" />
-			</then>
-		</if>
-
-		<!-- Create schema.json -->
-		<exec dir="${dir}" command="php develop/create_schema_files.php" />
-
 		<delete file="${dir}/config.php" />
 		<delete dir="${dir}/develop" />
 		<delete dir="${dir}/install/data" />
-		<delete dir="${dir}/config/development" />
-		<delete dir="${dir}/config/test" />

 		<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
 		<!-- set permissions of all files to 644, directories to 755 -->
@@ -394,198 +220,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">
-		<!-- Delete unrelated files from vendor/, see PHPBB3-12390 -->
-		<delete dir="${dir}/vendor/bantu/ini-get-wrapper/tests" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.gitignore" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.scrutinizer.yml" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.travis.yml" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/README.md" />
-
-		<delete dir="${dir}/vendor/google/recaptcha/examples" />
-		<delete dir="${dir}/vendor/google/recaptcha/tests" />
-		<delete file="${dir}/vendor/google/recaptcha/.gitignore" />
-		<delete file="${dir}/vendor/google/recaptcha/.travis.yml" />
-		<delete file="${dir}/vendor/google/recaptcha/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/google/recaptcha/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/google/recaptcha/README.md" />
-
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/build" />
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/docs" />
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/CHANGELOG.md" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.editorconfig" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/README.md" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.travis.yml" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/UPGRADING.md" />
-
-		<delete dir="${dir}/vendor/guzzlehttp/ringphp/docs" />
-		<delete dir="${dir}/vendor/guzzlehttp/ringphp/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/CHANGELOG.md" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/README.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/.travis.yml" />
-
-		<delete dir="${dir}/vendor/guzzlehttp/streams/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/CHANGELOG.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/README.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/.travis.yml" />
-
-		<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
-		<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
-		<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
-		<delete file="${dir}/vendor/lusitanian/oauth/.scrutinizer.yml" />
-		<delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" />
-		<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
-
-		<delete dir="${dir}/vendor/paragonie/random_compat/dist" />
-		<delete dir="${dir}/vendor/paragonie/random_compat/other" />
-		<delete file="${dir}/vendor/paragonie/random_compat/CHANGELOG.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/ERRATA.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/README.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/SECURITY.md" />
-
-		<delete file="${dir}/vendor/patchwork/utf8/.travis.yml" />
-		<delete file="${dir}/vendor/patchwork/utf8/CHANGELOG.md" />
-		<delete file="${dir}/vendor/patchwork/utf8/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/patchwork/utf8/README.md" />
-
-		<delete dir="${dir}/vendor/psr/log/Psr/Log/Test" />
-		<delete file="${dir}/vendor/psr/log/.gitignore" />
-		<delete file="${dir}/vendor/psr/log/README.md" />
-
-		<delete dir="${dir}/vendor/react/promise/tests" />
-		<delete file="${dir}/vendor/react/promise/CHANGELOG.md" />
-		<delete file="${dir}/vendor/react/promise/.gitignore" />
-		<delete file="${dir}/vendor/react/promise/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/react/promise/README.md" />
-		<delete file="${dir}/vendor/react/promise/.travis.yml" />
-
-		<delete dir="${dir}/vendor/s9e/text-formatter/.git" />
-
-		<delete dir="${dir}/vendor/symfony/config/.git" />
-		<delete dir="${dir}/vendor/symfony/config/Tests" />
-		<delete file="${dir}/vendor/symfony/config/.gitignore" />
-		<delete file="${dir}/vendor/symfony/config/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/config/README.md" />
-		<delete file="${dir}/vendor/symfony/config/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/console/.git" />
-		<delete dir="${dir}/vendor/symfony/console/Tests" />
-		<delete file="${dir}/vendor/symfony/console/.gitignore" />
-		<delete file="${dir}/vendor/symfony/console/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/console/README.md" />
-		<delete file="${dir}/vendor/symfony/console/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/debug/.git" />
-		<delete dir="${dir}/vendor/symfony/debug/Tests" />
-		<delete file="${dir}/vendor/symfony/debug/.gitignore" />
-		<delete file="${dir}/vendor/symfony/debug/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/debug/README.md" />
-		<delete file="${dir}/vendor/symfony/debug/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/dependency-injection/.git" />
-		<delete dir="${dir}/vendor/symfony/dependency-injection/Tests" />
-		<delete file="${dir}/vendor/symfony/dependency-injection/.gitignore" />
-		<delete file="${dir}/vendor/symfony/dependency-injection/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/dependency-injection/README.md" />
-		<delete file="${dir}/vendor/symfony/dependency-injection/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/event-dispatcher/.git" />
-		<delete dir="${dir}/vendor/symfony/event-dispatcher/Tests" />
-		<delete file="${dir}/vendor/symfony/event-dispatcher/.gitignore" />
-		<delete file="${dir}/vendor/symfony/event-dispatcher/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/event-dispatcher/README.md" />
-		<delete file="${dir}/vendor/symfony/event-dispatcher/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/filesystem/.git" />
-		<delete dir="${dir}/vendor/symfony/filesystem/Tests" />
-		<delete file="${dir}/vendor/symfony/filesystem/.gitignore" />
-		<delete file="${dir}/vendor/symfony/filesystem/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/filesystem/README.md" />
-		<delete file="${dir}/vendor/symfony/filesystem/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/finder/.git" />
-		<delete dir="${dir}/vendor/symfony/finder/Tests" />
-		<delete file="${dir}/vendor/symfony/finder/.gitignore" />
-		<delete file="${dir}/vendor/symfony/finder/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/finder/README.md" />
-		<delete file="${dir}/vendor/symfony/finder/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/http-foundation/.git" />
-		<delete dir="${dir}/vendor/symfony/http-foundation/Tests" />
-		<delete file="${dir}/vendor/symfony/http-foundation/.gitignore" />
-		<delete file="${dir}/vendor/symfony/http-foundation/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/http-foundation/README.md" />
-		<delete file="${dir}/vendor/symfony/http-foundation/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/http-kernel/.git" />
-		<delete dir="${dir}/vendor/symfony/http-kernel/Tests" />
-		<delete file="${dir}/vendor/symfony/http-kernel/.gitignore" />
-		<delete file="${dir}/vendor/symfony/http-kernel/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/http-kernel/README.md" />
-		<delete file="${dir}/vendor/symfony/http-kernel/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/proxy-manager-bridge/.git" />
-		<delete dir="${dir}/vendor/symfony/proxy-manager-bridge/Tests" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/.gitignore" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/README.md" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/routing/.git" />
-		<delete dir="${dir}/vendor/symfony/routing/Tests" />
-		<delete file="${dir}/vendor/symfony/routing/.gitignore" />
-		<delete file="${dir}/vendor/symfony/routing/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/routing/README.md" />
-		<delete file="${dir}/vendor/symfony/routing/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
-		<delete dir="${dir}/vendor/symfony/twig-bridge/Tests" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/.gitignore" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/README.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/yaml/.git" />
-		<delete dir="${dir}/vendor/symfony/yaml/Tests" />
-		<delete file="${dir}/vendor/symfony/yaml/.gitignore" />
-		<delete file="${dir}/vendor/symfony/yaml/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/yaml/README.md" />
-		<delete file="${dir}/vendor/symfony/yaml/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/twig/twig/doc" />
-		<delete dir="${dir}/vendor/twig/twig/ext" />
-		<delete dir="${dir}/vendor/twig/twig/test" />
-		<delete file="${dir}/vendor/twig/twig/.editorconfig" />
-		<delete file="${dir}/vendor/twig/twig/.gitignore" />
-		<delete file="${dir}/vendor/twig/twig/.travis.yml" />
-		<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
-		<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/twig/twig/README.rst" />
-
-		<delete file="${dir}/vendor/zendframework/zend-code/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-code/README.md" />
-
-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/README.md" />
-
-		<delete file="${dir}/vendor/zendframework/zend-stdlib/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-stdlib/README.md" />
 	</target>

 	<target name="clean-diff-dir">
--- a/build/build_announcement.php
+++ b/build/build_announcement.php
@@ -1,84 +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 (php_sapi_name() !== 'cli' || $_SERVER['argc'] != 5)
-{
-	echo "Usage (CLI only): build_announcement.php email|bbcode new_version release_files_dir checksum_algorithm\n";
-	exit(1);
-}
-
-$mode = $_SERVER['argv'][1];
-$version = $_SERVER['argv'][2];
-$root = $_SERVER['argv'][3];
-$checksum_algorithm = $_SERVER['argv'][4];
-
-$series_version = substr($version, 0, 3);
-$base_url = "https://download.phpbb.com/pub/release/$series_version";
-
-if (version_compare($version, "$series_version.0", '<'))
-{
-	// Everything before 3.x.0, i.e. unstable (e.g. alpha, beta, rc)
-	$url = "$base_url/unstable/$version";
-}
-else if (strpos($version, 'RC') !== false)
-{
-	// Release candidate of stable release
-	$url = "$base_url/qa/$version";
-}
-else
-{
-	// Stable release (e.g. 3.x.0, 3.x.1, 3.x.2, 3.x.3-PL1)
-	$url = "$base_url/$version";
-}
-
-if ($mode === 'bbcode')
-{
-	$template = "[url=%1\$s/%2\$s]%2\$s[/url]\n{$checksum_algorithm}sum: %3\$s\n";
-}
-else
-{
-	$template = "%s/%s\n{$checksum_algorithm}sum: %s\n";
-}
-
-function phpbb_rnatsort($array)
-{
-	$strrnatcmp = function($a, $b)
-	{
-		return strnatcmp($b, $a);
-	};
-	usort($array, $strrnatcmp);
-	return $array;
-}
-
-function phpbb_string_ends_with($haystack, $needle)
-{
-	return substr($haystack, -strlen($needle)) === $needle;
-}
-
-function phpbb_get_checksum($checksum_file)
-{
-	return array_shift(explode(' ', file_get_contents($checksum_file)));
-}
-
-foreach (phpbb_rnatsort(array_diff(scandir($root), array('.', '..'))) as $filename)
-{
-	if (phpbb_string_ends_with($filename, $checksum_algorithm))
-	{
-		continue;
-	}
-	else
-	{
-		printf($template, $url, $filename, phpbb_get_checksum("$root/$filename.$checksum_algorithm"));
-	}
-}
--- a/build/build_changelog.php
+++ b/build/build_changelog.php
@@ -1,16 +1,12 @@
 #!/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.
- *
- */
+*
+* @package build
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/

 if ($_SERVER['argc'] != 2)
 {
@@ -18,54 +14,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 = PHPBB3
+	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_diff.php
+++ b/build/build_diff.php
@@ -0,0 +1,414 @@
+#!/usr/bin/env php
+<?php
+/**
+*
+* @package build
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if ($_SERVER['argc'] != 3)
+{
+	die("Please specify the previous and current version as arguments (e.g. build_diff.php '1.0.2' '1.0.3').");
+}
+
+$old_version = trim($_SERVER['argv'][1]);
+$new_version = trim($_SERVER['argv'][2]);
+
+$substitute_old = $old_version;
+$substitute_new = $new_version;
+$simple_name_old = 'release-' . $old_version;
+$simple_name_new = 'release-' . $new_version;
+$echo_changes = false;
+
+// DO NOT EVER USE THE FOLLOWING! Fix the script to generate proper changes,
+// do NOT manually create them.
+
+// Set this to true to just compress the changes and do not build them again
+// This should be used for building custom modified txt file. ;)
+$package_changed_files = false;
+
+//$debug_file = 'includes/functions_user.php'; //'styles/prosilver/style.cfg';
+$debug_file = false;
+
+if ($debug_file !== false)
+{
+	$echo_changes = false;
+}
+
+$s_name = 'save_' . $substitute_old . '_to_' . $substitute_new;
+
+$location = dirname(__FILE__);
+
+if (!$package_changed_files)
+{
+	if (!$echo_changes)
+	{
+		// Create directory...
+		run_command("mkdir $location/save/{$s_name}");
+		run_command("mkdir $location/save/{$s_name}/language");
+		run_command("mkdir $location/save/{$s_name}/prosilver");
+		run_command("mkdir $location/save/{$s_name}/subsilver2");
+	}
+}
+
+// Build code changes and place them into 'save'
+if (!$package_changed_files)
+{
+	build_code_changes('language');
+	build_code_changes('prosilver');
+	build_code_changes('subsilver2');
+}
+
+// Package code changes
+$code_changes_filename = 'phpBB-' . $substitute_old . '_to_' . $substitute_new . '-codechanges';
+
+if (!$echo_changes)
+{
+	// Now compress the files...
+	// Build Main phpBB Release
+	$compress_programs = array(
+//		'tar.gz'	=> 'tar -czf',
+		'tar.bz2'	=> 'tar -cjf',
+		'zip'		=> 'zip -r'
+	);
+
+	chdir($location . '/save/' . $s_name);
+	foreach ($compress_programs as $extension => $compress_command)
+	{
+		echo "Packaging code changes for $extension\n";
+		run_command("rm ./../../new_version/release_files/{$code_changes_filename}.{$extension}");
+		flush();
+
+		// Build Package
+		run_command("$compress_command ./../../new_version/release_files/{$code_changes_filename}.{$extension} *");
+
+		// Build MD5 Sum
+		run_command("md5sum ./../../new_version/release_files/{$code_changes_filename}.{$extension} > ./../../new_version/release_files/{$code_changes_filename}.{$extension}.md5");
+		flush();
+	}
+}
+
+/**
+* $output_format can be: language, prosilver and subsilver2
+*/
+function build_code_changes($output_format)
+{
+	global $substitute_new, $substitute_old, $simple_name_old, $simple_name_new, $echo_changes, $package_changed_files, $location, $debug_file, $s_name;
+
+	// Global array holding the data entries
+	$data = array(
+		'header'		=> array(),
+		'diff'			=> array(),
+	);
+
+	// Read diff file and prepare the output filedata...
+	//$patch_filename = '../new_version/patches/phpBB-' . $substitute_old . '_to_' . $substitute_new . '.patch';
+	$release_filename = 'phpbb-' . $substitute_old . '_to_' . $substitute_new . '_' . $output_format . '.txt';
+
+	if (!$package_changed_files)
+	{
+		if (!$echo_changes)
+		{
+			$fp = fopen('save/' . $s_name . '/' . $output_format . '/' . $release_filename, 'wb');
+
+			if (!$fp)
+			{
+				die('Unable to create ' . $release_filename);
+			}
+		}
+	}
+
+	include_once($location . '/build_helper.php');
+	$package = new build_package(array($substitute_old, $substitute_new), false);
+
+	$titles = array(
+		'language'		=> 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' Language Pack Changes',
+		'prosilver'		=> 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' prosilver Changes',
+		'subsilver2'	=> 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' subsilver2 Changes',
+	);
+
+	$data['header'] = array(
+		'title'		=> $titles[$output_format],
+		'intro'		=> '
+
+These are the ' . $titles[$output_format] . ' summed up into a little Mod. These changes are only partial and do not include any code changes, therefore not meant for updating phpBB.
+
+	',
+		'included_files'	=> array(),
+	);
+
+	// We collect the files we want to diff first (ironically we grab this from a diff file)
+	if (!$echo_changes)
+	{
+		echo "\n\nCollecting Filenames:";
+	}
+
+	// We re-create the patch file
+	foreach ($package->old_packages as $_package_name => $dest_package_filename)
+	{
+		chdir($package->locations['old_versions']);
+
+		if (!$echo_changes)
+		{
+			echo "\n\n" . 'Creating patch/diff files for phpBB-' . $dest_package_filename . $package->get('new_version_number');
+		}
+
+		$dest_package_filename = $location . '/save/' . $s_name . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch';
+		$package->run_command('diff ' . $package->diff_options . ' ' . $_package_name . ' ' . $package->get('simple_name') . ' > ' . $dest_package_filename);
+
+		// Parse this diff to determine file changes from the checked versions and save them
+		$result = $package->collect_diff_files($dest_package_filename, $_package_name);
+		$package->run_command('rm ' . $dest_package_filename);
+	}
+
+	chdir($location);
+
+	$filenames = array();
+	foreach ($result['files'] as $filename)
+	{
+		if ($debug_file !== false && $filename != $debug_file)
+		{
+			continue;
+		}
+
+		// Decide which files to compare...
+		switch ($output_format)
+		{
+			case 'language':
+				if (strpos($filename, 'language/en/') !== 0)
+				{
+					continue 2;
+				}
+			break;
+
+			case 'prosilver':
+				if (strpos($filename, 'styles/prosilver/') !== 0)
+				{
+					continue 2;
+				}
+			break;
+
+			case 'subsilver2':
+				if (strpos($filename, 'styles/subsilver2/') !== 0)
+				{
+					continue 2;
+				}
+			break;
+		}
+
+		if (!file_exists($location . '/old_versions/' . $simple_name_old . '/' . $filename))
+		{
+			// New file... include it
+			$data['header']['included_files'][] = array(
+				'old'				=> $location . '/old_versions/' . $simple_name_old . '/' . $filename,
+				'new'				=> $location . '/old_versions/' . $simple_name_new . '/' . $filename,
+				'phpbb_filename'	=> $filename,
+			);
+			continue;
+		}
+
+		$filenames[] = array(
+			'old'				=> $location . '/old_versions/' . $simple_name_old . '/' . $filename,
+			'new'				=> $location . '/old_versions/' . $simple_name_new . '/' . $filename,
+			'phpbb_filename'	=> $filename,
+		);
+	}
+
+	// Now let us go through the filenames list and create a more comprehensive diff
+	if (!$echo_changes)
+	{
+		fwrite($fp, build_header($output_format, $filenames, $data['header']));
+	}
+	else
+	{
+		//echo build_header('text', $filenames, $data['header']);
+	}
+
+	// Copy files...
+	$files_to_copy = array();
+
+	foreach ($data['header']['included_files'] as $filename)
+	{
+		$files_to_copy[] = $filename['phpbb_filename'];
+	}
+
+	// First step is to copy the new version over (clean structure)
+	if (!$echo_changes && sizeof($files_to_copy))
+	{
+		foreach ($files_to_copy as $file)
+		{
+			// Create directory?
+			$dirname = dirname($file);
+
+			if ($dirname)
+			{
+				$dirname = explode('/', $dirname);
+				$__dir = array();
+
+				foreach ($dirname as $i => $dir)
+				{
+					$__dir[] = $dir;
+					run_command("mkdir -p $location/save/" . $s_name . '/' . $output_format . '/' . implode('/', $__dir));
+				}
+			}
+
+			$source_file = $location . '/new_version/phpBB3/' . $file;
+			$dest_file = $location . '/save/' . $s_name . '/' . $output_format . '/';
+			$dest_file .= $file;
+
+			$command = "cp -p $source_file $dest_file";
+			$result = trim(`$command`);
+			echo "- Copied File: " . $source_file . " -> " . $dest_file . "\n";
+		}
+	}
+
+	include_once('diff_class.php');
+
+	if (!$echo_changes)
+	{
+		echo "\n\nDiffing Codebases:";
+	}
+
+	foreach ($filenames as $file_ary)
+	{
+		if (!file_exists($file_ary['old']))
+		{
+			$lines1 = array();
+		}
+		else
+		{
+			$lines1 = file($file_ary['old']);
+		}
+		$lines2 = file($file_ary['new']);
+
+		if (!sizeof($lines1))
+		{
+			// New File
+		}
+		else
+		{
+			$diff = new Diff($lines1, $lines2);
+			$fmt = new BBCodeDiffFormatter(false, 5, $debug_file);
+
+			if (!$echo_changes)
+			{
+				fwrite($fp, $fmt->format_open($file_ary['phpbb_filename']));
+				fwrite($fp, $fmt->format($diff, $lines1));
+				fwrite($fp, $fmt->format_close($file_ary['phpbb_filename']));
+			}
+			else
+			{
+				echo $fmt->format_open($file_ary['phpbb_filename']);
+				echo $fmt->format($diff, $lines1);
+				echo $fmt->format_close($file_ary['phpbb_filename']);
+			}
+
+			if ($debug_file !== false)
+			{
+				echo $fmt->format_open($file_ary['phpbb_filename']);
+				echo $fmt->format($diff, $lines1);
+				echo $fmt->format_close($file_ary['phpbb_filename']);
+				exit;
+			}
+		}
+	}
+
+	if (!$echo_changes)
+	{
+		fwrite($fp, build_footer($output_format));
+
+		// Close file
+		fclose($fp);
+
+		chmod('save/' . $s_name . '/' . $output_format . '/' . $release_filename, 0666);
+	}
+	else
+	{
+		echo build_footer($output_format);
+	}
+}
+
+/**
+* Build Footer
+*/
+function build_footer($mode)
+{
+	$html = '';
+
+	$html .= "# \n";
+	$html .= "#-----[ SAVE/CLOSE ALL FILES ]------------------------------------------ \n";
+	$html .= "# \n";
+	$html .= "# EoM";
+
+	return $html;
+}
+
+/**
+* Build Header
+*/
+function build_header($mode, $filenames, $header)
+{
+	global $substitute_old;
+
+	$html = '';
+
+	$html .= "############################################################## \n";
+	$html .= "## Title: " . $header['title'] . "\n";
+	$html .= "## Author: naderman < naderman@phpbb.com > (Nils Adermann) http://www.phpbb.com \n";
+	$html .= "## Description: \n";
+
+	$intr = explode("\n", $header['intro']);
+	$introduction = '';
+	foreach ($intr as $_line)
+	{
+		$introduction .= wordwrap($_line, 80) . "\n";
+	}
+	$intr = explode("\n", $introduction);
+
+	foreach ($intr as $_line)
+	{
+		$html .= "##		" . $_line . "\n";
+	}
+	$html .= "## \n";
+	$html .= "## Files To Edit: \n";
+
+	foreach ($filenames as $file_ary)
+	{
+		$html .= "##		" . $file_ary['phpbb_filename'] . "\n";
+	}
+	$html .= "##\n";
+	if (sizeof($header['included_files']))
+	{
+		$html .= "## Included Files: \n";
+		foreach ($header['included_files'] as $filename)
+		{
+			$html .= "##		{$filename['phpbb_filename']}\n";
+		}
+	}
+	$html .= "## License: http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 \n";
+	$html .= "############################################################## \n";
+	$html .= "\n";
+
+	// COPY Statement?
+	if (sizeof($header['included_files']))
+	{
+		$html .= "#\n#-----[ COPY ]------------------------------------------\n#\n";
+		foreach ($header['included_files'] as $filename)
+		{
+			$html .= "copy {$filename['phpbb_filename']} to {$filename['phpbb_filename']}\n";
+		}
+		$html .= "\n";
+	}
+
+	return $html;
+}
+
+function run_command($command)
+{
+	$result = trim(`$command`);
+	echo "\n- Command Run: " . $command . "\n";
+}
+
+?>
--- a/build/build_helper.php
+++ b/build/build_helper.php
@@ -1,13 +1,9 @@
 <?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.
+* @package build
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */

@@ -22,35 +18,35 @@ class build_package
 	// -r - compare recursive
 	// -N - Treat missing files as empty
 	// -E - Ignore tab expansions
-	// -Z - Ignore white space at line end.
-	// -b - Ignore changes in the amount of white space.
+	//		not used: -b - Ignore space changes.
+	// -w - Ignore all whitespace
 	// -B - Ignore blank lines
 	// -d - Try to find smaller set of changes
-	var $diff_options = '-crNEBZbd';
+	var $diff_options = '-crNEBwd';
 	var $diff_options_long = '-x images -crNEB'; // -x fonts -x imageset //imageset not used here, because it includes the imageset.cfg file. ;)

 	var $verbose = false;
 	var $status_begun = false;
 	var $num_dots = 0;

-	function __construct($versions, $verbose = false)
+	function build_package($versions, $verbose = false)
 	{
 		$this->versions = $versions;
 		$this->verbose = $verbose;

 		// Get last two entries
-		$_latest = $this->versions[count($this->versions) - 1];
-		$_before = $this->versions[count($this->versions) - 2];
+		$_latest = $this->versions[sizeof($this->versions) - 1];
+		$_before = $this->versions[sizeof($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,
@@ -316,63 +312,4 @@ class build_package

 		return $result;
 	}
-
-	/**
-	* Collect the list of the deleted files from a list of deleted files and folders.
-	*
-	* @param string $deleted_filename   The full path to a file containing the list of deleted files and directories
-	* @param string $package_name       The name of the package
-	* @return array
-	*/
-	public function collect_deleted_files($deleted_filename, $package_name)
-	{
-		$result = array();
-		$file_contents = file($deleted_filename);
-
-		foreach ($file_contents as $filename)
-		{
-			$filename = trim($filename);
-
-			if (!$filename)
-			{
-				continue;
-			}
-
-			$filename = str_replace('Only in ' . $package_name, '', $filename);
-			$filename = ltrim($filename, '/');
-
-			if (substr($filename, 0, 1) == ':')
-			{
-				$replace = '';
-			}
-			else
-			{
-				$replace = '/';
-			}
-
-			$filename = str_replace(': ', $replace, $filename);
-
-			if (is_dir("{$this->locations['old_versions']}{$package_name}/{$filename}"))
-			{
-				$iterator = new \RecursiveIteratorIterator(
-					new \RecursiveDirectoryIterator(
-						"{$this->locations['old_versions']}{$package_name}/{$filename}",
-						\FilesystemIterator::UNIX_PATHS | \FilesystemIterator::SKIP_DOTS
-					),
-					\RecursiveIteratorIterator::LEAVES_ONLY
-				);
-
-				foreach ($iterator as $file_info)
-				{
-					$result[] = "{$filename}/{$iterator->getSubPathname()}";
-				}
-			}
-			else
-			{
-				$result[] = $filename;
-			}
-		}
-
-		return $result;
-	}
 }
--- 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
@@ -1,237 +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\Commenting;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-/**
-* Checks that each PHP source file contains a valid header as defined by the
-* phpBB Coding Guidelines.
-*
-* @package code_sniffer
-* @author Manuel Pichler <mapi@phpundercontrol.org>
-*/
-class FileCommentSniff implements Sniff
-{
-	/**
-	* Returns an array of tokens this test wants to listen for.
-	*
-	* @return array
-	*/
-	public function register()
-	{
-		return array(T_OPEN_TAG);
-	}
-
-	/**
-	* 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): void
-	{
-		// We are only interested in the first file comment.
-		if ($stackPtr !== 0)
-		{
-			if ($phpcsFile->findPrevious(T_OPEN_TAG, $stackPtr - 1) !== false)
-			{
-				return;
-			}
-		}
-
-		// Fetch next non whitespace token
-		$tokens = $phpcsFile->getTokens();
-		$start  = $phpcsFile->findNext(T_WHITESPACE, $stackPtr + 1, null, true);
-
-		// Skip empty files
-		if ($tokens[$start]['code'] === T_CLOSE_TAG)
-		{
-			return;
-		}
-		// Mark as error if this is not a doc comment
-		else if ($start === false || $tokens[$start]['code'] !== T_DOC_COMMENT_OPEN_TAG)
-		{
-			$phpcsFile->addError('Missing required file doc comment.', $stackPtr, 'MissingComment');
-			return;
-		}
-
-		// Find comment end token
-		$end = $tokens[$start]['comment_closer'];
-
-		// If there is no end, skip processing here
-		if ($end === false)
-		{
-			return;
-		}
-
-		// check comment lines without the first(/**) an last(*/) line
-		for ($token = $start + 1, $c = $end - 2; $token <= $c; ++$token)
-		{
-			// Check that each line starts with a '*'
-			if ($tokens[$token]['column'] === 1 && (($tokens[$token]['content'] !== '*' && $tokens[$token]['content'] !== ' ') || ($tokens[$token]['content'] === ' ' && $tokens[$token + 1]['content'] !== '*')))
-			{
-				$message = 'The file doc comment should not be indented.';
-				$phpcsFile->addWarning($message, $token, 'CommentIndented');
-			}
-		}
-
-		// Check that the first and last line is empty
-		// /**T_WHITESPACE
-		// (T_WHITESPACE)*T_WHITESPACE
-		// (T_WHITESPACE)* ...
-		// (T_WHITESPACE)*T_WHITESPACE
-		// T_WHITESPACE*/
-		if (!(($tokens[$start + 2]['content'] !== '*' && $tokens[$start + 4]['content'] !== '*') || ($tokens[$start + 3]['content'] !== '*' && $tokens[$start + 6]['content'] !== '*')))
-		{
-			$message = 'The first file comment line should be empty.';
-			$phpcsFile->addWarning($message, ($start + 1), 'CommentFirstNotEmpty');
-		}
-
-		if ($tokens[$end - 3]['content'] !== '*' && $tokens[$end - 6]['content'] !== '*')
-		{
-			$message = 'The last file comment line should be empty.';
-			$phpcsFile->addWarning($message, $end - 1, 'CommentLastNotEmpty');
-		}
-
-		//$this->processPackage($phpcsFile, $start, $tags);
-		//$this->processVersion($phpcsFile, $start, $tags);
-		$this->processCopyright($phpcsFile, $start, $tokens[$start]['comment_tags']);
-		$this->processLicense($phpcsFile, $start, $tokens[$start]['comment_tags']);
-	}
-
-	/**
-	* Checks that the tags array contains a valid package tag
-	*
-	* @param File $phpcsFile The context source file instance.
-	* @param integer The stack pointer for the first comment token.
-	* @param array(string=>array) $tags The found file doc comment tags.
-	*
-	* @return void
-	*/
-	protected function processPackage(File $phpcsFile, $ptr, $tags): void
-	{
-		if (!isset($tags['package']))
-		{
-			$message = 'Missing require @package tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr, 'MissingTagPackage');
-		}
-		else if (preg_match('/^([\w]+)$/', $tags['package'][0]) === 0)
-		{
-			$message = 'Invalid content found for @package tag.';
-			$phpcsFile->addWarning($message, $tags['package'][1], 'InvalidTagPackage');
-		}
-	}
-
-	/**
-	* Checks that the tags array contains a valid version tag
-	*
-	* @param File $phpcsFile The context source file instance.
-	* @param integer The stack pointer for the first comment token.
-	* @param array(string=>array) $tags The found file doc comment tags.
-	*
-	* @return void
-	*/
-	protected function processVersion(File $phpcsFile, $ptr, $tags): void
-	{
-		if (!isset($tags['version']))
-		{
-			$message = 'Missing require @version tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr, 'MissingTagVersion');
-		}
-		else if (preg_match('/^\$Id:[^\$]+\$$/', $tags['version'][0]) === 0)
-		{
-			$message = 'Invalid content found for @version tag, use "$Id: $".';
-			$phpcsFile->addError($message, $tags['version'][1], 'InvalidTagVersion');
-		}
-	}
-
-	/**
-	* Checks that the tags array contains a valid copyright tag
-	*
-	* @param File $phpcsFile The context source file instance.
-	* @param integer The stack pointer for the first comment token.
-	* @param array(string=>array) $tags The found file doc comment tags.
-	*
-	* @return void
-	*/
-	protected function processCopyright(File $phpcsFile, $ptr, $tags): void
-	{
-		$copyright = '(c) phpBB Limited <https://www.phpbb.com>';
-		$tokens = $phpcsFile->getTokens();
-
-		foreach ($tags as $tag)
-		{
-			if ($tokens[$tag]['content'] === '@copyright')
-			{
-				if ($tokens[$tag + 2]['content'] !== $copyright)
-				{
-					$message = 'Invalid content found for the first @copyright tag, use "' . $copyright . '".';
-					$phpcsFile->addError($message, $tags['copyright'][0][1], 'InvalidTagCopyright');
-				}
-
-				return;
-			}
-		}
-
-		$message = 'Missing require @copyright tag in file doc comment.';
-		$phpcsFile->addError($message, $ptr, 'MissingTagCopyright');
-	}
-
-	/**
-	* Checks that the tags array contains a valid license tag
-	*
-	* @param File $phpcsFile The context source file instance.
-	* @param integer The stack pointer for the first comment token.
-	* @param array(string=>array) $tags The found file doc comment tags.
-	*
-	* @return void
-	*/
-	protected function processLicense(File $phpcsFile, $ptr, $tags): void
-	{
-		$license = 'GNU General Public License, version 2 (GPL-2.0)';
-		$tokens = $phpcsFile->getTokens();
-
-		$found = false;
-		foreach ($tags as $tag)
-		{
-			if ($tokens[$tag]['content'] === '@license')
-			{
-				if ($found)
-				{
-					$message = 'It must be only one @license tag in file doc comment.';
-					$phpcsFile->addError($message, $ptr, 'MultiTagVersion');
-				}
-
-				$found = true;
-
-				if ($tokens[$tag + 2]['content'] !== $license)
-				{
-					$message = 'Invalid content found for @license tag, use "' . $license . '".';
-					$phpcsFile->addError($message, $tags['license'][0][1], 'InvalidTagLicense');
-				}
-			}
-		}
-
-		if (!$found)
-		{
-			$message = 'Missing require @license tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr, 'MissingTagLicense');
-		}
-	}
-}
--- a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php
@@ -1,148 +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 opening brace of a control structures is on the line after.
- * From Generic_Sniffs_Functions_OpeningFunctionBraceBsdAllmanSniff
- */
-class OpeningBraceBsdAllmanSniff implements Sniff
-{
-	/**
-	 * Registers the tokens that this sniff wants to listen for.
-	 */
-	public function register()
-	{
-		return array(
-			T_IF,
-			T_ELSE,
-			T_FOREACH,
-			T_WHILE,
-			T_DO,
-			T_FOR,
-			T_SWITCH,
-		);
-	}
-
-	/**
-	 * 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();
-
-		if (isset($tokens[$stackPtr]['scope_opener']) === false)
-		{
-			return;
-		}
-
-		/*
-		 * ...
-		 * }
-		 * else if ()
-		 * {
-		 * ...
-		 */
-		if ($tokens[$stackPtr]['code'] === T_ELSE && $tokens[$stackPtr + 2]['code'] === T_IF)
-		{
-			return;
-		}
-
-		$openingBrace = $tokens[$stackPtr]['scope_opener'];
-
-		/*
-		 * ...
-		 * do
-		 * {
-		 *     <code>
-		 * } while();
-		 * ...
-		 * }
-		 * else
-		 * {
-		 * ...
-		 */
-		if ($tokens[$stackPtr]['code'] === T_DO ||$tokens[$stackPtr]['code'] === T_ELSE)
-		{
-			$cs_line = $tokens[$stackPtr]['line'];
-		}
-		else
-		{
-			// The end of the function occurs at the end of the argument list. Its
-			// like this because some people like to break long function declarations
-			// over multiple lines.
-			$cs_line = $tokens[$tokens[$stackPtr]['parenthesis_closer']]['line'];
-		}
-
-		$braceLine    = $tokens[$openingBrace]['line'];
-
-		$lineDifference = ($braceLine - $cs_line);
-
-		if ($lineDifference === 0)
-		{
-			$error = 'Opening brace should be on a new line';
-			$phpcsFile->addError($error, $openingBrace, 'BraceOnSameLine');
-			return;
-		}
-
-		if ($lineDifference > 1)
-		{
-			$error = 'Opening brace should be on the line after the declaration; found %s blank line(s)';
-			$data  = array(($lineDifference - 1));
-			$phpcsFile->addError($error, $openingBrace, 'BraceSpacing', $data);
-			return;
-		}
-
-		// We need to actually find the first piece of content on this line,
-		// as if this is a method with tokens before it (public, static etc)
-		// or an if with an else before it, then we need to start the scope
-		// checking from there, rather than the current token.
-		$lineStart = $stackPtr;
-		while (($lineStart = $phpcsFile->findPrevious(array(T_WHITESPACE), ($lineStart - 1), null, false)) !== false)
-		{
-			if (strpos($tokens[$lineStart]['content'], $phpcsFile->eolChar) !== false)
-			{
-				break;
-			}
-		}
-
-		// We found a new line, now go forward and find the first non-whitespace
-		// token.
-		$lineStart = $phpcsFile->findNext(array(T_WHITESPACE), $lineStart, null, true);
-
-		// The opening brace is on the correct line, now it needs to be
-		// checked to be correctly indented.
-		$startColumn = $tokens[$lineStart]['column'];
-		$braceIndent = $tokens[$openingBrace]['column'];
-
-		if ($braceIndent !== $startColumn)
-		{
-			$error = 'Opening brace indented incorrectly; expected %s spaces, found %s';
-			$data  = array(
-				($startColumn - 1),
-				($braceIndent - 1),
-			);
-			$phpcsFile->addError($error, $openingBrace, 'BraceIndent', $data);
-		}
-	}
-}
--- a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php
@@ -1,64 +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 there is exactly one space between the keyword and the opening
- * parenthesis of a control structures.
- */
-class OpeningParenthesisSniff implements Sniff
-{
-	/**
-	 * Registers the tokens that this sniff wants to listen for.
-	 */
-	public function register()
-	{
-		return array(
-			T_IF,
-			T_FOREACH,
-			T_WHILE,
-			T_FOR,
-			T_SWITCH,
-			T_ELSEIF,
-			T_CATCH,
-		);
-	}
-
-	/**
-	 * 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();
-
-		if ($tokens[$stackPtr + 1]['content'] === '(')
-		{
-			$error = 'There should be exactly one space between the keyword and opening parenthesis';
-			$phpcsFile->addError($error, $stackPtr, 'NoSpaceBeforeOpeningParenthesis');
-		}
-		else if ($tokens[$stackPtr + 1]['content'] !== ' ')
-		{
-			$error = 'There should be exactly one space between the keyword and opening parenthesis';
-			$phpcsFile->addError($error, $stackPtr, 'IncorrectSpaceBeforeOpeningParenthesis');
-		}
-	}
-}
--- 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
@@ -1,396 +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\Namespaces;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-/**
-* Checks that each use statement is used.
-*/
-class UnusedUseSniff implements Sniff
-{
-	const FIND = [
-		T_NS_SEPARATOR,
-		T_STRING,
-		T_WHITESPACE,
-	];
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function register()
-	{
-		return [T_USE];
-	}
-
-	protected function check(File $phpcsFile, $found_name, $full_name, $short_name, $stack_pointer)
-	{
-		$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)
-		{
-			$error = 'Either use statement or full name must be used.';
-			$phpcsFile->addError($error, $stack_pointer, '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)
-		{
-			// Nullable type syntax
-			$type = (strpos($type, '?') === 0) ? substr($type, 1) : $type;
-
-			if ($short_name === $type)
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function process(File $phpcsFile, $stackPtr)
-	{
-		if ($this->should_ignore_use($phpcsFile, $stackPtr) === true)
-		{
-			return;
-		}
-
-		$tokens = $phpcsFile->getTokens();
-
-		$class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($stackPtr + 1));
-
-		$class_name_end = $phpcsFile->findNext(self::FIND, ($stackPtr + 1), null, true);
-
-		$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));
-		}
-		else
-		{
-			$name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start));
-			$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)
-		foreach (array(T_INSTANCEOF, T_NEW, T_EXTENDS) as $keyword)
-		{
-			$old_simple_statement = $stackPtr;
-			while (($simple_statement = $phpcsFile->findNext($keyword, ($old_simple_statement + 1))) !== false)
-			{
-				$old_simple_statement = $simple_statement;
-
-				$simple_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($simple_statement + 1));
-
-				if ($simple_class_name_start === false) {
-					continue;
-				}
-
-				$simple_class_name_end = $phpcsFile->findNext(self::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;
-			}
-		}
-
-		// Checks paamayim nekudotayim
-		$old_paamayim_nekudotayim = $stackPtr;
-		while (($paamayim_nekudotayim = $phpcsFile->findNext(T_PAAMAYIM_NEKUDOTAYIM, ($old_paamayim_nekudotayim + 1))) !== false)
-		{
-			$old_paamayim_nekudotayim = $paamayim_nekudotayim;
-
-			$paamayim_nekudotayim_class_name_start = $phpcsFile->findPrevious(self::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;
-		}
-
-		// Checks in implements
-		$old_implements = $stackPtr;
-		while (($implements = $phpcsFile->findNext(T_IMPLEMENTS, ($old_implements + 1))) !== false)
-		{
-			$old_implements = $implements;
-
-			$old_implemented_class = $implements;
-			while (($implemented_class = $phpcsFile->findNext(T_STRING, ($old_implemented_class + 1), null, false, null, true)) !== false)
-			{
-				$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 = 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;
-			}
-		}
-
-		$old_docblock = $stackPtr;
-		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;
-		}
-
-		// Checks in type hinting
-		$old_function_declaration = $stackPtr;
-		while (($function_declaration = $phpcsFile->findNext([T_FUNCTION, T_CLOSURE], ($old_function_declaration + 1))) !== false)
-		{
-			$old_function_declaration = $function_declaration;
-
-			// Check type hint
-			$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;
-			}
-
-			$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
-		$old_catch = $stackPtr;
-		while (($catch = $phpcsFile->findNext(T_CATCH, ($old_catch + 1))) !== false)
-		{
-			$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 = 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;
-		}
-
-		$old_use = $stackPtr;
-		while (($use = $phpcsFile->findNext(T_USE, ($old_use + 1))) !== false)
-		{
-			$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;
-		}
-
-		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;
-	}
-
-	/**
-	* Check if this use statement is part of the namespace block.
-	*
-	* @param File $phpcsFile The file being scanned.
-	* @param int                  $stackPtr  The position of the current token in
-	*                                        the stack passed in $tokens.
-	*
-	* @return bool
-	*/
-	private function should_ignore_use(File $phpcsFile, $stackPtr)
-	{
-		$tokens = $phpcsFile->getTokens();
-
-		// Ignore USE keywords inside closures.
-		$next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-		if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS)
-		{
-			return true;
-		}
-
-		// Ignore USE keywords for traits.
-		if ($phpcsFile->hasCondition($stackPtr, array(T_CLASS, T_TRAIT)) === true)
-		{
-			return true;
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * @param File $phpcsFile
-	 * @param int $field
-	 * @param array $tokens
-	 * @param string $class_name_full
-	 * @param string $class_name_short
-	 * @param bool $ok
-	 *
-	 * @return bool
-	 */
-	private function checkDocblock(File $phpcsFile, $comment_end, $tokens, $class_name_full, $class_name_short)
-	{
-		$ok = false;
-
-		$comment_start = $tokens[$comment_end]['comment_opener'];
-		foreach ($tokens[$comment_start]['comment_tags'] as $tag)
-		{
-			if (!in_array($tokens[$tag]['content'], array('@param', '@var', '@return', '@throws'), true))
-			{
-				continue;
-			}
-
-			$classes = $tokens[($tag + 2)]['content'];
-			$space = strpos($classes, ' ');
-			if ($space !== false)
-			{
-				$classes = substr($classes, 0, $space);
-			}
-
-			$tab = strpos($classes, "\t");
-			if ($tab !== false)
-			{
-				$classes = substr($classes, 0, $tab);
-			}
-
-			$classes = explode('|', str_replace('[]', '', $classes));
-			foreach ($classes as $class)
-			{
-				$ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tag + 2) || $ok;
-			}
-		}
-
-		return $ok;
-	}
-}
--- a/build/code_sniffer/ruleset-minimum.xml
+++ b/build/code_sniffer/ruleset-minimum.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB Minimum Standard">
-
- <description>phpBB minimum coding standard</description>
-
- <!-- All code files MUST use only UTF-8 without BOM. -->
- <rule ref="Generic.Files.ByteOrderMark" />
-
- <!-- All code files MUST use the Unix LF (linefeed) line ending. -->
- <rule ref="Generic.Files.LineEndings" />
-
- <!-- Tabs MUST be used for indentation -->
- <rule ref="Generic.WhiteSpace.DisallowSpaceIndent" />
-
- <!-- ALL braces MUST be on their own lines. -->
- <rule ref="./phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php" />
-
-</ruleset>
--- a/build/code_sniffer/ruleset-php-extensions.xml
+++ b/build/code_sniffer/ruleset-php-extensions.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB PHP Strict Standard Extensions">
-
- <description>phpBB coding standard for PHP files of phpBB extensions</description>
-
- <rule ref="./ruleset-php-strict.xml" />
-
-</ruleset>
--- a/build/code_sniffer/ruleset-php-legacy-core.xml
+++ b/build/code_sniffer/ruleset-php-legacy-core.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB PHP Legacy Standard Core">
-
- <description>phpBB legacy coding standard for PHP files of phpBB core</description>
-
- <rule ref="./ruleset-php-legacy.xml" />
-
- <!-- Each file MUST start with a valid header as defined by the Coding Guidelines -->
- <rule ref="./phpbb/Sniffs/Commenting/FileCommentSniff.php" />
-
-</ruleset>
--- a/build/code_sniffer/ruleset-php-legacy.xml
+++ b/build/code_sniffer/ruleset-php-legacy.xml
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB PHP Legacy Standard">
-
- <description>phpBB legacy coding standard for PHP files</description>
-
- <rule ref="./ruleset-minimum.xml" />
-
- <!-- "for (; bar; )" should be "while (bar)" instead -->
- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" />
-
- <!-- A method MUST not only call its parent -->
- <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" />
-
- <!-- The body of each structure MUST be enclosed by braces. -->
- <rule ref="Generic.ControlStructures.InlineControlStructure" />
-
- <!-- There MUST not be more than one statement per line. -->
- <rule ref="Generic.Formatting.DisallowMultipleStatements" />
-
- <!-- Filenames MUST be lowercase. -->
- <rule ref="Generic.Files.LowercasedFilename" />
-
- <!-- The function brace MUST be on the line following the function declaration
-      and MUST be indented to the same column as the start of the function declaration. -->
- <rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman" />
-
- <!-- There MUST be exactly one space after a cast. -->
- <rule ref="Generic.Formatting.SpaceAfterCast" />
-
- <!-- Class constants MUST be declared in all upper case with underscore separators. -->
- <rule ref="Generic.NamingConventions.UpperCaseConstantName" />
-
- <!-- Only <?php, no short tags. -->
- <rule ref="Generic.PHP.DisallowShortOpenTag.EchoFound" />
-
- <!-- Method arguments with default values MUST go at the end of the argument list. -->
- <rule ref="PEAR.Functions.ValidDefaultValue" />
-
- <!-- Each file MUST end with exactly one newline character -->
- <rule ref="PSR2.Files.EndFileNewline" />
-
- <!-- When referencing arrays there MUST NOT be any whitespace around the opening bracket
-      or before the closing bracket. -->
- <rule ref="Squiz.Arrays.ArrayBracketSpacing" />
-
- <!-- The "else if" statement MUST be written with a space between the words else and if. -->
- <rule ref="Squiz.ControlStructures.ElseIfDeclaration" />
-
- <!-- There MUST be a space between each element of a foreach loop. -->
- <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration" />
-
- <!-- In a for loop declaration, there MUST be no space inside the brackets
-      and there MUST be 0 spaces before and 1 space after semicolons. -->
- <rule ref="Squiz.ControlStructures.ForLoopDeclaration" />
-
- <!-- In the argument list, there MUST NOT be a space before each comma,
-      and there MUST be one space after each comma. -->
- <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
-  <properties>
-   <property name="equalsSpacing" value="1"/>
-  </properties>
- </rule>
- <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint" />
-
- <!-- All built-in PHP functions MUST be called lowercased. -->
- <rule ref="Squiz.Functions.LowercaseFunctionKeywords" />
-
- <!-- The eval() function MUST NOT be used. -->
- <rule ref="Squiz.PHP.Eval" />
-
- <!-- There MUST NOT be trailing whitespace at the end of lines. -->
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />
-
- <!-- There MUST NOT be whitespace before the first content of a file -->
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile" />
-
- <!-- There MUST NOT be whitespace after the last content of a file -->
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EndFile" />
-
- <!-- Functions MUST NOT contain multiple empty lines in a row -->
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines" />
-
- <!-- The ?> closing tag MUST be omitted from files containing only PHP. -->
- <rule ref="Zend.Files.ClosingTag" />
-
- <!-- 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-core.xml
+++ b/build/code_sniffer/ruleset-php-strict-core.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB PHP Strict Standard Core">
-
- <description>phpBB coding standard for PHP files of phpBB core</description>
-
- <rule ref="./ruleset-php-legacy-core.xml" />
- <rule ref="./ruleset-php-strict.xml" />
-
-</ruleset>
--- a/build/code_sniffer/ruleset-php-strict.xml
+++ b/build/code_sniffer/ruleset-php-strict.xml
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB PHP Strict Standard">
-
- <description>phpBB coding standard for PHP files</description>
-
- <rule ref="./ruleset-php-legacy.xml" />
-
- <!-- There SHOULD NOT be more than 80 characters per line
-      There MUST NOT be more than 120 characters per line -->
- <!--
- <rule ref="Generic.Files.LineLength">
-  <properties>
-   <property name="lineLimit" value="80"/>
-   <property name="absoluteLineLimit" value="120"/>
-  </properties>
- </rule>
- -->
-
- <!-- The PHP constants true, false, and null MUST be in lower case. -->
- <rule ref="Generic.PHP.LowerCaseConstant" />
-
- <!-- PHP keywords MUST be in lower case. -->
- <rule ref="Generic.PHP.LowerCaseKeyword" />
-
- <!-- Constructors MUST be called __construct() instead of after the class. -->
- <rule ref="Generic.NamingConventions.ConstructorName" />
-
- <!-- Classes etc. MUST be namespaced -->
- <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace" />
-
- <!-- A file MUST not contain more than one class/interface -->
- <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses" />
-
- <!-- Files containing classes MUST not have any side-effects -->
- <rule ref="PSR1.Files.SideEffects.FoundWithSymbols" />
-
- <!-- When present, all use declarations MUST go after the namespace declaration.
-      There MUST be one use keyword per declaration.
-      There MUST be one blank line after the use block. -->
- <rule ref="PSR2.Namespaces.UseDeclaration" />
-
- <!-- There MUST be one blank line after the namespace declaration -->
- <rule ref="PSR2.Namespaces.NamespaceDeclaration" />
-
- <!-- 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/diff_class.php
+++ b/build/diff_class.php
--- a/build/doctum-all.conf.php
+++ b/build/doctum-all.conf.php
@@ -1,21 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-require __DIR__ . '/doctum-checkout.conf.php';
-
-$config['versions'] = Doctum\Version\GitVersionCollection::create(__DIR__ . '/../')
-	->add('3.3.x')
-	->add('master')
-;
-
-return new Doctum\Doctum($iterator, $config);
--- 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
@@ -1,133 +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 (version_compare(PHP_VERSION, '7.0-dev', '<'))
-{
-	die('generate_package_json.php requires at least PHP 7.0.');
-}
-
-define('IN_PHPBB', true);
-include_once('../phpBB/includes/functions.php');
-
-$json_data = new \stdClass();
-$json_data->metadata = new stdClass();
-
-$json_data->metadata->current_version_date = '';
-$json_data->metadata->current_version = '';
-$json_data->metadata->download_path = '';
-$json_data->metadata->show_update_package = true;
-$json_data->metadata->historic = false;
-
-$json_data->package = [];
-
-// Open build.xml
-$build_xml = simplexml_load_file('build.xml');
-$current_version = (string) $build_xml->xpath('/project/property[@name=\'newversion\']/@value')[0]->value;
-$previous_version = (string) $build_xml->xpath('/project/property[@name=\'prevversion\']/@value')[0]->value;
-$older_verions = explode(', ', (string) $build_xml->xpath('/project/property[@name=\'olderversions\']/@value')[0]->value);
-
-// Clean and sort version info
-$older_verions[] = $previous_version;
-$older_verions = array_filter($older_verions, function($version) {
-	preg_match(get_preg_expression('semantic_version'), $version, $matches);
-	return empty($matches['prerelease']) || strpos($matches['prerelease'], 'pl') !== false;
-});
-usort($older_verions, function($version_a, $version_b)
-{
-	return phpbb_version_compare($version_b, $version_a);
-});
-
-// Set metadata
-$json_data->metadata->current_version = $current_version;
-$json_data->metadata->current_version_date = date('Y-m-d');
-$json_data->metadata->download_path = 'https://download.phpbb.com/pub/release/' . preg_replace('#([0-9]+\.[0-9]+)(\..+)#', '$1', $current_version) . '/' . $current_version . '/';
-
-// Add package, patch files, and changed files
-phpbb_add_package_file(
-	$json_data->package,
-	'phpBB ' . $current_version,
-	'phpBB-' . $current_version,
-	'full',
-	''
-);
-phpbb_add_package_file(
-	$json_data->package,
-	'phpBB ' . $current_version . ' Patch Files',
-	'phpBB-' . $current_version . '-patch',
-	'update',
-	'patch'
-);
-phpbb_add_package_file(
-	$json_data->package,
-	'phpBB ' . $current_version . ' Changed Files',
-	'phpBB-' . $current_version . '-files',
-	'update',
-	'files'
-);
-
-// Loop through packages and assign to packages array
-foreach ($older_verions as $version)
-{
-	phpbb_add_package_file(
-		$json_data->package,
-		'phpBB ' . $version . ' to ' . $current_version . ' Update Package',
-		'phpBB-' . $version . '_to_' . $current_version,
-		'update',
-		'advanced_update',
-		$version
-	);
-}
-
-echo(json_encode($json_data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n");
-
-function phpbb_add_package_file(array &$package_list, $name, $file_name, $type, $subtype, $from = '')
-{
-	if (!file_exists(__DIR__ . '/new_version/release_files/' . $file_name . '.zip'))
-	{
-		trigger_error('File does not exist: ' . __DIR__ . '/new_version/release_files/' . $file_name . '.zip');
-		return;
-	}
-
-	$package_file = new stdClass();
-	$package_file->name = $name;
-	$package_file->filename = $file_name;
-	$package_file->type = $type;
-	if (!empty($subtype))
-	{
-		$package_file->subtype = $subtype;
-	}
-	if (!empty($from))
-	{
-		$package_file->from = $from;
-	}
-	$package_file->files = [];
-
-	foreach (['zip', 'tar.bz2'] as $extension)
-	{
-		$file_path = 'new_version/release_files/' . $file_name  . '.' . $extension;
-		$filedata = new stdClass();
-		$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;
-	}
-
-	$package_list[] = $package_file;
-}
--- 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/package.php
+++ b/build/package.php
@@ -2,13 +2,9 @@
 <?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.
+* @package build
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */

@@ -33,7 +29,7 @@ echo "Now all three package types (patch, files, release) are built as well as t

 // Go trough all versions making a diff if we even have old versions
 // For phpBB 3.0.x we might choose a different update method, rendering the things below useless...
-if (count($package->old_packages))
+if (sizeof($package->old_packages))
 {
 	chdir($package->locations['old_versions']);

@@ -49,10 +45,6 @@ if (count($package->old_packages))
 			$package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch',
 			$_package_name
 		);
-		$diff_file_changes[$_package_name]['deleted'] = $package->collect_deleted_files(
-			$package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.deleted',
-			$_package_name
-		);
 	}

 	// Now put those files determined within the correct directories
@@ -76,7 +68,7 @@ if (count($package->old_packages))
 			// Create Directories along the way?
 			$file = explode('/', $file);
 			// Remove filename portion
-			$file[count($file)-1] = '';
+			$file[sizeof($file)-1] = '';

 			chdir($dest_filename_dir);
 			foreach ($file as $entry)
@@ -129,7 +121,6 @@ if (count($package->old_packages))

 		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $dest_filename_dir);
 		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $dest_filename_dir);
-		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/vendor ' . $dest_filename_dir);

 		$package->run_command('mkdir ' . $dest_filename_dir . '/install/update');
 		$package->run_command('mkdir ' . $dest_filename_dir . '/install/update/old');
@@ -147,12 +138,6 @@ if (count($package->old_packages))
 			{
 				unset($file_contents['all'][$index]);
 			}
-
-			$source_filename = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $file;
-			if (!file_exists($source_filename))
-			{
-				unset($file_contents['all'][$index]);
-			}
 		}

 		// First of all, fill the 'old' directory
@@ -169,7 +154,7 @@ if (count($package->old_packages))
 			// Create Directories along the way?
 			$file = explode('/', $file);
 			// Remove filename portion
-			$file[count($file)-1] = '';
+			$file[sizeof($file)-1] = '';

 			chdir($dest_filename_dir . '/install/update/old');
 			foreach ($file as $entry)
@@ -188,33 +173,21 @@ if (count($package->old_packages))
 			$package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
 		}

-		/**
-		* We try to keep the update packages as small as possible while creating them.
-		* However, we sometimes need to include additional files that are not included
-		* in the diff in order to be able to correctly include the relatively
-		* referenced files from the same or subsequent directories.
-		*/
-		$copy_relative_directories = array(
-			'config/'	=> array(
-				'recursive'	=> true,
-				'copied'	=> false,
-				'copy'		=> array(
-					'config/*' => 'config',
-				),
-			),
-		);
-
 		// Then fill the 'new' directory
 		foreach ($file_contents['all'] as $file)
 		{
 			$source_filename = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $file;
 			$dest_filename = $dest_filename_dir . '/install/update/new/' . $file;
-			$filename = $file;
+
+			if (!file_exists($source_filename))
+			{
+				continue;
+			}

 			// Create Directories along the way?
 			$file = explode('/', $file);
 			// Remove filename portion
-			$file[count($file)-1] = '';
+			$file[sizeof($file)-1] = '';

 			chdir($dest_filename_dir . '/install/update/new');
 			foreach ($file as $entry)
@@ -231,81 +204,6 @@ if (count($package->old_packages))
 			}

 			$package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
-
-			foreach ($copy_relative_directories as $reference => $data)
-			{
-				// Copy all relative referenced files if needed
-				if (strpos($filename, $reference) === 0 && !$data['copied'])
-				{
-					foreach ($data['copy'] as $source_dir_files => $destination_dir)
-					{
-						// Create directories along the way?
-						$directories = explode('/', $destination_dir);
-
-						chdir($dest_filename_dir . '/install/update/new');
-						foreach ($directories as $dir)
-						{
-							$dir = trim($dir);
-							if ($dir)
-							{
-								if (!file_exists('./' . $dir))
-								{
-									$package->run_command('mkdir ' . $dir);
-								}
-								chdir('./' . $dir);
-							}
-						}
-						$source_dir_files = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $source_dir_files;
-						$destination_dir = $dest_filename_dir . '/install/update/new/' . $destination_dir;
-
-						if (isset($data['recursive']) && $data['recursive'])
-						{
-							$package->run_command('cp -Rp ' . $source_dir_files . ' ' . $destination_dir);
-						}
-						else
-						{
-							$package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir);
-						}
-					}
-					$copy_relative_directories[$reference]['copied'] = true;
-				}
-			}
-		}
-
-		/**
-		* We need to always copy the template and asset files that we need in
-		* the update, to ensure that the page is displayed correctly.
-		*/
-		$copy_update_files = array(
-			'adm/images/*'			=> 'adm/images',
-			'adm/style/admin.css'	=> 'adm/style',
-			'adm/style/admin.js'	=> 'adm/style',
-			'adm/style/ajax.js'		=> 'adm/style',
-			'adm/style/installer_*'	=> 'adm/style',
-			'assets/javascript/*'	=> 'assets/javascript',
-		);
-
-		foreach ($copy_update_files as $source_files => $destination_dir)
-		{
-			// Create directories along the way?
-			$directories = explode('/', $destination_dir);
-
-			chdir($dest_filename_dir . '/install/update/new');
-			foreach ($directories as $dir)
-			{
-				$dir = trim($dir);
-				if ($dir)
-				{
-					if (!file_exists('./' . $dir))
-					{
-						$package->run_command('mkdir ' . $dir);
-					}
-					chdir('./' . $dir);
-				}
-			}
-			$source_dir_files = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $source_files;
-			$destination_dir = $dest_filename_dir . '/install/update/new/' . $destination_dir;
-			$package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir);
 		}

 		// Build index.php file for holding the file structure
@@ -321,34 +219,31 @@ $update_info = array(
 	\'version\'	=> array(\'from\' => \'' . str_replace('_to_', '', $package->old_packages[$_package_name]) . '\', \'to\' => \'' . $package->get('new_version_number') . '\'),
 ';

-		if (count($file_contents['all']))
+		if (sizeof($file_contents['all']))
 		{
-			$index_contents .= "\t'files'		=> array(\n\t\t'" . implode("',\n\t\t'", $file_contents['all']) . "',\n\t),\n";
+			$index_contents .= '\'files\'		=> array(\'' . implode("',\n\t'", $file_contents['all']) . '\'),
+';
 		}
 		else
 		{
-			$index_contents .= "\t'files'		=> array(),\n";
+			$index_contents .= '\'files\'		=> array(),
+';
 		}

-		if (count($file_contents['binary']))
+		if (sizeof($file_contents['binary']))
 		{
-			$index_contents .= "\t'binary'		=> array(\n\t\t'" . implode("',\n\t\t'", $file_contents['binary']) . "',\n\t),\n";
+			$index_contents .= '\'binary\'		=> array(\'' . implode("',\n\t'", $file_contents['binary']) . '\'),
+';
 		}
 		else
 		{
-			$index_contents .= "\t'binary'		=> array(),\n";
+			$index_contents .= '\'binary\'		=> array(),
+';
 		}

-		if (count($file_contents['deleted']))
-		{
-			$index_contents .= "\t'deleted'		=> array(\n\t\t'" . implode("',\n\t\t'", $file_contents['deleted']) . "',\n\t),\n";
-		}
-		else
-		{
-			$index_contents .= "\t'deleted'		=> array(),\n";
-		}
+		$index_contents .= ');

-		$index_contents .= ");\n";
+?' . '>';

 		$fp = fopen($dest_filename_dir . '/install/update/index.php', 'wt');
 		fwrite($fp, $index_contents);
@@ -361,7 +256,6 @@ $update_info = array(
 	// Copy the install files to their respective locations
 	$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $package->get('patch_directory'));
 	$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $package->get('patch_directory'));
-	$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/vendor ' . $package->get('patch_directory'));

 	// Remove some files
 	chdir($package->get('patch_directory') . '/install');
@@ -380,7 +274,7 @@ $compress_programs = array(
 	'zip'		=> 'zip -r'
 );

-if (count($package->old_packages))
+if (sizeof($package->old_packages))
 {
 	// Build Patch Files
 	chdir($package->get('patch_directory'));
@@ -391,6 +285,9 @@ if (count($package->old_packages))

 		// Build Package
 		$package->run_command($compress_command . ' ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' *');
+
+		// Build MD5 Sum
+		$package->run_command('md5sum ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' > ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . '.md5');
 	}

 	// Build Files Package
@@ -403,7 +300,6 @@ if (count($package->old_packages))
 		$package->run_command('mkdir ' . $package->get('files_directory') . '/release');
 		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $package->get('files_directory') . '/release');
 		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $package->get('files_directory') . '/release');
-		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/vendor ' . $package->get('files_directory') . '/release');

 		$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_install.php');
 		$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_update.php');
@@ -423,6 +319,8 @@ if (count($package->old_packages))

 		chdir('./release');
 		$package->run_command("$compress_command ../../release_files/" . $package->get('release_filename') . '-files.' . $extension . ' *');
+		// Build MD5 Sum
+		$package->run_command('md5sum ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . ' > ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . '.md5');
 		chdir('..');

 		$package->run_command('rm -Rv ' . $package->get('files_directory') . '/release');
@@ -465,6 +363,9 @@ if (count($package->old_packages))
 			// Copy last package over...
 			$package->run_command('rm -v ../release_files/phpBB-' . $last_version . ".$extension");
 			$package->run_command("$compress_command ../../release_files/phpBB-$last_version.$extension *");
+
+			// Build MD5 Sum
+			$package->run_command("md5sum ../../release_files/phpBB-$last_version.$extension > ../../release_files/phpBB-$last_version.$extension.md5");
 			chdir('..');
 		}

@@ -487,6 +388,9 @@ foreach ($compress_programs as $extension => $compress_command)

 	// Build Package
 	$package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name'));
+
+	// Build MD5 Sum
+	$package->run_command('md5sum ./release_files/' . $package->get('release_filename') . '.' . $extension . ' > ./release_files/' . $package->get('release_filename') . '.' . $extension . '.md5');
 }

 // Microsoft Web PI packaging
@@ -494,6 +398,7 @@ $package->begin_status('Packaging phpBB for Microsoft WebPI');
 $file = './release_files/' . $package->get('release_filename') . '.webpi.zip';
 $package->run_command('cp -p ./release_files/' . $package->get('release_filename') . ".zip $file");
 $package->run_command('cd ./../webpi && ' . $compress_programs['zip'] . " ./../new_version/$file *");
+$package->run_command("md5sum $file  > $file.md5");

 // verify results
 chdir($package->locations['root']);
--- a/build/phpdoc-phpbb.ini
+++ b/build/phpdoc-phpbb.ini
@@ -0,0 +1,145 @@
+; Default configuration file for PHPDoctor
+
+; This config file will cause PHPDoctor to generate API documentation of
+; itself.
+
+
+; PHPDoctor settings
+; -----------------------------------------------------------------------------
+
+; Names of files to parse. This can be a single filename, or a comma separated
+; list of filenames. Wildcards are allowed.
+
+files = "*.php"
+
+; Names of files or directories to ignore. This can be a single filename, or a
+; comma separated list of filenames. Wildcards are NOT allowed.
+
+;ignore = "CVS, .svn, .git, _compiled"
+ignore = templates_c/,*HTML/default/*,spec/,*config.php*,*CVS/,test_chora.php,testupdate/,cache/,store/,*proSilver/,develop/,includes/utf/data/,includes/captcha/fonts/,install/update/,install/update.new/,files/,*phpinfo.php*,*update_script.php*,*upgrade.php*,*convert.php*,install/converter/,language/de/,script/,*swatch.php*,*test.php*,*test2.php*,*install.php*,*functions_diff.php*,*acp_update.php*,acm_xcache.php
+
+; The directory to look for files in, if not used the PHPDoctor will look in
+; the current directory (the directory it is run from).
+
+source_path = "../phpBB/"
+
+; If you do not want PHPDoctor to look in each sub directory for files
+; uncomment this line.
+
+;subdirs = off
+
+; Set how loud PHPDoctor is as it runs. Quiet mode suppresses all output other
+; than warnings and errors. Verbose mode outputs additional messages during
+; execution.
+
+quiet = on
+;verbose = on
+
+; Select the doclet to use for generating output.
+
+doclet = standard
+;doclet = debug
+
+; The directory to find the doclet in. Doclets control the HTML output of
+; phpDoctor and can be modified to suit your needs. They are expected to be 
+; in a directory named after themselves at the location given.
+
+;doclet_path = ./doclets
+
+; Select the formatter to use for generating output.
+
+;formatter = htmlStandardFormatter
+
+; The directory to find the formatter in. Formatters convert textual markup
+; for use by the doclet.
+
+;formatter_path = ./formatters
+
+; The directory to find taglets in. Taglets allow you to make PHPDoctor handle
+; new tags and to alter the behavour of existing tags and their output.
+
+;taglet_path = ./taglets
+
+; If the code you are parsing does not use package tags or not all elements
+; have package tags, use this setting to place unbound elements into a
+; particular package.
+
+default_package = "phpBB"
+
+use_class_path_as_package = off
+
+ignore_package_tags = off
+
+; Specifies the name of a HTML file containing text for the overview
+; documentation to be placed on the overview page. The path is relative to
+; "source_path" unless an absolute path is given.
+
+overview = ../README.md
+
+; Package comments will be looked for in a file named package.html in the same
+; directory as the first source file parsed in that package or in the directory
+; given below. If package comments are placed in the directory given below then
+; they should be named "<packageName>.html".
+
+package_comment_dir = ./
+
+; Parse out global variables and/or global constants?
+
+;globals = off
+;constants = off
+
+; Generate documentation for all class members
+
+;private = on
+
+; Generate documentation for public and protected class members
+
+;protected = on
+
+; Generate documentation for only public class members
+
+;public = on
+
+; Use the PEAR compatible handling of the docblock first sentence
+
+;pear_compat = on
+
+; Standard doclet settings
+; -----------------------------------------------------------------------------
+
+; The directory to place generated documentation in. If the given path is
+; relative to it will be relative to "source_path".
+
+d = "../build/api/"
+
+; Specifies the title to be placed in the HTML <title> tag.
+
+windowtitle = "phpBB3"
+
+; Specifies the title to be placed near the top of the overview summary file.
+
+doctitle = "phpBB3 Sourcecode Documentation"
+
+; Specifies the header text to be placed at the top of each output file. The
+; header will be placed to the right of the upper navigation bar. 
+
+header = "phpBB3"
+
+; Specifies the footer text to be placed at the bottom of each output file. The
+; footer will be placed to the right of the lower navigation bar.
+
+footer = "phpBB3"
+
+; Specifies the text to be placed at the bottom of each output file. The text
+; will be placed at the bottom of the page, below the lower navigation bar.
+
+;bottom = "This document was generated by <a href="http://peej.github.com/phpdoctor/">PHPDoctor: The PHP Documentation Creator</a>"
+
+; Create a class tree?
+
+;tree = off
+
+; Use GeSHi to include formatted source files in the documentation. PHPDoctor will look in the current doclet directory for a /geshi subdirectory. Unpack the GeSHi archive from http://qbnz.com/highlighter to get this directory - it will contain a php script and a subdirectory with formatting files.
+
+include_source = off
+
--- 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/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/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,67 +0,0 @@
-const { browser: browserGlobals, node: nodeGlobals, jquery: jqueryGlobals } = (await import('globals')).default;
-
-// File patterns to ignore
-const IGNORED_FILES = [
-	'phpBB/assets/javascript/cropper.js',
-	'phpBB/assets/javascript/hermite.js',
-	'phpBB/assets/javascript/jquery-cropper.js',
-	'phpBB/**/*.min.js',
-	'phpBB/vendor/**/*.js',
-	'phpBB/vendor-ext/**/*.js',
-	'phpBB/phpbb/**/*.js',
-	'phpBB/tests/**/*.js',
-];
-
-// ESLint rule configurations
-const FORMATTING_RULES = {
-	'quotes': ['error', 'single'],
-	'comma-dangle': ['error', 'always-multiline'],
-	'block-spacing': 'error',
-	'array-bracket-spacing': ['error', 'always'],
-	'object-curly-spacing': ['error', 'always'],
-	'space-before-function-paren': ['error', 'never'],
-	'space-in-parens': 'off',
-};
-
-const CODE_QUALITY_RULES = {
-	'semi': ['error', 'always'],
-	'eqeqeq': ['error', 'always'],
-	'curly': ['error', 'multi-line'],
-	'no-var': 'error',
-	'prefer-const': 'error',
-	'no-console': 'off',
-	'no-unused-vars': ['error', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
-};
-
-const DISABLED_STYLE_RULES = {
-	'multiline-comment-style': 'off',
-	'computed-property-spacing': 'off',
-	'capitalized-comments': 'off',
-	'no-lonely-if': 'off',
-};
-
-const mainConfig = {
-	files: ['**/*.js', '**/*.js.twig'],
-	linterOptions: {
-		reportUnusedDisableDirectives: false,
-	},
-	languageOptions: {
-		ecmaVersion: 'latest',
-		sourceType: 'module',
-		globals: {
-			...browserGlobals,
-			...nodeGlobals,
-			...jqueryGlobals,
-		},
-	},
-	rules: {
-		...FORMATTING_RULES,
-		...CODE_QUALITY_RULES,
-		...DISABLED_STYLE_RULES,
-	},
-};
-
-export default [
-	{ ignores: IGNORED_FILES },
-	mainConfig,
-];
--- a/git-tools/commit-msg-hook-range.sh
+++ b/git-tools/commit-msg-hook-range.sh
@@ -1,66 +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.
-#
-# Calls the git commit-msg hook on all non-merge commits in a given commit range.
-#
-
-if [ "$#" -ne 1 ];
-then
-	echo "Expected one argument (commit range, e.g. phpbb/develop..ticket/12345)."
-	exit
-fi
-
-DIR=$(dirname "$0")
-COMMIT_RANGE="$1"
-COMMIT_MSG_HOOK_PATH="$DIR/hooks/commit-msg"
-COMMIT_MSG_HOOK_FATAL=$(git config --bool phpbb.hooks.commit-msg.fatal 2> /dev/null)
-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
-do
-	echo "Inspecting commit message of commit $COMMIT_HASH"
-
-	# The git commit-msg hook takes a path to a file containing a commit
-	# message. So we have to extract the commit message into a file first,
-	# which then also needs to be deleted after our work is done.
-	COMMIT_MESSAGE_PATH="$DIR/commit_msg.$COMMIT_HASH"
-	git log -n 1 --pretty=format:%B "$COMMIT_HASH" > "$COMMIT_MESSAGE_PATH"
-
-	# Invoke hook on commit message file.
-	"$COMMIT_MSG_HOOK_PATH" "$COMMIT_MESSAGE_PATH"
-
-	# If any commit message hook complains with a non-zero exit status, we
-	# will send a non-zero exit status upstream.
-	if [ $? -ne 0 ]
-	then
-		EXIT_STATUS=1
-	fi
-
-	rm "$COMMIT_MESSAGE_PATH"
-done
-
-# Restore phpbb.hooks.commit-msg.fatal config
-if [ -n "$COMMIT_MSG_HOOK_FATAL" ]
-then
-	git config phpbb.hooks.commit-msg.fatal "$COMMIT_MSG_HOOK_FATAL"
-fi
-
-exit $EXIT_STATUS
--- 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.
@@ -147,15 +147,6 @@ then
 	quit $ERR_LENGTH;
 fi

-# Check for CR/LF line breaks
-if grep -q $'\r$' "$1"
-then
-	complain "The commit message uses CR/LF line breaks, which are not permitted." >&2
-	complain >&2
-
-	quit $ERR_EOF;
-fi
-
 lines=$(wc -l "$1" | awk '{ print $1; }');
 expecting=header;
 in_description=0;
@@ -200,12 +191,12 @@ do
 				err=$ERR_HEADER;
 				echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] .+$"
 				result=$?
-				if ! echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] [a-zA-Z].+$"
+				if ! echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] [A-Z].+$"
 				then
 					# Don't be too strict.
 					# Commits may be temporary, intended to be squashed later.
 					# Just issue a warning here.
-					complain "$severity: heading should be a sentence beginning with a letter." 1>&2
+					complain "$severity: heading should be a sentence beginning with a capital letter." 1>&2
 					complain "You entered:" 1>&2
 					complain "$line" 1>&2
 				fi
@@ -224,7 +215,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 +347,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
@@ -2,13 +2,9 @@
 <?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.
+* @package phpBB3
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */

@@ -56,7 +52,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 +75,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 +90,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/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -0,0 +1,288 @@
+#!/usr/bin/env php
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+function show_usage()
+{
+	$filename = basename(__FILE__);
+
+	echo "$filename adds repositories of a github network as remotes to a local git repository.\n";
+	echo "\n";
+
+	echo "Usage: [php] $filename -s collaborators|organisation|contributors|forks [OPTIONS]\n";
+	echo "\n";
+
+	echo "Scopes:\n";
+	echo "  collaborators                 Repositories of people who have push access to the specified repository\n";
+	echo "  contributors                  Repositories of people who have contributed to the specified repository\n";
+	echo "  organisation                  Repositories of members of the organisation at github\n";
+	echo "  forks                         All repositories of the whole github network\n";
+	echo "\n";
+
+	echo "Options:\n";
+	echo " -s scope                       See description above (mandatory)\n";
+	echo " -u github_username             Overwrites the github username (optional)\n";
+	echo " -r repository_name             Overwrites the repository name (optional)\n";
+	echo " -m your_github_username        Sets up ssh:// instead of git:// for pushable repositories (optional)\n";
+	echo " -d                             Outputs the commands instead of running them (optional)\n";
+	echo " -h                             This help text\n";
+
+	exit(1);
+}
+
+// Handle arguments
+$opts = getopt('s:u:r:m:dh');
+
+if (empty($opts) || isset($opts['h']))
+{
+	show_usage();
+}
+
+$scope			= get_arg($opts, 's', '');
+$username		= get_arg($opts, 'u', 'phpbb');
+$repository 	= get_arg($opts, 'r', 'phpbb3');
+$developer		= get_arg($opts, 'm', '');
+$dry_run		= !get_arg($opts, 'd', true);
+run(null, $dry_run);
+exit(work($scope, $username, $repository, $developer));
+
+function work($scope, $username, $repository, $developer)
+{
+	// Get some basic data
+	$forks		= get_forks($username, $repository);
+	$collaborators	= get_collaborators($username, $repository);
+
+	if ($forks === false || $collaborators === false)
+	{
+		echo "Error: failed to retrieve forks or collaborators\n";
+		return 1;
+	}
+
+	switch ($scope)
+	{
+		case 'collaborators':
+			$remotes = array_intersect_key($forks, $collaborators);
+		break;
+
+		case 'organisation':
+			$remotes = array_intersect_key($forks, get_organisation_members($username));
+		break;
+
+		case 'contributors':
+			$remotes = array_intersect_key($forks, get_contributors($username, $repository));
+		break;
+
+		case 'forks':
+			$remotes = $forks;
+		break;
+
+		default:
+			show_usage();
+	}
+
+	if (file_exists('.git'))
+	{
+		add_remote($username, $repository, isset($collaborators[$developer]));
+	}
+	else
+	{
+		clone_repository($username, $repository, isset($collaborators[$developer]));
+	}
+
+	// Add private security repository for developers
+	if ($username == 'phpbb' && $repository == 'phpbb3' && isset($collaborators[$developer]))
+	{
+		run("git remote add $username-security " . get_repository_url($username, "$repository-security", true));
+	}
+
+	// Skip blessed repository.
+	unset($remotes[$username]);
+
+	foreach ($remotes as $remote)
+	{
+		add_remote($remote['username'], $remote['repository'], $remote['username'] == $developer);
+	}
+
+	run('git remote update');
+}
+
+function clone_repository($username, $repository, $pushable = false)
+{
+	$url = get_repository_url($username, $repository, false);
+	run("git clone $url ./ --origin $username");
+
+	if ($pushable)
+	{
+		$ssh_url = get_repository_url($username, $repository, true);
+		run("git remote set-url --push $username $ssh_url");
+	}
+}
+
+function add_remote($username, $repository, $pushable = false)
+{
+	$url = get_repository_url($username, $repository, false);
+	run("git remote add $username $url");
+
+	if ($pushable)
+	{
+		$ssh_url = get_repository_url($username, $repository, true);
+		run("git remote set-url --push $username $ssh_url");
+	}
+}
+
+function get_repository_url($username, $repository, $ssh = false)
+{
+	$url_base = ($ssh) ? 'git@github.com:' : 'git://github.com/';
+
+	return $url_base . $username . '/' . $repository . '.git';
+}
+
+function api_request($query)
+{
+	return api_url_request("https://api.github.com/$query?per_page=100");
+}
+
+function api_url_request($url)
+{
+	$contents = file_get_contents($url, false, stream_context_create(array(
+		'http' => array(
+			'header' => "User-Agent: phpBB/1.0\r\n",
+		),
+	)));
+
+	$sub_request_result = array();
+	// Check headers for pagination links
+	if (!empty($http_response_header))
+	{
+		foreach ($http_response_header as $header_element)
+		{
+			// Find Link Header which gives us a link to the next page
+			if (strpos($header_element, 'Link: ') === 0)
+			{
+				list($head, $header_content) = explode(': ', $header_element);
+				foreach (explode(', ', $header_content) as $links)
+				{
+					list($url, $rel) = explode('; ', $links);
+					if ($rel == 'rel="next"')
+					{
+						// Found a next link, follow it and merge the results
+						$sub_request_result = api_url_request(substr($url, 1, -1));
+					}
+				}
+			}
+		}
+	}
+
+	if ($contents === false)
+	{
+		return false;
+	}
+	$contents = json_decode($contents);
+
+	if (isset($contents->message) && strpos($contents->message, 'API Rate Limit') === 0)
+	{
+		throw new RuntimeException('Reached github API Rate Limit. Please try again later' . "\n", 4);
+	}
+
+	return ($sub_request_result) ? array_merge($sub_request_result, $contents) : $contents;
+}
+
+function get_contributors($username, $repository)
+{
+	$request = api_request("repos/$username/$repository/stats/contributors");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $contribution)
+	{
+		$usernames[$contribution->author->login] = $contribution->author->login;
+	}
+
+	return $usernames;
+}
+
+function get_organisation_members($username)
+{
+	$request = api_request("orgs/$username/public_members");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $member)
+	{
+		$usernames[$member->login] = $member->login;
+	}
+
+	return $usernames;
+}
+
+function get_collaborators($username, $repository)
+{
+	$request = api_request("repos/$username/$repository/collaborators");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $collaborator)
+	{
+		$usernames[$collaborator->login] = $collaborator->login;
+	}
+
+	return $usernames;
+}
+
+function get_forks($username, $repository)
+{
+	$request = api_request("repos/$username/$repository/forks");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $fork)
+	{
+		$usernames[$fork->owner->login] = array(
+			'username'		=> $fork->owner->login,
+			'repository'	=> $fork->name,
+		);
+	}
+
+	return $usernames;
+}
+
+function get_arg($array, $index, $default)
+{
+	return isset($array[$index]) ? $array[$index] : $default;
+}
+
+function run($cmd, $dry = false)
+{
+	static $dry_run;
+
+	if (is_null($cmd))
+	{
+		$dry_run = $dry;
+	}
+	else if (!empty($dry_run))
+	{
+		echo "$cmd\n";
+	}
+	else
+	{
+		passthru(escapeshellcmd($cmd));
+	}
+}
--- 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,57 +0,0 @@
-{
-	"name": "phpbb",
-	"version": "4.0.0-dev",
-	"description": "phpBB Forum Software application",
-	"main": " ",
-	"directories": {
-		"doc": "docs"
-	},
-	"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": "^9.28.0",
-		"globals": "^16.2.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/.htaccess
+++ b/phpBB/.htaccess
@@ -1,92 +1,19 @@
-<IfModule mod_rewrite.c>
-RewriteEngine on
-
-#
-# Uncomment the statement below if URL rewriting doesn't
-# work properly. If you installed phpBB in a subdirectory
-# of your site, properly set the argument for the statement.
-# e.g.: if your domain is test.com and you installed phpBB
-# in http://www.test.com/phpBB/index.php you have to set
-# the statement RewriteBase /phpBB/
-#
-#RewriteBase /
-
 #
 # Uncomment the statement below if you want to make use of
 # HTTP authentication and it does not already work.
 # This could be required if you are for example using PHP via Apache CGI.
 #
+#<IfModule mod_rewrite.c>
+#RewriteEngine on
 #RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
+#</IfModule>

-#
-# The following 3 lines will rewrite URLs passed through the front controller
-# to not require app.php in the actual URL. In other words, a controller is
-# by default accessed at /app.php/my/controller, but can also be accessed at
-# /my/controller
-#
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^(.*)$ app.php [QSA,L]
+<Files "config.php">
+Order Allow,Deny
+Deny from All
+</Files>

-#
-# If symbolic links are not already being followed,
-# uncomment the line below.
-# http://anothersysadmin.wordpress.com/2008/06/10/mod_rewrite-forbidden-403-with-apache-228/
-#
-#Options +FollowSymLinks
-</IfModule>
-
-# Apache content negotation tries to interpret non-existent paths as files if
-# MultiViews is enabled. This will however cause issues with paths containg
-# dots, e.g. for the cron tasks
-<IfModule mod_negotiation.c>
-	Options -MultiViews
-</IfModule>
-
-# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
-# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
-# We could just conditionally provide both versions, but unfortunately Apache
-# does not explicitly tell us its version if the module mod_version is not
-# available. In this case, we check for the availability of module
-# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-<IfModule mod_version.c>
-	<IfVersion < 2.4>
-		<Files "config.php">
-			Order Allow,Deny
-			Deny from All
-		</Files>
-		<Files "common.php">
-			Order Allow,Deny
-			Deny from All
-		</Files>
-	</IfVersion>
-	<IfVersion >= 2.4>
-		<Files "config.php">
-			Require all denied
-		</Files>
-		<Files "common.php">
-			Require all denied
-		</Files>
-	</IfVersion>
-</IfModule>
-<IfModule !mod_version.c>
-	<IfModule !mod_authz_core.c>
-		<Files "config.php">
-			Order Allow,Deny
-			Deny from All
-		</Files>
-		<Files "common.php">
-			Order Allow,Deny
-			Deny from All
-		</Files>
-	</IfModule>
-	<IfModule mod_authz_core.c>
-		<Files "config.php">
-			Require all denied
-		</Files>
-		<Files "common.php">
-			Require all denied
-		</Files>
-	</IfModule>
-</IfModule>
+<Files "common.php">
+Order Allow,Deny
+Deny from All
+</Files>
--- 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/Show More
+++ b/Show More