Merge 17c64bada3 into 30ee379576

[ticket/17533] Fix reverting migrations logic

.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/acp_ext_delete_data.html

@@ -11,6 +11,7 @@
 		<div class="errorbox">
 			<p><strong>{{ lang('MIGRATION_EXCEPTION_ERROR') }}</strong></p>
 			<p>{{ MIGRATOR_ERROR }}</p>
+			{% if MIGRATOR_ERROR_STACK_TRACE %}<p>{{ MIGRATOR_ERROR_STACK_TRACE|nl2br }}</p>{% endif %}
 			<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
 		</div>
 	{% elseif S_PRE_STEP %}

phpBB/adm/style/acp_ext_enable.html

@@ -11,6 +11,7 @@
 		<div class="errorbox">
 			<p><strong>{{ lang('MIGRATION_EXCEPTION_ERROR') }}</strong></p>
 			<p>{{ MIGRATOR_ERROR }}</p>
+			{% if MIGRATOR_ERROR_STACK_TRACE %}<p>{{ MIGRATOR_ERROR_STACK_TRACE|nl2br }}</p>{% endif %}
 			<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
 		</div>
 	{% elseif S_PRE_STEP %}

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/develop/create_schema_files.php

@@ -58,6 +58,7 @@ $db_doctrine = $ref->newInstanceWithoutConstructor();
 
 $factory = new \phpbb\db\tools\factory();
 $db_tools = $factory->get($db_doctrine, true);
+$db_tools->set_table_prefix($table_prefix);
 
 $tables_data = \Symfony\Component\Yaml\Yaml::parseFile($phpbb_root_path . '/config/default/container/tables.yml');
 $tables = [];

phpBB/includes/acp/acp_extensions.php

@@ -276,6 +276,11 @@ class acp_extensions
 				{
 					$this->template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($this->user));
 				}
+				catch (\Exception $e)
+				{
+					$this->template->assign_var('MIGRATOR_ERROR', $e->getMessage());
+					$this->template->assign_var('MIGRATOR_ERROR_STACK_TRACE', phpbb_filter_root_path($e->getTraceAsString()));
+				}
 
 				$this->tpl_name = 'acp_ext_enable';
 
@@ -363,6 +368,11 @@ class acp_extensions
 				{
 					$this->template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($this->user));
 				}
+				catch (\Exception $e)
+				{
+					$this->template->assign_var('MIGRATOR_ERROR', $e->getMessage());
+					$this->template->assign_var('MIGRATOR_ERROR_STACK_TRACE', phpbb_filter_root_path($e->getTraceAsString()));
+				}
 
 				$this->tpl_name = 'acp_ext_delete_data';
 

phpBB/includes/functions.php

@@ -2716,7 +2716,7 @@ function get_backtrace()
 		// Only show function arguments for include etc.
 		// Other parameters may contain sensible information
 		$argument = '';
-		if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once')))
+		if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once', 'try_apply')))
 		{
 			$argument = htmlspecialchars(phpbb_filter_root_path($trace['args'][0]), ENT_COMPAT);
 		}

phpBB/install/startup.php

@@ -107,7 +107,7 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline): bool
 				{
 					/** @var \phpbb\install\helper\iohandler\iohandler_interface $iohandler */
 					$iohandler = $phpbb_installer_container->get('installer.helper.iohandler');
-					$iohandler->add_error_message($msg);
+					$iohandler->add_error_message($msg, get_backtrace());
 					$iohandler->send_response(true);
 					exit();
 				}

phpBB/language/en/common.php

