[prep-release-3.2.0-a2] Add changelog for 3.2.0-a2

.devcontainer/Dockerfile

@@ -1,20 +0,0 @@
-# Debian version
-ARG VARIANT="buster"
-FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
-
-# Install PHP
-RUN apt-get -y update
-RUN apt-get -y install php php-xml php-mbstring php-curl php-zip php-xdebug
-
-# Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Install MySQL
-RUN apt-get -y install mysql-server php-mysql
-
-# Xdebug
-ADD resources/xdebug.ini /etc/php/8.1/apache2/conf.d/xdebug.ini
-
-# Configure Apache
-RUN echo "Listen 8080" >> /etc/apache2/ports.conf && \
-    a2enmod rewrite

.devcontainer/devcontainer.json

@@ -1,37 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.1/containers/ubuntu
-{
-	"name": "Ubuntu",
-	"build": {
-		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick an Ubuntu version: jammy / ubuntu-22.04, focal / ubuntu-20.04, bionic /ubuntu-18.04
-		// Use ubuntu-22.04 or ubuntu-18.04 on local arm64/Apple Silicon.
-		"args": { "VARIANT": "ubuntu-22.04" }
-	},
-
-	// Configure tool-specific properties.
-	"customizations": {
-		// Configure properties specific to VS Code.
-		"vscode": {
-			"settings": {
-				// Allow Xdebug to listen to requests from remote (or container)
-				"remote.localPortHost": "allInterfaces"
-			},
-			//"devPort": {},
-			// Specify which VS Code extensions to install (List of IDs)
-			"extensions": ["xdebug.php-debug"]
-			}
-		},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [80, 9003],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postStartCommand": "bash .devcontainer/resources/setup.sh",
-
-	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode",
-	"features": {
-		"github-cli": "latest"
-	}
-}

.devcontainer/resources/phpbb-config.yml

@@ -1,38 +0,0 @@
-installer:
-    admin:
-        name: admin
-        password: adminadmin
-        email: admin@example.org
-
-    board:
-        lang: en
-        name: My Board
-        description: My amazing new phpBB board
-
-    database:
-        dbms: mysqli
-        dbhost: 127.0.0.1
-        dbport: 3306
-        dbuser: phpbb
-        dbpasswd: phpbb
-        dbname: phpbb
-        table_prefix: phpbb_
-
-    email:
-        enabled: false
-        smtp_delivery : ~
-        smtp_host: ~
-        smtp_port: ~
-        smtp_auth: ~
-        smtp_user: ~
-        smtp_pass: ~
-
-    server:
-        cookie_secure: false
-        server_protocol: http://
-        force_server_vars: true
-        server_name: localhost
-        server_port: 80
-        script_path: /
-
-    extensions: []

.devcontainer/resources/setup.sh

@@ -1,52 +0,0 @@
-# setup.sh
-# Commands to install and configure phpBB
-
-# Start MySQL
-echo "[Codespaces] Start MySQL"
-sudo service mysql start
-
-# Start Apache
-echo "[Codespaces] Start Apache"
-sudo service apache2 start
-
-# Add SSH key
-echo "[Codespaces] Add SSH key"
-echo "$SSH_KEY" > /home/vscode/.ssh/id_rsa && chmod 600 /home/vscode/.ssh/id_rsa
-
-# Create a MySQL user to use
-echo "[Codespaces] Create MySQL user"
-sudo mysql -u root<<EOFMYSQL
-    CREATE USER 'phpbb'@'localhost' IDENTIFIED BY 'phpbb';
-    GRANT ALL PRIVILEGES ON *.* TO 'phpbb'@'localhost' WITH GRANT OPTION;
-    CREATE DATABASE IF NOT EXISTS phpbb;
-EOFMYSQL
-
-# Download dependencies
-echo "[Codespaces] Install Composer dependencies"
-composer install --no-interaction
-
-# Symlink the webroot so it can be viewed
-echo "[Codespaces] Create Symlink of webroot"
-sudo rm -rf /var/www/html
-sudo ln -s /workspaces/phpbb/phpBB /var/www/html
-
-# Copy phpBB config
-echo "[Codespaces] Copy phpBB configuration"
-cp /workspaces/phpbb/.devcontainer/resources/phpbb-config.yml /workspaces/phpbb/phpBB/install/install-config.yml
-
-# Force the server URL to reflect the Codespace
-# https://docs.github.com/en/codespaces/developing-in-a-codespace/default-environment-variables-for-your-codespace
-if [ "$CODESPACES" = true ] ; then
-    echo "[Codespaces] Set the phpBB server name using default environment variables"
-    codespaces_url="${CODESPACE_NAME}-80.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
-    sed -i "s/localhost/$codespaces_url/g" /workspaces/phpbb/phpBB/install/install-config.yml
-fi
-
-# Install phpBB
-echo "[Codespaces] Run phpBB CLI installation"
-cd /workspaces/phpbb/phpBB && composer install --no-interaction
-sudo php /workspaces/phpbb/phpBB/install/phpbbcli.php install /workspaces/phpbb/phpBB/install/install-config.yml
-rm -rf /workspaces/phpbb/phpBB/install
-
-# Finished
-echo "[Codespaces] phpBB installation completed"

.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

.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

.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

.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

.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

.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"

.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"

.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

.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

.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

.github/phpunit-mariadb-github.xml

@@ -1,36 +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>
-  <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>

.github/phpunit-mssql-github.xml

@@ -1,38 +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>
-  <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>

.github/phpunit-mysql-github.xml

@@ -1,38 +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>
-  <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>

.github/phpunit-postgres-github.xml

@@ -1,38 +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>
-  <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>

.github/phpunit-psql-windows-github.xml

@@ -1,38 +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>
-  <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>

.github/phpunit-sqlite3-github.xml

@@ -1,32 +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>
-  <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>

.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

.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"

.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

.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."

.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 }}

.github/workflows/tests.yml

