Merge 4372962e1d into 3cc7076513

Ticket/17517 Update eslint and lint all phpbb JS files

.github/check-js.sh

@@ -14,6 +14,6 @@ set +x
 sudo npm install -g > /dev/null
 npm ci > /dev/null
 set -x
-node_modules/eslint/bin/eslint.js "phpBB/**/*.js"
+node_modules/eslint/bin/eslint.js "phpBB/**/*.js" --ignore-pattern "phpBB/ext/"
-node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig"
+node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig" --ignore-pattern "phpBB/ext/"
 node_modules/eslint/bin/eslint.js "gulpfile.js"

eslint.config.mjs

@@ -0,0 +1,67 @@
+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,
+];

package.json

@@ -6,65 +6,6 @@
 	"directories": {
 		"doc": "docs"
 	},
-	"eslintConfig": {
-		"extends": "xo",
-		"ignorePatterns": [
-			"phpBB/adm/style/admin.js",
-			"phpBB/adm/style/ajax.js",
-			"phpBB/adm/style/permissions.js",
-			"phpBB/adm/style/tooltip.js",
-			"phpBB/assets/javascript/core.js",
-			"phpBB/assets/javascript/cropper.js",
-			"phpBB/assets/javascript/editor.js",
-			"phpBB/assets/javascript/hermite.js",
-			"phpBB/assets/javascript/installer.js",
-			"phpBB/assets/javascript/jquery-cropper.js",
-			"phpBB/assets/javascript/plupload.js",
-			"phpBB/ext/**/*.js",
-			"phpBB/styles/prosilver/template/ajax.js",
-			"phpBB/styles/prosilver/template/forum_fn.js",
-			"phpBB/**/*.min.js",
-			"phpBB/vendor/**/*.js",
-			"phpBB/vendor-ext/**/*.js",
-			"phpBB/phpbb/**/*.js",
-			"phpBB/tests/**/*.js"
-		],
-		"rules": {
-			"quotes": [
-				"error",
-				"single"
-			],
-			"comma-dangle": [
-				"error",
-				"always-multiline"
-			],
-			"block-spacing": "error",
-			"array-bracket-spacing": [
-				"error",
-				"always"
-			],
-			"multiline-comment-style": "off",
-			"computed-property-spacing": "off",
-			"space-before-function-paren": [
-				"error",
-				"never"
-			],
-			"space-in-parens": "off",
-			"capitalized-comments": "off",
-			"object-curly-spacing": [
-				"error",
-				"always"
-			],
-			"no-lonely-if": "off",
-			"unicorn/prefer-module": "off"
-		},
-		"env": {
-			"es6": true,
-			"browser": true,
-			"node": true,
-			"jquery": true
-		}
-	},
 	"browserslist": [
 		"> 1%",
 		"not ie 11",
@@ -101,8 +42,8 @@
 	"devDependencies": {
 		"autoprefixer": "^10.4.4",
 		"cssnano": "^5.1.7",
-		"eslint": "^8.13.0",
+		"eslint": "^9.28.0",
-		"eslint-config-xo": "^0.40.0",
+		"globals": "^16.2.0",
 		"gulp": "^5.0.0",
 		"gulp-concat": "^2.6.1",
 		"gulp-postcss": "^9.0.1",

phpBB/adm/style/admin.js

@@ -1,4 +1,6 @@
 /* global phpbb */
+/* eslint no-var: 0 */
+/* eslint no-unused-vars: 0 */
 
 /**
 * phpBB ACP functions
@@ -10,7 +12,7 @@
 function parse_document(container)
 {
 	var test = document.createElement('div'),
-		oldBrowser = (typeof test.style.borderRadius == 'undefined');
+		oldBrowser = (typeof test.style.borderRadius === 'undefined');
 
 	test.remove();
 
@@ -79,7 +81,7 @@ function parse_document(container)
 					dfn = cell.attr('data-dfn'),
 					text = dfn ? dfn : $.trim(cell.text());
 
-				if (text == ' ') text = '';
+				if (text === ' ') text = '';
 				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
 
 				for (i=0; i<colspan; i++) {
@@ -108,7 +110,7 @@ function parse_document(container)
 				cells = row.children('td'),
 				column = 0;
 
-			if (cells.length == 1) {
+			if (cells.length === 1) {
 				row.addClass('big-column');
 				return;
 			}
@@ -124,7 +126,7 @@ function parse_document(container)
 
 				if ((text.length && text !== '-') || cell.children().length) {
 					if (headers[column].length) {
-						cell.prepend($("<dfn>").css('display', 'none').text(headers[column]));
+						cell.prepend($('<dfn>').css('display', 'none').text(headers[column]));
 					}
 				}
 				else {
@@ -156,7 +158,7 @@ function parse_document(container)
 	*/
 	container.find('fieldset dt > span:last-child').each(function() {
 		var $this = $(this);
-		if ($this.html() == '&nbsp;') {
+		if ($this.html() === '&nbsp;') {
 			$this.addClass('responsive-hide');
 		}
 	});
@@ -194,7 +196,7 @@ function parse_document(container)
 		links.each(function() {
 			var link = $(this);
 			maxHeight = Math.max(maxHeight, Math.max(link.outerHeight(true), link.parent().outerHeight(true)));
-		})
+		});
 
 		function check() {
 			var width = $body.width(),
@@ -273,7 +275,7 @@ function parse_document(container)
 
 		// Do not underline actions icons on hover (could not be done via CSS)
 		$('.actions a:has(i.acp-icon)').mouseover(function() {
-			$(this).css("text-decoration", "none");
+			$(this).css('text-decoration', 'none');
 		});
 
 		// Live update BBCode font icon preview

phpBB/adm/style/ajax.js

@@ -1,4 +1,5 @@
 /* global phpbb, statsData */
+/* eslint no-var: 0 */
 
 (function($) {  // Avoid conflicts with other libraries
 
@@ -74,7 +75,7 @@ phpbb.prepareSendStats = function () {
 			var $sendStatisticsSuccess = $('<input />', {
 				type: 'hidden',
 				name: 'send_statistics_response',
-				value: JSON.stringify(res)
+				value: JSON.stringify(res),
 			});
 			$sendStatisticsSuccess.appendTo('p.submit-buttons');
 
@@ -90,7 +91,7 @@ phpbb.prepareSendStats = function () {
 			data: statsData,
 			success: returnHandler,
 			error: errorHandler,
-			cache: false
+			cache: false,
 		}).always(function() {
 			if ($loadingIndicator && $loadingIndicator.is(':visible')) {
 				$loadingIndicator.fadeOut(phpbb.alertTime);
@@ -176,7 +177,7 @@ phpbb.addAjaxCallback('generate_vapid_keys', () => {
 					namedCurve: 'P-256',
 				},
 				true,
-				['deriveKey', 'deriveBits']
+				[ 'deriveKey', 'deriveBits' ],
 			);
 
 			const privateKeyJwk = await crypto.subtle.exportKey('jwk', keyPair.privateKey);
@@ -187,7 +188,7 @@ phpbb.addAjaxCallback('generate_vapid_keys', () => {
 
 			return {
 				privateKey: privateKeyString,
-				publicKey: publicKeyString
+				publicKey: publicKeyString,
 			};
 		} catch (error) {
 			console.error('Error generating keys with SubtleCrypto:', error);
@@ -203,8 +204,8 @@ phpbb.addAjaxCallback('generate_vapid_keys', () => {
 		const privateKeyInput = document.querySelector('#webpush_vapid_private');
 		publicKeyInput.value = keyPair.publicKey;
 		privateKeyInput.value = keyPair.privateKey;
-	})
+	});
-})
+});
 
 /**
  * Handler for submitting permissions form in chunks
@@ -286,14 +287,14 @@ function submitPermissions() {
 					$alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/g, ''));
 					const $previousPageForm = $('<form>').attr({
 						action: $alertBoxLink.attr('href'),
-						method: 'post'
+						method: 'post',
 					});
 
 					$.each(forumIds, function(key, value) {
 						$previousPageForm.append($('<input>').attr({
 							type: 'text',
 							name: 'forum_id[]',
-							value: value
+							value: value,
 						}));
 					});
 
@@ -314,14 +315,14 @@ function submitPermissions() {
 						// exceeding the maximum length of URLs
 						const $form = $('<form>').attr({
 							action: res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/g, ''),
-							method: 'post'
+							method: 'post',
 						});
 
 						$.each(forumIds, function(key, value) {
 							$form.append($('<input>').attr({
 								type: 'text',
 								name: 'forum_id[]',
-								value: value
+								value: value,
 							}));
 						});
 
@@ -365,7 +366,7 @@ function submitPermissions() {
 				'&' + $form.children('input[type=hidden]').serialize() +
 				'&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
 			success: handlePermissionReturn,
-			error: handlePermissionReturn
+			error: handlePermissionReturn,
 		});
 	});
 }
@@ -379,7 +380,7 @@ $('[data-ajax]').each(function() {
 		phpbb.ajaxify({
 			selector: this,
 			refresh: $this.attr('data-refresh') !== undefined,
-			callback: fn
+			callback: fn,
 		});
 	}
 });
@@ -412,7 +413,7 @@ $(function() {
 			} else {
 				dateoptionInput.value = this.value;
 			}
-		})
+		});
 	}
 
 	if ($('#acp_help_phpbb')) {

phpBB/adm/style/permissions.js

@@ -1,4 +1,8 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-undef: 0 */
+/* eslint no-unused-vars: 0 */
+/* eslint no-var: 0 */
 
 /**
 * Hide and show all checkboxes

phpBB/adm/style/tooltip.js

@@ -1,4 +1,5 @@
 /* global phpbb */
+/* eslint no-var: 0 */
 
 /*
 javascript for Bubble Tooltips by Alessandro Fulciniti
@@ -30,8 +31,8 @@ phpbb.enableTooltipsSelect = function (id, headline, subId) {
 	hold = $('<span />', {
 		id:		'_tooltip_container',
 		css: {
-			position: 'absolute'
+			position: 'absolute',
-		}
+		},
 	});
 
 	$('body').append(hold);
@@ -73,8 +74,8 @@ phpbb.prepareTooltips = function ($element, headText) {
 	$title = $('<span />', {
 		class: 'top',
 		css: {
-			display:	'block'
+			display:	'block',
-		}
+		},
 	})
 		.append(document.createTextNode(headText));
 
@@ -82,15 +83,15 @@ phpbb.prepareTooltips = function ($element, headText) {
 		class: 'bottom',
 		html: text,
 		css: {
-			display: 'block'
+			display: 'block',
-		}
+		},
 	});
 
 	$tooltip = $('<span />', {
 		class: 'tooltip',
 		css: {
-			display: 'block'
+			display: 'block',
-		}
+		},
 	})
 		.append($title)
 		.append($desc);
@@ -135,12 +136,12 @@ phpbb.positionTooltip = function ($element) {
 	if ($('body').hasClass('rtl')) {
 		$('#_tooltip_container').css({
 			top: offset.top + 30,
-			left: offset.left + 255
+			left: offset.left + 255,
 		});
 	} else {
 		$('#_tooltip_container').css({
 			top: offset.top + 30,
-			left: offset.left - 205
+			left: offset.left - 205,
 		});
 	}
 };

phpBB/assets/javascript/core.js

@@ -1,4 +1,6 @@
 /* global bbfontstyle */
+/* eslint no-var: 0 */
+/* eslint no-unused-vars: 0 */
 
 var phpbb = {};
 phpbb.alertTime = 100;
@@ -13,7 +15,7 @@ var keymap = {
 	ENTER: 13,
 	ESC: 27,
 	ARROW_UP: 38,
-	ARROW_DOWN: 40
+	ARROW_DOWN: 40,
 };
 
 var $dark = $('#darkenwrapper');
@@ -363,7 +365,7 @@ phpbb.ajaxify = function(options) {
 						type: 'POST',
 						data: data + '&confirm=' + res.YES_VALUE + '&' + $('form', '#phpbb_confirm').serialize(),
 						success: returnHandler,
-						error: errorHandler
+						error: errorHandler,
 					});
 				}, false);
 			}