@@ -865,6 +865,7 @@ $lang = array_merge($lang, array(
 	'UNREAD_MESSAGES'		=> 'Unread messages',
 	'UNREAD_POST'			=> 'Unread post',
 	'UNREAD_POSTS'			=> 'Unread posts',
+	'UNRECOGNISED_PAGE'		=> 'Unrecognised page',
 	'UNWATCH_FORUM_CONFIRM'		=> 'Are you sure you wish to unsubscribe from this forum?',
 	'UNWATCH_FORUM_DETAILED'	=> 'Are you sure you wish to unsubscribe from the forum “%s”?',
 	'UNWATCH_TOPIC_CONFIRM'		=> 'Are you sure you wish to unsubscribe from this topic?',

phpBB/phpbb/db/doctrine/table_helper.php

@@ -13,6 +13,7 @@
 namespace phpbb\db\doctrine;
 
 use InvalidArgumentException;
+use phpbb\db\tools\doctrine as doctrine_dbtools;
 
 class table_helper
 {
@@ -123,6 +124,54 @@ class table_helper
 		}
 	}
 
+	/**
+	 * Maps table names to their short names for the purpose of prefixing tables' index names.
+	 *
+	 * @param array $table_names	Table names with prefix to add to the map.
+	 * @param string $table_prefix	Tables prefix.
+	 *
+	 * @return array<string, string>	Pairs of table names and their short name representations.
+	 * @psalm-return array{string, string}
+	 */
+	public static function map_short_table_names(array $table_names = [], string $table_prefix = ''): array
+	{
+		$short_table_names_map = [];
+		foreach ($table_names as $table_name)
+		{
+			$short_table_names_map[$table_name] = self::generate_shortname(doctrine_dbtools::remove_prefix($table_name, $table_prefix));
+		}
+
+		return $short_table_names_map;
+	}
+
+	/**
+	 * Generates short table names for the purpose of prefixing tables' index names.
+	 *
+	 * @param string $table_name	Table name without prefix to generate its short name.
+	 *
+	 * @return string	Short table name.
+	 */
+	public static function generate_shortname(string $table_name = ''): string
+	{
+		// Only shorten actually long names
+		if (strlen($table_name) > 4)
+		{
+			// Remove vowels
+			$table_name = preg_replace('/([^aeiou_])([aeiou]+)/i', '$1', $table_name);
+
+			// Remove underscores
+			$table_name = str_replace('_', '', $table_name);
+
+			// Remove repeated consonants and their combinations (like 'ss', 'flfl' and similar)
+			$table_name = preg_replace('/(.+)\\1+/i', '$1', $table_name);
+
+			// Restrict short name length to 10 chars
+			$table_name = substr($table_name, 0, 10);
+		}
+
+		return $table_name;
+	}
+
 	/**
 	 * Private constructor. Call methods of table_helper statically.
 	 */

phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php

@@ -0,0 +1,146 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+use phpbb\db\doctrine\table_helper;
+use phpbb\db\tools\doctrine as doctrine_dbtools;
+
+class rename_duplicated_index_names extends migration
+{
+	/**
+	 * @var array
+	 */
+	protected static $table_keys;
+
+	/**
+	 * @var array
+	 */
+	protected static $rename_index;
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v400\storage_track_index',
+		];
+	}
+
+	public function update_schema()
+	{
+		if (!isset(self::$rename_index))
+		{
+			if (!isset(self::$table_keys))
+			{
+				$this->get_tables_index_names();
+			}
+			$short_table_names = table_helper::map_short_table_names(array_keys(self::$table_keys), $this->table_prefix);
+
+			foreach (self::$table_keys as $table_name => $key_names)
+			{
+				$prefixless_table_name = doctrine_dbtools::remove_prefix($table_name, $this->table_prefix);
+				foreach ($key_names as $key_name)
+				{
+					// If 'old' key name is already new format, do not rename it
+					if (str_starts_with($key_name, $short_table_names[$table_name]))
+					{
+						continue;
+					}
+
+					// If 'old' key name is prefixed by its table name with and/or without table name common prefix
+					// (f.e. 'phpbb_log_log_time'), remove it to prefix with the relevant table's short name
+					$cleaned_key_name = $key_name;
+					foreach ([$table_name, $prefixless_table_name] as $prefix)
+					{
+						$cleaned_key_name = doctrine_dbtools::remove_prefix($cleaned_key_name, $prefix);
+					}
+					$key_name_new = $short_table_names[$table_name] . '_' . $cleaned_key_name;
+
+					self::$rename_index[$table_name][$key_name] = $key_name_new;
+				}
+			}
+		}
+
+		return [
+			'rename_index' => self::$rename_index,
+		];
+	}
+
+	public function revert_schema()
+	{
+		$schema = $this->update_schema();
+		array_walk($schema['rename_index'], function (&$index_data, $table_name) {
+		  $index_data = array_flip($index_data);
+		});
+
+		return $schema;
+	}
+
+	protected function get_schema()
+	{
+		$self_classname = '\\' . str_replace('/', '\\', self::class);
+		$finder_factory = new \phpbb\finder\factory(null, false, $this->phpbb_root_path, $this->php_ext);
+		$finder = $finder_factory->get();
+		$migrator_classes = $finder->core_path('phpbb/db/migration/data/')->get_classes();
+		$self_class_index = array_search($self_classname, $migrator_classes);
+		unset($migrator_classes[$self_class_index]);
+
+		$schema_generator = new \phpbb\db\migration\schema_generator(
+			$migrator_classes,
+			$this->config,
+			$this->db,
+			$this->db_tools,
+			$this->phpbb_root_path,
+			$this->php_ext,
+			$this->table_prefix,
+			$this->tables
+		);
+
+		return $schema_generator->get_schema();
+	}
+
+	public function get_tables_index_names()
+	{
+		$schema_manager = $this->db_tools->get_connection()->createSchemaManager();
+		$table_names = $schema_manager->listTableNames();
+
+		if (!empty($table_names))
+		{
+			foreach ($table_names as $table_name)
+			{
+				$indices = $schema_manager->listTableIndexes($table_name);
+				$indices = array_keys(array_filter($indices,
+					function (\Doctrine\DBAL\Schema\Index $index)
+					{
+						return !$index->isPrimary();
+					})
+				);
+
+				if (!empty($indices))
+				{
+					self::$table_keys[$table_name] = $indices;
+				}
+			}
+		}
+		else
+		{
+			foreach ($this->get_schema() as $table_name => $table_data)
+			{
+				if (isset($table_data['KEYS']))
+				{
+					self::$table_keys[$table_name] = array_keys($table_data['KEYS']);
+				}
+			}
+		}
+	}
+}

phpBB/phpbb/db/migration/helper.php

@@ -42,6 +42,7 @@ class helper
 			'add_primary_keys'	=> 2, // perform_schema_changes only uses one level, but second is in the function
 			'add_unique_index'	=> 2,
 			'add_index'			=> 2,
+			'rename_index'		=> 1,
 		);
 
 		foreach ($nested_level as $change_type => $data_depth)

phpBB/phpbb/db/migration/migration.php

@@ -72,6 +72,8 @@ abstract class migration implements migration_interface
 		$this->php_ext = $php_ext;
 
 		$this->errors = array();