@@ -1,613 +0,0 @@
-name: Tests
-
-on:
-    push:
-        branches:
-            - 3.3.x
-            - master
-            - 'prep-release-*'
-        tags:
-            - 'release-*'
-    pull_request:
-        branches:
-            - 3.3.x
-            - master
-            - 'prep-release-*'
-
-jobs:
-    # Basic checks, e.g. parse errors, commit messages, etc.
-    basic-checks:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                include:
-                    - db: 'none'
-                      php: '8.1'
-                      NOTESTS: 1
-
-        name: PHP ${{ matrix.php }} - ${{ matrix.db }}
-
-        steps:
-            - name: Update Ubuntu package lists
-              run: |
-                  sudo apt-get update -y  --allow-releaseinfo-change
-
-            - name: Checkout repository
-              uses: actions/checkout@v4
-              with:
-                  fetch-depth: 100
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  DB: ${{ matrix.db }}
-                  PHP_VERSION: ${{ matrix.php }}
-                  NOTESTS: '1'
-              run: |
-                  .github/setup-phpbb.sh $DB $PHP_VERSION $NOTESTS
-
-            - name: Phing sniff
-              run: |
-                  .github/phing-sniff.sh
-
-            - name: Check doctum parse errors
-              run: |
-                  .github/check-doctum-parse-errors.sh
-
-            - name: Check code with psalm
-              run: |
-                  phpBB/vendor/bin/psalm --output-format=github
-
-            - name: Check image ICC profiles
-              run: |
-                  .github/check-image-icc-profiles.sh
-
-            - name: Check executable files
-              run: |
-                  .github/check-executable-files.sh ./
-
-            - name: Check stylesheets
-              run: |
-                  .github/check-stylesheet.sh
-
-            - name: Lint JavaScript files
-              run: |
-                  .github/check-js.sh
-
-            - name: Check commit message
-              if: github.event_name == 'pull_request'
-              run: |
-                  git fetch origin $GITHUB_BASE_REF &> /dev/null
-                  git-tools/commit-msg-hook-range.sh $(git rev-parse origin/$GITHUB_BASE_REF)..$GITHUB_SHA
-
-    # Tests for MySQL and MariaDB
-    mysql-tests:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                include:
-                    - php: '8.1'
-                      db: "mariadb:10.2"
-                    - php: '8.1'
-                      db: "mariadb:10.3"
-                    - php: '8.1'
-                      db: "mariadb:10.4"
-                    - php: '8.1'
-                      db: "mariadb:10.6"
-                    - php: '8.1'
-                      db: "mariadb:10.9"
-                    - php: '8.1'
-                      db: "mariadb:10.10"
-                    - php: '8.1'
-                      db: "mariadb:10.11"
-                    - php: '8.1'
-                      db: "mysql:5.7"
-                      db_alias: "MySQL Slow Tests"
-                      SLOWTESTS: 1
-                    - php: '8.1'
-                      db: "mysql:5.7"
-                      db_alias: "MyISAM Tests"
-                      MYISAM: 1
-                    - php: '8.1'
-                      db: "mysql:5.7"
-                    - php: '8.1'
-                      db: "mysql:8.0"
-                    - php: '8.1'
-                      db: "mysql:8.1"
-                    - php: '8.2'
-                      db: "mysql:8.0"
-                    - php: '8.2'
-                      db: "mariadb:10.2"
-                    - php: '8.3'
-                      db: "mysql:5.7"
-                    - php: '8.3'
-                      db: "mariadb:10.2"
-                    - php: '8.4'
-                      db: "mysql:8.0"
-                    - php: '8.4'
-                      db: "mariadb:10.3"
-
-        name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
-
-        services:
-            mysql:
-                image: ${{ matrix.db }}
-                env:
-                    MYSQL_ALLOW_EMPTY_PASSWORD: yes
-                    MYSQL_DATABASE: phpbb_tests
-                ports:
-                    - 3306:3306
-                options: >-
-                    --health-cmd="mysqladmin ping"
-                    --health-interval=10s
-                    --health-timeout=5s
-                    --health-retries=3
-
-            redis:
-                image: redis
-                options: >-
-                    --health-cmd "redis-cli ping"
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-                ports:
-                    - 6379:6379
-
-        steps:
-            - name: Update Ubuntu package lists
-              run: |
-                  sudo apt-get update -y  --allow-releaseinfo-change
-
-            - name: Checkout repository
-              uses: actions/checkout@v4
-
-            - id: database-type
-              env:
-                  MATRIX_DB: ${{ matrix.db }}
-              run: |
-                  db=$(echo "${MATRIX_DB%%:*}")
-                  echo "db=$db" >> $GITHUB_OUTPUT
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, mysqli, pdo, pdo_mysql, ldap
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              env:
-                  PHP_VERSION: ${{ matrix.php }}
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  PHP_VERSION: ${{ matrix.php }}
-                  NOTESTS: '0'
-              run: |
-                  .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0}
-
-            - name: Setup database
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  MYISAM: ${{ matrix.MYISAM != 1 && '0' || '1' }}
-              run: |
-                  .github/setup-database.sh $DB $MYISAM
-
-            - name: Setup LDAP
-              if: ${{ matrix.SLOWTESTS == 1 }}
-              run: |
-                  .github/setup-ldap.sh
-
-            - name: Setup node
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-            - name: Setup node dependencies
-              run: npm ci
-
-            - name: Setup SPHINX
-              run: |
-                  .github/setup-sphinx.sh
-
-            - name: Lint tests
-              if: ${{ matrix.SLOWTESTS != 1 && steps.database-type.outputs.db == 'mysql' }}
-              run: phpBB/vendor/bin/phpunit tests/lint_test.php
-
-            - name: Run unit tests
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-              if: ${{ matrix.SLOWTESTS != 1 && matrix.NOTESTS != 1 }}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --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"
-
-        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-latest
-        strategy:
-            matrix:
-                type: ['unit', 'functional']
-                php: ['8.1', '8.2', '8.3']
-                db: ['postgres']
-
-        name: Windows - ${{ matrix.type }} - PHP ${{ matrix.php }} - ${{ matrix.db }}
-
-        steps:
-            - name: Prepare git for Windows
-              run: |
-                  git config --system core.autocrlf false
-                  git config --system core.eol lf
-            - name: Checkout repository
-              uses: actions/checkout@v4
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql, sodium
-                  ini-values: upload_tmp_dir=${{ runner.temp }}, sys_temp_dir=${{ runner.temp }}
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $env:GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  GITHUB_WORKSPACE: ${{ github.workspace }}
-                  TEMP_DIR: ${{ runner.temp }}
-              run: |
-                  Enable-WindowsOptionalFeature -Online -FeatureName IIS-WebServerRole, IIS-WebServer, IIS-CommonHttpFeatures, IIS-ManagementConsole, IIS-HttpErrors, IIS-HttpRedirect, IIS-WindowsAuthentication, IIS-StaticContent, IIS-DefaultDocument, IIS-HttpCompressionStatic, IIS-DirectoryBrowsing, IIS-WebServerManagementTools, IIS-CGI -All
-                  Set-Service wuauserv -StartupType Manual
-                  (Get-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config).replace("<configuration>", "<configuration>`n`t<system.web>`n`t`t<customErrors mode=`"Off`"/>`n`t</system.web>") | Set-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config
-                  (Get-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config).replace("`t</system.webServer>", "`t`t<httpErrors errorMode=`"Detailed`" />`n`t</system.webServer>") | Set-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config
-                  choco install urlrewrite -y
-                  Import-Module WebAdministration
-                  New-WebSite -Name 'phpBBTest' -PhysicalPath "${env:GITHUB_WORKSPACE}\phpBB" -Force
-                  $session = Get-PSSession -Name WinPSCompatSession
-                  $sb = {Set-ItemProperty 'IIS:\Sites\phpBBTest' -name Bindings -value @{protocol='http';bindingInformation='*:80:phpbb.test'}}
-                  Invoke-Command -Scriptblock $sb -Session $session
-                  $sb = {Set-WebConfigurationProperty -filter /system.WebServer/security/authentication/AnonymousAuthentication -name enabled -value true -location "IIS:\Sites\phpBBTest"}
-                  Invoke-Command -Scriptblock $sb -Session $session
-                  Add-Content -Path $env:windir\System32\drivers\etc\hosts -Value "`r`n127.0.0.1`tphpbb.test" -Force
-                  [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";%windir%\system32\inetsrv")
-                  echo Setup FAST-CGI configuration
-                  Add-WebConfiguration -Filter /system.webServer/fastCgi -PSPath IIS:\ -Value @{fullpath="C:\tools\php\php-cgi.exe"}
-                  echo Setup FACT-CGI handler
-                  New-WebHandler -Name "PHP-FastCGI" -Path "*.php" -Modules FastCgiModule -ScriptProcessor "C:\tools\php\php-cgi.exe" -Verb '*' -ResourceType Either
-                  iisreset
-                  NET START W3SVC
-                  mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\test"
-                  mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\installer"
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\cache" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\files" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\store" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\ext" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\vendor-ext" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\composer-ext.json" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\composer-ext.lock" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\images\avatars\upload" /grant Users:F /T
-                  $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule("IIS_IUSRS", "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow")
-                  $acl = Get-ACL "${env:TEMP_DIR}"
-                  $acl.AddAccessRule($accessRule)
-                  Set-ACL -Path "${env:TEMP_DIR}" -ACLObject $acl
-                  cd ${env:GITHUB_WORKSPACE}\phpBB
-                  php ..\composer.phar install
-                  cd ..
-            - name: Setup database
-              run: |
-                  $postgreSqlSvc = Get-Service "postgresql*"
-                  Set-Service $postgreSqlSvc.Name -StartupType manual
-                  $runningStatus = [System.ServiceProcess.ServiceControllerStatus]::Running
-                  $maxStartTimeout = New-TimeSpan -Seconds 30
-                  try {
-                    $postgreSqlSvc.Start()
-                    $postgreSqlSvc.WaitForStatus($runningStatus, $maxStartTimeout)
-                  } catch  {
-                    $_ | select *
-                  }
-                  [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";${env:PGBIN}")
-                  $env:PGPASSWORD = 'root'
-                  psql -c 'ALTER SYSTEM SET hot_standby = on;' -U postgres
-                  psql -c 'ALTER SYSTEM SET wal_level = minimal;' -U postgres
-                  psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres
-                  psql -c 'create database phpbb_tests;' -U postgres
-                  Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender
-                  Set-MpPreference -DisableRealtimeMonitoring $true
-
-            - name: Setup node
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-            - name: Setup node dependencies
-              run: npm ci
-
-            - name: Run unit tests
-              if: ${{ matrix.type == 'unit' }}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --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

