Moodle release 4.4.7

MDL-81945 gradereport_singleview: Fix hidden grade handling.
Seems to become broken after IR refactoring.
2025-03-15 20:19:52 +08:00 · 2025-03-14 15:21:15 +00:00 · 2025-03-14 15:21:15 +00:00 · 2025-03-14 15:21:15 +00:00 · 2025-03-14 15:21:15 +00:00 · 2025-03-14 15:21:15 +00:00
2308 changed files with 16971 additions and 7591 deletions
@@ -1,3 +1,6 @@
 **/yui/build/** -diff
 **/amd/build/** -diff
 lib/dml/oci_native_moodle_package.sql text eol=lf
+**.js.map -diff
+**-min.js -diff
+**.min.js -diff
@@ -1,2 +1,2 @@
 # Primary donations pages.
-custom: ["https://moodle.com/donations/", moodle.org]
+custom: ["https://moodle.com/donations/", "https://fund.moodle.org"]
@@ -1 +1 @@
-lts/iron
+lts/jod
@@ -4703,4 +4703,196 @@
      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
+  <MOODLE version="5.0" requires="4.2.3">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.11.0" />
+      <VENDOR name="mysql" version="8.4" />
+      <VENDOR name="postgres" version="14" />
+      <VENDOR name="mssql" version="14.0" />
+    </DATABASE>
+    <PHP version="8.2.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_async_backup" level="recommended">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -25,7 +25,7 @@ namespace core_adminpresets;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass core_adminpresets_generator
 */