+
+		$this->db_tools->set_table_prefix($this->table_prefix);
 	}
 
 	/**

phpBB/phpbb/db/migration/schema_generator.php

@@ -187,6 +187,7 @@ class schema_generator
 			'add_index'			=> 'KEYS',
 			'add_unique_index'	=> 'KEYS',
 			'drop_keys'			=> 'KEYS',
+			'rename_index'		=> 'KEYS',
 		];
 
 		$schema_changes = $migration->update_schema();
@@ -206,6 +207,7 @@ class schema_generator
 			{
 				case 'add':
 				case 'change':
+				case 'rename':
 					$action = function(&$value, $changes, $value_transform = null) {
 						self::set_all($value, $changes, $value_transform);
 					};
@@ -347,7 +349,7 @@ class schema_generator
 	 */
 	private static function get_value_transform(string $change_type, string $schema_type) : Closure|null
 	{
-		if ($change_type !== 'add')
+		if (!in_array($change_type, ['add', 'rename']))
 		{
 			return null;
 		}
@@ -355,6 +357,23 @@ class schema_generator
 		switch ($schema_type)
 		{
 			case 'index':
+				if ($change_type == 'rename')
+				{
+					return function(&$value, $key, $change) {
+						if (isset($value[$key]))
+						{
+							$data_backup = $value[$key];
+							unset($value[$key]);
+							$value[$change] = $data_backup;
+							unset($data_backup);
+						}
+						else
+						{
+							return null;
+						}
+					};
+				}
+
 				return function(&$value, $key, $change) {
 					$value[$key] = ['INDEX', $change];
 				};

phpBB/phpbb/db/migrator.php

@@ -575,7 +575,7 @@ class migrator
 				$state['migration_data_state']['_total_time'] : 0.0;
 			$elapsed_time = microtime(true);
 
-			$steps = array_merge($this->helper->reverse_update_data($migration->update_data()), $migration->revert_data());
+			$steps = $migration->revert_data() ?: $this->helper->reverse_update_data($migration->update_data());
 			$result = $this->process_data_step($steps, $state['migration_data_state']);
 
 			$elapsed_time = microtime(true) - $elapsed_time;

phpBB/phpbb/db/tools/doctrine.php

@@ -49,6 +49,11 @@ class doctrine implements tools_interface
 	 */
 	private $return_statements;
 
+	/**
+	 * @var string
+	 */
+	private $table_prefix;
+
 	/**
 	 * Database tools constructors.
 	 *
@@ -61,6 +66,14 @@ class doctrine implements tools_interface
 		$this->connection = $connection;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_connection(): Connection
+	{
+		return $this->connection;
+	}
+
 	/**
 	 * @return AbstractSchemaManager
 	 *
@@ -86,6 +99,14 @@ class doctrine implements tools_interface
 		return $this->get_schema_manager()->createSchema();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function set_table_prefix($table_prefix): void
+	{
+		$this->table_prefix = $table_prefix;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -330,6 +351,19 @@ class doctrine implements tools_interface
 		);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function sql_rename_index(string $table_name, string $index_name_old, string $index_name_new)
+	{
+		return $this->alter_schema(
+			function (Schema $schema) use ($table_name, $index_name_old, $index_name_new): void
+			{
+				$this->schema_rename_index($schema, $table_name, $index_name_old, $index_name_new);
+			}
+		);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -384,6 +418,23 @@ class doctrine implements tools_interface
 		}
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public static function add_prefix(string $name, string $prefix): string
+	{
+		return str_ends_with($prefix, '_') ? $prefix . $name : $prefix . '_' . $name;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public static function remove_prefix(string $name, string $prefix = ''): string
+	{
+		$prefix = str_ends_with($prefix, '_') ? $prefix : $prefix . '_';
+		return $prefix && str_starts_with($name, $prefix) ? substr($name, strlen($prefix)) : $name;
+	}
+
 	/**
 	 * Returns an array of indices for either unique and primary keys, or simple indices.
 	 *
@@ -457,8 +508,6 @@ class doctrine implements tools_interface
 	 * @return bool|string[]
 	 */
 	protected function alter_schema(callable $callback)
-	{
-		try
 	{
 		$current_schema = $this->get_schema();
 		$new_schema = clone $current_schema;
@@ -481,12 +530,6 @@ class doctrine implements tools_interface
 
 		return true;
 	}
-		catch (Exception $e)
-		{
-			// @todo: check if it makes sense to properly handle the exception
-			return [$e->getMessage()];
-		}
-	}
 
 	/**
 	 * Alter table.
@@ -553,6 +596,11 @@ class doctrine implements tools_interface
 				'use_key' => true,
 				'per_table' => true,
 			],
+			'rename_index' => [
+				'method' => 'schema_rename_index',
+				'use_key' => true,
+				'per_table' => true,
+			],
 		];
 
 		foreach ($mapping as $action => $params)
@@ -610,6 +658,7 @@ class doctrine implements tools_interface
 		}
 
 		$table = $schema->createTable($table_name);
+		$short_table_name = table_helper::generate_shortname(self::remove_prefix($table_name, $this->table_prefix));
 		$dbms_name = $this->get_schema_manager()->getDatabasePlatform()->getName();
 
 		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
@@ -635,6 +684,7 @@ class doctrine implements tools_interface
 			foreach ($table_data['KEYS'] as $key_name => $key_data)
 			{
 				$columns = (is_array($key_data[1])) ? $key_data[1] : [$key_data[1]];
+				$key_name = !str_starts_with($key_name, $short_table_name) ? self::add_prefix($key_name, $short_table_name) : $key_name;
 
 				// Supports key columns defined with there length
 				$columns = array_map(function (string $column)
@@ -667,6 +717,8 @@ class doctrine implements tools_interface
 	}
 
 	/**
+	 * Removes a table
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param bool   $safe_check
@@ -684,6 +736,8 @@ class doctrine implements tools_interface
 	}
 
 	/**
+	 * Adds column to a table
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $column_name
@@ -714,6 +768,8 @@ class doctrine implements tools_interface
 	}
 
 	/**
+	 * Alters column properties
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $column_name
@@ -744,6 +800,8 @@ class doctrine implements tools_interface
 	}
 
 	/**
+	 * Alters column properties or adds a column
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $column_name
@@ -766,6 +824,8 @@ class doctrine implements tools_interface
 	}
 
 	/**
+	 * Removes a column in a table
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $column_name
@@ -818,6 +878,8 @@ class doctrine implements tools_interface
 	}
 
 	/**
+	 * Creates non-unique index for a table
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $index_name
@@ -830,6 +892,8 @@ class doctrine implements tools_interface
 	{
 		$columns = (is_array($column)) ? $column : [$column];
 		$table = $schema->getTable($table_name);
+		$short_table_name = table_helper::generate_shortname(self::remove_prefix($table_name, $this->table_prefix));
+		$index_name = !str_starts_with($index_name, $short_table_name) ? self::add_prefix($index_name, $short_table_name) : $index_name;
 
 		if ($safe_check && $table->hasIndex($index_name))
 		{
@@ -840,6 +904,38 @@ class doctrine implements tools_interface
 	}
 
 	/**
+	 * Renames table index
+	 *
+	 * @param Schema $schema
+	 * @param string $table_name
+	 * @param string $index_name_old
+	 * @param string $index_name_new
+	 * @param bool   $safe_check
+	 *
+	 * @throws SchemaException
+	 */
+	protected function schema_rename_index(Schema $schema, string $table_name, string $index_name_old, string $index_name_new, bool $safe_check = false): void
+	{
+		$table = $schema->getTable($table_name);
+		$short_table_name = table_helper::generate_shortname(self::remove_prefix($table_name, $this->table_prefix));
+
+		if (!$table->hasIndex($index_name_old))
+		{
+			$index_name_old = !str_starts_with($index_name_old, $short_table_name) ? self::add_prefix($index_name_old, $short_table_name) : self::remove_prefix($index_name_old, $short_table_name);
+		}
+		$index_name_new = !str_starts_with($index_name_new, $short_table_name) ? self::add_prefix($index_name_new, $short_table_name) : $index_name_new;
+
+		if ($safe_check && !$table->hasIndex($index_name_old))
+		{
+			return;
+		}
+
+		$table->renameIndex($index_name_old, $index_name_new);
+	}
+
+	/**
+	 * Creates unique (non-primary) index for a table
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $index_name
@@ -852,6 +948,8 @@ class doctrine implements tools_interface
 	{
 		$columns = (is_array($column)) ? $column : [$column];
 		$table = $schema->getTable($table_name);
+		$short_table_name = table_helper::generate_shortname(self::remove_prefix($table_name, $this->table_prefix));
+		$index_name = !str_starts_with($index_name, $short_table_name) ? self::add_prefix($index_name, $short_table_name) : $index_name;
 
 		if ($safe_check && $table->hasIndex($index_name))
 		{
@@ -862,6 +960,8 @@ class doctrine implements tools_interface
 	}
 
 	/**
+	 * Removes table index
+	 *
 	 * @param Schema $schema
 	 * @param string $table_name
 	 * @param string $index_name
@@ -872,6 +972,12 @@ class doctrine implements tools_interface
 	protected function schema_index_drop(Schema $schema, string $table_name, string $index_name, bool $safe_check = false): void
 	{
 		$table = $schema->getTable($table_name);
+		$short_table_name = table_helper::generate_shortname(self::remove_prefix($table_name, $this->table_prefix));
+
+		if (!$table->hasIndex($index_name))
+		{
+			$index_name = !str_starts_with($index_name, $short_table_name) ? self::add_prefix($index_name, $short_table_name) : self::remove_prefix($index_name, $short_table_name);
+		}
 
 		if ($safe_check && !$table->hasIndex($index_name))
 		{
@@ -882,6 +988,8 @@ class doctrine implements tools_interface
 	}
 
 	/**
+	 * Creates primary key for a table
+	 *
 	 * @param        $column
 	 * @param Schema $schema
 	 * @param string $table_name

phpBB/phpbb/db/tools/tools_interface.php

@@ -165,6 +165,17 @@ interface tools_interface
 	 */
 	public function sql_create_index(string $table_name, string $index_name, $column);
 
+	/**
+	 * Rename index
+	 *
+	 * @param string $table_name     Table to modify
+	 * @param string $index_name_old Name of the index to rename
+	 * @param string $index_name_new New name of the index being renamed
+	 *
+	 * @return bool|string[]    True if the statements have been executed
+	 */
+	public function sql_rename_index(string $table_name, string $index_name_old, string $index_name_new);
+
 	/**
 	 * Drop Index
 	 *
@@ -215,4 +226,41 @@ interface tools_interface
 	 * @return void
 	 */
 	public function sql_truncate_table(string $table_name): void;
+
+	/**
+	 * Gets current Doctrine DBAL connection
+	 *
+	 * @return \Doctrine\DBAL\Connection
+	 */
+	public function get_connection(): \Doctrine\DBAL\Connection;
+
+	/**
+	 * Adds prefix to a string if needed
+	 *
+	 * @param string	$name		Table name with tables prefix
+	 * @param string	$prefix		Prefix to add
+	 *
+	 * @return string	Prefixed name
+	 */
+	public static function add_prefix(string $name, string $prefix): string;
+
+	/**
+	 * Removes prefix from string if exists. If prefix is empty,
+	 * the first part of the string ending with underscore will be removed.
+	 *
+	 * @param string	$name		String to remove the prefix from
+	 * @param string	$prefix		Prefix to remove
+	 *
+	 * @return string	Prefixless string
+	 */
+	public static function remove_prefix(string $name, string $prefix = ''): string;
+
+	/**
+	 * Sets table prefix
+	 *
+	 * @param string	$table_prefix	String to test vs prefix
+	 *
+	 * @return void
+	 */
+	public function set_table_prefix(string $table_prefix): void;
 }

phpBB/phpbb/install/helper/database.php

@@ -393,6 +393,7 @@ class database
 			$doctrine_db = connection_factory::get_connection_from_params($dbms, $dbhost, $dbuser, $dbpass, $dbname, $dbport);
 			$db_tools_factory = new \phpbb\db\tools\factory();
 			$db_tools = $db_tools_factory->get($doctrine_db);
+			$db_tools->set_table_prefix($table_prefix);
 			$tables = $db_tools->sql_list_tables();
 			$tables = array_map('strtolower', $tables);
 			$table_intersect = array_intersect($tables, $table_ary);

phpBB/phpbb/install/installer.php

@@ -280,7 +280,9 @@ class installer
 		}
 		catch (\Exception $e)
 		{
-			$this->iohandler->add_error_message($e->getMessage());
+			$stack_trace = phpbb_filter_root_path(str_replace("\n", '<br>', $e->getTraceAsString()));
+			$message = $e->getMessage();
+			$this->iohandler->add_error_message($message, $stack_trace);
 			$this->iohandler->send_response(true);
 			$fail_cleanup = true;
 		}