.gitignore

@@ -1,59 +1,24 @@
-# Excludes cache
+*~
+/phpunit.xml
 /phpBB/cache/*
 !/phpBB/cache/.htaccess
 !/phpBB/cache/index.html
-
-# Excludes user data
-/phpBB/config*.php*
+/phpBB/composer.phar
+/phpBB/config*.php
 /phpBB/ext/*
 /phpBB/files/*
 /phpBB/images/avatars/gallery/*
 /phpBB/images/avatars/upload/*
 /phpBB/images/ranks/*
-/phpBB/store/*
-
-# Excludes all custom langages
+/phpBB/install/schemas/schema.json
 /phpBB/language/*
 !/phpBB/language/en
-
-# Excludes all custom styles
+/phpBB/store/*
 /phpBB/styles/*
 !/phpBB/styles/prosilver
-!/phpBB/styles/prosilver/theme/en
-!/phpBB/styles/prosilver/theme/images
 !/phpBB/styles/all
-
-# Excludes all custom env
-/phpBB/config/*
-!/phpBB/config/default
-!/phpBB/config/development
-!/phpBB/config/installer
-!/phpBB/config/production
-!/phpBB/config/test
-!/phpBB/config/.htaccess
-
-# Excludes vendors
 /phpBB/vendor
-/phpBB/vendor-ext/*
-!/phpBB/vendor-ext/.git-keep
-/phpBB/composer-ext.json
-/phpBB/composer-ext.lock
-
-# Excludes test / dev files
-/phpunit.xml
-/.phpunit.result.cache
-/phpBB/composer.phar
 /tests/phpbb_unit_tests.sqlite*
 /tests/test_config*.php
 /tests/tmp/*
 /tests/vendor
-/vagrant/phpbb-install-config.yml
-.vagrant
-node_modules
-/build/package_signature
-
-# Excludes IDE / editors files
-*~
-.idea
-*.DS_Store*
-/.vscode

.jscsrc

@@ -0,0 +1,78 @@
+
+{
+  "excludeFiles": ["node_modules/**", "**/build/**"],
+  "requireCurlyBraces": [
+    "if", "else", "for", "while", "do", "try", "catch"
+  ],
+  "requireSpaceBeforeKeywords": [
+    "else", "while", "catch"
+  ],
+  "requireSpaceAfterKeywords": [
+    "do", "for", "if", "else", "switch", "case", "try", "catch", "while", "return", "typeof"
+  ],
+  "requireSpaceBeforeBlockStatements": true,
+  "requireParenthesesAroundIIFE": true,
+  "requireSpacesInConditionalExpression": {
+    "afterTest": true,
+    "beforeConsequent": true,
+    "afterConsequent": true,
+    "beforeAlternate": true
+  },
+  "requireSpacesInAnonymousFunctionExpression": {
+    "beforeOpeningCurlyBrace": true
+  },
+  "disallowSpacesInNamedFunctionExpression": {
+    "beforeOpeningRoundBrace": true
+  },
+  "requireSpacesInFunction": {
+    "beforeOpeningCurlyBrace": true
+  },
+  "disallowSpacesInCallExpression": true,
+  "requireBlocksOnNewline": true,
+  "requirePaddingNewlinesBeforeKeywords": ["case"],
+  "disallowEmptyBlocks": true,
+  "disallowSpacesInsideArrayBrackets": "nested",
+  "disallowSpacesInsideParentheses": true,
+  "requireSpacesInsideObjectBrackets": "all",
+  "disallowQuotedKeysInObjects": "allButReserved",
+  "disallowSpaceAfterObjectKeys": true,
+  "requireSpaceBeforeObjectValues": true,
+  "requireCommaBeforeLineBreak": true,
+  "requireOperatorBeforeLineBreak": [
+    "?", "=", "+", "-", "/", "*", "===", "!==", ">", ">=", "<", "<="
+  ],
+  "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
+  "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+  "requireSpaceBeforeBinaryOperators": [
+    "=", "+", "+=", "-", "-=", "/", "/=", "*", "*=", "===", "!==", "<", "<=", ">", ">="
+  ],
+  "requireSpaceAfterBinaryOperators": [
+    "=", "+", "+=", "-", "-=", "/", "/=", "*", "*=", "===", "!==", "<", "<=", ">", ">="
+  ],
+  "disallowKeywords": ["with"],
+  "disallowMultipleLineStrings": true,
+  "disallowMixedSpacesAndTabs": "smart",
+  "disallowTrailingWhitespace": true,
+  "disallowTrailingComma": true,
+  "disallowKeywordsOnNewLine": ["else"],
+  "requireLineFeedAtFileEnd": true,
+  "maximumLineLength": {
+    "value": 120,
+    "tabSize": 4,
+    "allowUrlComments": true,
+    "allowRegex": true
+  },
+  "requireCapitalizedConstructors": true,
+  "requireDotNotation": true,
+  "disallowYodaConditions": true,
+  "requireSpaceAfterLineComment": {
+    "allExcept": ["#", "="]
+  },
+  "disallowNewlineBeforeBlockStatements": true,
+  "validateQuoteMarks": {
+    "mark": "'",
+    "escape": true
+  },
+  "validateParameterSeparator": ", ",
+  "safeContextKeyword": ["that"]
+}

.jshintrc

@@ -0,0 +1,24 @@
+
+{
+  "bitwise": true,
+  "curly": true,
+  "eqeqeq": true,
+  "es3": true,
+  "forin": false,
+  "freeze": true,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "nonbsp": true,
+  "undef": true,
+  "unused": true,
+  "strict": true,
+
+  "browser": true,
+  "devel": true,
+  "jquery": true,
+
+  "globals": {
+    "JSON": true
+  }
+}

.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"
-}

.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" }
-		]
-	}
-}

.travis.yml

@@ -0,0 +1,49 @@
+language: php
+
+matrix:
+  include:
+    - php: 5.4
+      env: DB=none;NOTESTS=1
+    - php: 5.4
+      env: DB=mysqli # MyISAM
+    - php: 5.4
+      env: DB=mysql
+    - php: 5.4
+      env: DB=mariadb
+    - php: 5.4
+      env: DB=postgres
+    - php: 5.4
+      env: DB=sqlite3
+    - php: 5.4
+      env: DB=mysqli;SLOWTESTS=1
+    - php: 5.5
+      env: DB=mysqli
+    - php: 5.6
+      env: DB=mysqli
+    - php: 7.0
+      env: DB=mysqli
+    - php: hhvm
+      env: DB=mysqli
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
+
+services:
+  - redis-server
+
+install:
+  - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+
+before_script:
+  - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - phantomjs --webdriver=8910 > /dev/null &
+
+script:
+  - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./
+  - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/lint_test.php; fi"
+  - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
+  - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
+  - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"

.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
-        }
-    ]
-}

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "php.debug.ideKey": "VSCODE"
-}

CONTRIBUTING.md

@@ -0,0 +1,6 @@
+## 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://wiki.phpbb.com/Coding_guidelines) and [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

LICENSE

@@ -1,281 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-

README.md

@@ -1,50 +1,36 @@
-[<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)
+## INSTALLING DEPENDENCIES
+
+To be able to run an installation from the repo (and not from a pre-built package) you need to run the following commands to install phpBB's dependencies.
+
+	cd phpBB
+	php ../composer.phar install --dev
+
+
+## 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:
 
-- 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
-  ```
+* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=master)](http://travis-ci.org/phpbb/phpbb) **master** - Latest development version
+* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.1.x)](http://travis-ci.org/phpbb/phpbb) **3.1.x** - Development of version 3.1.x
+* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.0.x)](http://travis-ci.org/phpbb/phpbb) **3.0.x** - Development of version 3.0.x
 
-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)

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.

Vagrantfile

@@ -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

build/build.xml

@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="4.0.0-a1-dev" />
-	<property name="prevversion" value="3.3.15" />
-	<property name="olderversions" value="3.1.12, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10, 3.3.11, 3.3.12, 3.3.13, 3.3.14" />
+	<property name="newversion" value="3.2.0-a2" />
+	<property name="prevversion" value="3.2.0-a1" />
+	<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6" />
 	<!-- 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>
@@ -81,36 +81,28 @@
 				--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}
+				--ignore=${project.basedir}/phpBB/cache/*
+				--ignore=${project.basedir}/phpBB/develop/*
+				--ignore=${project.basedir}/phpBB/ext/*
+				--ignore=${project.basedir}/phpBB/includes/diff/*.php
+				--ignore=${project.basedir}/phpBB/includes/sphinxapi.php
+				--ignore=${project.basedir}/phpBB/includes/utf/data/*
+				--ignore=${project.basedir}/phpBB/install/data/*
+				--ignore=${project.basedir}/phpBB/install/database_update.php
+				--ignore=${project.basedir}/phpBB/phpbb/*
+				--ignore=${project.basedir}/phpBB/vendor/*
 				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/*
+				--ignore=${project.basedir}/phpBB/ext/*/tests/*
+				--ignore=${project.basedir}/phpBB/ext/*/vendor/*
 				phpBB/ext"
 			dir="." returnProperty="retval-php-ext" passthru="true" />
 		<if>
@@ -128,13 +120,13 @@
 	<!-- Builds docs for current branch into build/api/output/master -->
 	<target name="docs">
 		<exec dir="."
-			command="./doctum.phar update build/doctum-checkout.conf.php"
+			command="phpBB/vendor/bin/sami.php update build/sami-checkout.conf.php"
 			passthru="true" />
 	</target>
 	<!-- Builds docs for multiple branches/tags into build/api/output/$branch -->
 	<target name="docs-all">
 		<exec dir="."
-			command="./doctum.phar update build/doctum-all.conf.php"
+			command="phpBB/vendor/bin/sami.php update build/sami-all.conf.php"
 			passthru="true" />
 	</target>
 
@@ -150,9 +142,7 @@
 
 		<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">
@@ -166,32 +156,31 @@
 
 	<target name="prepare-new-version">
 		<!-- select the currently checked out commit (HEAD) for packaging -->
-		<mkdir dir="build/new_version/phpBB" />
+		<mkdir dir="build/new_version/phpBB3" />
 		<phingcall target="export">
 			<property name="revision" value="HEAD" />
-			<property name="dir" value="build/new_version/phpBB" />
+			<property name="dir" value="build/new_version/phpBB3" />
 		</phingcall>
 
 		<!-- copy into directory for diffs -->
-		<exec dir="build" command="cp -rp new_version/phpBB old_versions/release-${newversion}" />
+		<exec dir="build" command="cp -rp new_version/phpBB3 old_versions/release-${newversion}" />
 		<!-- and clean up -->
 		<phingcall target="clean-diff-dir">
 			<property name="dir" value="build/old_versions/release-${newversion}" />
 		</phingcall>
 
 		<!-- create an empty config.php file (not for diffs) -->
-		<touch file="build/new_version/phpBB/config.php" />
-		<copy file="build/new_version/phpBB/vendor-ext/.htaccess" tofile="build/new_version/phpBB/vendor/.htaccess" />
+		<touch file="build/new_version/phpBB3/config.php" />
 
 	</target>
 
 	<target name="package" depends="clean,prepare,prepare-new-version,old-version-diffs">
 		<exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" />
 		<exec dir="build" escape="false"
-			command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/language new_version/phpBB/language >
+			command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/language new_version/phpBB3/language >
 				save/phpbb-${prevversion}_to_${newversion}_language.patch" />
 		<exec dir="build" escape="false"
-			command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB/styles/prosilver >
+			command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver >
 				save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />
 
 		<exec dir="build" escape="false"
@@ -204,12 +193,6 @@
 		<phingcall target="checksum-dir">
 			<property name="dir" value="build/new_version/release_files" />
 		</phingcall>
-
-		<phingcall target="sign-packages">
-			<property name="dir" value="build/new_version/release_files" />
-		</phingcall>
-
-		<exec dir="build" command="php generate_package_json.php > new_version/packages.json"/>
 	</target>
 
 	<target name="checksum-dir">
@@ -226,31 +209,6 @@
 		<exec dir="${dir}" command="sha256sum ${filename} > ${filename}.sha256" />
 	</target>
 
-	<target name="sign-packages">
-		<property name="packageSignatureExists" value="false" />
-		<exec command="if [ -f 'build/package_signature' ]; then echo 'true'; else echo 'false'; fi;" outputProperty="packageSignatureExists" />
-		<if>
-			<equals arg1="${packageSignatureExists}" arg2="true" />
-			<then>
-				<foreach param="filename" absparam="absfilename" target="sign-file">
-					<fileset dir="${dir}">
-						<type type="file" />
-						<include name="*.tar.bz2"/>
-						<include name="*.zip"/>
-					</fileset>
-				</foreach>
-			</then>
-			<else>
-				<echo msg="Skipping signing of packages due to missing build/package_signature"/>
-			</else>
-		</if>
-	</target>
-
-	<target name="sign-file">
-		<echo msg="Creating signature file for ${absfilename}" />
-		<exec command="php build/generate_signature.php `cat build/package_signature` ${absfilename}" />
-	</target>
-
 	<target name="announcement" depends="prepare">
 		<echo msg="Writing download links and checksums for email announcement to save/announcement_email_${newversion}.txt" />
 		<exec dir="build" escape="false"
@@ -290,35 +248,26 @@
 			<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 --no-dev --optimize-autoloader"
+							checkreturn="true"
+							passthru="true" />
+						<delete file="${dir}/composer.phar" />
+					</else>
 				</if>
 			</then>
 			<else>
@@ -328,54 +277,6 @@
 			</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" />
 
@@ -385,6 +286,10 @@
 		<delete dir="${dir}/config/development" />
 		<delete dir="${dir}/config/test" />
 
+		<phingcall target="clean-vendor-dir">
+			<property name="dir" value="${dir}" />
+		</phingcall>
+
 		<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
 		<!-- set permissions of all files to 644, directories to 755 -->
 		<exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />
@@ -394,71 +299,17 @@
 		<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" />
@@ -468,13 +319,6 @@
 		<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" />
@@ -540,13 +384,6 @@
 		<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" />
@@ -554,19 +391,12 @@
 		<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/symfony/yaml/Symfony/Tests" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/.gitignore" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/README.md" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/phpunit.xml.dist" />
 
 		<delete dir="${dir}/vendor/twig/twig/doc" />
 		<delete dir="${dir}/vendor/twig/twig/ext" />
@@ -574,18 +404,38 @@
 		<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/AUTHORS" />
 		<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/twig/twig/README.markdown" />
 
-		<delete file="${dir}/vendor/zendframework/zend-code/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-code/README.md" />
+		<delete dir="${dir}/vendor/symfony/security-core/.git" />
+		<delete dir="${dir}/vendor/symfony/security-core/Core/Tests" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/README.md" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/phpunit.xml.dist" />
 
-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/README.md" />
+		<delete dir="${dir}/vendor/symfony/security-csrf/.git" />
+		<delete dir="${dir}/vendor/symfony/security-csrf/Csrf/Tests" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/README.md" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/phpunit.xml.dist" />
 
-		<delete file="${dir}/vendor/zendframework/zend-stdlib/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-stdlib/README.md" />
+		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
+		<delete dir="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/Tests" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/README.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/security/.git" />
+		<delete dir="${dir}/vendor/symfony/security/Tests" />
+		<delete file="${dir}/vendor/symfony/security/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security/README.md" />
+		<delete file="${dir}/vendor/symfony/security/phpunit.xml.dist" />
 	</target>
 
 	<target name="clean-diff-dir">

build/build_changelog.php

@@ -1,16 +1,16 @@
 #!/usr/bin/env php
 <?php
 /**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
 
 if ($_SERVER['argc'] != 2)
 {
@@ -18,54 +18,40 @@ if ($_SERVER['argc'] != 2)
 	exit(1);
 }
 
-if ($_SERVER['argv'][1] == '--stdin')
-{
-	$stdIn = file_get_contents('php://stdin');
-	// XML output from tracker can be directly piped to this script using:
-	// cat tracker_output.xml | php build/build_changelog.php --stdin
-	$xml = simplexml_load_string($stdIn);
-}
-else
-{
-	$fixVersion = $_SERVER['argv'][1];
+$fixVersion = $_SERVER['argv'][1];
 
-	$query = 'project IN (PHPBB, PHPBB3, SECURITY)
-		AND resolution = Fixed
-		AND fixVersion = "' . $fixVersion . '"
-		AND status IN ("Unverified Fix", Closed)';
+$query = 'project IN (PHPBB3, SECURITY)
+	AND resolution = Fixed
+	AND fixVersion = "' . $fixVersion . '"
+	AND status IN ("Unverified Fix", Closed)';
 
-	$url = 'https://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000';
-	$xml = simplexml_load_string(file_get_contents($url));
-}
+$url = 'http://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000';
+$xml = simplexml_load_string(file_get_contents($url));
 
-$types = [];
 foreach ($xml->xpath('//item') as $item)
 {
 	$key = (string) $item->key;
 
-	$keyUrl = 'https://tracker.phpbb.com/browse/' . $key;
+	$keyUrl = 'http://tracker.phpbb.com/browse/' . $key;
 	$keyLink = '<a href="' . $keyUrl . '">' . $key . '</a>';
 
-	$value = str_replace($key, $keyLink, htmlspecialchars($item->title, ENT_COMPAT));
+	$value = str_replace($key, $keyLink, htmlspecialchars($item->title));
 	$value = str_replace(']', '] -', $value);
 
 	$types[(string) $item->type][$key] = $value;
 }
 
-if (count($types))
+ksort($types);
+foreach ($types as $type => $tickets)
 {
-	ksort($types);
-	foreach ($types as $type => $tickets)
+	echo "<h4>$type</h4>\n";
+	echo "<ul>\n";
+
+	uksort($tickets, 'strnatcasecmp');
+
+	foreach ($tickets as $ticket)
 	{
-		echo "<h4>$type</h4>\n";
-		echo "<ul>\n";
-
-		uksort($tickets, 'strnatcasecmp');
-
-		foreach ($tickets as $ticket)
-		{
-			echo "<li>$ticket</li>\n";
-		}
-		echo "</ul>\n";
+		echo "<li>$ticket</li>\n";
 	}
+	echo "</ul>\n";
 }

build/build_helper.php

@@ -33,24 +33,24 @@ class build_package
 	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,

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);
-				}
-			}
-		}
-	}
-}

build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php

@@ -11,11 +11,6 @@
 *
 */
 