@@ -383,7 +385,7 @@ phpbb.ajaxify = function(options) {
 				submit = $this.find('input[type="submit"][data-clicked]');
 				data.push({
 					name: submit.attr('name'),
-					value: submit.val()
+					value: submit.val(),
 				});
 			}
 		} else if (isText) {
@@ -409,7 +411,7 @@ phpbb.ajaxify = function(options) {
 				data: data,
 				success: returnHandler,
 				error: errorHandler,
-				cache: false
+				cache: false,
 			});
 
 			request.always(function() {
@@ -445,10 +447,10 @@ phpbb.ajaxify = function(options) {
 
 phpbb.search = {
 	cache: {
-		data: []
+		data: [],
 	},
 	tpl: [],
-	container: []
+	container: [],
 };
 
 /**
@@ -609,7 +611,7 @@ phpbb.search.filter = function(data, event, sendRequest) {
 				if (cache.results[keyword]) {
 					var response = {
 						keyword: keyword,
-						results: cache.results[keyword]
+						results: cache.results[keyword],
 					};
 					phpbb.search.handleResponse(response, $this, true);
 					proceed = false;
@@ -1079,7 +1081,7 @@ phpbb.addAjaxCallback('toggle_link', function() {
 		$this.attr('href', toggleUrl);
 
 		// Toggle Icon
-		$this.children().first().toggleClass('is-active').next().toggleClass('is-active')
+		$this.children().first().toggleClass('is-active').next().toggleClass('is-active');
 	});
 });
 
@@ -1113,7 +1115,7 @@ phpbb.resizeTextArea = function($items, options) {
 		maxHeight: 500,
 		heightDiff: 200,
 		resizeCallback: function() {},
-		resetCallback: function() {}
+		resetCallback: function() {},
 	};
 
 	if (phpbb.isTouch) {
@@ -1152,7 +1154,7 @@ phpbb.resizeTextArea = function($items, options) {
 
 		var maxHeight = Math.min(
 				Math.max(windowHeight - configuration.heightDiff, configuration.minHeight),
-				configuration.maxHeight
+				configuration.maxHeight,
 			),
 			$item = $(item),
 			height = parseInt($item.innerHeight(), 10),
@@ -1434,7 +1436,7 @@ phpbb.toggleDropdown = function(event_) {
 				marginLeft: 0,
 				left: 0,
 				marginRight: 0,
-				maxWidth: (windowWidth - 4) + 'px'
+				maxWidth: (windowWidth - 4) + 'px',
 			});
 
 			var offset = $this.offset().left,
@@ -1468,7 +1470,7 @@ phpbb.toggleDropdown = function(event_) {
 				var maxOffset = Math.min(contentWidth, fullFreeSpace) + 'px';
 				options.dropdown.css({
 					width: maxOffset,
-					marginLeft: -maxOffset
+					marginLeft: -maxOffset,
 				});
 			}
 		} else {
@@ -1512,7 +1514,7 @@ phpbb.registerDropdown = function(toggle, dropdown, options) {
 			leftClass: 'dropdown-left', // Class to add to parent item when dropdown opens to left side
 			rightClass: 'dropdown-right', // Class to add to parent item when dropdown opens to right side
 			upClass: 'dropdown-up', // Class to add to parent item when dropdown opens above menu item
-			downClass: 'dropdown-down' // Class to add to parent item when dropdown opens below menu item
+			downClass: 'dropdown-down', // Class to add to parent item when dropdown opens below menu item
 		};
 	if (options) {
 		ops = $.extend(ops, options);
@@ -1716,7 +1718,7 @@ phpbb.registerPageDropdowns = function() {
 			$contents = $this.find('.dropdown'),
 			options = {
 				direction: 'auto',
-				verticalDirection: 'auto'
+				verticalDirection: 'auto',
 			},
 			data;
 
@@ -1795,7 +1797,7 @@ phpbb.getEditorTextArea = function(formName, textareaName) {
 	}
 
 	return doc.forms[formName].elements[textareaName];
-}
+};
 
 phpbb.recaptcha = {
 	button: null,
@@ -1826,7 +1828,7 @@ phpbb.recaptcha = {
 				if (phpbb.recaptcha.v3.length) {
 					grecaptcha.execute(
 						phpbb.recaptcha.v3.data('recaptcha-v3'),
-						{action: phpbb.recaptcha.v3.val()}
+						{ action: phpbb.recaptcha.v3.val() },
 					).then(function(token) {
 						// Place the token inside the form
 						phpbb.recaptcha.token.val(token);
@@ -1860,7 +1862,7 @@ phpbb.recaptcha = {
 
 			phpbb.recaptcha.form.submit();
 		}
-	}
+	},
 };
 
 // reCAPTCHA v2 doesn't accept callback functions nested inside objects

phpBB/assets/javascript/editor.js

@@ -1,4 +1,8 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-undef: 0 */
+/* eslint no-unused-vars: 0 */
+/* eslint no-var: 0 */
 
 /**
 * bbCode control by subBlue design [ www.subBlue.com ]
@@ -100,7 +104,7 @@ function bbfontstyle(bbopen, bbclose) {
 	// IE
 	else if (document.selection) {
 		var range = textarea.createTextRange();
-		range.move("character", new_pos);
+		range.move('character', new_pos);
 		range.select();
 		storeCaret(textarea);
 	}
@@ -271,7 +275,7 @@ function formatAttributeValue(str) {
 		// Return as-is if it contains none of: space, ' " \ or ]
 		return str;
 	}
-	var singleQuoted = "'" + str.replace(/[\\']/g, '\\$&') + "'",
+	var singleQuoted = '\'' + str.replace(/[\\']/g, '\\$&') + '\'',
 		doubleQuoted = '"' + str.replace(/[\\"]/g, '\\$&') + '"';
 
 	return (singleQuoted.length < doubleQuoted.length) ? singleQuoted : doubleQuoted;

phpBB/assets/javascript/installer.js

@@ -2,6 +2,9 @@
  * Installer's AJAX frontend handler
  */
 
+/* eslint no-prototype-builtins: 0 */
+/* eslint no-var: 0 */
+
 (function($) { // Avoid conflicts with other libraries
 	'use strict';
 
@@ -361,8 +364,8 @@
 			addMessage('error',
 				[ {
 					title: installLang.title,
-					description: installLang.msg
+					description: installLang.msg,
-				}]
+				} ],
 			);
 		}
 	}

phpBB/assets/javascript/plupload.js

@@ -1,4 +1,7 @@
 /* global phpbb, plupload, attachInline */
+/* eslint camelcase: 0 */
+/* eslint no-var: 0 */
+/* eslint no-unused-vars: 0 */
 
 plupload.addI18n(phpbb.plupload.i18n);
 phpbb.plupload.ids = [];
@@ -21,7 +24,7 @@ phpbb.plupload.initialize = function() {
 	// Only execute if Plupload initialized successfully.
 	phpbb.plupload.uploader.bind('Init', function() {
 		phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0];
-		let $attachRowTemplate = $('#attach-row-tpl');
+		const $attachRowTemplate = $('#attach-row-tpl');
 		$attachRowTemplate.removeClass('attach-row-tpl');
 		phpbb.plupload.rowTpl = $attachRowTemplate[0].outerHTML;
 
@@ -300,7 +303,7 @@ phpbb.plupload.deleteFile = function(row, attachId) {
 	$.ajax(phpbb.plupload.config.url, {
 		type: 'POST',
 		data: $.extend(fields, phpbb.plupload.getSerializedData()),
-		headers: phpbb.plupload.config.headers
+		headers: phpbb.plupload.config.headers,
 	})
 	.always(always)
 	.done(done);
@@ -452,7 +455,7 @@ phpbb.plupload.fileError = function(file, error) {
 		.addClass('file-error')
 		.attr({
 			'data-error-title': phpbb.plupload.lang.ERROR,
-			'data-error-message': error
+			'data-error-message': error,
 		});
 };
 
@@ -469,14 +472,14 @@ phpbb.plupload.initialize();
 plupload.addFileFilter('mime_types_max_file_size', function(types, file, callback) {
 	if (file.size !== 'undefined') {
 		$(types).each(function(i, type) {
-			let extensions = [],
+			const extensions = [],
 				extsArray = type.extensions.split(',');
 
 			$(extsArray).each(function(i, extension) {
-				/^\s*\*\s*$/.test(extension) ? extensions.push("\\.*") : extensions.push("\\." + extension.replace(new RegExp("[" + "/^$.*+?|()[]{}\\".replace(/./g, "\\$&") + "]", "g"), "\\$&"));
+				/^\s*\*\s*$/.test(extension) ? extensions.push('\\.*') : extensions.push('\\.' + extension.replace(new RegExp('[' + '/^$.*+?|()[]{}\\'.replace(/./g, '\\$&') + ']', 'g'), '\\$&'));
 			});
 
-			let regex = new RegExp("(" + extensions.join("|") + ")$", "i");
+			const regex = new RegExp('(' + extensions.join('|') + ')$', 'i');
 
 			if (regex.test(file.name)) {
 				if (type.max_file_size !== 'undefined' && type.max_file_size) {
@@ -484,7 +487,7 @@ plupload.addFileFilter('mime_types_max_file_size', function(types, file, callbac
 						phpbb.plupload.uploader.trigger('Error', {
 							code: plupload.FILE_SIZE_ERROR,
 							message: plupload.translate('File size error.'),
-							file: file
+							file: file,
 						});
 
 						callback(false);
@@ -587,9 +590,9 @@ phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
 		up.trigger('FileUploaded', file, {
 			response: JSON.stringify({
 				error: {
-					message: 'Error parsing server response.'
+					message: 'Error parsing server response.',
-				}
+				},
-			})
+			}),
 		});
 	}
 
@@ -603,9 +606,9 @@ phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
 		up.trigger('FileUploaded', file, {
 			response: JSON.stringify({
 				error: {
-					message: json.error.message
+					message: json.error.message,
-				}
+				},
-			})
+			}),
 		});
 	}
 });

phpBB/composer.json

@@ -33,11 +33,10 @@
 		"ext-sodium": "*",
 		"bantu/ini-get-wrapper": "~1.0",
 		"carlos-mg89/oauth": "^0.8.15",
-		"chita/topological_sort": "^3.0",
 		"composer/composer": "^2.0",
 		"composer/installers": "^1.9",
 		"composer/package-versions-deprecated": "^1.11",
-		"doctrine/dbal": "~3.3.6",
+		"doctrine/dbal": "^3.9",
 		"google/recaptcha": "~1.1",
 		"guzzlehttp/guzzle": " ^7.0",
 		"marc1706/fast-image-size": "^1.1",

phpBB/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5ed4369e5ba29297443f428dd3001fae",
+    "content-hash": "39f3a7c03ba85a8c7892e5c076372eb0",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",
@@ -171,49 +171,6 @@
             },
             "time": "2025-02-08T12:14:07+00:00"
         },
-        {
-            "name": "chita/topological_sort",
-            "version": "v3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/CHItA/TopologicalSort.git",
-                "reference": "9e0401c712d0c7cf012f264cc105669844d2479e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/CHItA/TopologicalSort/zipball/9e0401c712d0c7cf012f264cc105669844d2479e",
-                "reference": "9e0401c712d0c7cf012f264cc105669844d2479e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "CHItA\\TopologicalSort\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Máté Bartus",
-                    "email": "mate.bartus@gmail.com"
-                }
-            ],
-            "description": "Topological sort function",
-            "support": {
-                "issues": "https://github.com/CHItA/TopologicalSort/issues",
-                "source": "https://github.com/CHItA/TopologicalSort/tree/v3.0.1"
-            },
-            "time": "2021-01-04T21:31:59+00:00"
-        },
         {
             "name": "composer/ca-bundle",
             "version": "1.5.6",
@@ -1171,38 +1128,38 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.3.8",
+            "version": "3.9.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "f873a820227bc352d023791775a01f078a30dfe1"
+                "reference": "ec16c82f20be1a7224e65ac67144a29199f87959"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/f873a820227bc352d023791775a01f078a30dfe1",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/ec16c82f20be1a7224e65ac67144a29199f87959",
-                "reference": "f873a820227bc352d023791775a01f078a30dfe1",
+                "reference": "ec16c82f20be1a7224e65ac67144a29199f87959",
                 "shasum": ""
             },
             "require": {
                 "composer-runtime-api": "^2",
                 "doctrine/cache": "^1.11|^2.0",
                 "doctrine/deprecations": "^0.5.3|^1",
-                "doctrine/event-manager": "^1.0",
+                "doctrine/event-manager": "^1|^2",
-                "php": "^7.3 || ^8.0",
+                "php": "^7.4 || ^8.0",
                 "psr/cache": "^1|^2|^3",
                 "psr/log": "^1|^2|^3"
             },
             "require-dev": {
-                "doctrine/coding-standard": "9.0.0",
+                "doctrine/coding-standard": "12.0.0",
-                "jetbrains/phpstorm-stubs": "2022.1",
+                "fig/log-test": "^1",
-                "phpstan/phpstan": "1.8.2",
+                "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan-strict-rules": "^1.3",
+                "phpstan/phpstan": "2.1.1",
-                "phpunit/phpunit": "9.5.21",
+                "phpstan/phpstan-strict-rules": "^2",
-                "psalm/plugin-phpunit": "0.17.0",
+                "phpunit/phpunit": "9.6.22",
-                "squizlabs/php_codesniffer": "3.7.1",
+                "slevomat/coding-standard": "8.13.1",
-                "symfony/cache": "^5.2|^6.0",
+                "squizlabs/php_codesniffer": "3.10.2",
-                "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
+                "symfony/cache": "^5.4|^6.0|^7.0",
-                "vimeo/psalm": "4.24.0"
+                "symfony/console": "^4.4|^5.4|^6.0|^7.0"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -1262,7 +1219,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.3.8"
+                "source": "https://github.com/doctrine/dbal/tree/3.9.4"
             },
             "funding": [
                 {
@@ -1278,7 +1235,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-05T15:35:35+00:00"
+            "time": "2025-01-16T08:28:55+00:00"
         },
         {
             "name": "doctrine/deprecations",

phpBB/develop/adjust_avatars.php

@@ -4,6 +4,9 @@
 *
 * You should make a backup from your users table and the avatar directory in case something goes wrong
 */
+
+use phpbb\storage\provider\local;
+
 die("Please read the first lines of this script for instructions on how to enable it");
 
 set_time_limit(0);
@@ -30,7 +33,7 @@ if (!isset($config['avatar_salt']))
 	die('database not up to date');
 }
 
-if (!isset($config['storage\\avatar\\config\\path']) || $config['storage\\avatar\\config\\path'] !== 'phpbb\\storage\\provider\\local')
+if (!isset($config['storage\\attachment\\provider']) || $config['storage\\attachment\\provider'] !== local::class)
 {
 	die('use local provider');
 }

phpBB/docs/events.md

@@ -2821,6 +2821,13 @@ ucp_pm_viewmessage_custom_fields_before
 * Purpose: Add data before the custom fields on the user profile when viewing
 a private message
 
+ucp_pm_viewmessage_message_content_before
+===
+* Locations:
+    + styles/prosilver/template/ucp_pm_viewmessage.html
+* Since: 3.3.16-RC1
+* Purpose: Add content before the private message text
+
 ucp_pm_viewmessage_options_before
 ===
 * Locations:

phpBB/language/en/install.php

@@ -70,11 +70,11 @@ $lang = array_merge($lang, array(
 
 	<p>phpBB supports the following databases:</p>
 	<ul>
-		<li>MySQL 4.1.3 or above (MySQLi required)</li>
+		<li>MySQL 5.6 or above</li>
-		<li>PostgreSQL 8.3+</li>
+		<li>MariaDB 10.2.7 or above</li>
-		<li>SQLite 3.6.15+</li>
+		<li>PostgreSQL 9.4 or above</li>
-		<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
+		<li>SQLite 3.8.3 or above</li>
-		<li>MS SQL Server 2005 or above (native)</li>
+		<li>MS SQL Server 2012 or above (via ODBC or the native adapter)</li>
 		<li>Oracle</li>
 	</ul>
 
@@ -184,9 +184,9 @@ $lang = array_merge($lang, array(
 	'TABLE_PREFIX_EXPLAIN'	=> 'The prefix must start with a letter and must only contain letters, numbers and underscores.',
 
 	// Database options
-	'DB_OPTION_MSSQL_ODBC'	=> 'MSSQL Server 2000+ via ODBC',
+	'DB_OPTION_MSSQL_ODBC'	=> 'MSSQL Server via ODBC',
-	'DB_OPTION_MSSQLNATIVE'	=> 'MSSQL Server 2005+ [ Native ]',
+	'DB_OPTION_MSSQLNATIVE'	=> 'MSSQL Server [ Native ]',
-	'DB_OPTION_MYSQLI'		=> 'MySQL with MySQLi Extension',
+	'DB_OPTION_MYSQLI'		=> 'MySQL',
 	'DB_OPTION_ORACLE'		=> 'Oracle',
 	'DB_OPTION_POSTGRES'	=> 'PostgreSQL',
 	'DB_OPTION_SQLITE3'		=> 'SQLite 3',
@@ -202,10 +202,13 @@ $lang = array_merge($lang, array(
 	'INST_ERR_DB_NO_WRITABLE'		=> 'Both the database and the directory containing it must be writable.',
 	'INST_ERR_DB_NO_ERROR'			=> 'No error message given.',
 	'INST_ERR_PREFIX'				=> 'Tables with the specified prefix already exist, please choose an alternative.',
-	'INST_ERR_DB_NO_MYSQLI'			=> 'The version of MySQL installed on this machine is incompatible with the “MySQL with MySQLi Extension” option you have selected. Please try the “MySQL” option instead.',
+	'INST_ERR_DB_NO_MARIADB'		=> 'The version of MariaDB installed on this machine is too old, it must be upgraded to at least 10.2.7.',
-	'INST_ERR_DB_NO_SQLITE3'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 3.6.15.',
+	'INST_ERR_DB_NO_MYSQLI'			=> 'The version of MySQL installed on this machine is too old, it must be upgraded to at least 5.6.',
-	'INST_ERR_DB_NO_ORACLE'			=> 'The version of Oracle installed on this machine requires you to set the <var>NLS_CHARACTERSET</var> parameter to <var>UTF8</var>. Either upgrade your installation to 9.2+ or change the parameter.',
+	'INST_ERR_DB_NO_MSSQL'			=> 'The version of Microsoft SQL Server installed on this machine is too old, it must be upgraded to at least SQL Server 2012 (11.0.2100.60)',
-	'INST_ERR_DB_NO_POSTGRES'		=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
+	'INST_ERR_DB_NO_SQLITE3'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 3.8.3.',
+	'INST_ERR_DB_NO_ORACLE'			=> 'The version of Oracle installed is too old, it must be upgraded to at least 12.1.0.2.',
+	'INST_ERR_DB_NO_POSTGRES'		=> 'The version of the PostgreSQL you have installed is too old, it must be upgraded to at least 9.4.',
+	'INST_ERR_DB_NO_POSTGRES_UTF8'	=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
 	'INST_SCHEMA_FILE_NOT_WRITABLE'	=> 'The schema file is not writable',
 
 	//

phpBB/memberlist.php

@@ -1681,6 +1681,18 @@ switch ($mode)
 					$memberrow = array_merge($memberrow, $cp_row['row']);
 				}
 
+				/**
+				 * Modify the memberrow data before template variables are assigned.
+				 *
+				 * @event core.memberlist_modify_memberrow
+				 * @var int		user_id		The current user ID.
+				 * @var array	row			Array of raw user data.
+				 * @var array	memberrow	Array of member template variables.
+				 * @since 3.3.16-RC1
+				 */
+				$vars = ['user_id', 'row', 'memberrow'];
+				extract($phpbb_dispatcher->trigger_event('core.memberlist_modify_memberrow', compact($vars)));
+
 				$template->assign_block_vars('memberrow', $memberrow);
 
 				if (isset($cp_row['blockrow']) && count($cp_row['blockrow']))

phpBB/phpbb/db/doctrine/connection_parameter_factory.php

@@ -79,7 +79,7 @@ class connection_parameter_factory
 		string|null $name = null,
 		string|null $port = null) : array
 	{
-		if ($params['driver'] === 'pdo_sqlite')
+		if (in_array($params['driver'], ['pdo_sqlite', 'sqlite3']))
 		{
 			return self::enrich_parameters(
 				self::build_sqlite_parameters($params, $host, $user, $password)

phpBB/phpbb/db/driver/sqlite3.php

@@ -15,7 +15,7 @@ namespace phpbb\db\driver;
 
 /**
 * SQLite3 Database Abstraction Layer
-* Minimum Requirement: 3.6.15+
+* Minimum Requirement: 3.8.3+
 */
 class sqlite3 extends \phpbb\db\driver\driver
 {

phpBB/phpbb/db/migration/schema_generator.php

@@ -14,21 +14,17 @@
 namespace phpbb\db\migration;
 
 use Closure;
-use LogicException;
 use phpbb\config\config;
 use phpbb\db\driver\driver_interface;
 use phpbb\db\migrator;
 use phpbb\db\tools\tools_interface;
 use UnexpectedValueException;
-use CHItA\TopologicalSort\TopologicalSort;
 
 /**
 * The schema generator generates the schema based on the existing migrations
 */
 class schema_generator
 {
-	use TopologicalSort;
-
 	/** @var config */
 	protected $config;
 
@@ -103,24 +99,56 @@ class schema_generator
 			return $this->tables;
 		}
 
-		$migrations = $this->class_names;
+		$dependency_counts = [];
-		$filter = function($class_name) {
+		$dependencies = [];
-			return !migrator::is_migration($class_name);
+		$applicable_migrations = [];
-		};
+		$migration_count = 0;
-
+		foreach ($this->class_names as $class_name)
-		$edges = function($class_name) {
-			return $class_name::depends_on();
-		};
-
-		$apply_for_each = function($class_name) {
-			$this->apply_migration_to_schema($class_name);
-		};
-
-		try
 		{
-			$this->topologicalSort($migrations, $edges, true, $apply_for_each, $filter);
+			if (!migrator::is_migration($class_name))
+			{
+				continue;
 			}
-		catch (LogicException $e)
+
+			$migration_count++;
+			$migration_dependencies = $class_name::depends_on();
+			if (empty($migration_dependencies))
+			{
+				$applicable_migrations[] = $class_name;
+				continue;
+			}
+
+			$dependency_counts[$class_name] = count($migration_dependencies);
+			foreach ($migration_dependencies as $migration_dependency)
+			{
+				$dependencies[$migration_dependency][] = $class_name;
+			}
+		}
+
+		$applied_migrations = 0;
+		while (!empty($applicable_migrations))
+		{
+			$migration = array_pop($applicable_migrations);
+			$this->apply_migration_to_schema($migration);
+			++$applied_migrations;
+
+			if (!array_key_exists($migration, $dependencies))
+			{
+				continue;
+			}
+
+			$dependents = $dependencies[$migration];
+			foreach ($dependents as $dependent)
+			{
+				$dependency_counts[$dependent]--;
+				if ($dependency_counts[$dependent] === 0)
+				{
+					$applicable_migrations[] = $dependent;
+				}
+			}
+		}
+
+		if ($migration_count !== $applied_migrations)
 		{
 			throw new UnexpectedValueException(
 				"Migrations either have circular dependencies or unsatisfiable dependencies."

phpBB/phpbb/db/tools/doctrine.php

@@ -289,6 +289,12 @@ class doctrine implements tools_interface
 
 		if (count($primary_key_indexes))
 		{
+			// For PostgreSQL, drop primary index first to avoid "Dependent objects still exist" error
+			if (stripos($this->get_schema_manager()->getDatabasePlatform()->getname(), 'postgresql') !== false)
+			{
+				$this->get_schema_manager()->dropIndex('"primary"', $table_name);
+			}
+
 			$ret = $this->alter_schema(
 				function (Schema $schema) use ($table_name, $column_name): void
 				{
@@ -478,7 +484,7 @@ class doctrine implements tools_interface
 		catch (Exception $e)
 		{
 			// @todo: check if it makes sense to properly handle the exception
-			return false;
+			return [$e->getMessage()];
 		}
 	}
 

phpBB/phpbb/install/controller/helper.php

@@ -339,6 +339,14 @@ class helper
 	protected function render_language_select($selected_language = null)
 	{
 		$langs = $this->lang_helper->get_available_languages();
+
+		// The first language will be selected by default. Unless a user has consciously included
+		// other languages in the installation process, it will be British English anyway.
+		if ($selected_language === null && count($langs))
+		{
+			$selected_language = $langs[0]['iso'];
+		}
+
 		foreach ($langs as $lang)
 		{
 			$this->template->assign_block_vars('language_select_item', array(

phpBB/phpbb/install/helper/database.php

@@ -39,7 +39,7 @@ class database
 		// Note: php 5.5 alpha 2 deprecated mysql.
 		// Keep mysqli before mysql in this list.
 		'mysqli'	=> array(
-			'LABEL'			=> 'MySQL with MySQLi Extension',
+			'LABEL'			=> 'MySQL',
 			'SCHEMA'		=> 'mysql_41',
 			'MODULE'		=> 'mysqli',
 			'DOCTRINE'		=> ['pdo_mysql'],
@@ -59,7 +59,7 @@ class database
 			'2.0.x'			=> true,
 		),
 		'mssqlnative'	=> array(
-			'LABEL'			=> 'MS SQL Server 2005+ [ Native ]',
+			'LABEL'			=> 'MS SQL Server [ Native ]',
 			'SCHEMA'		=> 'mssql',
 			'MODULE'		=> 'sqlsrv',
 			'DOCTRINE'		=> ['pdo_sqlsrv'],
@@ -78,7 +78,7 @@ class database
 			'2.0.x'			=> false,
 		),
 		'postgres' => array(
-			'LABEL'			=> 'PostgreSQL 8.3+',
+			'LABEL'			=> 'PostgreSQL',
 			'SCHEMA'		=> 'postgres',
 			'MODULE'		=> 'pgsql',
 			'DOCTRINE'		=> ['pdo_pgsql'],
@@ -405,10 +405,29 @@ class database
 			}
 
 			// Check if database version is supported
+			/** @psalm-suppress UndefinedInterfaceMethod */
+			$db_server_version = $doctrine_db->getWrappedConnection()->getServerVersion();
 			switch ($dbms)
 			{
+				case 'mysqli':
+					if (stripos($db->sql_server_info(), 'mariadb') !== false && version_compare($db_server_version, '10.2.7', '<'))
+					{
+						$errors[] = array(
+							'title' => 'INST_ERR_DB_NO_MARIADB',
+						);
+					}
+					else
+					{
+						if (version_compare($db_server_version, '5.6', '<'))
+						{
+							$errors[] = array(
+								'title' => 'INST_ERR_DB_NO_MYSQLI',
+							);
+						}
+					}
+				break;
 				case 'sqlite3':
-					if (version_compare($db->sql_server_info(true), '3.6.15', '<'))
+					if (version_compare($db_server_version, '3.8.3', '<'))
 					{
 						$errors[] = array(
 							'title' => 'INST_ERR_DB_NO_SQLITE3',
@@ -416,20 +435,7 @@ class database
 					}
 				break;
 				case 'oracle':
-					$sql = "SELECT *
+					if (version_compare($db_server_version, '12.1.0.2', '<'))
-						FROM NLS_DATABASE_PARAMETERS
-						WHERE PARAMETER = 'NLS_RDBMS_VERSION'
-							OR PARAMETER = 'NLS_CHARACTERSET'";
-					$result = $db->sql_query($sql);
-
-					$stats = [];
-					while ($row = $db->sql_fetchrow($result))
-					{
-						$stats[$row['parameter']] = $row['value'];
-					}
-					$db->sql_freeresult($result);
-
-					if (version_compare($stats['NLS_RDBMS_VERSION'], '9.2', '<') && $stats['NLS_CHARACTERSET'] !== 'UTF8')
 					{
 						$errors[] = array(
 							'title' => 'INST_ERR_DB_NO_ORACLE',
@@ -437,6 +443,14 @@ class database
 					}
 				break;
 				case 'postgres':
+					if (version_compare($db_server_version, '9.4', '<'))
+					{
+						$errors[] = array(
+							'title' => 'INST_ERR_DB_NO_POSTGRES',
+						);
+					}
+					else
+					{
 						$sql = "SHOW server_encoding;";
 						$result = $db->sql_query($sql);
 						$row = $db->sql_fetchrow($result);
@@ -445,7 +459,17 @@ class database
 						if ($row['server_encoding'] !== 'UNICODE' && $row['server_encoding'] !== 'UTF8')
 						{
 							$errors[] = array(
-							'title' => 'INST_ERR_DB_NO_POSTGRES',
+								'title' => 'INST_ERR_DB_NO_POSTGRES_UTF8',
+							);
+						}
+					}
+				break;
+				case 'mssqlnative':
+				case 'mssql_odbc':
+					if (version_compare($db_server_version, '11.0.2100.60', '<'))
+					{
+						$errors[] = array(
+							'title' => 'INST_ERR_DB_NO_MSSQL',
 						);
 					}
 				break;

phpBB/phpbb/install/module/requirements/task/check_filesystem.php

@@ -145,7 +145,12 @@ class check_filesystem extends \phpbb\install\task_base
 		// Try to create file if it does not exists
 		if (!file_exists($path))
 		{
-			$fp = @fopen($path, 'w');
+			if (!is_resource($fp = @fopen($path, 'w')))
+			{
+				$exists = $writable = false;
+			}
+			else
+			{
 				@fclose($fp);
 				try
 				{
@@ -155,21 +160,14 @@ class check_filesystem extends \phpbb\install\task_base
 					$exists = true;
 				}
 				catch (\phpbb\filesystem\exception\filesystem_exception $e)
-			{
-				// Do nothing
-			}
-		}
-
-		if (file_exists($path))
-		{
-			if (!$this->filesystem->is_writable($path))
 				{
 					$writable = false;
 				}
 			}
-		else
+		}
+		else if (!$this->filesystem->is_writable($path))
 		{
-			$exists = $writable = false;
+			$writable = false;
 		}
 
 		$this->set_test_passed(($exists && $writable) || $failable);

phpBB/phpbb/language/language_file_helper.php

@@ -65,6 +65,8 @@ class language_file_helper
 			$available_languages[] = $this->get_language_data_from_json($data);
 		}
 
+		usort($available_languages, [$this, 'sort_by_local_name']);
+
 		return $available_languages;
 	}
 
@@ -123,4 +125,16 @@ class language_file_helper
 			'turnstile_lang'	=> $data['extra']['turnstile-lang'] ?? '',
 		];
 	}
+
+	/**
+	 * Sorts the languages by their name instead of iso code
+	 *
+	 * @param mixed $a First language data
+	 * @param mixed $b Second language data
+	 * @return int
+	 */
+	private static function sort_by_local_name(mixed $a, mixed $b): int
+	{
+		return $a['local_name'] <=> $b['local_name'];
+	}
 }

phpBB/phpbb/storage/controller/attachment.php

@@ -24,8 +24,11 @@ use phpbb\exception\http_exception;
 use phpbb\language\language;
 use phpbb\mimetype\extension_guesser;
 use phpbb\request\request;
+use phpbb\storage\provider\local;
 use phpbb\storage\storage;
 use phpbb\user;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\Request as symfony_request;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -35,26 +38,41 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
 /**
  * Controller for /download/attachment/{id} routes
  */
-class attachment extends controller
+class attachment
 {
 	/** @var auth */
 	protected $auth;
 
+	/** @var service */
+	protected $cache;
+
 	/** @var config */
 	protected $config;
 
 	/** @var content_visibility */
 	protected $content_visibility;
 
+	/** @var driver_interface */
+	protected $db;
+
 	/** @var dispatcher_interface */
 	protected $dispatcher;
 
+	/** @var extension_guesser */
+	protected $extension_guesser;
+
 	/** @var language */
 	protected $language;
 
 	/** @var request */
 	protected $request;
 
+	/** @var storage */
+	protected $storage;
+
+	/** @var symfony_request */
+	protected $symfony_request;
+
 	/** @var user */
 	protected $user;
 
@@ -76,14 +94,17 @@ class attachment extends controller
 	 */
 	public function __construct(auth $auth, service $cache, config $config, content_visibility $content_visibility, driver_interface $db, dispatcher_interface $dispatcher, extension_guesser $extension_guesser, language $language, request $request, storage $storage, symfony_request $symfony_request, user $user)
 	{
-		parent::__construct($cache, $db, $extension_guesser, $storage, $symfony_request);
-
 		$this->auth = $auth;
+		$this->cache = $cache;
 		$this->config = $config;
 		$this->content_visibility = $content_visibility;
+		$this->db = $db;
 		$this->dispatcher = $dispatcher;
+		$this->extension_guesser = $extension_guesser;
 		$this->language = $language;
 		$this->request = $request;
+		$this->storage = $storage;
+		$this->symfony_request = $symfony_request;
 		$this->user = $user;
 	}
 
@@ -252,21 +273,19 @@ class attachment extends controller
 		);
 		extract($this->dispatcher->trigger_event('core.send_file_to_browser_before', compact($vars)));
 
-		// TODO: The next lines should go better in prepare, also the mimetype is handled by the storage table
+		// Correct the mime type - we force application/octet-stream for all files, except images
-		// so probably can be removed
+		if ($display_cat != attachment_category::IMAGE || !str_starts_with($attachment['mimetype'], 'image'))
-
+		{
-		$response = new StreamedResponse();
+			$attachment['mimetype'] = 'application/octet-stream';
-
+		}
-		// Content-type header
-		$response->headers->set('Content-Type', $attachment['mimetype']);
 
 		// Display file types in browser and force download for others
-		if (strpos($attachment['mimetype'], 'image') !== false
+		if (str_contains($attachment['mimetype'], 'image')
-			|| strpos($attachment['mimetype'], 'audio') !== false
+			|| str_contains($attachment['mimetype'], 'audio')
-			|| strpos($attachment['mimetype'], 'video') !== false
+			|| str_contains($attachment['mimetype'], 'video')
 		)
 		{
-			$disposition = $response->headers->makeDisposition(
+			$disposition = HeaderUtils::makeDisposition(
 				ResponseHeaderBag::DISPOSITION_INLINE,
 				$attachment['real_filename'],
 				$this->filenameFallback($attachment['real_filename'])
@@ -274,20 +293,56 @@ class attachment extends controller
 		}
 		else
 		{
-			$disposition = $response->headers->makeDisposition(
+			$disposition = HeaderUtils::makeDisposition(
 				ResponseHeaderBag::DISPOSITION_ATTACHMENT,
 				$attachment['real_filename'],
 				$this->filenameFallback($attachment['real_filename'])
 			);
 		}
 
+		if ($this->config['storage\\attachment\\provider'] === local::class)
+		{
+			$response = new BinaryFileResponse($this->config['storage\\attachment\\config\\path'] . '/' . $attachment['physical_filename']);
+		}
+		else
+		{
+			$response = new StreamedResponse();
+
+			$fp = $this->storage->read($attachment['physical_filename']);
+
+			$output = fopen('php://output', 'w+b');
+
+			$response->setCallback(function () use ($fp, $output) {
+				stream_copy_to_stream($fp, $output);
+				fclose($fp);
+				fclose($output);
+				flush();
+
+				// Terminate script to avoid the execution of terminate events
+				// This avoid possible errors with db connection closed
+				exit;
+			});
+		}
+
+		// Close db connection
+		$this->file_gc();
+
+		$response->setPrivate();
+
+		// Content-type header
+		$response->headers->set('Content-Type', $attachment['mimetype']);
+
 		$response->headers->set('Content-Disposition', $disposition);
 
+		$response->isNotModified($this->symfony_request);
+
 		// Set expires header for browser cache
 		$time = new \DateTime();
 		$response->setExpires($time->modify('+1 year'));
 
-		return parent::handle($attachment['physical_filename']);
+		@set_time_limit(0);
+
+		return $response;
 	}
 
 	/**
@@ -300,16 +355,6 @@ class attachment extends controller
 		return !empty($filename) ? $filename : 'File';
 	}
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function prepare(StreamedResponse $response, string $file): void
-	{
-		$response->setPrivate();	// By default, should be private, but make sure of it
-
-		parent::prepare($response, $file);
-	}
-
 	/**
 	 * Handles authentication when downloading attachments from a post or topic
 	 *
@@ -539,4 +584,13 @@ class attachment extends controller
 
 		return $allowed;
 	}
+
+	/**
+	 * Garbage Collection
+	 */
+	protected function file_gc(): void
+	{
+		$this->cache->unload(); // Equivalent to $this->cache->get_driver()->unload();
+		$this->db->sql_close();
+	}
 }

phpBB/phpbb/template/twig/environment.php

@@ -161,6 +161,16 @@ class environment extends \Twig\Environment
 		return $this->assets_bag;
 	}
 
+	/**
+	 * Gets the event dispatcher instance
+	 *
+	 * @return dispatcher_interface
+	 */
+	public function get_phpbb_dispatcher()
+	{
+		return $this->phpbb_dispatcher;
+	}
+
 	/**
 	* Get the namespace look up order
 	*

phpBB/phpbb/template/twig/node/event.php

@@ -24,9 +24,13 @@ class event extends \Twig\Node\Node
 	/** @var \phpbb\template\twig\environment */
 	protected $environment;
 
-	public function __construct(\Twig\Node\Expression\AbstractExpression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
+	/** @var array */
+	protected $template_event_priority_array;
+
+	public function __construct(\Twig\Node\Expression\AbstractExpression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null, $template_event_priority_array = [])
 	{
 		$this->environment = $environment;
+		$this->template_event_priority_array = $template_event_priority_array;
 
 		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
 	}
@@ -42,10 +46,20 @@ class event extends \Twig\Node\Node
 
 		$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name');
 
+		$template_event_listeners = [];
+
+		// Group and sort extension template events in according to their priority (0 by default if not set)
 		foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
 		{
 			$ext_namespace = str_replace('/', '_', $ext_namespace);
+			$priority_key = intval($this->template_event_priority_array[$ext_namespace][$location] ?? 0);
+			$template_event_listeners[$priority_key][] = $ext_namespace;
+		}
+		krsort($template_event_listeners);
 
+		$template_event_listeners = array_merge(...$template_event_listeners);
+		foreach ($template_event_listeners as $ext_namespace)
+		{
 			if ($this->environment->isDebug())
 			{
 				// If debug mode is enabled, lets check for new/removed EVENT
@@ -54,8 +68,7 @@ class event extends \Twig\Node\Node
 				//  purge the cache when a new event template file is added)
 				$compiler
 					->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
-					->indent()
+					->indent();
-				;
 			}
 
 			if ($this->environment->isDebug() || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
@@ -66,16 +79,14 @@ class event extends \Twig\Node\Node
 					// We set the namespace lookup order to be this extension first, then the main path
 					->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
 					->write("\$this->env->loadTemplate(\$this->env->getTemplateClass('@{$ext_namespace}/{$location}.html'), '@{$ext_namespace}/{$location}.html')->display(\$context);\n")
-					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
+					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n");
-				;
 			}
 
 			if ($this->environment->isDebug())
 			{
 				$compiler
 					->outdent()
-					->write("}\n\n")
+					->write("}\n\n");
-				;
 			}
 		}
 	}

phpBB/phpbb/template/twig/tokenparser/event.php

@@ -18,6 +18,9 @@ class event extends \Twig\TokenParser\AbstractTokenParser
 	/** @var \phpbb\template\twig\environment */
 	protected $environment;
 
+	/** @var array */
+	protected $template_event_priority_array;
+
 	/**
 	* Constructor
 	*
@@ -26,6 +29,25 @@ class event extends \Twig\TokenParser\AbstractTokenParser
 	public function __construct(\phpbb\template\twig\environment $environment)
 	{
 		$this->environment = $environment;
+		$phpbb_dispatcher = $this->environment->get_phpbb_dispatcher();
+
+		$template_event_priority_array = [];
+		/**
+		 * Allows assigning priority to template event listeners
+		 *
+		 * @event core.twig_event_tokenparser_constructor
+		 * @var	array	template_event_priority_array	Array with template event priority assignments per extension namespace
+		 *
+		 * @since 4.0.0-a1
+		 */
+		if ($phpbb_dispatcher)
+		{
+			$vars = ['template_event_priority_array'];
+			extract($phpbb_dispatcher->trigger_event('core.twig_event_tokenparser_constructor', compact($vars)));
+		}
+
+		$this->template_event_priority_array = $template_event_priority_array;
+		unset($template_event_priority_array);
 	}
 
 	/**
@@ -42,7 +64,7 @@ class event extends \Twig\TokenParser\AbstractTokenParser
 		$stream = $this->parser->getStream();
 		$stream->expect(\Twig\Token::BLOCK_END_TYPE);
 
-		return new \phpbb\template\twig\node\event($expr, $this->environment, $token->getLine(), $this->getTag());
+		return new \phpbb\template\twig\node\event($expr, $this->environment, $token->getLine(), $this->getTag(), $this->template_event_priority_array);
 	}
 
 	/**

phpBB/phpbb/template/twig/twig.php

@@ -87,9 +87,12 @@ class twig extends \phpbb\template\base
 		$this->loader = $twig_environment->getLoader();
 
 		foreach ($extensions as $extension)
+		{
+			if (!$this->twig->hasExtension(get_class($extension)))
 			{
 				$this->twig->addExtension($extension);
 			}
+		}
 
 		// Add admin namespace
 		if ($this->path_helper->get_adm_relative_path() !== null

phpBB/styles/all/js/push_worker.js.twig

@@ -34,16 +34,17 @@ self.addEventListener('push', event => {
 		notificationVersion = parseInt(notificationData.version, 10);
 		pushToken = notificationData.token;
 	} catch {
-		self.registration.showNotification(event.data.text());
+		event.waitUntil(self.registration.showNotification(event.data.text()));
 		return;
 	}
 
+	event.waitUntil((async() => {
 		const getNotificationUrl = '{{ U_WEBPUSH_GET_NOTIFICATION }}';
 		const assetsVersion = parseInt('{{ ASSETS_VERSION }}', 10);
 
 		// Force update if versions differ
 		if (assetsVersion !== notificationVersion) {
-		self.registration.update();
+			await self.registration.update();
 		}
 
 		const formData = new FormData();
@@ -52,23 +53,29 @@ self.addEventListener('push', event => {
 		formData.append('user_id', userId.toString(10));
 		formData.append('token', pushToken);
 
-	fetch(getNotificationUrl, {
+		try {
+			const response = await fetch(getNotificationUrl, {
 				method: 'POST',
 				headers: {
 					'X-Requested-With': 'XMLHttpRequest',
 				},
 				body: formData,
-	})
+			});
-		.then(response => response.json())
+
-		.then(response => {
+			const responseData = await response.json();
-			const responseBody = response.title + '\n' + response.text;
+
+			const responseBody = responseData.title + '\n' + responseData.text;
 			const options = {
 				body: responseBody,
-				data: response,
+				data: responseData,
-				icon: response.avatar.src,
+				icon: responseData.avatar.src,
 			};
-			self.registration.showNotification(response.heading, options);
+
-		});
+			await self.registration.showNotification(responseData.heading, options);
+		} catch (e) {
+			console.error('Push error:', e);
+		}
+	})());
 });
 
 /**

phpBB/styles/prosilver/template/ajax.js

@@ -1,4 +1,6 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-var: 0 */
 
 (function($) {  // Avoid conflicts with other libraries
 
@@ -11,7 +13,7 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
 	var iconsArray = {
 		forum_unread: 'forum_read',
 		forum_unread_subforum: 'forum_read_subforum',
-		forum_unread_locked: 'forum_read_locked'
+		forum_unread_locked: 'forum_read_locked',
 	};
 
 	$('li.row').find('dl[class*="forum_unread"]').each(function() {
@@ -52,7 +54,7 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
 		global_unread: 'global_read',
 		announce_unread: 'announce_read',
 		sticky_unread: 'sticky_read',
-		topic_unread: 'topic_read'
+		topic_unread: 'topic_read',
 	};
 	var iconsState = [ '', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine' ];
 	var unreadClassSelectors;
@@ -332,7 +334,7 @@ $('[data-ajax]').each(function() {
 			selector: this,
 			refresh: $this.attr('data-refresh') !== undefined,
 			filter: filter,
-			callback: fn
+			callback: fn,
 		});
 	}
 });
@@ -367,7 +369,7 @@ $('.display_post').click(function(e) {
 $('.display_post_review').on('click', function(e) {
 	e.preventDefault();
 
-	let $displayPostLink = $(this);
+	const $displayPostLink = $(this);
 	$displayPostLink.closest('.post-ignore').removeClass('post-ignore');
 	$displayPostLink.hide();
 });

phpBB/styles/prosilver/template/forum_fn.js

@@ -1,4 +1,7 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-unused-vars: 0 */
+/* eslint no-var:0 */
 
 /**
 * phpBB forum functions
@@ -496,7 +499,7 @@ function parseDocument($container) {
 
 		// Find all headers, get contents
 		$list.prev('.topiclist').find('li.header dd').not('.mark').each(function() {
-			headers.push($("<div>").text($(this).text()).html());
+			headers.push($('<div>').text($(this).text()).html());
 			headersLength++;
 		});
 
@@ -600,7 +603,7 @@ function parseDocument($container) {
 
 				if ((text.length && text !== '-') || cell.children().length) {
 					if (headers[column].length) {
-						cell.prepend($("<dfn>").css('display', 'none').text(headers[column]));
+						cell.prepend($('<dfn>').css('display', 'none').text(headers[column]));
 					}
 				} else {
 					cell.addClass('empty');
@@ -687,7 +690,7 @@ function parseDocument($container) {
 
 		var $tabLink = $item.find('a.responsive-tab-link');
 		phpbb.registerDropdown($tabLink, $item.find('.dropdown'), {
-			visibleClass: 'activetab'
+			visibleClass: 'activetab',
 		});
 
 		check(true);

phpBB/styles/prosilver/template/ucp_pm_viewmessage.html

@@ -149,6 +149,7 @@
 				<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}"<!-- IF bcc_recipient.COLOUR --> style="color:{bcc_recipient.COLOUR};"<!-- ENDIF -->><strong>{bcc_recipient.NAME}</strong></a><!-- ENDIF -->&nbsp;<!-- END bcc_recipient --><!-- ENDIF -->
 			</p>
 
+			{% EVENT ucp_pm_viewmessage_message_content_before %}
 
 			<div class="content">{MESSAGE}</div>
 

tests/cron/wrapper_test.php

@@ -0,0 +1,131 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+require_once __DIR__ . '/../template/template_test_case.php';
+
+class phpbb_cron_wrapper_test extends phpbb_template_template_test_case
+{
+	private $task;
+	private $routing_helper;
+	private $wrapper;
+
+	protected function setUp(): void
+	{
+		global $phpbb_root_path;
+
+		$this->setup_engine([], $phpbb_root_path . 'styles/all/template');
+
+		global $phpbb_filesystem;
+
+		$phpbb_filesystem = new \phpbb\filesystem\filesystem();
+
+		$this->task = $this->createMock(\phpbb\cron\task\task::class);
+		$this->routing_helper = $this->createMock(\phpbb\routing\helper::class);
+
+		$this->wrapper = new \phpbb\cron\task\wrapper(
+			$this->task,
+			$this->routing_helper,
+			$this->template
+		);
+	}
+
+	public function test_generate_template_pagination()
+	{
+		$this->task = $this->createMock(\phpbb\cron\task\parametrized::class);
+		$this->task->expects($this->any())
+			->method('get_parameters')
+			->willReturn(['f' => '5']);
+		$this->task->expects($this->any())
+			->method('get_name')
+			->willReturn('test_task');
+		$this->routing_helper = $this->createMock(\phpbb\routing\helper::class);
+		$this->routing_helper->expects($this->any())
+			->method('route')
+			->with('phpbb_cron_run', ['cron_type' => 'test_task', 'f' => '5'])
+			->willReturn('app.php/cron/foo?f=5');
+
+		$this->wrapper = new \phpbb\cron\task\wrapper(
+			$this->task,
+			$this->routing_helper,
+			$this->template
+		);
+
+		$this->assertEquals('<img class="sr-only" aria-hidden="true" src="app.php&#x2F;cron&#x2F;foo&#x3F;f&#x3D;5" width="1" height="1" alt="">', str_replace(["\n", "\t"], '', $this->wrapper->get_html_tag()));
+	}
+
+	public function test_is_parametrized_false()
+	{
+		$this->assertFalse($this->wrapper->is_parametrized());
+	}
+
+	public function test_is_ready()
+	{
+		$this->task->method('is_runnable')->willReturn(true);
+		$this->task->method('should_run')->willReturn(true);
+
+		$this->assertTrue($this->wrapper->is_ready());
+	}
+
+	public function test_get_url_non_parametrized()
+	{
+		$this->task->method('get_name')->willReturn('test_task');
+		$this->routing_helper->expects($this->once())
+			->method('route')
+			->with('phpbb_cron_run', ['cron_type' => 'test_task'])
+			->willReturn('/cron/url');
+
+		$this->assertEquals('/cron/url', $this->wrapper->get_url());
+	}
+
+	public function test_get_html_tag()
+	{
+		$this->template = $this->createMock(\phpbb\template\template::class);
+		$this->wrapper = new \phpbb\cron\task\wrapper(
+			$this->task,
+			$this->routing_helper,
+			$this->template
+		);
+
+		$this->template->expects($this->once())
+			->method('set_filenames');
+		$this->template->expects($this->once())
+			->method('assign_var');
+		$this->template->expects($this->once())
+			->method('assign_display')
+			->willReturn('<img src="cron">');
+
+		$this->assertEquals('<img src="cron">', $this->wrapper->get_html_tag());
+	}
+
+	public function test_call_forwards_to_task()
+	{
+		$this->task = $this->getMockBuilder(\phpbb\cron\task\task::class)
+			->disableOriginalConstructor()
+			->setMethods(['get_name', 'run', 'is_runnable', 'should_run', 'some_method'])
+			->getMock();
+		$this->routing_helper = $this->createMock(\phpbb\routing\helper::class);
+
+		$this->wrapper = new \phpbb\cron\task\wrapper(
+			$this->task,
+			$this->routing_helper,
+			$this->template
+		);
+		$this->task->expects($this->once())
+			->method('some_method')
+			->with('arg1', 'arg2')
+			->willReturn('result');
+
+		$result = $this->wrapper->some_method('arg1', 'arg2');
+		$this->assertEquals('result', $result);
+	}
+}

tests/functional/extension_controller_test.php

@@ -16,8 +16,6 @@
 */
 class phpbb_functional_extension_controller_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;
 
 	protected static $fixtures = array(

tests/functional/extension_global_lang_test.php

@@ -16,8 +16,6 @@
 */
 class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;
 
 	protected static $fixtures = array(

tests/functional/extension_module_test.php

@@ -17,8 +17,6 @@ require_once __DIR__ . '/../../phpBB/includes/acp/acp_modules.php';
 */
 class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;
 
 	protected static $fixtures = array(

tests/functional/extension_permission_lang_test.php

@@ -16,8 +16,6 @@
 */
 class phpbb_functional_extension_permission_lang_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;
 
 	protected static $fixtures = array(

tests/functional/extension_template_event_order_test.php

@@ -0,0 +1,105 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_extension_template_event_order_test extends phpbb_functional_test_case
+{
+	static private $helper;
+
+	static protected $fixtures = [
+		'./',
+	];
+
+	static public function setUpBeforeClass(): void
+	{
+		parent::setUpBeforeClass();
+
+		self::$helper = new phpbb_test_case_helpers(__CLASS__);
+		self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures);
+	}
+
+	static public function tearDownAfterClass(): void
+	{
+		parent::tearDownAfterClass();
+
+		self::$helper->restore_original_ext_dir();
+	}
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->purge_cache();
+	}
+
+	protected function tearDown(): void
+	{
+		$this->uninstall_ext('foo/bar');
+		$this->uninstall_ext('foo/foo');
+
+		parent::tearDown();
+	}
+
+	protected static function setup_extensions()
+	{
+		return ['foo/bar', 'foo/foo'];
+	}
+
+	/**
+	 * Check extensions template event listener prioritizing
+	 */
+	public function test_different_template_event_priority()
+	{
+		global $phpbb_root_path;
+
+		$crawler = self::request('GET', 'index.php');
+		$quick_links_menu = $crawler->filter('ul[role="menu"]')->eq(0);
+		$quick_links_menu_nodes_count = (int) $quick_links_menu->filter('li')->count();
+		// Ensure foo/foo template event goes before foo/bar one
+		$this->assertStringContainsString('FOO_FOO_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 4)->filter('span')->text());
+		$this->assertStringContainsString('FOO_BAR_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 3)->filter('span')->text());
+
+		// Change template events order to default, put foo/bar event before foo/foo one
+		$this->disable_ext('foo/bar');
+		$this->disable_ext('foo/foo');
+
+		$this->assertTrue(copy(__DIR__ . '/fixtures/ext/foo/bar/event/template_event_order_higher.php', $phpbb_root_path . 'ext/foo/bar/event/template_event_order.php'));
+		$this->assertTrue(copy(__DIR__ . '/fixtures/ext/foo/foo/event/template_event_order_lower.php', $phpbb_root_path . 'ext/foo/foo/event/template_event_order.php'));
+
+		$this->install_ext('foo/bar');
+		$this->install_ext('foo/foo');
+
+		$crawler = self::request('GET', 'index.php');
+		$quick_links_menu = $crawler->filter('ul[role="menu"]')->eq(0);
+		$quick_links_menu_nodes_count = (int) $quick_links_menu->filter('li')->count();
+		// Ensure foo/foo template event goes before foo/bar one
+		$this->assertStringContainsString('FOO_BAR_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 4)->filter('span')->text());
+		$this->assertStringContainsString('FOO_FOO_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 3)->filter('span')->text());
+	}
+
+	/**
+	 * Check extensions template event listener equal (default - 0) priority rendering
+	 * Should render in the order of reading listener files from the filesystem
+	 */
+	public function test_same_template_event_priority()
+	{
+		global $phpbb_root_path;
+
+		$crawler = self::request('GET', 'index.php');
+		// Ensure foo/bar template event goes before foo/foo one (assuming they have been read from the filesystem in alphabetical order)
+		$this->assertStringContainsString('FOO_BAR_FORUMLIST_BODY_BEFORE', $crawler->filter('p[id*="forumlist_body_before"]')->eq(0)->text());
+		$this->assertStringContainsString('FOO_FOO_FORUMLIST_BODY_BEFORE', $crawler->filter('p[id*="forumlist_body_before"]')->eq(1)->text());
+	}
+}

tests/functional/fixtures/ext/foo/bar/config/services.yml

@@ -14,7 +14,13 @@ services:
         class: foo\bar\event\permission
         tags:
             - { name: event.listener }
+
     foo_bar.listener.user_setup:
         class: foo\bar\event\user_setup
         tags:
             - { name: event.listener }
+
+    foo_bar.listener.template_event_order:
+        class: foo\bar\event\template_event_order
+        tags:
+            - { name: event.listener }

tests/functional/fixtures/ext/foo/bar/event/template_event_order.php

@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\bar\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_bar'] = [
+			'event/navbar_header_quick_links_after' => -1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}

tests/functional/fixtures/ext/foo/bar/event/template_event_order_higher.php

@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\bar\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_bar'] = [
+			'event/navbar_header_quick_links_after' => 1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}

tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/index_body_forumlist_body_before.html

@@ -0,0 +1 @@
+<p id="foo_bar_forumlist_body_before">{{ lang('FOO_BAR_FORUMLIST_BODY_BEFORE') }}</p>

tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/navbar_header_quick_links_after.html

@@ -0,0 +1 @@
+<li><span>{{ lang('FOO_BAR_QUICK_LINK') }}</span></li>

tests/functional/fixtures/ext/foo/foo/config/services.yml

@@ -1,3 +1,8 @@
 services:
     foo_foo.controller:
         class: foo\foo\controller\controller
+
+    foo_foo.listener.template_event_order:
+        class: foo\foo\event\template_event_order
+        tags:
+            - { name: event.listener }

tests/functional/fixtures/ext/foo/foo/event/template_event_order.php

@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\foo\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_foo'] = [
+			'event/navbar_header_quick_links_after' => 1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}

tests/functional/fixtures/ext/foo/foo/event/template_event_order_lower.php

@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\foo\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_foo'] = [
+			'event/navbar_header_quick_links_after' => -1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}

tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/index_body_forumlist_body_before.html

@@ -0,0 +1 @@
+<p id="foo_foo_forumlist_body_before">{{ lang('FOO_FOO_FORUMLIST_BODY_BEFORE') }}</p>

tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/navbar_header_quick_links_after.html

@@ -0,0 +1 @@
+<li><span>{{ lang('FOO_FOO_QUICK_LINK') }}</span></li>

tests/functional/metadata_manager_test.php

@@ -16,8 +16,6 @@
 */
 class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;
 
 	protected static $fixtures = array(

tests/template/extension_test.php

@@ -15,7 +15,7 @@ require_once __DIR__ . '/template_test_case.php';
 
 class phpbb_template_extension_test extends phpbb_template_template_test_case
 {
-	protected function setup_engine(array $new_config = [])
+	protected function setup_engine(array $new_config = [], string $template_path = '')
 	{
 		global $config, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
 

tests/template/template_includecss_test.php

@@ -21,7 +21,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
 	/** @var string */
 	protected $parent_template_path;
 
-	protected function setup_engine(array $new_config = array())
+	protected function setup_engine(array $new_config = array(), string $template_path = '')
 	{
 		global $phpbb_root_path, $phpEx, $user;
 

tests/template/template_test_case.php

@@ -1,4 +1,7 @@
 <?php
+
+use phpbb\template\twig\twig;
+
 /**
 *
 * This file is part of the phpBB Forum Software package.
@@ -14,6 +17,7 @@
 class phpbb_template_template_test_case extends phpbb_test_case
 {
 	protected $lang;
+	/** @var twig */
 	protected $template;
 	protected $template_path;
 	protected $user;
@@ -68,7 +72,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
 		return $defaults;
 	}
 
-	protected function setup_engine(array $new_config = array())
+	protected function setup_engine(array $new_config = array(), string $template_path = '')
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -90,7 +94,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
 			$phpEx
 		);
 
-		$this->template_path = $this->test_path . '/templates';
+		$this->template_path = $template_path ?: $this->test_path . '/templates';
 
 		$cache_path = $phpbb_root_path . 'cache/twig';
 		$context = new \phpbb\template\context();

tests/template/template_test_case_with_tree.php

@@ -21,7 +21,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
 	/** @var string */
 	protected $parent_template_path;
 
-	protected function setup_engine(array $new_config = array())
+	protected function setup_engine(array $new_config = [], string $template_path = '')
 	{
 		global $phpbb_root_path, $phpEx, $user;
 

tests/test_framework/phpbb_functional_test_case.php

@@ -644,7 +644,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');
 
-		// Wait for extension to be fully enabled
+		// Wait for extension to be fully disabled
 		while (count($meta_refresh))
 		{
 			preg_match('#url=.+/(adm+.+)#', $meta_refresh->attr('content'), $match);