phpBB/phpbb/install/module/install_database/task/add_tables.php

@@ -98,6 +98,7 @@ class add_tables extends task_base
 		$this->schema_file_path	= $phpbb_root_path . 'store/schema.json';
 		$this->table_prefix		= $this->config->get('table_prefix');
 		$this->change_prefix	= $this->config->get('change_table_prefix', true);
+		$this->db_tools->set_table_prefix($this->table_prefix);
 
 		parent::__construct(true);
 	}

phpBB/phpbb/install/module/install_database/task/create_schema_file.php

@@ -145,6 +145,7 @@ class create_schema_file extends \phpbb\install\task_base
 			$migrator_classes = $finder->core_path('phpbb/db/migration/data/')->get_classes();
 			$factory = new \phpbb\db\tools\factory();
 			$db_tools = $factory->get($this->db_doctrine, true);
+			$db_tools->set_table_prefix($table_prefix);
 			$tables_data = \Symfony\Component\Yaml\Yaml::parseFile($this->phpbb_root_path . '/config/default/container/tables.yml');
 			$tables = [];
 			foreach ($tables_data['parameters'] as $parameter => $table)

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/viewonline.php

@@ -268,6 +268,57 @@ foreach ($session_data_rowset as $row)
 		case 'viewtopic':
 			$forum_id = $row['session_forum_id'];
 