-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.
@@ -23,7 +18,7 @@ use PHP_CodeSniffer\Sniffs\Sniff;
 * @package code_sniffer
 * @author Manuel Pichler <mapi@phpundercontrol.org>
 */
-class FileCommentSniff implements Sniff
+class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
 {
 	/**
 	* Returns an array of tokens this test wants to listen for.
@@ -38,13 +33,13 @@ class FileCommentSniff implements Sniff
 	/**
 	* Processes this test, when one of its tokens is encountered.
 	*
-	* @param File $phpcsFile The file being scanned.
+	* @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
 	* @param int				  $stackPtr  The position of the current token
 	*										in the stack passed in $tokens.
 	*
-	* @return void
+	* @return null
 	*/
-	public function process(File $phpcsFile, $stackPtr): void
+	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	{
 		// We are only interested in the first file comment.
 		if ($stackPtr !== 0)
@@ -67,7 +62,7 @@ class FileCommentSniff implements Sniff
 		// 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');
+			$phpcsFile->addError('Missing required file doc comment.', $stackPtr);
 			return;
 		}
 
@@ -87,7 +82,7 @@ class FileCommentSniff implements Sniff
 			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');
+				$phpcsFile->addWarning($message, $token);
 			}
 		}
 
@@ -100,13 +95,13 @@ class FileCommentSniff implements Sniff
 		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');
