Moodle release 4.4.8

* Return early if the `userids` params is empty or if the filtered
user IDs end up being empty.

.gitattributes

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

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 # Primary donations pages.
-custom: ["https://moodle.com/donations/", moodle.org]
+custom: ["https://moodle.com/donations/", "https://fund.moodle.org"]

.nvmrc

@@ -1 +1 @@
-lts/iron
+lts/jod

admin/cli/restore_backup.php

@@ -55,13 +55,14 @@ If courseid is set, course module/s will be added into the course.
 
 Options:
 -f, --file=STRING       Path to the backup file.
--c, --categoryid=INT    ID of the course category to restore to.
--C, --courseid=INT      ID of the course to restore to. This option is ignored if categoryid is set.
+-c, --categoryid=INT    ID of the course category to restore to. This option is ignored when restoring an activity and courseid is set.
+-C, --courseid=INT      ID of the course to restore to. This option is ignored when restoring a course and the categoryid is set.
 -s, --showdebugging     Show developer level debugging information
 -h, --help              Print out this help.
 
 Example:
-\$sudo -u www-data /usr/bin/php admin/cli/restore_backup.php --file=/path/to/backup/file.mbz --categoryid=1\n
+\$sudo -u www-data /usr/bin/php admin/cli/restore_backup.php --file=/path/to/backup/coursebackup.mbz --categoryid=1\n
+\$sudo -u www-data /usr/bin/php admin/cli/restore_backup.php --file=/path/to/backup/activitybackup.mbz --courseid=1\n
 EOL;
 
     echo $help;
@@ -84,11 +85,15 @@ if ($options['categoryid']) {
     if (!$category = $DB->get_record('course_categories', ['id' => $options['categoryid']], 'id')) {
         throw new \moodle_exception('invalidcategoryid');
     }
-} else if ($options['courseid']) {
+}
+
+if ($options['courseid']) {
     if (!$course = $DB->get_record('course', ['id' => $options['courseid']], 'id')) {
         throw new \moodle_exception('invalidcourseid');
     }
-} else {
+}
+
+if (empty($category) && empty($course)) {
     throw new \moodle_exception('invalidoption');
 }
 
@@ -100,28 +105,46 @@ $fp = get_file_packer('application/vnd.moodle.backup');
 $fp->extract_to_pathname($options['file'], $path);
 
 cli_heading(get_string('preprocessingbackupfile'));