+			if (!$forum_id)
+			{
+				$array_match_index = 5;
+				// find the forum_id from the page URI
+				$matches = array();
+
+				$pattern = '#(viewtopic|posting)\.' . $phpEx . '((\?|&)\w+=\w+)*(\?|&)';
+				preg_match($pattern . 'f=(\d+)#', $row['session_page'], $matches);
+				if ($matches[$array_match_index])
+				{
+					$forum_id = (int) $matches[$array_match_index];
+				}
+				else
+				{
+					preg_match($pattern . 't=(\d+)#', $row['session_page'], $matches);
+					if ($matches[$array_match_index])
+					{
+						$topic_id = $matches[$array_match_index];
+
+						$sql = 'SELECT forum_id
+							FROM ' . TOPICS_TABLE . "
+							WHERE topic_id = $topic_id";
+						$result1 = $db->sql_query($sql);
+						$forum_id = (int) $db->sql_fetchfield('forum_id');
+						$db->sql_freeresult($result1);
+					}
+					else
+					{
+						preg_match($pattern . 'p=(\d+)#', $row['session_page'], $matches);
+						if ($matches[$array_match_index])
+						{
+							$post_id = $matches[$array_match_index];
+
+							$topic_forum = array();
+
+							$sql = 'SELECT t.forum_id
+								FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p
+								WHERE p.post_id = ' . $post_id . '
+								AND t.topic_id = p.topic_id';
+							$result1 = $db->sql_query($sql);
+							$forum_id = (int) $db->sql_fetchfield('forum_id');
+							$db->sql_freeresult($result1);
+						}
+						else
+						{
+							$forum_id = 0;
+						}
+					}
+				}
+			}
+
 			if ($forum_id && $auth->acl_get('f_list', $forum_id))
 			{
 				$location = '';
@@ -309,7 +360,7 @@ foreach ($session_data_rowset as $row)
 			}
 			else
 			{
-				$location = $user->lang['INDEX'];
+				$location = $user->lang['UNRECOGNISED_PAGE'];
 				$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
 			}
 		break;
@@ -382,17 +433,23 @@ foreach ($session_data_rowset as $row)
 		break;
 
 		default:
-			$location = $user->lang['INDEX'];
-			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
-
 			if ($row['session_page'] === 'app.' . $phpEx . '/help/faq' ||
 				$row['session_page'] === 'app.' . $phpEx . '/help/bbcode')
 			{
 				$location = $user->lang['VIEWING_FAQ'];
 				$location_url = $controller_helper->route('phpbb_help_faq_controller');
 			}
+			else
+			{
+				$location = $user->lang['UNRECOGNISED_PAGE'];
+				$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
+			}
 		break;
 	}