+			$phpcsFile->addWarning($message, ($start + 1));
 		}
 
 		if ($tokens[$end - 3]['content'] !== '*' && $tokens[$end - 6]['content'] !== '*')
 		{
 			$message = 'The last file comment line should be empty.';
-			$phpcsFile->addWarning($message, $end - 1, 'CommentLastNotEmpty');
+			$phpcsFile->addWarning($message, $end - 1);
 		}
 
 		//$this->processPackage($phpcsFile, $start, $tags);
@@ -118,59 +113,59 @@ class FileCommentSniff implements Sniff
 	/**
 	* Checks that the tags array contains a valid package tag
 	*
-	* @param File $phpcsFile The context source file instance.
+	* @param PHP_CodeSniffer_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
+	* @return null
 	*/
-	protected function processPackage(File $phpcsFile, $ptr, $tags): void
+	protected function processPackage(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
 	{
 		if (!isset($tags['package']))
 		{
 			$message = 'Missing require @package tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr, 'MissingTagPackage');
+			$phpcsFile->addError($message, $ptr);
 		}
 		else if (preg_match('/^([\w]+)$/', $tags['package'][0]) === 0)
 		{
 			$message = 'Invalid content found for @package tag.';
-			$phpcsFile->addWarning($message, $tags['package'][1], 'InvalidTagPackage');
+			$phpcsFile->addWarning($message, $tags['package'][1]);
 		}
 	}
 
 	/**
 	* Checks that the tags array contains a valid version tag
 	*
-	* @param File $phpcsFile The context source file instance.
+	* @param PHP_CodeSniffer_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
+	* @return null
 	*/
-	protected function processVersion(File $phpcsFile, $ptr, $tags): void
+	protected function processVersion(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
 	{
 		if (!isset($tags['version']))
 		{
 			$message = 'Missing require @version tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr, 'MissingTagVersion');
+			$phpcsFile->addError($message, $ptr);
 		}
 		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');
+			$phpcsFile->addError($message, $tags['version'][1]);
 		}
 	}
 
 	/**
 	* Checks that the tags array contains a valid copyright tag
 	*
-	* @param File $phpcsFile The context source file instance.
+	* @param PHP_CodeSniffer_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
+	* @return null
 	*/
-	protected function processCopyright(File $phpcsFile, $ptr, $tags): void
+	protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
 	{
 		$copyright = '(c) phpBB Limited <https://www.phpbb.com>';
 		$tokens = $phpcsFile->getTokens();
@@ -182,7 +177,7 @@ class FileCommentSniff implements Sniff
 				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');
+					$phpcsFile->addError($message, $tags['copyright'][0][1]);
 				}
 
 				return;
@@ -190,19 +185,19 @@ class FileCommentSniff implements Sniff
 		}
 
 		$message = 'Missing require @copyright tag in file doc comment.';
