Merge branch 'release-3.0' into 3.0/MailQueueExtension

Author: jdarwood007

.git-blame-ignore-revs

@@ -0,0 +1,4 @@
+# https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
+# https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
+
+74e835324fbdbc594b2e67b068e548e541a163da

.github/phpcs/SectionComments.php

@@ -310,7 +310,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
 					while (
 						isset($tokens[$insert_at - 1])
 						&& (
-							$tokens[$insert_at - 1]->isGivenKind([T_FINAL, T_READONLY])
+							$tokens[$insert_at - 1]->isGivenKind([T_FINAL, T_READONLY, T_ABSTRACT])
 							|| $tokens[$insert_at - 1]->isWhitespace()
 							|| $tokens[$insert_at - 1]->isComment()
 						)

.github/workflows/php-cs-fixer.yml

@@ -34,4 +34,4 @@ jobs:
       - name: PHP-CS-Fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:
-          args: --config=.php-cs-fixer.dist.php -v --dry-run --stop-on-violation --using-cache=no ${{ env.PHPCS_EXTRA_ARGS }}
+          args: --config=.php-cs-fixer.dist.php -v --dry-run --stop-on-violation --using-cache=no --allow-risky=yes ${{ env.PHPCS_EXTRA_ARGS }}

.php-cs-fixer.dist.php

@@ -130,6 +130,10 @@
 		'nullable_type_declaration' => ['syntax' => 'question_mark'],
 
 		// Namespace notation.
+		'native_function_invocation' => [
+			'include' => ['@compiler_optimized'],
+			'scope' => 'namespaced',
+		],
 		'no_leading_namespace_whitespace' => true,
 
 		// Operator.

Languages/en_US/Errors.php

@@ -141,6 +141,7 @@
 $txt['delFirstPost'] = 'You are not allowed to delete the first post in a topic.<p>If you want to delete this topic, click on the Remove Topic link, or ask a moderator/administrator to do it for you.</p>';
 $txt['parent_error'] = 'Unable to create board!';
 $txt['login_cookie_error'] = 'You were unable to login. Please check your cookie settings.';
+$txt['func_cookie_error'] = 'This function requires cookies enabled. Please check your cookie settings.';
 $txt['login_ssl_required'] = 'You can only login via HTTPS';
 $txt['register_ssl_required'] = 'You can only register via HTTPS';
 $txt['incorrect_answer'] = 'Sorry, but you did not answer your question correctly. Please click back to try again, or click back twice to use the default method of obtaining your password.';

Languages/en_US/General.php

@@ -400,7 +400,7 @@
 $txt['male'] = 'Male';
 $txt['female'] = 'Female';
 
-$txt['error_invalid_characters_username'] = 'Invalid character used in Username.';
+$txt['error_invalid_characters_username'] = 'Invalid character used in username.';
 
 $txt['welcome_guest'] = 'Welcome to <strong>{forum_name}</strong>. Please <a href="{login_url}" onclick="{onclick}">log in</a>.';
 $txt['welcome_guest_register'] = 'Welcome to <strong>{forum_name}</strong>. Please <a href="{login_url}" onclick="{onclick}">log in</a> or <a href="{register_url}">sign up</a>.';

Languages/en_US/Maintenance.php

@@ -118,7 +118,7 @@
 $txt['error_message'] = 'Error message';
 $txt['error_file'] = 'File';
 $txt['error_line'] = 'Line';
-$txt['error_file_and_line'] = '{file} (Line {line, number, integer})';
+$txt['error_file_and_line'] = '{file} (Line {line, number, :: group-off})';
 $txt['clear_filter'] = 'Clear filter';
 $txt['remove_selection'] = 'Remove selection';
 $txt['remove_filtered_results'] = 'Remove all filtered results';
@@ -133,7 +133,7 @@
 $txt['apply_filter_of_type'] = 'Apply filter of type: {list}';
 $txt['backtrace_title'] = 'Backtrace information';
 // argument(s): error message, function, filename, line nr, filehash, Config::$scripturl
-$txt['backtrace_info'] = '<b>#{0, number, integer}</b>: {1}()<br>Called from <a href="{5}?action=admin;area=logs;sa=errorlog;file={4};line={3, number, integer}" onclick="return reqWin(this.href, 600, 480, false);">{2} on line {3, number, integer}</a>';
+$txt['backtrace_info'] = '<b>#{0, number, integer}</b>: {1}()<br>Called from <a href="{5}?action=admin;area=logs;sa=errorlog;file={4};line={3, number, :: group-off}" onclick="return reqWin(this.href, 600, 480, false);">{2} on line {3, number, :: group-off}</a>';
 $txt['backtrace_info_internal_function'] = '<b>#{0, number, integer}</b>: {1}()<br>Called from [internal function]';
 
 $txt['errortype_all'] = 'All errors';
@@ -177,13 +177,6 @@
 $txt['maintain_run_now'] = 'Run task now';
 $txt['maintain_return'] = 'Back to Forum Maintenance';
 
-$txt['maintain_backup'] = 'Backup Database';
-$txt['maintain_backup_info'] = 'Download a backup copy of your forum’s database in case of emergency.';
-$txt['maintain_backup_struct'] = 'Save the table structure.';
-$txt['maintain_backup_data'] = 'Save the table data (the important stuff).';
-$txt['maintain_backup_gz'] = 'Compress the file with gzip.';
-$txt['maintain_backup_save'] = 'Download';
-
 $txt['maintain_old'] = 'Remove old posts';
 // The argument for this string is an HTML input element.
 $txt['maintain_old_since_days'] = 'Remove all topics not posted in for {input_number} days, which are:';

Languages/en_US/ManageMaintenance.php

@@ -152,7 +152,7 @@
 $txt['cache_memcached_servers'] = 'Memcache/Memcached servers';
 $txt['cache_memcached_servers_subtext'] = 'Example: 127.0.0.1:11211,127.0.0.2';
 
-$txt['loadavg_warning'] = 'Please note: the settings below are to be edited with care. Setting any of them too low may render your forum <strong>unusable</strong>! The current load average is <strong>{0, number, :: .00}</strong>';
+$txt['loadavg_warning'] = 'Please note: the settings below are to be edited with care. Setting any of them too low may render your forum <strong>unusable</strong>!';
 $txt['loadavg_enable'] = 'Enable load balancing by load averages';
 $txt['loadavg_auto_opt'] = 'Threshold to disabling automatic database optimization';
 $txt['loadavg_search'] = 'Threshold to disabling search';
@@ -163,8 +163,9 @@
 $txt['loadavg_bbc'] = 'Threshold to disabling BBC formatting when showing posts';
 $txt['loadavg_forum'] = 'Threshold to disabling the forum <strong>completely</strong>';
 $txt['loadavg_disabled_windows'] = 'Load balancing support is not available on Windows.';
-$txt['loadavg_disabled_osx'] = 'Load balancing support is not available on OS:X.';
 $txt['loadavg_disabled_conf'] = 'Load balancing support is disabled by your host configuration.';
+$txt['loadavg_current_load'] = 'The current load average is <strong>{load_average, number, :: percent}</strong>';
+$txt['loadavg_processors']  = 'CPU(s) detected: {cpu_count, number}';
 
 $txt['setting_password_strength'] = 'Required strength for user passwords';
 $txt['setting_password_strength_low'] = 'Low';

Languages/en_US/ManageSettings.php

@@ -58,7 +58,6 @@
 $txt['board_perms_name_post_unapproved_replies_any'] = 'Post unapproved replies in any topic';
 $txt['board_perms_name_post_unapproved_replies_own'] = 'Post unapproved replies in own topic';
 $txt['board_perms_name_post_draft'] = 'Save drafts of posts';
-$txt['board_perms_name_post_autosave_draft'] = 'Automatically save drafts of posts';
 $txt['board_perms_name_remove_any'] = 'Remove any topic';
 $txt['board_perms_name_remove_own'] = 'Remove own topics';
 $txt['board_perms_name_report_any'] = 'Report any post';