+	if ($auth->acl_get('a_'))
+	{
+		$location .= nl2br("\n" . substr($row['session_page'], 0, 99));
+	}
 
 	/**
 	* Overwrite the location's name and URL, which are displayed in the list

tests/dbal/auto_increment_test.php

@@ -28,10 +28,12 @@ class phpbb_dbal_auto_increment_test extends phpbb_database_test_case
 	{
 		parent::setUp();
 
+		$table_prefix = 'prefix_';
 		$this->db = $this->new_dbal();
 		$this->db_doctrine = $this->new_doctrine_dbal();
 		$factory = new \phpbb\db\tools\factory();
 		$this->tools = $factory->get($this->db_doctrine);
+		$this->tools->set_table_prefix($table_prefix);
 
 		$this->table_data = array(
 			'COLUMNS'		=> array(

tests/dbal/db_tools_test.php

@@ -35,12 +35,15 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 
 	protected function setUp(): void
 	{
+
 		parent::setUp();
 
+		$table_prefix = 'prefix_';
 		$this->db = $this->new_dbal();
 		$this->doctrine_db = $this->new_doctrine_dbal();
 		$factory = new \phpbb\db\tools\factory();
 		$this->tools = $factory->get($this->doctrine_db);
+		$this->tools->set_table_prefix($table_prefix);
 
 		$this->table_data = array(
 			'COLUMNS'		=> array(
@@ -232,23 +235,25 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 
 	public function test_column_change_with_index()
 	{
+		$short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname('table_name');
+
 		// Create column
 		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012'));
 		$this->assertTrue($this->tools->sql_column_add('prefix_table_name', 'c_bug_12012', array('DECIMAL', 0)));
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012'));
 
 		// Create index over the column
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012'));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012'));
 		$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'i_bug_12012', array('c_bug_12012', 'c_bool')));
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012'));
 
 		// Change type from int to string
 		$this->assertTrue($this->tools->sql_column_change('prefix_table_name', 'c_bug_12012', array('VCHAR:100', '')));
 
 		// Remove the index
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012'));
 		$this->assertTrue($this->tools->sql_index_drop('prefix_table_name', 'i_bug_12012'));
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012'));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012'));
 
 		// Remove the column
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012'));
@@ -301,19 +306,21 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 
 	public function test_column_remove_with_index()
 	{
+		$short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname('table_name');
+
 		// Create column
 		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2'));
 		$this->assertTrue($this->tools->sql_column_add('prefix_table_name', 'c_bug_12012_2', array('UINT', 4)));
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2'));
 
 		// Create index over the column
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_2'));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_2'));
 		$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'bug_12012_2', array('c_bug_12012_2', 'c_bool')));
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_2'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_2'));
 
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_3'));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_3'));
 		$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'bug_12012_3', array('c_bug_12012_2')));
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_3'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_3'));
 
 		// Remove the column
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2'));
@@ -443,24 +450,24 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 
 	public function test_index_exists()
 	{
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_simple'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_i_simple'));
 	}
 
 	public function test_unique_index_exists()
 	{
-		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', 'i_uniq'));
+		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_i_uniq'));
 	}
 
 	public function test_create_index_against_index_exists()
 	{
 		$this->tools->sql_create_index('prefix_table_name', 'fookey', array('c_timestamp', 'c_decimal'));
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'fookey'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_fookey'));
 	}
 
 	public function test_create_unique_index_against_unique_index_exists()
 	{
 		$this->tools->sql_create_unique_index('prefix_table_name', 'i_uniq_ts_id', array('c_timestamp', 'c_id'));
-		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', 'i_uniq_ts_id'));
+		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_i_uniq_ts_id'));
 	}
 
 	public function test_create_int_default_null()
@@ -493,27 +500,28 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 
 		$table_suffix = str_repeat('a', 25 - strlen($table_prefix));
 		$table_name = $table_prefix . $table_suffix;
+		$short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname($table_suffix);
 
 		$this->tools->sql_create_table($table_name, $this->table_data);
 
 		// Index name and table suffix and table prefix have > maximum index length chars in total.
 		// Index name and table suffix have <= maximum index length chars in total.
 		$long_index_name = str_repeat('i', $max_index_length - strlen($table_suffix));
-		$this->assertFalse($this->tools->sql_index_exists($table_name, $long_index_name));
+		$this->assertFalse($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $long_index_name));
 		$this->assertTrue($this->tools->sql_create_index($table_name, $long_index_name, array('c_timestamp')));
-		$this->assertTrue($this->tools->sql_index_exists($table_name, $long_index_name));
+		$this->assertTrue($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $long_index_name));
 
 		// Index name and table suffix have > maximum index length chars in total.
 		$very_long_index_name = str_repeat('i', $max_index_length);
-		$this->assertFalse($this->tools->sql_index_exists($table_name, $very_long_index_name));
+		$this->assertFalse($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $very_long_index_name));
 		$this->assertTrue($this->tools->sql_create_index($table_name, $very_long_index_name, array('c_timestamp')));
-		$this->assertTrue($this->tools->sql_index_exists($table_name, $very_long_index_name));
+		$this->assertTrue($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $very_long_index_name));
 
 		$this->tools->sql_table_drop($table_name);
 
 		// Index name has > maximum index length chars - that should not be possible.
 		$too_long_index_name = str_repeat('i', $max_index_length + 1);
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $too_long_index_name));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_' . $too_long_index_name));
 		$this->setExpectedTriggerError(E_USER_ERROR); // TODO: Do we want to keep this limitation, if yes reimplement the user check
 		/* https://github.com/phpbb/phpbb/blob/aee5e373bca6cd20d44b99585d3b758276a2d7e6/phpBB/phpbb/db/tools/tools.php#L1488-L1517 */
 		$this->tools->sql_create_index('prefix_table_name', $too_long_index_name, array('c_timestamp'));

tests/dbal/migration/schema_index.php

@@ -0,0 +1,65 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+class phpbb_dbal_migration_schema_index extends \phpbb\db\migration\migration
+{
+	function update_schema()
+	{
+		return [
+			'add_tables' => [
+				$this->table_prefix . 'foobar1' => [
+					'COLUMNS' => [
+						'user_id' => ['UINT', 0],
+						'username' => ['VCHAR:50', 0],
+					],
+					'KEYS'	=> [
+						'tstidx_user_id' => ['UNIQUE', 'user_id'],
+						'tstidx_username' => ['INDEX', 'username'],
+					],
+				],
+				$this->table_prefix . 'foobar2' => [
+					'COLUMNS' => [
+						'ban_userid'		=> ['ULINT', 0],
+						'ban_ip'			=> ['VCHAR:40', ''],
+						'ban_reason'		=> ['VCHAR:100', ''],
+					],
+					'KEYS'	=> [
+						'tstidx_ban_userid' => ['UNIQUE', 'ban_userid'],
+						'tstidxban_data' => ['INDEX', ['ban_ip', 'ban_reason']],
+					],
+				],
+			],
+
+			'rename_index' => [
+				$this->table_prefix . 'foobar1' => [
+					'tstidx_user_id' => 'fbr1_user_id',
+					'tstidx_username' => 'fbr1_username',
+				],
+				$this->table_prefix . 'foobar2' => [
+					'tstidx_ban_userid' => 'fbr2_ban_userid',
+					'tstidxban_data' => 'fbr2_ban_data',
+				],
+			],
+		];
+	}
+
+	function revert_schema()
+	{
+		return [
+			'drop_tables'	=> [
+				$this->table_prefix . 'foobar1',
+				$this->table_prefix . 'foobar2',
+			],
+		];
+	}
+}