-		$phpcsFile->addError($message, $ptr, 'MissingTagCopyright');
+		$phpcsFile->addError($message, $ptr);
 	}
 
 	/**
 	* Checks that the tags array contains a valid license tag
 	*
-	* @param File $phpcsFile The context source file instance.
+	* @param PHP_CodeSniffer_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
+	* @return null
 	*/
-	protected function processLicense(File $phpcsFile, $ptr, $tags): void
+	protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
 	{
 		$license = 'GNU General Public License, version 2 (GPL-2.0)';
 		$tokens = $phpcsFile->getTokens();
@@ -215,7 +210,7 @@ class FileCommentSniff implements Sniff
 				if ($found)
 				{
 					$message = 'It must be only one @license tag in file doc comment.';
-					$phpcsFile->addError($message, $ptr, 'MultiTagVersion');
+					$phpcsFile->addError($message, $ptr);
 				}
 
 				$found = true;
@@ -223,7 +218,7 @@ class FileCommentSniff implements Sniff
 				if ($tokens[$tag + 2]['content'] !== $license)
 				{
 					$message = 'Invalid content found for @license tag, use "' . $license . '".';
-					$phpcsFile->addError($message, $tags['license'][0][1], 'InvalidTagLicense');
+					$phpcsFile->addError($message, $tags['license'][0][1]);
 				}
 			}
 		}
@@ -231,7 +226,7 @@ class FileCommentSniff implements Sniff
 		if (!$found)
 		{
 			$message = 'Missing require @license tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr, 'MissingTagLicense');
+			$phpcsFile->addError($message, $ptr);
 		}
 	}
 }

build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php

@@ -11,16 +11,11 @@
 *
 */
 
-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
+class phpbb_Sniffs_ControlStructures_OpeningBraceBsdAllmanSniff implements PHP_CodeSniffer_Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.
@@ -41,13 +36,13 @@ class OpeningBraceBsdAllmanSniff implements Sniff
 	/**
 	 * Processes this test, when one of its tokens is encountered.
 	 *
-	 * @param File $phpcsFile The file being scanned.
+	 * @param PHP_CodeSniffer_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)
+	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	{
 		$tokens = $phpcsFile->getTokens();
 

build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php

@@ -10,16 +10,12 @@
  * 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
+class phpbb_Sniffs_ControlStructures_OpeningParenthesisSniff implements PHP_CodeSniffer_Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.
@@ -40,13 +36,13 @@ class OpeningParenthesisSniff implements Sniff
 	/**
 	 * Processes this test, when one of its tokens is encountered.
 	 *
-	 * @param File $phpcsFile The file being scanned.
+	 * @param PHP_CodeSniffer_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)
+	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	{
 		$tokens = $phpcsFile->getTokens();
 

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');
-		}
-	}
-}

build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php

@@ -11,60 +11,31 @@
 *
 */
 
-namespace phpbb\Sniffs\Namespaces;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
 /**
 * Checks that each use statement is used.
 */
-class UnusedUseSniff implements Sniff
+class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
 {
-	const FIND = [
-		T_NS_SEPARATOR,
-		T_STRING,
-		T_WHITESPACE,
-	];
-
 	/**
 	* {@inheritdoc}
 	*/
 	public function register()
 	{
-		return [T_USE];
+		return array(T_USE);
 	}
 
-	protected function check(File $phpcsFile, $found_name, $full_name, $short_name, $stack_pointer)
+	protected function check($phpcsFile, $found_name, $full_name, $short_name, $line)
 	{
-		$found_name_normalized = ltrim($found_name, '\\');
-		$full_name = ltrim($full_name, '\\');
 
-		$is_global = ($full_name === $short_name);
-		$unnecessarily_fully_qualified = ($is_global)
-			? ($found_name_normalized !== $found_name && $found_name_normalized === $short_name)
-			: ($found_name_normalized === $full_name);
-
-		if ($unnecessarily_fully_qualified)
+		if ($found_name === $full_name)
 		{
 			$error = 'Either use statement or full name must be used.';
-			$phpcsFile->addError($error, $stack_pointer, 'FullName');
+			$phpcsFile->addError($error, $line, 'FullName');
 		}
 
-		/* 
-		 * Check for possible union types (like string|MyType|null)
-		 * and question mark nullable type syntax (like ?MyType)
-		 */
-		$types = explode('|', $found_name);
-		foreach ($types as $type)
+		if ($found_name === $short_name)
 		{
-			// Nullable type syntax
-			$type = (strpos($type, '?') === 0) ? substr($type, 1) : $type;
-
-			if ($short_name === $type)
-			{
-				return true;
-			}
+			return true;
 		}
 
 		return false;
@@ -73,7 +44,7 @@ class UnusedUseSniff implements Sniff
 	/**
 	* {@inheritdoc}
 	*/
-	public function process(File $phpcsFile, $stackPtr)
+	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	{
 		if ($this->should_ignore_use($phpcsFile, $stackPtr) === true)
 		{
@@ -84,50 +55,27 @@ class UnusedUseSniff implements Sniff
 
 		$class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($stackPtr + 1));
 
-		$class_name_end = $phpcsFile->findNext(self::FIND, ($stackPtr + 1), null, true);
+		$find = array(
+			T_NS_SEPARATOR,
+			T_STRING,
+			T_WHITESPACE,
+		);
+
+		$class_name_end = $phpcsFile->findNext($find, ($stackPtr + 1), null, true);
 
 		$aliasing_as_position = $phpcsFile->findNext(T_AS, $class_name_end, null, false, null, true);
 		if ($aliasing_as_position !== false)
 		{
 			$alias_position = $phpcsFile->findNext(T_STRING, $aliasing_as_position, null, false, null, true);
-			$name_short = $tokens[$alias_position]['content'];
-			$name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1));
+			$class_name_short = $tokens[$alias_position]['content'];
+			$class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1));
 		}
 		else
 		{
-			$name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start));
-			$name_short = $tokens[$class_name_end - 1]['content'];
+			$class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start));
+			$class_name_short = $tokens[$class_name_end - 1]['content'];
 		}
 