-class generator_test extends \advanced_testcase {
+final class generator_test extends \advanced_testcase {

    /**
     * Test the behaviour of create_preset() method.
@@ -180,7 +180,7 @@ class generator_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function create_preset_provider(): array {
+    public static function create_preset_provider(): array {
        return [
            'Default values' => [
            ],
@@ -25,7 +25,7 @@ namespace core_adminpresets;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass helper
 */
-class helper_test extends \advanced_testcase {
+final class helper_test extends \advanced_testcase {

    /**
     * Test the behaviour of create_preset() method.
@@ -84,7 +84,7 @@ class helper_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function create_preset_provider(): array {
+    public static function create_preset_provider(): array {
        return [
            'Default values' => [
            ],
@@ -177,7 +177,7 @@ class helper_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function add_item_provider(): array {
+    public static function add_item_provider(): array {
        return [
            'Setting without plugin' => [
                'name' => 'settingname',
@@ -239,7 +239,7 @@ class helper_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function add_plugin_provider(): array {
+    public static function add_plugin_provider(): array {
        return [
            'Plugin: enabled (using int)' => [
                'type' => 'plugintype',
@@ -321,7 +321,7 @@ class helper_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function change_default_preset_provider(): array {
+    public static function change_default_preset_provider(): array {
        return [
            'Starter preset' => [
                'preset' => 'starter',
@@ -364,7 +364,7 @@ class helper_test extends \advanced_testcase {
                'preset' => 'unexisting',
            ],
            'Valid XML file' => [
-                'preset' => __DIR__ . '/fixtures/import_settings_plugins.xml',
+                'preset' => self::get_fixture_path(__NAMESPACE__, 'import_settings_plugins.xml'),
                'settings' => [
                    'allowemojipicker' => 1,
                    'enableportfolios' => 1,
@@ -377,7 +377,7 @@ class helper_test extends \advanced_testcase {
                ],
            ],
            'Invalid XML file' => [
-                'preset' => __DIR__ . '/fixtures/invalid_xml_file.xml',
+                'preset' => self::get_fixture_path(__NAMESPACE__, 'invalid_xml_file.xml'),
            ],
            'Unexisting XML file' => [
                'preset' => __DIR__ . '/fixtures/unexisting.xml',
@@ -25,7 +25,7 @@ namespace core_adminpresets\local\setting;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \core_adminpresets\local\setting\adminpresets_admin_setting_bloglevel
 */
-class adminpresets_admin_setting_bloglevel_test extends \advanced_testcase {
+final class adminpresets_admin_setting_bloglevel_test extends \advanced_testcase {

    /**
     * Test the behaviour of save_value() method.
@@ -72,7 +72,7 @@ class adminpresets_admin_setting_bloglevel_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function save_value_provider(): array {
+    public static function save_value_provider(): array {
        return [
            'Save the bloglevel and set blog_menu block visibility to true' => [
                'setttingvalue' => BLOG_USER_LEVEL,
@@ -25,7 +25,7 @@ namespace core_adminpresets\local\setting;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \core_adminpresets\local\setting\adminpresets_admin_setting_sitesettext
 */
-class adminpresets_admin_setting_sitesettext_test extends \advanced_testcase {
+final class adminpresets_admin_setting_sitesettext_test extends \advanced_testcase {

    /**
     * Test the behaviour of save_value() method.
@@ -66,7 +66,7 @@ class adminpresets_admin_setting_sitesettext_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function save_value_provider(): array {
+    public static function save_value_provider(): array {
        return [
            'Fullname: different value' => [
                'settingname' => 'fullname',
@@ -25,7 +25,7 @@ namespace core_adminpresets\local\setting;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \core_adminpresets\local\setting\adminpresets_setting
 */
-class adminpresets_setting_test extends \advanced_testcase {
+final class adminpresets_setting_test extends \advanced_testcase {

    /**
     * Test the behaviour of save_value() method.
@@ -77,7 +77,7 @@ class adminpresets_setting_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function save_value_provider(): array {
+    public static function save_value_provider(): array {
        return [
            'Core setting with the same value is not saved' => [
                'category' => 'optionalsubsystems',
@@ -167,7 +167,7 @@ class adminpresets_setting_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function save_attributes_values_provider(): array {
+    public static function save_attributes_values_provider(): array {
        return [
            'Plugin setting with the same value is not saved' => [
                'category' => 'modsettinglesson',
@@ -28,7 +28,7 @@ use stdClass;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \core_adminpresets\manager
 */
-class manager_test extends \advanced_testcase {
+final class manager_test extends \advanced_testcase {
    /**
     * Include required libraries.
     */
@@ -367,7 +367,7 @@ class manager_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function export_preset_provider(): array {
+    public static function export_preset_provider(): array {
        return [
            'Export settings and plugins, excluding sensible' => [
                'includesensible' => false,
@@ -530,26 +530,32 @@ class manager_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function import_preset_provider(): array {
+    public static function import_preset_provider(): array {
        return [
            'Import settings from an empty file' => [
                'filecontents' => '',
                'expectedpreset' => false,
            ],
            'Import settings and plugins from a valid XML file' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_settings_plugins.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'import_settings_plugins.xml')
+                ),
                'expectedpreset' => true,
                'expectedsettings' => true,
                'expectedplugins' => true,
            ],
            'Import only settings from a valid XML file' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_settings.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'import_settings.xml')
+                ),
                'expectedpreset' => true,
                'expectedsettings' => true,
                'expectedplugins' => false,
            ],
            'Import settings and plugins from a valid XML file with Starter name, which will be marked as non-core' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_starter_name.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'import_starter_name.xml')
+                ),
                'expectedpreset' => true,
                'expectedsettings' => true,
                'expectedplugins' => true,
@@ -558,7 +564,9 @@ class manager_test extends \advanced_testcase {
                'expectedpresetname' => 'Starter',
            ],
            'Import settings from an invalid XML file' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/invalid_xml_file.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'invalid_xml_file.xml')
+                ),
                'expectedpreset' => false,
                'expectedsettings' => false,
                'expectedplugins' => false,
@@ -566,20 +574,26 @@ class manager_test extends \advanced_testcase {
                'expectedexception' => \Exception::class,
            ],
            'Import unexisting settings category' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/unexisting_category.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'unexisting_category.xml')
+                ),
                'expectedpreset' => false,
                'expectedsettings' => false,
                'expectedplugins' => false,
            ],
            'Import unexisting setting' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/unexisting_setting.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'unexisting_setting.xml')
+                ),
                'expectedpreset' => false,
                'expectedsettings' => false,
                'expectedplugins' => false,
                'expecteddebugging' => true,
            ],
            'Import valid settings with one unexisting setting too' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_settings_with_unexisting_setting.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'import_settings_with_unexisting_setting.xml'),
+                ),
                'expectedpreset' => true,
                'expectedsettings' => false,
                'expectedplugins' => false,
@@ -30,7 +30,7 @@ use core_privacy\tests\provider_testcase;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \core_adminpresets\privacy\provider
 */
-class privacy_provider_test extends provider_testcase {
+final class privacy_provider_test extends provider_testcase {

    /**
     * Test for provider::get_metadata().
@@ -2180,10 +2180,11 @@ class core_admin_renderer extends plugin_renderer_base {

        $output = '';
        $output .= $this->header();
-        $output .= $this->container_start('upgradekeyreq');
        $output .= $this->heading(get_string('upgradekeyreq', 'core_admin'));
+        $output .= $this->container_start('upgradekeyreq w-25');
        $output .= html_writer::start_tag('form', array('method' => 'POST', 'action' => $url));
        $output .= html_writer::empty_tag('input', [
+            'id' => 'upgradekey',
            'name' => 'upgradekey',
            'type' => 'password',
            'class' => 'form-control w-auto',
@@ -26,7 +26,7 @@ use core_role_preset;
 * @copyright 2013 Petr Skoda {@link http://skodak.org}
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class preset_test extends \advanced_testcase {
+final class preset_test extends \advanced_testcase {
    public function test_xml(): void {
        global $DB;

@@ -84,7 +84,7 @@ class preset_test extends \advanced_testcase {
    public function test_mixed_levels(): void {
        // The problem here is that we cannot guarantee plugin contexts
        // have unique short names, so we have to also support level numbers.
-        $xml = file_get_contents(__DIR__ . '/fixtures/mixed_levels.xml');
+        $xml = file_get_contents(self::get_fixture_path(__NAMESPACE__, 'mixed_levels.xml'));
        $this->assertTrue(\core_role_preset::is_valid_preset($xml));

        $preset = \core_role_preset::parse_preset($xml);
@@ -40,7 +40,7 @@ use core_privacy\local\request\approved_userlist;
 * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class provider_test extends provider_testcase {
+final class provider_test extends provider_testcase {
    /**
     * Test to check export_user_preferences.
     * returns user preferences data.
@@ -20,13 +20,8 @@ namespace core_role\reportbuilder\datasource;

 use core\context\course;
 use core_reportbuilder_generator;
-use core_reportbuilder_testcase;
 use core_reportbuilder\local\filters\{date, select, text};
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+use core_reportbuilder\tests\core_reportbuilder_testcase;

 /**
 * Unit tests for roles datasource
@@ -420,6 +420,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
            new lang_string('generalgroups', 'backup'), new lang_string('configgeneralgroups', 'backup'),
            array('value' => 1, 'locked' => 0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), array('value'=>1, 'locked'=>0)));
+    $temp->add(new admin_setting_configcheckbox_with_lock(
+        'backup/backup_general_customfield',
+        new lang_string('generalcustomfield', 'backup'),
+        new lang_string('configgeneralcustomfield', 'backup'),
+        ['value' => 1, 'locked' => 0],
+    ));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_contentbankcontent',
        new lang_string('generalcontentbankcontent', 'backup'),
        new lang_string('configgeneralcontentbankcontent', 'backup'),
@@ -431,7 +437,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
        ['value' => 1, 'locked' => 0])
    );

-
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_legacyfiles',
        new lang_string('generallegacyfiles', 'backup'),
        new lang_string('configlegacyfiles', 'backup'), array('value' => 1, 'locked' => 0)));
@@ -460,6 +465,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
            new lang_string('generalgroups', 'backup'), new lang_string('configgeneralgroups', 'backup'),
            array('value' => 1, 'locked' => 0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_import_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), array('value'=>1, 'locked'=>0)));
+    $temp->add(new admin_setting_configcheckbox_with_lock(
+        'backup/backup_import_customfield',
+        new lang_string('generalcustomfield', 'backup'),
+        new lang_string('configgeneralcustomfield', 'backup'),
+        ['value' => 1, 'locked' => 0],
+    ));
    $temp->add(new admin_setting_configcheckbox_with_lock(
        'backup/backup_import_contentbankcontent',
        new lang_string('generalcontentbankcontent', 'backup'),
@@ -589,6 +600,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_groups', new lang_string('generalgroups', 'backup'),
            new lang_string('configgeneralgroups', 'backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), 1));
+    $temp->add(new admin_setting_configcheckbox(
+        'backup/backup_auto_customfield',
+        new lang_string('generalcustomfield', 'backup'),
+        new lang_string('configgeneralcustomfield', 'backup'),
+        1,
+    ));
    $temp->add(new admin_setting_configcheckbox(
        'backup/backup_auto_contentbankcontent',
        new lang_string('generalcontentbankcontent', 'backup'),
@@ -668,6 +685,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_competencies',
        new lang_string('generalcompetencies', 'backup'),
        new lang_string('configrestorecompetencies', 'backup'), array('value' => 1, 'locked' => 0)));
+    $temp->add(new admin_setting_configcheckbox_with_lock(
+        'restore/restore_general_customfield',
+        new lang_string('generalcustomfield', 'backup'),
+        new lang_string('configrestorecustomfield', 'backup'),
+        ['value' => 1, 'locked' => 0],
+    ));
    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_contentbankcontent',
        new lang_string('generalcontentbankcontent', 'backup'),
        new lang_string('configrestorecontentbankcontent', 'backup'), array('value' => 1, 'locked' => 0)));
@@ -181,8 +181,16 @@ if ($hassiteconfig) {
        new lang_string('configproxyuser', 'admin'), ''));
    $temp->add(new admin_setting_configpasswordunmask('proxypassword', new lang_string('proxypassword', 'admin'),
        new lang_string('configproxypassword', 'admin'), ''));
-    $temp->add(new admin_setting_configtext('proxybypass', new lang_string('proxybypass', 'admin'),
-        new lang_string('configproxybypass', 'admin'), 'localhost, 127.0.0.1'));
+
+    $setting = new admin_setting_configtext('proxybypass', new lang_string('proxybypass', 'admin'),
+        new lang_string('configproxybypass', 'admin'), 'localhost,127.0.0.1');
+    $setting->set_updatedcallback(function() {
+        // Normalize $CFG->proxybypass value.
+        $normalizedvalue = \core\ip_utils::normalize_internet_address_list(get_config('core', 'proxybypass'));
+        set_config('proxybypass', $normalizedvalue);
+    });
+    $temp->add($setting);
+
    $temp->add(new admin_setting_configcheckbox('proxylogunsafe', new lang_string('proxylogunsafe', 'admin'),
        new lang_string('configproxylogunsafe_help', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('proxyfixunsafe', new lang_string('proxyfixunsafe', 'admin'),
@@ -0,0 +1,40 @@
+@core @core_admin
+Feature: Plugins overview page
+  In order to manage plugin and settings
+  As an admin
+  I can access the plugins overview page
+
+  Background:
+    Given I am logged in as "admin"
+    And I navigate to "Plugins > Plugins overview" in site administration
+
+  Scenario: An administrator can view plugins overview page
+    Then "Plugins overview" "text" should exist
+    And "Check for available updates" "button" should exist
+    And "All plugins" "link" should exist
+    And "Additional plugins" "link" should exist
+
+  Scenario: An administrator can access list of activities when activity modules cog icon is pressed
+    When I click on "Settings" "link" in the "Activity modules" "table_row"
+    Then "Activities" "text" should exist
+    And "Manage activities" "text" should exist in the ".breadcrumb" "css_element"
+    And "Activity modules" "link" should exist in the ".breadcrumb" "css_element"
+
+  Scenario: An administrator can access plugin settings
+    When I click on "Settings" "link" in the "Assignment" "table_row"
+    Then "Assignment settings" "text" should exist
+    And "Assignment settings" "text" should exist in the ".breadcrumb" "css_element"
+    And "Assignment" "link" should exist in the ".breadcrumb" "css_element"
+    And "Activity modules" "link" should exist in the ".breadcrumb" "css_element"
+
+  Scenario: Plugins with dependencies cannot be uninstalled
+    When I navigate to "Plugins > Plugins overview" in site administration
+    Then "Uninstall" "link" should not exist in the "Database" "table_row"
+    And "Required by: filter_data" "text" should exist in the "Database" "table_row"
+
+  Scenario: Cancelling plugin uninstall does not uninstall the selected plugin
+    When I click on "Uninstall" "link" in the "Assignment" "table_row"
+    Then "Uninstalling Assignment" "text" should exist
+    And "You are about to uninstall the plugin Assignment. This will completely delete everything in the database associated with this plugin, including its configuration, log records, user files managed by the plugin etc. There is no way back and Moodle itself does not create any recovery backup. Are you SURE you want to continue?" "text" should exist
+    And I click on "Cancel" "button"
+    And "Uninstall" "link" should exist in the "Assignment" "table_row"
@@ -31,7 +31,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
 * @copyright   2023 Andrew Lyons <andrew@nicols.co.uk>
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class set_block_protection_test extends \externallib_advanced_testcase {
+final class set_block_protection_test extends \externallib_advanced_testcase {
    /**
     * Test execute method with no login.
     */
@@ -85,7 +85,7 @@ class set_block_protection_test extends \externallib_advanced_testcase {
     *
     * @return array
     */
-    public function execute_provider(): array {
+    public static function execute_provider(): array {
        return [
            [
                'block_login',
@@ -33,7 +33,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
 * @copyright   2023 Andrew Lyons <andrew@nicols.co.uk>
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class set_plugin_order_test extends \externallib_advanced_testcase {
+final class set_plugin_order_test extends \externallib_advanced_testcase {
    /**
     * Text execute method for editor plugins, which support ordering.
     *
@@ -72,7 +72,7 @@ class set_plugin_order_test extends \externallib_advanced_testcase {
     *
     * @return array
     */
-    public function execute_editor_provider(): array {
+    public static function execute_editor_provider(): array {
        $pluginmanager = \core_plugin_manager::instance();
        $allplugins = array_keys($pluginmanager->get_plugins_of_type('editor'));

@@ -142,7 +142,7 @@ class set_plugin_order_test extends \externallib_advanced_testcase {
        $this->assertIsArray(set_plugin_order::execute($plugin, 1));
    }

-    public function execute_non_orderable_provider(): array {
+    public static function execute_non_orderable_provider(): array {
        return [
            // Activities do not support ordering.
            ['mod_assign'],
@@ -31,7 +31,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
 * @copyright   2023 Andrew Lyons <andrew@nicols.co.uk>
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class set_plugin_state_test extends \externallib_advanced_testcase {
+final class set_plugin_state_test extends \externallib_advanced_testcase {
    /**
     * Text execute method.
     *
@@ -66,7 +66,7 @@ class set_plugin_state_test extends \externallib_advanced_testcase {
     *
     * @return array
     */
-    public function execute_standard_provider(): array {
+    public static function execute_standard_provider(): array {
        $generatetestsfor = function (string $plugin): array {
            return [
                [
@@ -20,14 +20,9 @@ namespace core_admin\reportbuilder\datasource;

 use core\task\database_logger;
 use core_reportbuilder_generator;
-use core_reportbuilder_testcase;
 use core_reportbuilder\local\filters\{boolean_select, date, duration, number, select, text};
 use core_reportbuilder\task\send_schedules;
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+use core_reportbuilder\tests\core_reportbuilder_testcase;

 /**
 * Unit tests for task logs datasource
@@ -37,7 +32,7 @@ require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
 * @copyright   2022 Paul Holden <paulh@moodle.com>
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class task_logs_test extends core_reportbuilder_testcase {
+final class task_logs_test extends core_reportbuilder_testcase {

    /**
     * Test default datasource
@@ -110,7 +105,7 @@ class task_logs_test extends core_reportbuilder_testcase {
     *
     * @return array[]
     */
-    public function datasource_filters_provider(): array {
+    public static function datasource_filters_provider(): array {
        return [
            'Filter name' => ['task_log:name', [
                'task_log:name_values' => [send_schedules::class],
@@ -30,7 +30,7 @@ use core_reportbuilder\local\report\filter;
 * @copyright   2023 Paul Holden <paulh@moodle.com>
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class courserole_test extends advanced_testcase {
+final class courserole_test extends advanced_testcase {

    /**
     * Data provider for {@see test_get_sql_filter}
@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @covers     \tool_admin_presets\event\preset_deleted
 */
-class preset_deleted_test extends \advanced_testcase {
+final class preset_deleted_test extends \advanced_testcase {

    /**
     * Test preset_deleted event.
@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @covers     \tool_admin_presets\event\preset_downloaded
 */
-class preset_downloaded_test extends \advanced_testcase {
+final class preset_downloaded_test extends \advanced_testcase {

    /**
     * Test preset_downloaded event.
@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @covers     \tool_admin_presets\event\preset_exported
 */
-class preset_exported_test extends \advanced_testcase {
+final class preset_exported_test extends \advanced_testcase {

    /**
     * Test preset_exported event.
@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @covers     \tool_admin_presets\event\preset_imported
 */
-class preset_imported_test extends \advanced_testcase {
+final class preset_imported_test extends \advanced_testcase {

    /**
     * Test preset_imported event.
@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @covers     \tool_admin_presets\event\preset_loaded
 */
-class preset_loaded_test extends \advanced_testcase {
+final class preset_loaded_test extends \advanced_testcase {

    /**
     * Test preset_loaded event.
@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @covers     \tool_admin_presets\event\preset_previewed
 */
-class preset_previewed_test extends \advanced_testcase {
+final class preset_previewed_test extends \advanced_testcase {

    /**
     * Test preset_previewed event.
@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @covers     \tool_admin_presets\event\preset_reverted
 */
-class preset_reverted_test extends \advanced_testcase {
+final class preset_reverted_test extends \advanced_testcase {

    /**
     * Test preset_reverted event.
@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @covers     \tool_admin_presets\event\presets_listed
 */
-class presets_listed_test extends \advanced_testcase {
+final class presets_listed_test extends \advanced_testcase {

    /**
     * Test presets_listed event.
@@ -25,7 +25,7 @@ namespace tool_admin_presets\local\action;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \tool_admin_presets\local\action\base
 */
-class base_test extends \advanced_testcase {
+final class base_test extends \advanced_testcase {

    /**
     * Test the behaviour of log() method.
@@ -70,7 +70,7 @@ class base_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function log_provider(): array {
+    public static function log_provider(): array {
        return [
            // Action = base.
            'action=base and mode = show' => [
@@ -25,7 +25,7 @@ namespace tool_admin_presets\local\action;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \tool_admin_presets\local\action\delete
 */
-class delete_test extends \advanced_testcase {
+final class delete_test extends \advanced_testcase {

    /**
     * Test the behaviour of execute() method.
@@ -27,7 +27,7 @@ use core_adminpresets\manager;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \tool_admin_presets\local\action\export
 */
-class export_test extends \advanced_testcase {
+final class export_test extends \advanced_testcase {

    /**
     * Test the behaviour of execute() method.
@@ -156,7 +156,7 @@ class export_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function export_execute_provider(): array {
+    public static function export_execute_provider(): array {
        return [
            'Export settings and plugins, excluding sensible' => [
                'includesensible' => false,
@@ -27,7 +27,7 @@ use core_adminpresets\manager;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \tool_admin_presets\local\action\import
 */
-class import_test extends \advanced_testcase {
+final class import_test extends \advanced_testcase {

    /**
     * Test the behaviour of execute() method.
@@ -190,7 +190,7 @@ class import_test extends \advanced_testcase {
     *
     * @return array
     */
-    public function import_execute_provider(): array {
+    public static function import_execute_provider(): array {
        $fixturesfolder = __DIR__ . '/../../../../../presets/tests/fixtures/';

        return [
@@ -25,7 +25,7 @@ namespace tool_admin_presets\local\action;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \tool_admin_presets\local\action\load
 */
-class load_test extends \advanced_testcase {
+final class load_test extends \advanced_testcase {

    /**
     * Test the behaviour of show() method when the preset id doesn't exist.
@@ -25,7 +25,7 @@ namespace tool_admin_presets\local\action;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \tool_admin_presets\local\action\rollback
 */
-class rollback_test extends \advanced_testcase {
+final class rollback_test extends \advanced_testcase {

    /**
     * Test the behaviour of execute() method.
@@ -0,0 +1,79 @@
+@tool @tool_analytics
+Feature: Manager can obtain prediction models insights
+  In order to view prediction models insights
+  As a manager
+  I should be able to obtain the prediction models insights
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email          |
+      | s1       | Student   | One      | s1@example.com |
+      | m1       | Manager   | One      | m1@example.com |
+      | m2       | Manager   | Two      | m2@example.com |
+      | t1       | Teacher   | One      | t1@example.com |
+    And the following "role assigns" exist:
+      | user | role    | contextlevel | reference |
+      | m1   | manager | System       |           |
+      | m2   | manager | System       |           |
+    # To ensure that course start date is in the future, set course start date to "tomorrow".
+    And the following "courses" exist:
+      | fullname | shortname | startdate    |
+      | Course 1 | C1        | ##tomorrow## |
+      | Course 2 | C2        | ##tomorrow## |
+      | Course 3 | C3        | ##tomorrow## |
+    And the following "course enrolments" exist:
+      | user | course | role           |
+      | s1   | C1     | student        |
+      | s1   | C2     | student        |
+      | s1   | C3     | student        |
+      | t1   | C3     | editingteacher |
+    # Disable "Analytics processes execution via command line only".
+    And the following config values are set as admin:
+      | onlycli         | 0 | analytics |
+
+  @javascript
+  Scenario: Manager can obtain prediction models insights
+    Given I log in as "m1"
+    And I navigate to "Analytics > Analytics models" in site administration
+    And I click on "Actions" "link" in the "Courses at risk of not starting" "table_row"
+    And I click on "Execute scheduled analysis" "link" in the "Courses at risk of not starting" "table_row"
+    And I press "Continue"
+    When I select "All predictions" from the "contextid" singleselect
+    # Confirm that only courses without teachers, Course 1 and Course 2, are listed.
+    Then "Course 1" "text" should exist
+    And "Course 2" "text" should exist
+    And "Course 3" "text" should not exist
+    And I click on "Select Course 1 for bulk action" "checkbox"
+    And I press "Not applicable"
+    And I press "Confirm"
+    # After m1 marks Course 1 as Not applicable, only Course 2 should be listed in the predictions for manager 1.
+    And "Course 1" "text" should not exist
+    And "Course 2" "text" should exist
+    And I log in as "m2"
+    And I click on ".popover-region-notifications" "css_element"
+    # Notification of new insight exists.
+    And "Upcoming courses have no teachers or students" "text" should exist
+    And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element"
+    And I click on "View insight" "link"
+    # Course 1, previously marked as Not applicable by manager 1, is still listed for manager 2.
+    And "Course 1" "text" should exist
+    And I click on "View details" "link" in the "Course 1" "table_row"
+    # Prediction details and indicators are displayed for the selected course.
+    And the following should exist in the "insights-list" table:
+      | Description |
+      | Course 1    |
+    And the following should exist in the "prediction-calculations" table:
+      |            -1-       | -2- |
+      | Teacher availability | No  |
+      | Student enrolments   | Yes |
+    # Date of prediction analysis execution.
+    And "##today##%A, %d %B %Y##" "text" should exist in the "Time predicted" "table_row"
+    And I click on "Select Course 1 for bulk action" "checkbox"
+    And I press "Accept"
+    And I press "Confirm"
+    # Verify that you end up on the page listing predictions for 'No teaching'.
+    And "Courses at risk of not starting" "text" should exist
+    And "The following courses due to start in the upcoming days are at risk of not starting because they don't have teachers or students enrolled." "text" should exist
+    And the following should not exist in the "insights-list" table:
+      | Description |
+      | Course 1    |
@@ -45,7 +45,7 @@ require_once($CFG->dirroot . '/analytics/tests/fixtures/test_target_course_level
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @since      Moodle 3.8
 */
-class external_test extends externallib_advanced_testcase {
+final class external_test extends externallib_advanced_testcase {

    /**
     * test_potential_contexts description
@@ -0,0 +1,61 @@
+@tool @tool_behat
+Feature: Frozen clock in Behat
+  In order to write tests that depend on the current system time
+  As a test writer
+  I need to set the time using a Behat step
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "activities" exist:
+      | activity | course | name      | idnumber | externalurl                                                 |
+      | url      | C1     | Fixture   | url1     | #wwwroot#/admin/tool/behat/tests/fixtures/core/showtime.php |
+      | forum    | C1     | TestForum | forum1   |                                                             |
+
+  Scenario: Time has been frozen
+    # Set up 2 forum discussions at different times. This tests the clock in the Behat CLI process.
+    Given the time is frozen at "2024-03-01 12:34:56"
+    And the following "mod_forum > discussions" exist:
+      | user  | forum  | name     | message  |
+      | admin | forum1 | Subject1 | Message1 |
+    And the time is frozen at "2024-08-01 12:34:56"
+    And the following "mod_forum > discussions" exist:
+      | user  | forum  | name     | message  |
+      | admin | forum1 | Subject2 | Message2 |
+    When I am on the "TestForum" "forum activity" page logged in as admin
+    Then I should see "1 Mar 2024" in the "Subject1" "table_row"
+    And I should see "1 Aug 2024" in the "Subject2" "table_row"
+    # Also view time on the fixture page. This tests the clock for Behat web server requests.
+    And I am on the "Fixture" "url activity" page
+    And I should see "Behat time is not the same as real time"
+    # This Unix time corresponds to 12:34:56 in Perth time zone.
+    And I should see "Unix time 1722486896"
+    And I should see "Date-time 2024-08-01 12:34:56"
+
+  # This scenario is second, to verify that the clock automatically goes back to normal after test.
+  Scenario: Time is normal
+    Given the following "mod_forum > discussions" exist:
+      | user  | forum  | name     | message  |
+      | admin | forum1 | Subject1 | Message1 |
+    When I am on the "TestForum" "forum activity" page logged in as admin
+    # The time should be the real current time, not the frozen time.
+    Then I should see "## today ##%d %b %Y##" in the "Subject1" "table_row"
+    And I am on the "Fixture" "url activity" page
+    And I should see "Behat time is the same as real time"
+
+  Scenario: Time is frozen and then unfrozen
+    Given the time is frozen at "2024-03-01 12:34:56"
+    And the following "mod_forum > discussions" exist:
+      | user  | forum  | name     | message  |
+      | admin | forum1 | Subject1 | Message1 |
+    And the time is no longer frozen
+    And the following "mod_forum > discussions" exist:
+      | user  | forum  | name     | message  |
+      | admin | forum1 | Subject2 | Message2 |
+    When I am on the "TestForum" "forum activity" page logged in as admin
+    Then I should see "1 Mar 2024" in the "Subject1" "table_row"
+    # The time should be the real current time, not the frozen time for this entry.
+    And I should see "## today ##%d %b %Y##" in the "Subject2" "table_row"
+    And I am on the "Fixture" "url activity" page
+    And I should see "Behat time is the same as real time"
@@ -46,14 +46,14 @@ require_once($CFG->libdir . '/behat/form_field/behat_form_text.php');
 * @covers \behat_form_text
 * @covers \behat_form_field
 */
-class behat_form_text_test extends \basic_testcase {
+final class behat_form_text_test extends \basic_testcase {

    /**
     * Data provider for the test_set_get_value() method.
     *
     * @return array of value and expectation pairs to be tested.
     */
-    public function provider_test_set_get_value() {
+    public static function provider_test_set_get_value(): array {
        return [
            'null' => [null, null],
            'int' => [3, 3],
@@ -68,7 +68,7 @@ class behat_form_text_test extends \basic_testcase {
     *
     * @param mixed $value value to be set.
     * @param mixed $expectation value to be checked.
-     * @dataProvider provider_test_set_get_value()
+     * @dataProvider provider_test_set_get_value
     */
    public function test_set_get_value($value, $expectation): void {
        $session = $this->createMock(Session::class);
@@ -85,7 +85,7 @@ class behat_form_text_test extends \basic_testcase {
     *
     * @return array of decsep, value, match and result pairs to be tested.
     */
-    public function provider_test_matches() {
+    public static function provider_test_matches(): array {
        return [
            'lazy true' => ['.', 'hello', 'hello', true],
            'lazy false' => ['.', 'hello', 'bye', false],
@@ -113,7 +113,7 @@ class behat_form_text_test extends \basic_testcase {
     * @param mixed $value value to be set.
     * @param mixed $match value to be matched.
     * @param bool  $result expected return status of the function.
-     * @dataProvider provider_test_matches()
+     * @dataProvider provider_test_matches
     */
    public function test_matches($decsep, $value, $match, $result): void {
        global $CFG;
@@ -30,7 +30,7 @@ namespace tool_behat\external;
 *
 * @covers \tool_behat\external\get_entity_generator
 */
-class get_entity_generator_test extends \advanced_testcase {
+final class get_entity_generator_test extends \advanced_testcase {

    /**
     * Log in as admin
@@ -0,0 +1,52 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Fixture to show the current server time using \core\clock.
+ *
+ * @package tool_behat
+ * @copyright 2024 The Open University
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+// phpcs:disable moodle.Files.RequireLogin.Missing
+require(__DIR__ . '/../../../../../../config.php');
+
+defined('BEHAT_SITE_RUNNING') || die('Behat fixture');
+
+$PAGE->set_context(\context_system::instance());
+$PAGE->set_url(new \moodle_url('/admin/tool/behat/tests/fixtures/core/showtime.php'));
+
+echo $OUTPUT->header();
+
+$clock = \core\di::get(\core\clock::class);
+$dt = $clock->now();
+$realbefore = time();
+$time = $clock->time();
+$realafter = time();
+
+echo html_writer::div('Unix time ' . $time);
+echo html_writer::div('Date-time ' . $dt->format('Y-m-d H:i:s'));
+
+echo html_writer::div('TZ ' . $dt->getTimezone()->getName());
+
+if ($time >= $realbefore && $time <= $realafter) {
+    echo html_writer::div('Behat time is the same as real time');
+} else {
+    echo html_writer::div('Behat time is not the same as real time');
+}
+
+echo $OUTPUT->footer();
@@ -1,7 +1,4 @@
 <?php
-// phpcs:ignoreFile
-// @codeCoverageIgnoreStart
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -43,8 +40,7 @@ require_once($CFG->libdir . '/behat/classes/behat_config_manager.php');
 * @copyright  2016 Rajesh Taneja
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class manager_util_test extends \advanced_testcase {
-
+final class manager_util_test extends \advanced_testcase {
    /** @var array Fixtures features which are available. */
    private $featurepaths = array(
        'default' => array(
@@ -107,11 +103,11 @@ class manager_util_test extends \advanced_testcase {
     */
    private function get_behat_config_util($behatconfigutil, $notheme = false) {
        // Create a map of arguments to return values.
-        $map = array(
-            array('withfeatures', __DIR__.'/fixtures/theme/withfeatures'),
-            array('nofeatures', __DIR__.'/fixtures/theme/nofeatures'),
-            array('defaulttheme', __DIR__.'/fixtures/theme/defaulttheme'),
-        );
+        $map = [
+            ['withfeatures', self::get_fixture_path(__NAMESPACE__, 'theme/withfeatures')],
+            ['nofeatures', self::get_fixture_path(__NAMESPACE__, 'theme/nofeatures')],
+            ['defaulttheme', self::get_fixture_path(__NAMESPACE__, 'theme/defaulttheme')],
+        ];
        // List of themes is const for test.
        if ($notheme) {
            $themelist = array('defaulttheme');
@@ -410,13 +410,13 @@ class brickfield_accessibility_color_test extends brickfield_accessibility_test
        $pos3 = stripos($fontsize, 'px');
        if ($pos1 !== false) {
            $rem = substr($fontsize, 0, -3);
-            $newfontsize = $newfontsize * $rem;
+            $newfontsize = is_numeric($rem) ? $newfontsize * $rem : $newfontsize;
        } else if ($pos2 !== false) {
            $em = substr($fontsize, 0, -2);
-            $newfontsize = $newfontsize * $em;
+            $newfontsize = is_numeric($em) ? $newfontsize * $em : $newfontsize;
        } else if ($pos3 !== false) {
            $px = substr($fontsize, 0, -2);
-            $newfontsize = 0.75 * $px;
+            $newfontsize = is_numeric($px) ? 0.75 * $px : $newfontsize;
        } else if (in_array($fontsize, array_keys($this->fontsizenames))) {
            $newfontsize = $this->fontsizenames[$fontsize];
        } else {
@@ -16,7 +16,7 @@

 namespace tool_brickfield\local\htmlchecker\common\checks;

-use tool_brickfield\local\htmlchecker\common\brickfield_accessibility_tag_test;
+use tool_brickfield\local\htmlchecker\common\brickfield_accessibility_test;

 /**
 * Brickfield accessibility HTML checker library.
@@ -28,11 +28,25 @@ use tool_brickfield\local\htmlchecker\common\brickfield_accessibility_tag_test;
 * @copyright  2020 onward: Brickfield Education Labs, www.brickfield.ie
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class i_is_not_used extends brickfield_accessibility_tag_test {
+class i_is_not_used extends brickfield_accessibility_test {

    /** @var int The default severity code for this test. */
    public $defaultseverity = \tool_brickfield\local\htmlchecker\brickfield_accessibility::BA_TEST_SEVERE;

    /** @var string The tag this test will fire on. */
    public $tag = 'i';
+
+    /**
+     * Check for any i elements and flag them as errors
+     * while allowing font awesome icons to be used.
+     */
+    public function check(): void {
+        foreach ($this->get_all_elements('i') as $element) {
+            // Ensure this is not a font awesome icon with aria-hidden.
+            if (str_contains($element->getAttribute('class'), 'fa-') && $element->getAttribute('aria-hidden') === 'true') {
+                continue;
+            }
+            $this->add_report($element);
+        }
+    }
 }
@@ -16,6 +16,7 @@

 namespace tool_brickfield\local\htmlchecker\common\checks;

+use core_text;
 use tool_brickfield\local\htmlchecker\common\brickfield_accessibility_test;

 /**
@@ -29,10 +30,6 @@ use tool_brickfield\local\htmlchecker\common\brickfield_accessibility_test;
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
 class img_alt_is_too_long extends brickfield_accessibility_test {
-
-    /** @var int The default severity code for this test. */
-    public $defaultseverity = \tool_brickfield\local\htmlchecker\brickfield_accessibility::BA_TEST_SEVERE;
-
    /**
     * The main check function. This is called by the parent class to actually check content.
     */
@@ -40,8 +37,8 @@ class img_alt_is_too_long extends brickfield_accessibility_test {
        global $alttextlengthlimit;

        foreach ($this->get_all_elements('img') as $img) {
-            $alttextlengthlimit = 125;
-            if ($img->hasAttribute('alt') && strlen($img->getAttribute('alt')) > $alttextlengthlimit) {
+            $alttextlengthlimit = 750;
+            if ($img->hasAttribute('alt') && core_text::strlen($img->getAttribute('alt')) > $alttextlengthlimit) {
                $this->add_report($img);
            }
        }
@@ -46,7 +46,7 @@ class table_data_should_have_th extends brickfield_accessibility_table_test {
                            foreach ($tr->childNodes as $th) {
                                if ($this->property_is_equal($th, 'tagName', 'th')) {
                                    break 3;
-                                } else {
+                                } else if ($th->nodeName != '#text') {
                                    $this->add_report($table);
                                    break 3;
                                }
@@ -57,7 +57,7 @@ class table_data_should_have_th extends brickfield_accessibility_table_test {
                    foreach ($child->childNodes as $th) {
                        if ($this->property_is_equal($th, 'tagName', 'th')) {
                            break 2;
-                        } else {
+                        } else if ($th->nodeName != '#text') {
                            $this->add_report($table);
                            break 2;
                        }
@@ -402,6 +402,8 @@ class manager {
            }
        }

+        $rs->close();
+
        if (count($batchinserts) > 0) {
            $DB->insert_records(self::DB_PROCESS, $batchinserts);
        }
@@ -179,7 +179,7 @@ $string['checkdesc:headerh3'] = 'Headers following after H3 headers (the editor
 $string['checkdesc:headershavetext'] = 'A header needs to contain text to be perceivable.';
 $string['checkdesc:iisnotused'] = 'Italic (i) elements should not be used; "em" should be used instead.';
 $string['checkdesc:imgaltisdifferent'] = 'Image alt (alternative) text should not be the image filename.';
-$string['checkdesc:imgaltistoolong'] = 'Image alt (alternative) text should not be more than the maximum allowed (125) characters.';
+$string['checkdesc:imgaltistoolong'] = 'Ensure that the image alt (alternative) text is concise enough to describe the image.';
 $string['checkdesc:imgaltnotemptyinanchor'] = 'Image alt (alternative) text should not be empty, especially when the image has a link going elsewhere.';
 $string['checkdesc:imgaltnotplaceholder'] = 'Image alt (alternative) text should not be a simple placeholder text, such as "image".';
 $string['checkdesc:imghasalt'] = 'Image alt (alternative) text should not be missing for image elements, unless purely decorative with no meaning.';
@@ -26,7 +26,7 @@ use tool_brickfield\local\tool\filter;
 * @author     Jay Churchward (jay@brickfieldlabs.ie)
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class accessibility_test extends \advanced_testcase {
+final class accessibility_test extends \advanced_testcase {

    /**
     * Test get_title().
@@ -28,7 +28,7 @@ require_once($CFG->dirroot . '/admin/tool/brickfield/tests/area_test_base.php');
 * @copyright  2020 onward: Brickfield Education Labs, https://www.brickfield.ie
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class area_test extends area_test_base {
+final class area_test extends area_test_base {
    /**
     * Test for the area assign intro
     */
@@ -26,7 +26,7 @@ use tool_brickfield\local\tool\filter;
 * @author     Jay Churchward (jay.churchward@poetopensource.org)
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class filters_test extends \advanced_testcase {
+final class filters_test extends \advanced_testcase {
    public function test_constructor(): void {
        $this->resetAfterTest();

@@ -23,7 +23,7 @@ namespace tool_brickfield\local\areas\core_question;
 * @copyright   2020 onward: Brickfield Education Labs, https://www.brickfield.ie
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class questionanswers_test extends \advanced_testcase {
+final class questionanswers_test extends \advanced_testcase {

    /**
     * Set up before class.
@@ -30,7 +30,7 @@ use tool_brickfield\area_test_base;
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @coversDefaultClass \tool_brickfield\local\areas\core_question\base
 */
-class questiontext_test extends area_test_base {
+final class questiontext_test extends area_test_base {
    /**
     * Set up before class.
     */
@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class a_links_dont_open_new_window_testcase
 */
-class a_links_dont_open_new_window_test extends all_checks {
+final class a_links_dont_open_new_window_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'a_links_dont_open_new_window';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class a_must_contain_text_testcase
 */
-class a_must_contain_text_test extends all_checks {
+final class a_must_contain_text_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'a_must_contain_text';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class a_suspicious_link_text
 */
-class a_suspicious_link_text_test extends all_checks {
+final class a_suspicious_link_text_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'a_suspicious_link_text';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class area_dont_open_new_window_testcase
 */
-class area_dont_open_new_window_test extends all_checks {
+final class area_dont_open_new_window_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'area_dont_open_new_window';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class area_has_alt_value_testcase
 */
-class area_has_alt_value_test extends all_checks {
+final class area_has_alt_value_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'area_has_alt_value';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class basefont_is_not_used_testcase
 */
-class basefont_is_not_used_test extends all_checks {
+final class basefont_is_not_used_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'basefont_is_not_used';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class blink_is_not_used_testcase
 */
-class blink_is_not_used_test extends all_checks {
+final class blink_is_not_used_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'blink_is_not_used';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class bold_is_not_used_testcase
 */
-class bold_is_not_used_test extends all_checks {
+final class bold_is_not_used_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'bold_is_not_used';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class content_too_long_testcase
 */
-class content_too_long_test extends all_checks {
+final class content_too_long_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'content_too_long';

@@ -32,7 +32,7 @@ require_once('all_checks.php');
 * Class test_css_text_has_contrast_test
 * @covers \tool_brickfield\local\htmlchecker\brickfield_accessibility
 */
-class css_text_has_contrast_test extends all_checks {
+final class css_text_has_contrast_test extends all_checks {
    /** @var string The check type. */
    protected $checktype = 'css_text_has_contrast';

@@ -227,6 +227,18 @@ EOD;
    This is contrasty enough.</p></body>
 EOD;

+    /** @var string HTML with calculated size colour values. */
+    private $calculatedfail = <<<EOD
+    <body><p style="color:#EF0000; background-color:white; font-size: calc(0.90375rem + 0.045vw)">
+    This is not contrasty enough.</p></body>
+EOD;
+
+    /** @var string HTML with calculated size colour values. */
+    private $calculatedpass = <<<EOD
+    <body><p style="color:#E60000; background-color:white; font-size: calc(0.90375rem + 0.045vw);">
+    This is contrasty enough.</p></body>
+EOD;
+
    /**
     * Test for the area assign intro
     */
@@ -458,4 +470,20 @@ EOD;
        $results = $this->get_checker_results($html);
        $this->assertEmpty($results);
    }
+
+    /**
+     * Test for calculated (12pt) text with insufficient contrast of 4.49.
+     */
+    public function test_check_for_calculated_fail(): void {
+        $results = $this->get_checker_results($this->calculatedfail);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for calculated (12pt) text with sufficient contrast of 4.81.
+     */
+    public function test_check_for_calculated_pass(): void {
+        $results = $this->get_checker_results($this->calculatedpass);
+        $this->assertEmpty($results);
+    }
 }
@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class embed_has_associated_no_embed_testcase
 */
-class embed_has_associated_no_embed_test extends all_checks {
+final class embed_has_associated_no_embed_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'embed_has_associated_no_embed';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class header_h3_testcase
 */
-class header_h3_test extends all_checks {
+final class header_h3_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'header_h3';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class headers_have_text_testcase
 */
-class headers_have_text_test extends all_checks {
+final class headers_have_text_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'headers_have_text';

@@ -30,8 +30,10 @@ require_once('all_checks.php');

 /**
 * Class i_is_not_used_testcase
+ *
+ * @covers \tool_brickfield\local\htmlchecker\common\checks\i_is_not_used
 */
-class i_is_not_used_test extends all_checks {
+final class i_is_not_used_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'i_is_not_used';

@@ -71,4 +73,13 @@ EOD;
        $results = $this->get_checker_results($this->htmlpass);
        $this->assertEmpty($results);
    }
+
+    /**
+     * Test for font awesome icon.
+     */
+    public function test_fa_icon(): void {
+        $html = '<div><i class="fa fa-user"></i><i>Hello there</i><i class="fa fa-address-book" aria-hidden="true"></i></div>';
+        $results = $this->get_checker_results($html);
+        $this->assertCount(2, $results);
+    }
 }
@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class img_alt_is_different_testcase
 */
-class img_alt_is_different_test extends all_checks {
+final class img_alt_is_different_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'img_alt_is_different';

@@ -24,55 +24,92 @@

 namespace tool_brickfield\local\htmlchecker\common\checks;

+use tool_brickfield\local\htmlchecker\brickfield_accessibility;
+
 defined('MOODLE_INTERNAL') || die();

 require_once('all_checks.php');

 /**
 * Class img_alt_is_too_long_testcase
+ *
+ * @covers \tool_brickfield\local\htmlchecker\common\checks\img_alt_is_too_long
 */
-class img_alt_is_too_long_test extends all_checks {
+final class img_alt_is_too_long_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'img_alt_is_too_long';

-    /** @var string Html fail */
-    private $htmlfail = <<<EOD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+    /**
+     * Get test HTML with an image tag.
+     *
+     * @param string $alttext
+     * @return string
+     */
+    protected function get_test_html(string $alttext): string {
+        return <<<EOD
+<!DOCTYPE HTML>
+<html lang="en">
    <head>
        <title>Image alt attributes must not be too long</title>
    </head>
    <body>
-    <img src="rex.jpg" alt="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent accumsan, ante varius viverra aliquam,
-     dolor risus scelerisque massa, ut lacinia ipsum felis id est. Nullam convallis odio ante, in commodo elit fermentum sed.
-     Vivamus ullamcorper tincidunt sagittis. Sed et semper sapien. Quisque malesuada lacus nec libero cursus, aliquam malesuada
-     neque ultricies. Cras sit amet enim vel orci tristique porttitor a vitae urna. Suspendisse mi leo, hendrerit et eleifend a,
-     mollis at ex. Maecenas eget magna nec sem dignissim pharetra vel nec ex. Donec in porta lectus. Aenean porttitor euismod
-     lectus, sodales eleifend ex egestas in. Donec sed metus sodales, lobortis velit quis, dictum arcu.">
+    <img src="rex.jpg" alt="$alttext">
    </body>
 </html>
 EOD;
+    }
+
+    /**
+     * Image alt text data provider.
+     *
+     * @return array
+     */
+    public static function img_alt_text_provider(): array {
+        return [
+            'Alt text <= 750 characters' => [
+                true,
+                str_repeat("Hello world!", 60),
+            ],
+            'Alt text > 750 characters' => [
+                false,
+                str_repeat("Hello world!", 65),
+            ],
+            'Multi-byte alt text <= 750 characters' => [
+                true,
+                str_repeat('こんにちは、世界！', 83),
+            ],
+            'Multi-byte alt text > 750 characters' => [
+                false,
+                str_repeat('こんにちは、世界！', 90),
+            ],
+        ];
+    }

-    /** @var string Html pass */
-    private $htmlpass = <<<EOD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-    <head>
-        <title>Image alt attributes must not be too long</title>
-    </head>
-    <body>
-    <img src="rex.jpg" alt="this is an image of rex">
-    </body>
-</html>
-EOD;
    /**
     * Test for image alt attributes being too long
+     *
+     * @dataProvider img_alt_text_provider
+     * @param bool $expectedpass Whether the test is expected to pass or fail.
+     * @param string $alttext The alt text to test.
     */
-    public function test_check(): void {
-        $results = $this->get_checker_results($this->htmlfail);
-        $this->assertTrue($results[0]->element->tagName == 'img');
+    public function test_check(bool $expectedpass, string $alttext): void {
+        $html = $this->get_test_html($alttext);
+        $results = $this->get_checker_results($html);
+        if ($expectedpass) {
+            $this->assertEmpty($results);
+        } else {
+            $this->assertEquals('img', $results[0]->element->tagName);
+        }
+    }

-        $results = $this->get_checker_results($this->htmlpass);
-        $this->assertEmpty($results);
+    /**
+     * Test the severity of the {@see img_alt_is_too_long} check.
+     *
+     * @return void
+     */
+    public function test_severity(): void {
+        $html = $this->get_test_html('Some alt text');
+        $checker = new brickfield_accessibility($html, 'brickfield', 'string');
+        $this->assertEquals(brickfield_accessibility::BA_TEST_SUGGESTION, $checker->get_test_severity(img_alt_is_too_long::class));
    }
 }
@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class img_alt_not_empty_in_anchor_testcase
 */
-class img_alt_not_empty_in_anchor_test extends all_checks {
+final class img_alt_not_empty_in_anchor_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'img_alt_not_empty_in_anchor';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class img_alt_not_placeholder_testcase
 */
-class img_alt_not_place_holder_test extends all_checks {
+final class img_alt_not_place_holder_test extends all_checks {
    /** @var string Check type */
    protected $checktype = 'img_alt_not_place_holder';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class test_css_text_has_contrast_testcase
 */
-class img_has_alt_test extends all_checks {
+final class img_has_alt_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'img_has_alt';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class img_with_map_has_use_map_test
 */
-class img_with_map_has_use_map_test extends all_checks {
+final class img_with_map_has_use_map_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'img_with_map_has_use_map';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class legend_text_not_empty_test
 */
-class legend_text_not_empty_test extends all_checks {
+final class legend_text_not_empty_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'legend_text_not_empty';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class no_headings_test
 */
-class no_headings_test extends all_checks {
+final class no_headings_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'no_headings';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class object_must_have_embeded_test
 */
-class object_must_have_embed_test extends all_checks {
+final class object_must_have_embed_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'object_must_have_embed';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class object_must_have_title_test
 */
-class object_must_have_title_test extends all_checks {
+final class object_must_have_title_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'object_must_have_title';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class object_must_have_valid_title_test
 */
-class object_must_have_valid_title_test extends all_checks {
+final class object_must_have_valid_title_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'object_must_have_valid_title';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class strike_is_not_used_testcase
 */
-class strike_is_not_used_test extends all_checks {
+final class strike_is_not_used_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'strike_is_not_used';

@@ -30,8 +30,10 @@ require_once('all_checks.php');

 /**
 * Class table_data_should_have_th_test
+ *
+ * @covers \tool_brickfield\local\htmlchecker\common\checks\table_data_should_have_th
 */
-class table_data_should_have_th_test extends all_checks {
+final class table_data_should_have_th_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'table_data_should_have_th';

@@ -113,6 +115,117 @@ EOD;
        </table>
    </body>
 </html>
+EOD;
+
+    /** @var string HTML that should not get flagged. */
+    private $htmlpass3 = <<<EOD
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>Table should have at least one th - pass</title>
+    </head>
+    <body>
+        <table>
+            <thead>
+                <tr>
+                    <th>
+                        This is table heading
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td>
+                        This is a tables data
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
+EOD;
+
+    /** @var string HTML that should not get flagged. */
+    private $htmlpass4 = <<<EOD
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>Table should have at least one th - pass</title>
+    </head>
+    <body>
+        <table>
+            <tr>
+                <th>
+                    This is table heading
+                </th>
+            </tr>
+            <tr>
+                <td>
+                    This is a tables data
+                </td>
+            </tr>
+        </table>
+    </body>
+</html>
+EOD;
+
+    /** @var string HTML that should not get flagged. */
+    private $htmlpass5 = <<<EOD
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>Table should have at least one th - pass</title>
+    </head>
+    <body>
+        <table>
+            <thead>
+                <tr>
+                    <th>
+                        This is table heading
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th>
+                        This is a table heading in table data
+                    </th>
+                </tr>
+                <tr>
+                    <td>
+                        This is a tables data
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
+EOD;
+
+    /** @var string HTML that should not get flagged. */
+    private $htmlpass6 = <<<EOD
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>Table should have at least one th - pass</title>
+    </head>
+    <body>
+        <table>
+            <tbody>
+                <tr>
+                    <th>
+                        This is a table heading in table data
+                    </th>
+                </tr>
+                <tr>
+                    <td>
+                        This is a tables data
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
 EOD;
    /**
     * Test that th does not exist
@@ -134,5 +247,17 @@ EOD;

        $results = $this->get_checker_results($this->htmlpass2);
        $this->assertEmpty($results);
+
+        $results = $this->get_checker_results($this->htmlpass3);
+        $this->assertEmpty($results);
+
+        $results = $this->get_checker_results($this->htmlpass4);
+        $this->assertEmpty($results);
+
+        $results = $this->get_checker_results($this->htmlpass5);
+        $this->assertEmpty($results);
+
+        $results = $this->get_checker_results($this->htmlpass6);
+        $this->assertEmpty($results);
    }
 }
@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class table_summary_does_not_duplicate_caption_test
 */
-class table_summary_does_not_duplicate_caption_test extends all_checks {
+final class table_summary_does_not_duplicate_caption_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'table_summary_does_not_duplicate_caption';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class table_td_should_not_merge_test
 */
-class table_td_should_not_merge_test extends all_checks {
+final class table_td_should_not_merge_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'table_td_should_not_merge';

@@ -31,7 +31,7 @@ require_once('all_checks.php');
 /**
 * Class table_th_should_have_scope_test
 */
-class table_th_should_have_scope_test extends all_checks {
+final class table_th_should_have_scope_test extends all_checks {
    /** @var string Check type */
    public $checktype = 'table_th_should_have_scope';

@@ -24,7 +24,7 @@ namespace tool_brickfield\local\tool;
 * @author     Jay Churchward (jay.churchward@poetopensource.org)
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class activityresults_test extends \advanced_testcase {
+final class activityresults_test extends \advanced_testcase {

    public function test_toolname(): void {
        $this->resetAfterTest();
@@ -24,7 +24,7 @@ namespace tool_brickfield\local\tool;
 * @author     Jay Churchward (jay.churchward@poetopensource.org)
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class checktyperesults_test extends \advanced_testcase {
+final class checktyperesults_test extends \advanced_testcase {

    public function test_toolname(): void {
        $this->resetAfterTest();
@@ -24,7 +24,7 @@ namespace tool_brickfield\local\tool;
 * @author     Jay Churchward (jay.churchward@poetopensource.org)
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class errors_test extends \advanced_testcase {
+final class errors_test extends \advanced_testcase {

    public function test_toolname(): void {
        $this->resetAfterTest();
@@ -24,7 +24,7 @@ namespace tool_brickfield\local\tool;
 * @author     Jay Churchward (jay.churchward@poetopensource.org)
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class printable_test extends \advanced_testcase {
+final class printable_test extends \advanced_testcase {

    /**
     * Test tool name.
@@ -23,7 +23,7 @@ namespace tool_brickfield;
 * @copyright  2020 onward: Brickfield Education Labs, https://www.brickfield.ie
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class manager_test extends \advanced_testcase {
+final class manager_test extends \advanced_testcase {

    /**
     * Tests for the function manager::get_all_areas()
@@ -28,7 +28,7 @@ namespace tool_brickfield;
 * Unit tests for {@registration tool_brickfield\registration.php}.
 * @group tool_brickfield
 */
-class registration_test extends \advanced_testcase {
+final class registration_test extends \advanced_testcase {
    public static function setUpBeforeClass(): void {
        global $CFG;

@@ -24,7 +24,7 @@ namespace tool_brickfield;
 * @author     Jay Churchward (jay@brickfieldlabs.ie)
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class scheduler_test extends \advanced_testcase {
+final class scheduler_test extends \advanced_testcase {

    public function test_request_analysis(): void {
        $this->resetAfterTest();
@@ -27,10 +27,10 @@ use tool_brickfield\local\tool\tool;
 * @author     Jay Churchward (jay.churchward@poetopensource.org)
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_test extends \advanced_testcase {
+final class tool_test extends \advanced_testcase {

    /** @var string base 64 image */
-    protected $base64img = <<<EOF
+    protected static string $base64img = <<<EOF
 <img src="data:image/gif;base64,R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/
 8mJl+fn/9ZWb8/PzWlwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2ccMDA8PD/95eX5N
 WvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjAJ8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29u
@@ -118,11 +118,11 @@ EOF;
     * Base64 image provider.
     * @return array
     */
-    public function base64_img_provider(): array {
+    public static function base64_img_provider(): array {
        $img = '<img src="myimage.jpg" />';
        return [
            'Image tag alone (base64)' => [
-                $this->base64img,
+                self::$base64img,
                true,
            ],
            'Image tag alone (link)' => [
@@ -130,7 +130,7 @@ EOF;
                false,
            ],
            'Image tag in string (base64)' => [
-                "This is my image {$this->base64img}.",
+                "This is my image " . self::$base64img,
                true,
            ],
            'Image tag in string (link)' => [
@@ -162,7 +162,7 @@ EOF;
    }

    public function test_truncate_base64(): void {
-        $truncated = tool::truncate_base64($this->base64img);
+        $truncated = tool::truncate_base64(self::$base64img);
        $this->assertStringContainsString('<img src="data:image/gif;base64..."', $truncated);
    }
 }
@@ -31,7 +31,7 @@ namespace tool_capability\event;
 * @copyright  2014 Petr Skoda
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
 */
-class events_test extends \advanced_testcase {
+final class events_test extends \advanced_testcase {

    /**
     * Setup testcase.
@@ -31,7 +31,7 @@ require_once($CFG->dirroot . '/' . $CFG->admin . '/tool/capability/locallib.php'
 /**
 * Tests for the capability overview helper functions.
 */
-class locallib_test extends \advanced_testcase {
+final class locallib_test extends \advanced_testcase {

    /**
     * Test the function that gets the data - simple case.
@@ -63,11 +63,9 @@ class assign_role_cohort extends moodleform {
        $mform->addElement('select', 'roleid', get_string('selectrole', 'tool_cohortroles'), $options);
        $mform->addRule('roleid', null, 'required');

-        $context = context_system::instance();
        $options = array(
            'multiple' => true,
-            'data-contextid' => $context->id,
-            'data-includes' => 'all'
+            'includes' => 'all',
        );
        $mform->addElement('cohort', 'cohortids', get_string('selectcohorts', 'tool_cohortroles'), $options);
        $mform->addRule('cohortids', null, 'required');
@@ -175,7 +175,7 @@ class cohort_role_assignments_table extends table_sql {
     * @return array containing sql to use and an array of params.
     */
    protected function get_sql_and_params($count = false) {
-        $fields = 'uca.id, uca.cohortid, uca.userid, uca.roleid, ';
+        $fields = 'uca.id, uca.cohortid, uca.userid, uca.roleid, r.shortname AS rolename, ';
        $fields .= 'c.name as cohortname, c.idnumber as cohortidnumber, c.contextid as cohortcontextid, ';
        $fields .= 'c.visible as cohortvisible, c.description as cohortdescription, c.theme as cohorttheme';

@@ -193,6 +193,7 @@ class cohort_role_assignments_table extends table_sql {
        $sql = "SELECT $select
                   FROM {tool_cohortroles} uca
                   JOIN {user} u ON u.id = uca.userid
+                   JOIN {role} r ON r.id = uca.roleid
                   JOIN {cohort} c ON c.id = uca.cohortid";

        // Check if any additional filtering is required.
@@ -23,7 +23,7 @@ namespace tool_cohortroles;
 * @copyright  2015 Damyon Wiese
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class api_test extends \advanced_testcase {
+final class api_test extends \advanced_testcase {
    /** @var \stdClass $cohort */
    protected $cohort = null;

@@ -39,7 +39,7 @@ use core_privacy\local\request\approved_userlist;
 * @copyright  2018 Zig Tan <zig@moodle.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class provider_test extends \core_privacy\tests\provider_testcase {
+final class provider_test extends \core_privacy\tests\provider_testcase {

    /**
     * Overriding setUp() function to always reset after tests.
@@ -36,7 +36,7 @@ use moodle_exception;
 * @copyright  2020 Ferran Recio <ferran@moodle.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class langstring_test extends advanced_testcase {
+final class langstring_test extends advanced_testcase {

    /**
     * Sanity 1.x string
@@ -60,7 +60,7 @@ class langstring_test extends advanced_testcase {
     *
     * @return  array
     */
-    public function fix_syntax_data(): array {
+    public static function fix_syntax_data(): array {
        return [
            // Syntax sanity v1 strings.
            [
--- a/Show More
+++ b/Show More