tests/dbal/migrator_test.php

@@ -24,6 +24,7 @@ require_once __DIR__ . '/migration/revert_table_with_dependency.php';
 require_once __DIR__ . '/migration/fail.php';
 require_once __DIR__ . '/migration/installed.php';
 require_once __DIR__ . '/migration/schema.php';
+require_once __DIR__ . '/migration/schema_index.php';
 
 class phpbb_dbal_migrator_test extends phpbb_database_test_case
 {
@@ -52,12 +53,15 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 
 	protected function setUp(): void
 	{
+		global $table_prefix;
+
 		parent::setUp();
 
 		$this->db = $this->new_dbal();
 		$this->doctrine_db = $this->new_doctrine_dbal();
 		$factory = new \phpbb\db\tools\factory();
 		$this->db_tools = $factory->get($this->doctrine_db);
+		$this->db_tools->set_table_prefix($table_prefix);
 
 		$this->config = new \phpbb\config\db($this->db, new phpbb_mock_cache, 'phpbb_config');
 
@@ -416,4 +420,86 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 		$this->assertFalse($this->db_tools->sql_column_exists('phpbb_config', 'test_column1'));
 		$this->assertFalse($this->db_tools->sql_table_exists('phpbb_foobar'));
 	}
+
+	public function test_rename_index()
+	{
+		$this->migrator->set_migrations(array('phpbb_dbal_migration_schema_index'));
+
+		while (!$this->migrator->finished())
+		{
+			$this->migrator->update();
+		}
+
+		$this->assertTrue($this->db_tools->sql_unique_index_exists('phpbb_foobar1', 'fbr1_user_id'));
+		$this->assertTrue($this->db_tools->sql_index_exists('phpbb_foobar1', 'fbr1_username'));
+		$this->assertTrue($this->db_tools->sql_unique_index_exists('phpbb_foobar2', 'fbr2_ban_userid'));
+		$this->assertTrue($this->db_tools->sql_index_exists('phpbb_foobar2', 'fbr2_ban_data'));
+
+		while ($this->migrator->migration_state('phpbb_dbal_migration_schema_index'))
+		{
+			$this->migrator->revert('phpbb_dbal_migration_schema_index');
+		}
+
+		$this->assertFalse($this->db_tools->sql_table_exists('phpbb_foobar1'));
+		$this->assertFalse($this->db_tools->sql_table_exists('phpbb_foobar2'));
+	}
+
+	public function test_schema_generator(): array
+	{
+		global $phpbb_root_path, $phpEx;
+
+		$finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $phpEx);
+		$finder = $finder_factory->get();
+		$migrator_classes = $finder->core_path('phpbb/db/migration/data/')->get_classes();
+
+		$schema_generator = new \phpbb\db\migration\schema_generator(
+			$migrator_classes,
+			$this->config,
+			$this->db,
+			$this->db_tools,
+			$phpbb_root_path,
+			$phpEx,
+			'phpbb_',
+			self::get_core_tables()
+		);
+		$db_table_schema = $schema_generator->get_schema();
+
+		$this->assertNotEmpty($db_table_schema);
+
+		return $db_table_schema;
+	}
+
+    /**
+     * @depends test_schema_generator
+     */
+	public function test_table_indexes(array $db_table_schema)
+	{
+		$table_keys = [];
+		foreach ($db_table_schema as $table_name => $table_data)
+		{
+			if (isset($table_data['KEYS']))
+			{
+				foreach ($table_data['KEYS'] as $key_name => $key_data)
+				{
+					$table_keys[$table_name][] = $key_name;
+				}
+			}
+		}
+
+		$this->assertNotEmpty($table_keys);
+
+		$table_names = array_merge(array_keys($db_table_schema), ['phpbb_custom_table']);
+		$short_table_names = \phpbb\db\doctrine\table_helper::map_short_table_names($table_names, 'phpbb_');
+		$this->assertEquals('phpbb_custom_table', array_search(\phpbb\db\doctrine\table_helper::generate_shortname('custom_table'), $short_table_names));
+		$this->assertEquals($short_table_names['phpbb_custom_table'], \phpbb\db\doctrine\table_helper::generate_shortname('custom_table'));
+
+		foreach ($table_keys as $table_name => $key_names)
+		{
+			$index_prefix = $short_table_names[$table_name] . '_';
+			foreach ($key_names as $key_name)
+			{
+				$this->assertEquals(0, strpos($key_name, $index_prefix), "$key_name does not contain $index_prefix");
+			}
+		}
+	}
 }

tests/extension/manager_test.php

@@ -154,6 +154,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 	{
 		$phpbb_root_path = __DIR__ . './../../phpBB/';
 		$php_ext = 'php';
+		$table_prefix = 'phpbb_';
 
 		$config = new \phpbb\config\config(array('version' => PHPBB_VERSION));
 		$db = $this->new_dbal();
@@ -162,7 +163,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 		$factory = new \phpbb\db\tools\factory();
 		$finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $php_ext);
 		$db_tools = $factory->get($db_doctrine);
-		$table_prefix = 'phpbb_';
+		$db_tools->set_table_prefix($table_prefix);
 
 		$container = new phpbb_mock_container_builder();
 

tests/extension/metadata_manager_test.php