-		if ($tokens[$class_name_start]['content'] === 'function'
-			&& $tokens[$class_name_start + 1]['code'] === T_WHITESPACE)
-		{
-			$class_name_start += 2;
-			$name_full = $phpcsFile->getTokensAsString(
-				$class_name_start,
-				($class_name_end - $class_name_start - (int) ($aliasing_as_position !== false))
-			);
-			$ok = $this->findFunctionUsage($phpcsFile, $stackPtr, $tokens, $name_full, $name_short);
-		}
-		else
-		{
-			$ok = $this->findClassUsage($phpcsFile, $stackPtr, $tokens, $name_full, $name_short);
-		}
-
-		if ($name_full[0] === '\\')
-		{
-			$phpcsFile->addError("There must not be a leading '\\' in use statements.", $stackPtr, 'Malformed');
-		}
-
-		if (!$ok)
-		{
-			$error = 'There must not be unused USE statements.';
-			$phpcsFile->addError($error, $stackPtr, 'Unused');
-		}
-	}
-
-	private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name_full, $class_name_short)
-	{
 		$ok = false;
 
 		// Checks in simple statements (new, instanceof and extends)
@@ -139,16 +87,11 @@ class UnusedUseSniff implements Sniff
 				$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_end = $phpcsFile->findNext($find, ($simple_statement + 1), null, true);
 
 				$simple_class_name = trim($phpcsFile->getTokensAsString($simple_class_name_start, ($simple_class_name_end - $simple_class_name_start)));
 
-				$ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) || $ok;
+				$ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) ? true : $ok;
 			}
 		}
 
@@ -158,12 +101,12 @@ class UnusedUseSniff implements Sniff
 		{
 			$old_paamayim_nekudotayim = $paamayim_nekudotayim;
 
-			$paamayim_nekudotayim_class_name_start = $phpcsFile->findPrevious(self::FIND, $paamayim_nekudotayim - 1, null, true);
+			$paamayim_nekudotayim_class_name_start = $phpcsFile->findPrevious($find, $paamayim_nekudotayim - 1, null, true);
 			$paamayim_nekudotayim_class_name_end = $paamayim_nekudotayim - 1;
 
 			$paamayim_nekudotayim_class_name = trim($phpcsFile->getTokensAsString($paamayim_nekudotayim_class_name_start + 1, ($paamayim_nekudotayim_class_name_end - $paamayim_nekudotayim_class_name_start)));
 
-			$ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) || $ok;
+			$ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) ? true : $ok;
 		}
 
 		// Checks in implements
@@ -178,36 +121,67 @@ class UnusedUseSniff implements Sniff
 				$old_implemented_class = $implemented_class;
 
 				$implements_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($implemented_class - 1));
-				$implements_class_name_end = $phpcsFile->findNext(self::FIND, ($implemented_class - 1), null, true);
+				$implements_class_name_end = $phpcsFile->findNext($find, ($implemented_class - 1), null, true);
 
 				$implements_class_name = trim($phpcsFile->getTokensAsString($implements_class_name_start, ($implements_class_name_end - $implements_class_name_start)));
 
-				$ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) || $ok;
+				$ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) ? true : $ok;
 			}
 		}
 
-		$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)
+		while (($function_declaration = $phpcsFile->findNext(T_FUNCTION, ($old_function_declaration + 1))) !== false)
 		{
 			$old_function_declaration = $function_declaration;
 
+			// Check docblocks
+			$find = array(
+				T_COMMENT,
+				T_DOC_COMMENT_CLOSE_TAG,
+				T_DOC_COMMENT,
+				T_CLASS,
+				T_FUNCTION,
+				T_OPEN_TAG,
+			);
+
+			$comment_end = $phpcsFile->findPrevious($find, ($function_declaration - 1));
+			if ($comment_end !== false)
+			{
+				if ($tokens[$comment_end]['code'] === T_DOC_COMMENT_CLOSE_TAG)
+				{
+					$comment_start = $tokens[$comment_end]['comment_opener'];
+					foreach ($tokens[$comment_start]['comment_tags'] as $tag) {
+						if ($tokens[$tag]['content'] !== '@param' && $tokens[$tag]['content'] !== '@return' && $tokens[$tag]['content'] !== '@throws') {
+							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, $tokens[$tag + 2]['line']) ? true : $ok;
+						}
+					}
+				}
+			}
+
 			// 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;
+				$ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) ? true : $ok;
 			}
-
-			$method_properties = $phpcsFile->getMethodProperties($function_declaration);
-			$ok = $this->check($phpcsFile, $method_properties['return_type'], $class_name_full, $class_name_short, $function_declaration) || $ok;
 		}
 
 		// Checks in catch blocks
@@ -217,118 +191,30 @@ class UnusedUseSniff implements Sniff
 			$old_catch = $catch;
 
 			$caught_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $catch + 1);
-			$caught_class_name_end = $phpcsFile->findNext(self::FIND, $caught_class_name_start + 1, null, true);
+			$caught_class_name_end = $phpcsFile->findNext($find, $caught_class_name_start + 1, null, true);
 
 			$caught_class_name = trim($phpcsFile->getTokensAsString($caught_class_name_start, ($caught_class_name_end - $caught_class_name_start)));
 
-			$ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) || $ok;
+			$ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) ? true : $ok;
 		}
 
-		$old_use = $stackPtr;
-		while (($use = $phpcsFile->findNext(T_USE, ($old_use + 1))) !== false)
+		if (!$ok)
 		{
-			$old_use = $use;
-
-			// Needs to be inside a class and must not be inside a function scope.
-			if (!$phpcsFile->hasCondition($use, [T_CLASS, T_TRAIT]) || $phpcsFile->hasCondition($use, T_FUNCTION))
-			{
-				continue;
-			}
-
-			$next = $phpcsFile->findNext(T_WHITESPACE, ($use + 1), null, true, null, true);
-			if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS)
-			{
-				continue;
-			}
-
-			$class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $use + 1, null, false, null, true);
-			$class_name_end = $phpcsFile->findNext(self::FIND, $class_name_start + 1, null, true, null, true);
-			$found_name = trim($phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start)));
-
-			$ok = $this->check($phpcsFile, $found_name, $class_name_full, $class_name_short, $use) || $ok;
+			$error = 'There must not be unused USE statements.';
+			$phpcsFile->addError($error, $stackPtr, 'Unused');
 		}