-try {
-    list($fullname, $shortname) = restore_dbops::calculate_course_names(0, get_string('restoringcourse', 'backup'),
-        get_string('restoringcourseshortname', 'backup'));
 
-    if (!empty($course)) {
-        $courseid = $course->id;
-        $rc = new restore_controller($backupdir, $courseid, backup::INTERACTIVE_NO,
-            backup::MODE_GENERAL, $admin->id, backup::TARGET_EXISTING_ADDING);
-    } else {
+try {
+    // Create a temporary restore controller to determine the restore type.
+    $tmprc = new restore_controller($backupdir, SITEID, backup::INTERACTIVE_NO,
+        backup::MODE_GENERAL, $admin->id, backup::TARGET_EXISTING_ADDING);
+    // Restore the backup into a new course if:
+    // - It is a course backup and the category is set.
+    // - It is an activity backup and the course is not set.
+    $restoreasnewcourse = ($tmprc->get_type() === backup::TYPE_1COURSE && !empty($category)) ||
+        ($tmprc->get_type() !== backup::TYPE_1COURSE && empty($course));
+    // Make sure to clean up the temporary restore controller.
+    $tmprc->destroy();
+
+    if ($restoreasnewcourse) {
+        list($fullname, $shortname) = restore_dbops::calculate_course_names(0, get_string('restoringcourse', 'backup'),
+            get_string('restoringcourseshortname', 'backup'));
         $courseid = restore_dbops::create_new_course($fullname, $shortname, $category->id);
         $rc = new restore_controller($backupdir, $courseid, backup::INTERACTIVE_NO,
             backup::MODE_GENERAL, $admin->id, backup::TARGET_NEW_COURSE);
+    } else {
+        $courseid = $course->id;
+        $rc = new restore_controller($backupdir, $courseid, backup::INTERACTIVE_NO,
+            backup::MODE_GENERAL, $admin->id, backup::TARGET_EXISTING_ADDING);
     }
     $rc->execute_precheck();
     $rc->execute_plan();
     $rc->destroy();
 
-    // Rename course name if the backup is from course module and restore to category.
-    if (empty($course)) {
+    // Rename the course's full and short names with the backup file's original names if the backup file is an activity backup
+    // that is restored to a new course.
+    if ($restoreasnewcourse && $rc->get_type() !== backup::TYPE_1COURSE) {
         $course = get_course($courseid);
-        list($fullname, $shortname) = restore_dbops::calculate_course_names(0, get_string('restoretonewcourse', 'backup'),
-            get_string('newcourse'));
+        $backupinfo = $rc->get_info();
+        $tmpfullname = $backupinfo->original_course_fullname ?? get_string('restoretonewcourse', 'backup');
+        $tmpshortname = $backupinfo->original_course_shortname ?? get_string('newcourse');
+        list($fullname, $shortname) = restore_dbops::calculate_course_names(
+            courseid: 0,
+            fullname: $tmpfullname,
+            shortname: $tmpshortname,
+        );
         $course->fullname = $fullname;
         $course->shortname = $shortname;
         $course->visible = 1;

admin/environment.xml

@@ -4327,6 +4327,7 @@
       <VENDOR name="oracle" version="19" />
     </DATABASE>
     <PHP version="8.1.0" level="required">
+      <RESTRICT function="restrict_php_version_84" message="unsupportedphpversion84" />
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -4522,6 +4523,7 @@
       <VENDOR name="oracle" version="19" />
     </DATABASE>
     <PHP version="8.1.0" level="required">
+      <RESTRICT function="restrict_php_version_84" message="unsupportedphpversion84" />
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -4714,7 +4716,6 @@
       <VENDOR name="mysql" version="8.4" />
       <VENDOR name="postgres" version="14" />
       <VENDOR name="mssql" version="14.0" />
-      <VENDOR name="oracle" version="19" />
     </DATABASE>
     <PHP version="8.2.0" level="required">
     </PHP>
@@ -4892,8 +4893,6 @@
       </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_oracle_usage" level="optional">
-      </CUSTOM_CHECK>
       <CUSTOM_CHECK file="lib/upgradelib.php" function="check_async_backup" level="recommended">
       </CUSTOM_CHECK>
     </CUSTOM_CHECKS>

admin/presets/tests/generator_test.php

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

admin/presets/tests/helper_test.php

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

admin/presets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php

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

admin/presets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php

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

admin/presets/tests/local/setting/adminpresets_setting_test.php

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

admin/presets/tests/manager_test.php

@@ -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.
      */

admin/presets/tests/privacy/privacy_provider_test.php

@@ -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().

admin/renderer.php

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

admin/roles/tests/preset_test.php

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

admin/roles/tests/privacy/provider_test.php

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

admin/roles/tests/reportbuilder/datasource/roles_test.php

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

admin/settings/server.php

@@ -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'),

admin/tests/behat/behat_admin.php

@@ -81,6 +81,8 @@ class behat_admin extends behat_base {
 
             $this->execute('behat_forms::i_set_the_field_with_xpath_to', [$fieldxpath, $value]);
             $this->execute("behat_general::i_click_on", [get_string('savechanges'), 'button']);
+            // Wait for the page to be redirected.
+            $this->execute("behat_general::i_wait_to_be_redirected");
         }
     }
 

admin/tests/behat/plugins_overview.feature

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

admin/tests/external/set_block_protection_test.php

@@ -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.
      */

admin/tests/external/set_plugin_order_test.php

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

admin/tests/external/set_plugin_state_test.php

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

admin/tests/reportbuilder/datasource/task_logs_test.php

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

admin/tests/reportbuilder/local/filters/courserole_test.php

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

admin/tool/admin_presets/tests/event/preset_deleted_test.php

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

admin/tool/admin_presets/tests/event/preset_downloaded_test.php

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

admin/tool/admin_presets/tests/event/preset_exported_test.php

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

admin/tool/admin_presets/tests/event/preset_imported_test.php

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

admin/tool/admin_presets/tests/event/preset_loaded_test.php

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

admin/tool/admin_presets/tests/event/preset_previewed_test.php

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

admin/tool/admin_presets/tests/event/preset_reverted_test.php

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

admin/tool/admin_presets/tests/event/presets_listed_test.php

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

admin/tool/admin_presets/tests/local/action/base_test.php

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

admin/tool/admin_presets/tests/local/action/delete_test.php

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

admin/tool/admin_presets/tests/local/action/export_test.php

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

admin/tool/admin_presets/tests/local/action/import_test.php

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

admin/tool/admin_presets/tests/local/action/load_test.php

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

admin/tool/admin_presets/tests/local/action/rollback_test.php

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

admin/tool/analytics/tests/behat/obtain_prediction_models_insights.feature

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

admin/tool/analytics/tests/external/external_test.php

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

admin/tool/behat/tests/behat_form_text_test.php

@@ -46,7 +46,7 @@ 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.

admin/tool/behat/tests/external/get_entity_generator_test.php

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

admin/tool/behat/tests/manager_util_test.php

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

admin/tool/brickfield/classes/local/htmlchecker/common/checks/img_alt_is_too_long.php

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

admin/tool/brickfield/classes/manager.php

@@ -402,6 +402,8 @@ class manager {
             }
         }
 
+        $rs->close();
+
         if (count($batchinserts) > 0) {
             $DB->insert_records(self::DB_PROCESS, $batchinserts);
         }

admin/tool/brickfield/index.php

@@ -87,6 +87,7 @@ $action = optional_param('action', '', PARAM_ALPHA);
 // Handle any single operation actions.
 if ($action == 'requestanalysis') {
     if ($courseid != 0) {
+        require_sesskey();
         scheduler::request_course_analysis($courseid);
         if ($courseid == SITEID) {
             redirect(accessibility::get_plugin_url());

admin/tool/brickfield/lang/en/tool_brickfield.php

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

admin/tool/brickfield/tests/accessibility_test.php

@@ -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().

admin/tool/brickfield/tests/area_test.php

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

admin/tool/brickfield/tests/filters_test.php

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

admin/tool/brickfield/tests/local/areas/core_question/questionanswers_test.php

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

admin/tool/brickfield/tests/local/areas/core_question/questiontext_test.php

@@ -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.
      */

admin/tool/brickfield/tests/local/htmlchecker/common/checks/a_links_dont_open_new_window_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/a_must_contain_text_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/a_suspicious_link_text_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/area_dont_open_new_window_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/area_has_alt_value_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/basefont_is_not_used_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/blink_is_not_used_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/bold_is_not_used_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/content_too_long_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/embed_has_associated_no_embed_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/header_h3_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/headers_have_text_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/i_is_not_used_test.php

@@ -33,7 +33,7 @@ require_once('all_checks.php');
  *
  * @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';
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_alt_is_different_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_alt_is_too_long_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_alt_not_empty_in_anchor_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_alt_not_place_holder_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_has_alt_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_with_map_has_use_map_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/legend_text_not_empty_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/no_headings_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/object_must_have_embed_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/object_must_have_title_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/object_must_have_valid_title_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/strike_is_not_used_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/table_data_should_have_th_test.php

@@ -33,7 +33,7 @@ require_once('all_checks.php');
  *
  * @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';
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/table_summary_does_not_duplicate_caption_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/table_td_should_not_merge_test.php

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

admin/tool/brickfield/tests/local/htmlchecker/common/checks/table_th_should_have_scope_test.php

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

admin/tool/brickfield/tests/local/tool/activityresults_test.php

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

admin/tool/brickfield/tests/local/tool/checktyperesults_test.php

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

admin/tool/brickfield/tests/local/tool/errors_test.php

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

admin/tool/brickfield/tests/local/tool/printable_test.php

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

admin/tool/brickfield/tests/manager_test.php

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

admin/tool/brickfield/tests/registration_test.php

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

admin/tool/brickfield/tests/scheduler_test.php

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

admin/tool/brickfield/tests/tool_test.php

@@ -27,7 +27,7 @@ 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 static string $base64img = <<<EOF

admin/tool/capability/tests/event/events_test.php

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

admin/tool/capability/tests/locallib_test.php

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

admin/tool/cohortroles/classes/output/cohort_role_assignments_table.php

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

admin/tool/cohortroles/tests/api_test.php

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

admin/tool/cohortroles/tests/privacy/provider_test.php

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

admin/tool/customlang/tests/local/mlang/langstring_test.php

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

admin/tool/customlang/tests/local/mlang/phpparser_test.php

@@ -34,7 +34,7 @@ use moodle_exception;
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class phpparser_test extends advanced_testcase {
+final class phpparser_test extends advanced_testcase {
 
 
     /**

admin/tool/dataprivacy/classes/expired_contexts_manager.php

@@ -123,6 +123,7 @@ class expired_contexts_manager {
             $expiredcontext = new expired_context(0, $orphan);
             $expiredcontext->delete();
         }
+        $orphaned->close();
 
         // Delete any child of a user context.
         $parentpath = $DB->sql_concat('ctxuser.path', "'/%'");
@@ -143,6 +144,7 @@ class expired_contexts_manager {
             $expiredcontext = new expired_context(0, $child);
             $expiredcontext->delete();
         }
+        $userchildren->close();
     }
 
     /**

admin/tool/dataprivacy/lang/en/tool_dataprivacy.php

@@ -127,7 +127,6 @@ $string['dporolemapping'] = 'Privacy officer role mapping';
 $string['dporolemapping_desc'] = 'The privacy officer can manage data requests. The capability tool/dataprivacy:managedatarequests must be allowed for a role to be listed as a privacy officer role mapping option.';
 $string['editcategories'] = 'Edit categories';
 $string['editcategory'] = 'Edit category';
-$string['editcategories'] = 'Edit categories';
 $string['editdefaults'] = 'Edit defaults: {$a}';
 $string['editmoduledefaults'] = 'Edit module defaults';
 $string['editpurpose'] = 'Edit purpose';

admin/tool/dataprivacy/tests/api_test.php

@@ -31,7 +31,7 @@ use tool_dataprivacy\task\initiate_data_request_task;
  * @copyright  2018 Jun Pataleta
  * @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 {
 
     /**
      * Ensure that the check_can_manage_data_registry function fails cap testing when a user without capabilities is

admin/tool/dataprivacy/tests/data_registry_test.php

@@ -23,7 +23,7 @@ namespace tool_dataprivacy;
  * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class data_registry_test extends \advanced_testcase {
+final class data_registry_test extends \advanced_testcase {
 
     /**
      * Ensure that the get_effective_context_value only errors if provided an inappropriate element.