@@ -37,6 +37,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 	{
 		parent::setUp();
 
+		$this->table_prefix = 'phpbb_';
 		$this->config = new \phpbb\config\config(array(
 			'version'		=> '3.1.0',
 		));
@@ -45,13 +46,13 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$factory = new \phpbb\db\tools\factory();
 		$this->db_tools = $factory->get($this->db_doctrine);
+		$this->db_tools->set_table_prefix($this->table_prefix);
 		$finder_factory = $this->createMock('\phpbb\finder\factory');
 		$this->phpbb_root_path = __DIR__ . '/';
 		$this->phpEx = 'php';
 
 		$this->cache =  new \phpbb\cache\service(new phpbb_mock_cache(), $this->config, $this->db, $phpbb_dispatcher, $this->phpbb_root_path, $this->phpEx);
 
-		$this->table_prefix = 'phpbb_';
 
 		$container = new phpbb_mock_container_builder();
 		$cache_path = $this->phpbb_root_path . 'cache/twig';

tests/migrations/migrations_check_config_added_test.php

@@ -55,6 +55,10 @@ class migrations_check_config_added_test extends phpbb_test_case
 	{
 		global $phpbb_root_path, $phpEx;
 
+		$this->table_prefix = 'phpbb_';
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $phpEx;
+
 		$this->config = new \phpbb\config\config([
 			'search_type'		=> '\phpbb\search\fulltext_mysql',
 		]);
@@ -63,9 +67,7 @@ class migrations_check_config_added_test extends phpbb_test_case
 		$this->db_doctrine = $this->createMock(\Doctrine\DBAL\Connection::class);
 		$factory = new \phpbb\db\tools\factory();
 		$this->db_tools = $factory->get($this->db_doctrine);
-		$this->table_prefix = 'phpbb_';
+		$this->db_tools->set_table_prefix($this->table_prefix);
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $phpEx;
 
 		$tools = [
 			new \phpbb\db\migration\tool\config($this->config),

tests/migrator/get_callable_from_step_test.php

@@ -23,6 +23,8 @@ class get_callable_from_step_test extends phpbb_database_test_case
 		$db = $this->new_dbal();
 		$db_doctrine = $this->new_doctrine_dbal();
 		$factory = new \phpbb\db\tools\factory();
+		$db_tools = $factory->get($db_doctrine);
+		$db_tools->set_table_prefix($table_prefix);
 		$user = $this->getMockBuilder('\phpbb\user')->disableOriginalConstructor()->getMock();
 		$user->ip = '127.0.0.1';
 		$module_manager = new \phpbb\module\module_manager(
@@ -38,7 +40,7 @@ class get_callable_from_step_test extends phpbb_database_test_case
 			new phpbb_mock_container_builder(),
 			new \phpbb\config\config(array()),
 			$db,
-			$factory->get($db_doctrine),
+			$db_tools,
 			'phpbb_migrations',
 			$phpbb_root_path,
 			$php_ext,

tests/migrator/schema_generator_test.php

@@ -30,14 +30,16 @@ class schema_generator_test extends phpbb_test_case
 
 		parent::setUp();
 
+		$this->table_prefix = 'phpbb_';
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $phpEx;
+
 		$this->config = new \phpbb\config\config(array());
 		$this->db = new \phpbb\db\driver\sqlite3();
 		$this->doctrine_db = \phpbb\db\doctrine\connection_factory::get_connection(new phpbb_mock_config_php_file());
 		$factory = new \phpbb\db\tools\factory();
 		$this->db_tools = $factory->get($this->doctrine_db);
-		$this->table_prefix = 'phpbb_';
+		$this->db_tools->set_table_prefix($this->table_prefix);
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $phpEx;
 	}
 
 	protected function get_schema_generator(array $class_names)

tests/test_framework/phpbb_database_test_case.php

@@ -88,6 +88,7 @@ abstract class phpbb_database_test_case extends TestCase
 			$doctrine = \phpbb\db\doctrine\connection_factory::get_connection(new phpbb_mock_config_php_file());
 			$factory = new \phpbb\db\tools\factory();
 			$db_tools = $factory->get($doctrine, true);
+			$db_tools->set_table_prefix($table_prefix);
 
 			$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix, self::get_core_tables());
 			file_put_contents(self::$schema_file, json_encode($schema_generator->get_schema()));

tests/test_framework/phpbb_database_test_connection_manager.php

@@ -327,6 +327,8 @@ class phpbb_database_test_connection_manager
 	*/
 	protected function load_schema_from_file($directory, \phpbb\db\driver\driver_interface $db, \Doctrine\DBAL\Connection $doctrine)
 	{
+		global $table_prefix;
+
 		$schema = $this->dbms['SCHEMA'];
 
 		if ($this->config['dbms'] == 'phpbb\db\driver\mysql')
@@ -363,7 +365,7 @@ class phpbb_database_test_connection_manager
 		}
 		else
 		{
-			global $phpbb_root_path, $phpEx, $table_prefix;
+			global $phpbb_root_path, $phpEx;
 
 			$finder = new \phpbb\finder\finder(null, false, $phpbb_root_path, $phpEx);
 			$classes = $finder->core_path('phpbb/db/migration/data/')
@@ -373,6 +375,7 @@ class phpbb_database_test_connection_manager
 			$doctrine = \phpbb\db\doctrine\connection_factory::get_connection(new phpbb_mock_config_php_file());
 			$factory = new \phpbb\db\tools\factory();
 			$db_tools = $factory->get($doctrine, true);
+			$db_tools->set_table_prefix($table_prefix);
 			$tables = phpbb_database_test_case::get_core_tables();
 
 			$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix, $tables);
@@ -381,6 +384,7 @@ class phpbb_database_test_connection_manager
 
 		$factory = new \phpbb\db\tools\factory();
 		$db_tools = $factory->get($doctrine);
+		$db_tools->set_table_prefix($table_prefix);
 		foreach ($db_table_schema as $table_name => $table_data)
 		{
 			$db_tools->sql_create_table(

tests/test_framework/phpbb_functional_test_case.php

@@ -286,6 +286,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$factory = new \phpbb\db\tools\factory();
 		$finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $phpEx);
 		$db_tools = $factory->get($db_doctrine);
+		$db_tools->set_table_prefix(self::$config['table_prefix']);
 
 		$container = new phpbb_mock_container_builder();
 		$migrator = new \phpbb\db\migrator(