-
-		return $ok;
-	}
-
-	private function findFunctionUsage(File $phpcsFile, $stackPtr, $tokens, $name_full, $name_short)
-	{
-		$ok = false;
-		$position = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr + 1);
-		while ($position !== false)
-		{
-			$function_name_end = $position;
-			$found_start = 1 + $phpcsFile->findPrevious(
-				[T_NS_SEPARATOR, T_STRING, T_WHITESPACE],
-				$function_name_end - 1,
-				null,
-				true
-			);
-
-			$position = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $position + 1);
-			if ($found_start === null)
-			{
-				continue;
-			}
-
-			$function_name_start = $found_start;
-
-			// Trim the output.
-			while ($tokens[$function_name_start]['code'] === T_WHITESPACE && $function_name_start < $function_name_end)
-			{
-				++$function_name_start;
-			}
-
-			while ($tokens[$function_name_end]['code'] === T_WHITESPACE && $function_name_end > $function_name_start)
-			{
-				--$function_name_end;
-			}
-
-			$function_name_length = $function_name_end - $function_name_start;
-
-			// Filter out control structures, built in type constructors, etc.
-			if ($function_name_length <= 0)
-			{
-				continue;
-			}
-
-			// This doesn't seem to be valid PHP, where is the opening tag?
-			if ($found_start === 0)
-			{
-				continue;
-			}
-
-			$previous_token = $found_start - 1;
-			$filter = [
-				T_FUNCTION, // Function declaration
-				T_OBJECT_OPERATOR, // Method call
-				T_DOUBLE_COLON, // Static method call
-				T_NEW, // Constructors
-			];
-
-			// Filter out calls to methods and function declarations.
-			if (in_array($tokens[$previous_token]['code'], $filter))
-			{
-				continue;
-			}
-
-			$function_name = $phpcsFile->getTokensAsString($function_name_start, $function_name_length);
-			$ok = $this->check($phpcsFile, $function_name, $name_full, $name_short, $function_name_start) || $ok;
-		}
-
-		return $ok;
 	}
 
 	/**
 	* Check if this use statement is part of the namespace block.
 	*
-	* @param File $phpcsFile The file being scanned.
+	* @param PHP_CodeSniffer_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)
+	private function should_ignore_use(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	{
 		$tokens = $phpcsFile->getTokens();
 
@@ -348,49 +234,4 @@ class UnusedUseSniff implements Sniff
 		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;
-	}
 }

build/code_sniffer/ruleset-php-legacy.xml

@@ -17,6 +17,9 @@
  <!-- There MUST not be more than one statement per line. -->
  <rule ref="Generic.Formatting.DisallowMultipleStatements" />
 
+ <!-- Call-time pass-by-reference MUST not be used. -->
+ <rule ref="Generic.Functions.CallTimePassByReference.NotAllowed" />
+
  <!-- Filenames MUST be lowercase. -->
  <rule ref="Generic.Files.LowercasedFilename" />
 
@@ -86,7 +89,4 @@
  <!-- There MUST be one space between control structure and opening parenthesis -->
  <rule ref="./phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php" />
 
- <!-- Static qualifier MUST be placed before the visibility qualifiers. -->
- <rule ref="./phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php" />
-
 </ruleset>

build/code_sniffer/ruleset-php-strict.xml

@@ -45,8 +45,4 @@
  <!-- There MUST NOT be unused use statements. -->
  <rule ref="./phpbb/Sniffs/Namespaces/UnusedUseSniff.php" />
 
- <!-- The null type SHALL be the last union type element, other types SHALL follow alphabetical order.
-	No nullable type shortcut syntax should be used. -->
- <rule ref="./phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php" />
-
 </ruleset>

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 ..

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);

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);

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;
-}

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);

build/package.php

@@ -33,7 +33,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']);
 
@@ -76,7 +76,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)
@@ -169,7 +169,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)
@@ -214,7 +214,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/new');
 			foreach ($file as $entry)
@@ -321,7 +321,7 @@ $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";
 		}
@@ -330,7 +330,7 @@ $update_info = array(
 			$index_contents .= "\t'files'		=> array(),\n";
 		}
 
-		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";
 		}
@@ -339,7 +339,7 @@ $update_info = array(
 			$index_contents .= "\t'binary'		=> array(),\n";
 		}
 
-		if (count($file_contents['deleted']))
+		if (sizeof($file_contents['deleted']))
 		{
 			$index_contents .= "\t'deleted'		=> array(\n\t\t'" . implode("',\n\t\t'", $file_contents['deleted']) . "',\n\t),\n";
 		}
@@ -380,7 +380,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'));

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()
-	{
-	}
-}

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);

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);

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;
-}

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);

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);

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;
-}

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);

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');

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
-{
-}

build/sami-all.conf.php

@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+require __DIR__ . '/sami-checkout.conf.php';
+
+$config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../')
+	/*
+	This would be nice, but currently causes various problems that need
+	debugging.
+	->addFromTags('release-3.0.*')
+	->add('3.0.x', '3.0-next (olympus)')
+	->addFromTags('release-3.1.*')
+	->add('3.1.x', '3.1-next (ascraeus)')
+	->add('master')
+	*/
+	->add('3.0.x')
+	->add('3.1.x')
+	->add('master')
+;
+
+return new Sami\Sami($iterator, $config);

build/sami-checkout.conf.php

@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+// Prevent 'Class "acm" does not exist.' exception on removeClass().
+class PhpbbArrayStore extends Sami\Store\ArrayStore
+{
+	public function removeClass(Sami\Project $project, $name)
+	{
+		unset($this->classes[$name]);
+	}
+}
+
+$iterator = Symfony\Component\Finder\Finder::create()
+	->files()
+	->name('*.php')
+	->in(__DIR__ . '/../phpBB/')
+	->notPath('#^cache/#')
+	->notPath('#^develop/#')
+	->notPath('#^ext/#')
+	->notPath('#^vendor/#')
+	->notPath('data')
+;
+
+$config = array(
+	'theme'                => 'enhanced',
+	'title'                => 'phpBB API Documentation',
+	'build_dir'            => __DIR__.'/api/output/%version%',
+	'cache_dir'            => __DIR__.'/api/cache/%version%',
+	'default_opened_level' => 2,
+	// Do not use JsonStore. See https://github.com/fabpot/Sami/issues/79
+	'store'                => new PhpbbArrayStore,
+);
+
+return new Sami\Sami($iterator, $config);

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);
-	}
-}

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");
-}

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,
-];

git-tools/commit-msg-hook-range.sh

@@ -24,17 +24,7 @@ COMMIT_MSG_HOOK_FATAL=$(git config --bool phpbb.hooks.commit-msg.fatal 2> /dev/n
 git config phpbb.hooks.commit-msg.fatal true
 
 EXIT_STATUS=0
-
-COMMIT_HASHES=$(git rev-list --no-merges "$COMMIT_RANGE")
-
-# If any message have been returned instead of commit hashes list
-# send a non-zero exit status upstream.
-if ! [[ "$COMMIT_HASHES" =~ ^[0-9a-f]{5,40} ]]
-then
-	EXIT_STATUS=1
-fi
-
-for COMMIT_HASH in $COMMIT_HASHES
+for COMMIT_HASH in $(git rev-list --no-merges "$COMMIT_RANGE")
 do
 	echo "Inspecting commit message of commit $COMMIT_HASH"
 

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;
@@ -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;

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

git-tools/merge.php

@@ -56,7 +56,7 @@ catch (RuntimeException $e)
 function work($pull_id, $remote)
 {
 	// Get some basic data
-	$pull = get_pull('phpbb', 'phpbb', $pull_id);
+	$pull = get_pull('phpbb', 'phpbb3', $pull_id);
 
 	if (!$pull_id)
 	{
@@ -79,7 +79,7 @@ function work($pull_id, $remote)
 			run("git checkout develop-olympus");
 			run("git pull $remote develop-olympus");
 
-			add_remote($pull_user, 'phpbb');
+			add_remote($pull_user, 'phpbb3');
 			run("git fetch $pull_user");
 			run("git merge --no-ff $pull_user/$pull_branch");
 			run("phpBB/vendor/bin/phpunit");
@@ -94,7 +94,7 @@ function work($pull_id, $remote)
 			run("git checkout develop");
 			run("git pull $remote develop");
 
-			add_remote($pull_user, 'phpbb');
+			add_remote($pull_user, 'phpbb3');
 			run("git fetch $pull_user");
 			run("git merge --no-ff $pull_user/$pull_branch");
 			run("phpBB/vendor/bin/phpunit");

git-tools/setup_github_network.php

@@ -0,0 +1,292 @@
+#!/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.
+*
+*/
+
+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));
+	}
+}

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);

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"
-	}
-}

phpBB/.htaccess

@@ -1,16 +1,6 @@
 <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.
@@ -36,13 +26,6 @@ RewriteRule ^(.*)$ app.php [QSA,L]
 #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.