Moodle release 4.0.3

weekly release 4.0.2+
MDL-75210 mod_quiz: fix sequential quiz access
2022-08-19 09:50:23 +02:00 · 2022-08-18 14:54:15 +02:00 · 2022-08-18 08:08:00 +04:00 · 2022-08-18 11:17:43 +08:00 · 2022-08-17 16:53:10 +02:00 · 2022-08-17 12:26:44 +02:00
2161 changed files with 16146 additions and 8335 deletions
@@ -13,7 +13,7 @@ env:

 jobs:
  Grunt:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04

    steps:
      - name: Checking out code
@@ -54,11 +54,11 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
            php: 7.3
            extensions:
            db: mysqli
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
            php: 8.0
            db: pgsql
            extensions: xmlrpc-beta
@@ -111,4 +111,5 @@ jobs:
      - name: Running PHPUnit tests
        env:
          dbtype: ${{ matrix.db }}
-        run: vendor/bin/phpunit -v
+          phpunit_options: ${{ secrets.phpunit_options }}
+        run: vendor/bin/phpunit $phpunit_options
@@ -54,3 +54,4 @@ moodle-plugin-ci.phar
 /admin/tool/componentlibrary/docs
 /admin/tool/componentlibrary/hugo/site/data/my-index.json
 .hugo_build.lock
+.phpcs.xml
@@ -21,6 +21,43 @@
 */

 module.exports = grunt => {
+
+    /**
+     * Generate the PHPCS configuration.
+     *
+     * @param {Object} thirdPartyPaths
+     */
+    const phpcsIgnore = (thirdPartyPaths) => {
+        const {toXML} = require('jstoxml');
+
+        const config = {
+            _name: 'ruleset',
+            _attrs: {
+                name: "MoodleCore",
+            },
+            _content: [
+                {
+                    rule: {
+                        _attrs: {
+                            ref: './.phpcs.xml.dist',
+                        },
+                    },
+                },
+            ],
+        };
+
+        thirdPartyPaths.forEach(library => {
+            config._content.push({
+                'exclude-pattern': library,
+            });
+        });
+
+        grunt.file.write('.phpcs.xml', toXML(config, {
+            header: true,
+            indent: '  ',
+        }) + "\n");
+    };
+
    /**
     * Generate ignore files (utilising thirdpartylibs.xml data)
     */
@@ -53,6 +90,8 @@ module.exports = grunt => {
            'admin/tool/componentlibrary/hugo/dist/css/docs.css',
        ].concat(thirdPartyPaths);
        grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
+
+        phpcsIgnore(thirdPartyPaths);
    };

    grunt.registerTask('ignorefiles', 'Generate ignore files for linters', handler);
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="MoodleCore">
+  <rule ref="moodle"/>
+</ruleset>
@@ -36,7 +36,7 @@ jobs:
        - php: 7.3
          env: DB=none     TASK=CITEST
        - php: 7.3
-          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'
+          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/gallium'

        - if: env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present
          php: 7.3
@@ -52,7 +52,7 @@ jobs:
          env: DB=none     TASK=CITEST
        - if: env(MOODLE_PHP) = "all"
          php: 8.0
-          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'
+          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/gallium'

        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
          php: 8.0
@@ -221,7 +221,7 @@ before_script:
        # We need the official upstream for comparison
        git remote add upstream https://github.com/moodle/moodle.git;

-        git fetch upstream master;
+        git fetch upstream MOODLE_400_STABLE;
        export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
        export GIT_COMMIT="$TRAVIS_COMMIT";
        export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`
@@ -69,11 +69,11 @@ if ($options['help'] or (!$options['list'] and !$options['execute'])) {
    die;
 }

-if ($options['showdebugging']) {
+if ($options['showdebugging'] || !empty($CFG->showcrondebugging)) {
    set_debugging(DEBUG_DEVELOPER, true);
 }

-if ($options['showsql']) {
+if ($options['showsql'] || !empty($CFG->showcronsql)) {
    $DB->set_debug(true);
 }
 if ($options['list']) {
@@ -3539,6 +3539,8 @@
      </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_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
  <MOODLE version="4.0" requires="3.6">
@@ -3733,4 +3735,196 @@
      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
+  <MOODLE version="4.1" requires="3.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.4" />
+      <VENDOR name="mysql" version="5.7" />
+      <VENDOR name="postgres" version="12" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="7.4.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="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </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="optional"/>
+      <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="optional">
+        <FEEDBACK>
+          <ON_CHECK message="sixtyfourbitswarning" />
+        </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_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -53,6 +53,12 @@ if (!extension_loaded('xml')) {
    die();
 }

+// Make sure mbstring extension is available.
+if (!extension_loaded('mbstring')) {
+    echo 'Moodle requires the mbstring PHP extension. Please install or enable the mbstring extension.';
+    die();
+}
+
 define('NO_OUTPUT_BUFFERING', true);

 if (isset($_POST['upgradekey'])) {
@@ -38,11 +38,22 @@
    }

    if (!empty($show) and confirm_sesskey()) {
-        $class = \core_plugin_manager::resolve_plugininfo_class('mod');
-        $class::enable_plugin($show, true);
+        $canenablemodule = true;
+        $modulename = $show;

-        admin_get_root(true, false);  // settings not required - only pages
-        redirect(new moodle_url('/admin/modules.php'));
+        // Invoking a callback function that enables plugins to force additional actions (e.g. displaying notifications,
+        // modals, etc.) and also specify through its returned value (bool) whether the process of enabling the plugin
+        // should continue after these actions or not.
+        if (component_callback_exists("mod_{$modulename}", 'pre_enable_plugin_actions')) {
+            $canenablemodule = component_callback("mod_{$modulename}", 'pre_enable_plugin_actions');
+        }
+
+        if ($canenablemodule) {
+            $class = \core_plugin_manager::resolve_plugininfo_class('mod');
+            $class::enable_plugin($show, true);
+            admin_get_root(true, false);  // Settings not required - only pages.
+            redirect(new moodle_url('/admin/modules.php'));
+        }
    }

    echo $OUTPUT->header();
@@ -14,19 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

+namespace core_role;
+
+use core_role_preset;
+
 /**
 * Role XML presets test case.
 *
 * @package   core_role
- * @category  phpunit
+ * @category  test
 * @copyright 2013 Petr Skoda {@link http://skodak.org}
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-
-defined('MOODLE_INTERNAL') || die();
-
-
-class core_role_preset_testcase extends advanced_testcase {
+class preset_test extends \advanced_testcase {
    public function test_xml() {
        global $DB;

@@ -61,7 +61,7 @@ class core_role_preset_testcase extends advanced_testcase {
                   FROM {role_capabilities}
                  WHERE contextid = :syscontext AND roleid = :roleid
               ORDER BY capability ASC",
-                array('syscontext'=>context_system::instance()->id, 'roleid'=>$role->id));
+                array('syscontext' => \context_system::instance()->id, 'roleid' => $role->id));

            foreach ($capabilities as $cap) {
                $this->assertEquals($cap->permission, $info['permissions'][$cap->capability]);
@@ -33,8 +33,16 @@ if (!($settingspage->check_access())) {
    die;
 }

-$hassiteconfig = has_capability('moodle/site:config', $PAGE->context);
-if ($hassiteconfig) {
+// If the context in the admin_settingpage object is explicitly defined and it is not system, reset the current
+// page context and use that one instead. This ensures that the proper navigation is displayed and highlighted.
+if ($settingspage->context && !$settingspage->context instanceof \context_system) {
+    $PAGE->set_context($settingspage->context);
+}
+
+$hassiteconfig = has_capability('moodle/site:config', context_system::instance());
+// Display the admin search input element in the page header if the user has the capability to change the site
+// configuration and the current page context is system.
+if ($hassiteconfig && $PAGE->context instanceof \context_system) {
    $PAGE->add_header_action($OUTPUT->render_from_template('core_admin/header_search_input', [
        'action' => new moodle_url('/admin/search.php'),
    ]));
@@ -125,13 +133,6 @@ if (empty($SITE->fullname)) {

    $PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
    $PAGE->set_heading($SITE->fullname);
-    if ($section === 'frontpagesettings') {
-        $frontpagenode = $PAGE->settingsnav->find('frontpage', navigation_node::TYPE_SETTING);
-        $frontpagenode->make_active();
-        $PAGE->navbar->add(get_string('frontpage', 'admin'),
-            new moodle_url('/admin/category.php', ['category' => 'frontpage']));
-        $PAGE->navbar->add(get_string('frontpagesettings', 'admin'), $PAGE->url);
-    }
    echo $OUTPUT->header();

    if ($errormsg !== '') {
@@ -88,6 +88,15 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $downloadcontentsitedefault->add_dependent_on('downloadcoursecontentallowed');
    $temp->add($downloadcontentsitedefault);

+    $temp->add(
+            new admin_setting_configtext(
+                'moodlecourse/participantsperpage',
+                new lang_string('participants:perpage', 'course'),
+                new lang_string('participants:perpage_help', 'course'),
+                20
+            )
+        );
+
    // Course format.
    $temp->add(new admin_setting_heading('courseformathdr', new lang_string('type_format', 'plugin'), ''));

@@ -527,7 +527,10 @@ if ($hassiteconfig && !empty($CFG->enableplagiarism)) {
        $plugin->load_settings($ADMIN, 'plagiarism', $hassiteconfig);
    }
 }
-$ADMIN->add('reports', new admin_externalpage('comments', new lang_string('comments'), $CFG->wwwroot.'/comment/', 'moodle/site:viewreports'));
+
+// Comments report, note this page is really just a means to delete comments so check that.
+$ADMIN->add('reports', new admin_externalpage('comments', new lang_string('comments'), $CFG->wwwroot . '/comment/index.php',
+    'moodle/comment:delete'));

 // Course reports settings
 if ($hassiteconfig) {
@@ -151,7 +151,8 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $sensiblesettingsdefault .= 'dbpass@@enrol_database, bind_pw@@enrol_ldap, ';
    $sensiblesettingsdefault .= 'server_password@@search_solr, ssl_keypassword@@search_solr, ';
    $sensiblesettingsdefault .= 'alternateserver_password@@search_solr, alternatessl_keypassword@@search_solr, ';
-    $sensiblesettingsdefault .= 'test_password@@cachestore_redis, password@@mlbackend_python';
+    $sensiblesettingsdefault .= 'test_password@@cachestore_redis, password@@mlbackend_python, ';
+    $sensiblesettingsdefault .= 'badges_badgesalt@@none, calendar_exportsalt@@none';
    $temp->add(new admin_setting_configtextarea('adminpresets/sensiblesettings',
            get_string('sensiblesettings', 'core_adminpresets'),
            get_string('sensiblesettingstext', 'core_adminpresets'),
@@ -240,7 +240,8 @@ if ($hassiteconfig
                        if ($field->param2 > 255 || $field->datatype != 'text') {
                            continue;
                        }
-                        $fields['profile_field_' . $field->shortname] = $field->name . ' *';
+                        $fields['profile_field_' . $field->shortname] = format_string($field->name, true,
+                            ['context' => context_system::instance()]) . ' *';
                    }

                    return $fields;
@@ -18,6 +18,10 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
    And the following "cohorts" exist:
      | name | idnumber |
      | Cohort 1 | CH1 |
+    And the following "cohort members" exist:
+      | user  | cohort |
+      | user2 | CH1    |
+      | user3 | CH1    |
    And the following "courses" exist:
      | fullname | shortname | category |
      | Course 1 | C1 | 0 |
@@ -27,8 +31,6 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
      | user2 | C1 | student |
      | user3 | C1 | student |
    And I log in as "admin"
-    And I add "User Two (two@example.com)" user to "CH1" cohort members
-    And I add "User Three (three@example.com)" user to "CH1" cohort members
    And I navigate to "Users > Accounts > Browse list of users" in site administration

  Scenario: Filter user accounts by role and cohort
@@ -63,7 +63,7 @@ Feature: View task logs report and use its filters
    Then I should see "Filters applied"
    And I should see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
    And I should see "Nothing to display"
-    And I click on "Reset" "button" in the "[data-region='report-filters']" "css_element"
+    And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
    And I should see "Filters reset"
    And I should not see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
    And I should see "Filters" in the "#dropdownFiltersButton" "css_element"
@@ -26,5 +26,5 @@
 defined('MOODLE_INTERNAL') || die();

 $plugin->component = 'tool_admin_presets';
-$plugin->version = 2021111100;
-$plugin->requires = 2021080500;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_analytics'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2021052500;
-$plugin->requires = 2021052500;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;
 $plugin->component = 'tool_availabilityconditions';
@@ -7,8 +7,8 @@ Feature: Behat steps for interacting with form work
  @javascript
  Scenario: Test fields in containers
    Given the following "courses" exist:
-      | fullname | shortname |
-      | Course 1 | C1        |
+      | fullname | shortname | summary | summaryformat |
+      | Course 1 | C1        | Red     | 1             |
    When I log in as "admin"
    And I am on "Course 1" course homepage
    # Just get to any form.
@@ -17,11 +17,15 @@ Feature: Behat steps for interacting with form work
    And I set the following fields in the "Appearance" "fieldset" to these values:
      | Show activity reports   | Yes |
      | Number of announcements | 1   |
+    And I set the following fields in the "Description" "fieldset" to these values:
+      | Course summary          | Green |
    Then the field "Show activity reports" in the "Appearance" "fieldset" matches value "Yes"
    And the field "Show activity reports" in the "Appearance" "fieldset" does not match value "No"
    And the following fields in the "region-main" "region" match these values:
      | Course full name        | Frog |
      | Number of announcements | 1    |
+      | Course summary          | Green |
    And the following fields in the "region-main" "region" do not match these values:
      | Course full name        | Course 1 |
      | Number of announcements | 5        |
+      | Course summary          | Red      |
@@ -20,9 +20,10 @@ Feature: Forms manipulation
    Given the following "courses" exist:
      | fullname | shortname | category |
      | Course 1 | C1 | 0 |
-    And I log in as "admin"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Quiz" to section "1"
+    And the following "activities" exist:
+      | activity | course | section | name     |
+      | quiz     | C1     | 1       | Quiz 1   |
+    And I am on the "Quiz 1" "quiz activity editing" page logged in as admin
    When I expand all fieldsets
    Then I should see "Close the quiz"
    And I should see "Group mode"
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500;   // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500;   // Requires this Moodle version.
+$plugin->version   = 2022041900;   // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200;   // Requires this Moodle version.
 $plugin->component = 'tool_behat'; // Full name of the plugin (used for diagnostics)
@@ -248,7 +248,7 @@ $string['printable:toolname'] = 'Summary report';
 $string['printable:toolshortname'] = 'Summary report';
 $string['printable:downloadpdf'] = 'Download PDF';
 $string['printable:printreport'] = 'Printable report';
-$string['error:nocoursespecified'] = 'This summary report requires a valid course id. Please access the accessibility toolkit from within a course, via the actions menu, which will then supply this required course id.';
+$string['error:nocoursespecified'] = 'The summary report requires a valid course ID. Please access the accessibility toolkit from within a course.';
 $string['pdf:filename'] = 'Brickfield_Summaryreport_CourseID-{$a}';

 // Advanced page.
@@ -25,5 +25,5 @@
 defined('MOODLE_INTERNAL') || die();

 $plugin->component = 'tool_brickfield';
-$plugin->version = 2021052500;
-$plugin->requires = 2021042000;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_capability'; // Full name of the plugin (used for diagnostics).
@@ -44,5 +44,8 @@ function xmldb_tool_cohortroles_upgrade($oldversion) {
    // Automatically generated Moodle v3.9.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_cohortroles'; // Full name of the plugin (used for diagnostics).

 $plugin->dependencies = array(
@@ -21,6 +21,6 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2021052501; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_componentlibrary';
@@ -41,5 +41,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
    // Automatically generated Moodle v3.9.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052502;
-$plugin->requires  = 2021052500;
+$plugin->version   = 2022041900;
+$plugin->requires  = 2022041200;
 $plugin->component = 'tool_customlang'; // Full name of the plugin (used for diagnostics)
@@ -786,6 +786,18 @@ class api {
        return true;
    }

+    /**
+     * Check if user has permission to create data download request for themselves
+     *
+     * @param int|null $userid
+     * @return bool
+     */
+    public static function can_create_data_download_request_for_self(int $userid = null): bool {
+        global $USER;
+        $userid = $userid ?: $USER->id;
+        return has_capability('tool/dataprivacy:downloadownrequest', \context_user::instance($userid), $userid);
+    }
+
    /**
     * Check if user has permisson to create data deletion request for themselves.
     *
@@ -847,7 +859,7 @@ class api {

        $usercontext = \context_user::instance($userid);
        // If it's your own and you have the right capability, you can download it.
-        if ($userid == $downloaderid && has_capability('tool/dataprivacy:downloadownrequest', $usercontext, $downloaderid)) {
+        if ($userid == $downloaderid && self::can_create_data_download_request_for_self($downloaderid)) {
            return true;
        }
        // If you can download anyone's in that context, you can download it.
@@ -96,6 +96,11 @@ if ($data = $mform->get_data()) {
            throw new moodle_exception('nopermissions', 'error', '',
                get_string('errorcannotrequestdeleteforother', 'tool_dataprivacy'));
        }
+    } else if ($data->type == \tool_dataprivacy\api::DATAREQUEST_TYPE_EXPORT) {
+        if ($data->userid == $USER->id && !\tool_dataprivacy\api::can_create_data_download_request_for_self()) {
+            throw new moodle_exception('nopermissions', 'error', '',
+                get_string('errorcannotrequestexportforself', 'tool_dataprivacy'));
+        }
    }

    \tool_dataprivacy\api::create_data_request($data->userid, $data->type, $data->comments);
@@ -97,10 +97,11 @@ class tool_dataprivacy_data_request_form extends \core\form\persistent {
        $mform->setType('userid', PARAM_INT);

        // Subject access request type.
-        $options = [
-            api::DATAREQUEST_TYPE_EXPORT => get_string('requesttypeexport', 'tool_dataprivacy'),
-            api::DATAREQUEST_TYPE_DELETE => get_string('requesttypedelete', 'tool_dataprivacy')
-        ];
+        $options = [];
+        if ($this->manage || api::can_create_data_download_request_for_self()) {
+            $options[api::DATAREQUEST_TYPE_EXPORT] = get_string('requesttypeexport', 'tool_dataprivacy');
+        }
+        $options[api::DATAREQUEST_TYPE_DELETE] = get_string('requesttypedelete', 'tool_dataprivacy');

        $mform->addElement('select', 'type', get_string('requesttype', 'tool_dataprivacy'), $options);
        $mform->addHelpButton('type', 'requesttype', 'tool_dataprivacy');
@@ -174,7 +175,7 @@ class tool_dataprivacy_data_request_form extends \core\form\persistent {
            $errors['type'] = get_string('errorrequestalreadyexists', 'tool_dataprivacy');
        }

-        // Check if current user can create data deletion request.
+        // Check if current user can create data requests.
        if ($data->type == api::DATAREQUEST_TYPE_DELETE) {
            if ($userid == $USER->id) {
                if (!api::can_create_data_deletion_request_for_self()) {
@@ -184,6 +185,10 @@ class tool_dataprivacy_data_request_form extends \core\form\persistent {
                && !api::can_create_data_deletion_request_for_children($userid)) {
                $errors['type'] = get_string('errorcannotrequestdeleteforother', 'tool_dataprivacy');
            }
+        } else if ($data->type == api::DATAREQUEST_TYPE_EXPORT) {
+            if ($userid == $USER->id && !api::can_create_data_download_request_for_self()) {
+                $errors['type'] = get_string('errorcannotrequestexportforself', 'tool_dataprivacy');
+            }
        }

        return $errors;
@@ -78,5 +78,8 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
        upgrade_plugin_savepoint(true, 2020061501, 'tool', 'dataprivacy');
    }

+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -135,6 +135,7 @@ $string['effectiveretentionperioduser'] = '{$a} (since the last time the user ac
 $string['emailsalutation'] = 'Dear {$a},';
 $string['errorcannotrequestdeleteforself'] = 'You don\'t have permission to create deletion request for yourself.';
 $string['errorcannotrequestdeleteforother'] = 'You don\'t have permission to create deletion request for this user.';
+$string['errorcannotrequestexportforself'] = 'You don\'t have permission to create export request for yourself.';
 $string['errorcontactdpodisabled'] = 'The option to contact the privacy officer is disabled.';
 $string['errorinvalidrequestcomments'] = 'The comments field may contain plain text only.';
 $string['errorinvalidrequestcreationmethod'] = 'Invalid request creation method!';
@@ -68,8 +68,9 @@ function tool_dataprivacy_myprofile_navigation(tree $tree, $user, $iscurrentuser

        // Check if the user has an ongoing data export request.
        $hasexportrequest = \tool_dataprivacy\api::has_ongoing_request($user->id, \tool_dataprivacy\api::DATAREQUEST_TYPE_EXPORT);
-        // Show data export link only if the user doesn't have an ongoing data export request.
-        if (!$hasexportrequest) {
+        // Show data export link only if the user doesn't have an ongoing data export request and has permission
+        // to download own data.
+        if (!$hasexportrequest && \tool_dataprivacy\api::can_create_data_download_request_for_self()) {
            $exportparams = ['type' => \tool_dataprivacy\api::DATAREQUEST_TYPE_EXPORT];
            $exporturl = new moodle_url('/admin/tool/dataprivacy/createdatarequest.php', $exportparams);
            $exportnode = new core_user\output\myprofile\node('privacyandpolicies', 'requestdataexport',
@@ -26,6 +26,7 @@ use tool_dataprivacy\task\process_data_request_task;
 * API tests.
 *
 * @package    tool_dataprivacy
+ * @covers     \tool_dataprivacy\api
 * @copyright  2018 Jun Pataleta
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
@@ -2174,6 +2175,27 @@ class api_test extends \advanced_testcase {
        return $request;
    }

+    /**
+     * Test whether user can create data download request for themselves
+     */
+    public function test_can_create_data_download_request_for_self(): void {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        $user = $this->getDataGenerator()->create_user();
+        $this->setUser($user);
+
+        // The default user role allows for the creation of download data requests.
+        $this->assertTrue(api::can_create_data_download_request_for_self());
+
+        // Prohibit that capability.
+        $userrole = $DB->get_field('role', 'id', ['shortname' => 'user'], MUST_EXIST);
+        assign_capability('tool/dataprivacy:downloadownrequest', CAP_PROHIBIT, $userrole, \context_user::instance($user->id));
+
+        $this->assertFalse(api::can_create_data_download_request_for_self());
+    }
+
    /**
     * Test user cannot create data deletion request for themselves if they don't have
     * "tool/dataprivacy:requestdelete" capability.
@@ -14,17 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-/**
- * Unit tests for the data_registry class.
- *
- * @package    tool_dataprivacy
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-use \tool_dataprivacy\data_registry;
+namespace tool_dataprivacy;

 /**
 * Unit tests for the data_registry class.
@@ -33,7 +23,7 @@ use \tool_dataprivacy\data_registry;
 * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_dataprivacy_dataregistry_testcase extends advanced_testcase {
+class data_registry_test extends \advanced_testcase {

    /**
     * Ensure that the get_effective_context_value only errors if provided an inappropriate element.
@@ -41,7 +31,7 @@ class tool_dataprivacy_dataregistry_testcase extends advanced_testcase {
     * This test is not great because we only test a limited set of values. This is a fault of the underlying API.
     */
    public function test_get_effective_context_value_invalid_element() {
-        $this->expectException(coding_exception::class);
+        $this->expectException(\coding_exception::class);
        data_registry::get_effective_context_value(\context_system::instance(), 'invalid');
    }

@@ -51,7 +41,7 @@ class tool_dataprivacy_dataregistry_testcase extends advanced_testcase {
     * This test is not great because we only test a limited set of values. This is a fault of the underlying API.
     */
    public function test_get_effective_contextlevel_value_invalid_element() {
-        $this->expectException(coding_exception::class);
+        $this->expectException(\coding_exception::class);
        data_registry::get_effective_contextlevel_value(\context_system::instance(), 'invalid');
    }
 }
@@ -14,19 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-/**
- * Tests for the data_request persistent.
- *
- * @package    tool_dataprivacy
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace tool_dataprivacy;
+
+use data_privacy_testcase;

 defined('MOODLE_INTERNAL') || die();
 require_once('data_privacy_testcase.php');

-use tool_dataprivacy\api;
-
 /**
 * Tests for the data_request persistent.
 *
@@ -34,7 +28,7 @@ use tool_dataprivacy\api;
 * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_dataprivacy_data_request_testcase extends data_privacy_testcase {
+class data_request_test extends data_privacy_testcase {

    /**
     * Data provider for testing is_resettable, and is_active.
@@ -14,25 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-/**
- * Expired contexts tests.
- *
- * @package    tool_dataprivacy
- * @copyright  2018 David Monllao
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-use tool_dataprivacy\api;
-use tool_dataprivacy\data_registry;
-use tool_dataprivacy\expired_context;
-use tool_dataprivacy\purpose;
-use tool_dataprivacy\purpose_override;
-use tool_dataprivacy\category;
-use tool_dataprivacy\contextlevel;
-use tool_dataprivacy\expired_contexts_manager;
-
-defined('MOODLE_INTERNAL') || die();
-global $CFG;
+namespace tool_dataprivacy;

 /**
 * Expired contexts tests.
@@ -41,7 +23,7 @@ global $CFG;
 * @copyright  2018 David Monllao
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_dataprivacy_expired_contexts_testcase extends advanced_testcase {
+class expired_contexts_test extends \advanced_testcase {

    /**
     * Setup the basics with the specified retention period.
@@ -14,21 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-/**
- * Expired data requests tests.
- *
- * @package    tool_dataprivacy
- * @copyright  2018 Michael Hawkins
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace tool_dataprivacy;

-use tool_dataprivacy\api;
-use tool_dataprivacy\category;
-use tool_dataprivacy\data_request;
-use tool_dataprivacy\purpose;
+use data_privacy_testcase;

 defined('MOODLE_INTERNAL') || die();
-global $CFG;

 require_once('data_privacy_testcase.php');

@@ -39,7 +29,7 @@ require_once('data_privacy_testcase.php');
 * @copyright  2018 Michael Hawkins
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_dataprivacy_expired_data_requests_testcase extends data_privacy_testcase {
+class expired_data_requests_test extends data_privacy_testcase {

    /**
     * Test tearDown.
@@ -59,7 +49,7 @@ class tool_dataprivacy_expired_data_requests_testcase extends data_privacy_testc
        // Set up test users.
        $this->setAdminUser();
        $studentuser = $this->getDataGenerator()->create_user();
-        $studentusercontext = context_user::instance($studentuser->id);
+        $studentusercontext = \context_user::instance($studentuser->id);

        $dpouser = $this->getDataGenerator()->create_user();
        $this->assign_site_dpo($dpouser);
@@ -14,13 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-/**
- * Unit tests for the filtered_userlist.
- *
- * @package    tool_dataprivacy
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace tool_dataprivacy;

 /**
 * Unit tests for the filtered_userlist.
@@ -29,7 +23,7 @@
 * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_dataprivacy_filtered_userlist_testcase extends advanced_testcase {
+class filtered_userlist_test extends \advanced_testcase {
    /**
     * Test the apply_expired_contexts_filters function with arange of options.
     *
@@ -14,6 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

+namespace tool_dataprivacy;
+
+use data_privacy_testcase;
+
+defined('MOODLE_INTERNAL') || die();
+require_once('data_privacy_testcase.php');
+
 /**
 * Tests for the manager observer.
 *
@@ -21,18 +28,7 @@
 * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-
-defined('MOODLE_INTERNAL') || die();
-require_once('data_privacy_testcase.php');
-
-/**
- * API tests.
- *
- * @package    tool_dataprivacy
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class tool_dataprivacy_manager_observer_testcase extends data_privacy_testcase {
+class manager_observer_test extends data_privacy_testcase {
    /**
     * Ensure that when users are configured as DPO, they are sent an message upon failure.
     */
@@ -14,16 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-/**
- * Metadata registry tests.
- *
- * @package    tool_dataprivacy
- * @copyright  2018 Adrian Greeve <adriangreeve.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-global $CFG;
+namespace tool_dataprivacy;

 /**
 * Metadata registry tests.
@@ -32,7 +23,7 @@ global $CFG;
 * @copyright  2018 Adrian Greeve <adriangreeve.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_dataprivacy_metadata_registry_testcase extends advanced_testcase {
+class metadata_registry_test extends \advanced_testcase {

    /**
     * Fetch the meta data and return it in a form that we can easily unit test.
@@ -14,18 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-/**
- * Tests for the event observer.
- *
- * @package    tool_dataprivacy
- * @copyright  2018 Mihail Geshoski <mihail@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace tool_dataprivacy;

-defined('MOODLE_INTERNAL') || die();
-
-use \tool_dataprivacy\event\user_deleted_observer;
-use \tool_dataprivacy\api;
+use tool_dataprivacy\event\user_deleted_observer;

 /**
 * Event observer test.
@@ -34,7 +25,7 @@ use \tool_dataprivacy\api;
 * @copyright  2018 Mihail Geshoski <mihail@moodle.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_dataprivacy_user_deleted_observer_testcase extends advanced_testcase {
+class user_deleted_observer_test extends \advanced_testcase {

    /**
     * Ensure that a delete data request is created upon user deletion.
@@ -0,0 +1,6 @@
+This file describes API changes in /admin/tool/dataprivacy/*
+Information provided here is intended especially for developers.
+
+=== 4.0.2 ===
+* New `api::can_create_data_download_request_for_self` method for determining whether user has permission to create their
+  own data download requests
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die;

-$plugin->version   = 2021052500;
-$plugin->requires  = 2021052500;
+$plugin->version   = 2022041900;
+$plugin->requires  = 2022041200;
 $plugin->component = 'tool_dataprivacy';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_dbtransfer'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2021052500;
-$plugin->requires = 2021052500;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;
 $plugin->component = 'tool_filetypes';
@@ -14,7 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-defined('MOODLE_INTERNAL') || die();
+namespace tool_generator;
+
+use tool_generator_course_backend;

 /**
 * Automated unit testing. This tests the 'make large course' backend,
@@ -24,7 +26,7 @@ defined('MOODLE_INTERNAL') || die();
 * @copyright 2013 The Open University
 * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_generator_maketestcourse_testcase extends advanced_testcase {
+class maketestcourse_test extends \advanced_testcase {
    /**
     * Creates a small test course and checks all the components have been put in place.
     */
@@ -52,7 +54,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {

        // Get course details.
        $course = get_course($courseid);
-        $context = context_course::instance($courseid);
+        $context = \context_course::instance($courseid);
        $modinfo = get_fast_modinfo($course);

        // Check course names.
@@ -88,7 +90,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {

        // Check it contains 2 files (the default txt and a dat file).
        $fs = get_file_storage();
-        $resourcecontext = context_module::instance($resource->id);
+        $resourcecontext = \context_module::instance($resource->id);
        $files = $fs->get_area_files($resourcecontext->id, 'mod_resource', 'content', false, 'filename', false);
        $files = array_values($files);
        $this->assertEquals(2, count($files));
@@ -106,7 +108,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
        $this->assertTrue($ok);

        // Check it contains 2 files.
-        $resourcecontext = context_module::instance($resource->id);
+        $resourcecontext = \context_module::instance($resource->id);
        $files = $fs->get_area_files($resourcecontext->id, 'mod_resource', 'content', false, 'filename', false);
        $files = array_values($files);
        $this->assertEquals(2, count($files));
@@ -155,7 +157,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
        $lastusernumber = 0;
        $discussionstarters = array();
        foreach ($discussions as $discussion) {
-            $usernumber = core_user::get_user($discussion->userid, 'id, idnumber')->idnumber;
+            $usernumber = \core_user::get_user($discussion->userid, 'id, idnumber')->idnumber;

            // Checks that the users are odd numbers.
            $this->assertEquals(1, $usernumber % 2);
@@ -190,7 +192,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
        $fs = get_file_storage();
        $resources = $modinfo->get_instances_of('resource');
        foreach ($resources as $resource) {
-            $resourcecontext = context_module::instance($resource->id);
+            $resourcecontext = \context_module::instance($resource->id);
            $files = $fs->get_area_files($resourcecontext->id, 'mod_resource', 'content', false, 'filename', false);
            foreach ($files as $file) {
                if ($file->get_mimetype() == 'application/octet-stream') {
@@ -210,7 +212,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
        $fs = get_file_storage();
        $resources = $modinfo->get_instances_of('resource');
        foreach ($resources as $resource) {
-            $resourcecontext = context_module::instance($resource->id);
+            $resourcecontext = \context_module::instance($resource->id);
            $files = $fs->get_area_files($resourcecontext->id, 'mod_resource', 'content', false, 'filename', false);
            foreach ($files as $file) {
                if ($file->get_mimetype() == 'application/octet-stream') {
@@ -22,27 +22,12 @@
 * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

+namespace tool_generator;
+
+use tool_generator_site_backend;
+
 defined('MOODLE_INTERNAL') || die();

-/**
- * Silly class to access site_backend internal methods.
- *
- * @package tool_generator
- * @copyright 2013 David Monllaó
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class testable_tool_generator_site_backend extends tool_generator_site_backend {
-
-    /**
-     * Public accessor.
-     *
-     * @return int
-     */
-    public static function get_last_testcourse_id() {
-        return parent::get_last_testcourse_id();
-    }
-}
-
 /**
 * Unit test for the site generator
 *
@@ -50,7 +35,7 @@ class testable_tool_generator_site_backend extends tool_generator_site_backend {
 * @copyright 2013 David Monllaó
 * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_generator_maketestsite_testcase extends advanced_testcase {
+class maketestsite_test extends \advanced_testcase {

    /**
     * Checks that site courses shortnames are properly generated.
@@ -102,5 +87,22 @@ class tool_generator_maketestsite_testcase extends advanced_testcase {
        $lastshortname = testable_tool_generator_site_backend::get_last_testcourse_id();
        $this->assertEquals(20, $lastshortname);
    }
-
+}
+
+/**
+ * Silly class to access site_backend internal methods.
+ *
+ * @copyright 2013 David Monllaó
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class testable_tool_generator_site_backend extends tool_generator_site_backend {
+
+    /**
+     * Public accessor.
+     *
+     * @return int
+     */
+    public static function get_last_testcourse_id() {
+        return parent::get_last_testcourse_id();
+    }
 }
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2021052500;
-$plugin->requires = 2021052500;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;
 $plugin->component = 'tool_generator';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_httpsreplace'; // Full name of the plugin (used for diagnostics).
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_innodb'; // Full name of the plugin (used for diagnostics)
@@ -1,3 +1,3 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
 	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M16 9v6c0 .5-.5 1-1 1H1c-.5 0-1-.5-1-1V9c0-.5.5-1 1-1h1c.5 0 1 .5 1 1v4h10V9c0-.5.5-1 1-1h1c.5 0 1 .5 1 1zm-3.6-3.9l-.7-.7c-.4-.4-1-.4-1.4 0l-.8.8V1c0-.5-.4-1-1-1h-1c-.5 0-1 .5-1 1v4.2l-.8-.8c-.4-.4-1-.4-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.7 3.7c.2.2.5.3.7.3.3 0 .5-.1.7-.3l3.7-3.7c.4-.3.4-1 0-1.4z" fill="#999"/></svg>
+]><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M16 9v6c0 .5-.5 1-1 1H1c-.5 0-1-.5-1-1V9c0-.5.5-1 1-1h1c.5 0 1 .5 1 1v4h10V9c0-.5.5-1 1-1h1c.5 0 1 .5 1 1zm-3.6-3.9l-.7-.7c-.4-.4-1-.4-1.4 0l-.8.8V1c0-.5-.4-1-1-1h-1c-.5 0-1 .5-1 1v4.2l-.8-.8c-.4-.4-1-.4-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.7 3.7c.2.2.5.3.7.3.3 0 .5-.1.7-.3l3.7-3.7c.4-.3.4-1 0-1.4z" fill="#888"/></svg>
@@ -15,14 +15,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-/**
- * Provides the unit tests class and some helper classes
- *
- * @package     tool_installaddon
- * @category    test
- * @copyright   2013 David Mudrak <david@moodle.com>
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace tool_installaddon;
+
+use testable_tool_installaddon_installer;
+use tool_installaddon_installer;

 defined('MOODLE_INTERNAL') || die();

@@ -32,10 +28,12 @@ require_once(__DIR__.'/fixtures/testable_installer.php');
 /**
 * Unit tests for the {@link tool_installaddon_installer} class
 *
+ * @package     tool_installaddon
+ * @category    test
 * @copyright 2013 David Mudrak <david@moodle.com>
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_installaddon_installer_testcase extends advanced_testcase {
+class installer_test extends \advanced_testcase {

    public function test_get_addons_repository_url() {
        $installer = testable_tool_installaddon_installer::instance();
@@ -24,6 +24,6 @@
 defined('MOODLE_INTERNAL') || die();

 $plugin->component  = 'tool_installaddon';
-$plugin->version    = 2021052500;
-$plugin->requires   = 2021052500;
+$plugin->version    = 2022041900;
+$plugin->requires   = 2022041200;
 $plugin->maturity   = MATURITY_STABLE;
@@ -22,15 +22,17 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-defined('MOODLE_INTERNAL') || die();
+namespace tool_langimport;

 /**
 * Tests for \tool_langimport\locale class.
 *
+ * @package    tool_langimport
+ * @category   test
 * @copyright  2018 Université Rennes 2 {@link https://www.univ-rennes2.fr}
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class locale_testcase extends \advanced_testcase {
+class locale_test extends \advanced_testcase {
    /**
     * Test that \tool_langimport\locale::check_locale_availability() works as expected.
     *
@@ -65,7 +67,7 @@ class locale_testcase extends \advanced_testcase {

        // Test an invalid parameter.
        $locale = new \tool_langimport\locale();
-        $this->expectException(coding_exception::class);
+        $this->expectException(\coding_exception::class);
        $locale->check_locale_availability('');
    }
 }
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_langimport'; // Full name of the plugin (used for diagnostics)
@@ -24,8 +24,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500;
-$plugin->requires  = 2021052500;         // Requires this Moodle version.
+$plugin->version   = 2022041900;
+$plugin->requires  = 2022041200;         // Requires this Moodle version.
 $plugin->component = 'tool_licensemanager';

 $plugin->maturity = MATURITY_STABLE;
@@ -45,5 +45,8 @@ function xmldb_tool_log_upgrade($oldversion) {
    // Automatically generated Moodle v3.9.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -46,5 +46,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
    // Automatically generated Moodle v3.9.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2021052500; // Requires this Moodle version.
+$plugin->version = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2022041200; // Requires this Moodle version.
 $plugin->component = 'logstore_database'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2021052500; // Requires this Moodle version.
+$plugin->version = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2022041200; // Requires this Moodle version.
 $plugin->component = 'logstore_legacy'; // Full name of the plugin (used for diagnostics).
@@ -46,5 +46,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
    // Automatically generated Moodle v3.9.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2021052500; // Requires this Moodle version.
+$plugin->version = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2022041200; // Requires this Moodle version.
 $plugin->component = 'logstore_standard'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2021052500; // Requires this Moodle version.
+$plugin->version = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_log'; // Full name of the plugin (used for diagnostics).
@@ -9,7 +9,7 @@
 	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
 <defs>
 </defs>
-<path style="fill:#999999;" d="M8.5,9.5C8.8,10,9,10.6,9,11.2c0,0.6-0.3,1.1-0.7,1.6l-2.5,2.5C5.2,15.8,4.7,16,4,16
+<path style="fill:#888;" d="M8.5,9.5C8.8,10,9,10.6,9,11.2c0,0.6-0.3,1.1-0.7,1.6l-2.5,2.5C5.2,15.8,4.7,16,4,16
 	s-1.3-0.2-1.7-0.7l-1.5-1.5C0.2,13.3,0,12.7,0,12c0-0.7,0.2-1.3,0.7-1.7l2.5-2.5C3.7,7.3,4.3,7,5,7c0.5,0,1,0.2,1.5,0.5l-1,1
 	C5.3,8.5,5.2,8.4,5,8.4c-0.3,0-0.5,0.1-0.8,0.3l-2.5,2.5c-0.2,0.2-0.3,0.5-0.3,0.7c0,0.3,0.1,0.5,0.3,0.7l1.5,1.5
 	c0.2,0.2,0.5,0.3,0.7,0.3s0.5-0.1,0.7-0.3l2.5-2.5c0.2-0.2,0.3-0.5,0.3-0.8c0-0.2,0-0.3-0.1-0.4L8.5,9.5z M5,10L10,5
@@ -63,4 +63,67 @@ class behat_tool_lp extends behat_base {
        $this->execute('behat_general::i_click_on', [$xpathtarget, 'xpath_element']);
    }

+    /**
+     * Convert page names to URLs for steps like 'When I am on the "[identifier]" "[page type]" page'.
+     *
+     * Recognised page names are:
+     * | pagetype            | name meaning | description                  |
+     * | Course competencies | Course name  | The course competencies page |
+     *
+     * @param string $page identifies which type of page this is, e.g. 'Course competencies'.
+     * @param string $identifier identifies the particular page, e.g. 'C1'.
+     * @return moodle_url the corresponding URL.
+     * @throws Exception with a meaningful error message if the specified page cannot be found.
+     */
+    protected function resolve_page_instance_url(string $page, string $identifier): moodle_url {
+        switch (strtolower($page)) {
+            case 'course competencies':
+                $courseid = $this->get_course_id($identifier);
+                return new moodle_url('/admin/tool/lp/coursecompetencies.php', [
+                    'courseid' => $courseid,
+                ]);
+            default:
+                throw new Exception("Unrecognised page type '{$page}'");
+        }
+    }
+
+    /**
+     * Return a list of the exact named selectors for the component.
+     *
+     * @return behat_component_named_selector[]
+     */
+    public static function get_exact_named_selectors(): array {
+        return [
+            new behat_component_named_selector('competency', [
+                "//*[@data-region='coursecompetencies']//table[contains(@class,'managecompetencies')]".
+                    "//tr[contains(., //a[@title='View details'][contains(., %locator%)])]",
+            ]),
+            new behat_component_named_selector('learning plan', [
+                "//*[@data-region='plan-competencies']//table[contains(@class,'managecompetencies')]".
+                    "//tr[@data-node='user-competency'][contains(., //a[@data-usercompetency='true'][contains(., %locator%)])]",
+            ]),
+            new behat_component_named_selector('competency description', [
+                "//td/p[contains(., %locator%)]",
+            ]),
+            new behat_component_named_selector('competency grade', [
+                "//span[contains(concat(' ', normalize-space(@class), ' '), ' badge ')][contains(., %locator%)]",
+            ]),
+            new behat_component_named_selector('learning plan rating', [
+                "//td[position()=2][contains(., %locator%)]",
+            ]),
+            new behat_component_named_selector('learning plan proficiency', [
+                "//td[position()=3][contains(., %locator%)]",
+            ]),
+            new behat_component_named_selector('competency page proficiency', [
+                "//dt[contains(., 'Proficient')]/following-sibling::dd[1][contains(., %locator%)]",
+            ]),
+            new behat_component_named_selector('competency page rating', [
+                "//dt[contains(., 'Rating')]/following-sibling::dd[1][contains(., %locator%)]",
+            ]),
+            new behat_component_named_selector('competency page related competency', [
+                "//*[@data-region='relatedcompetencies']//a[contains(., %locator%)]",
+            ]),
+        ];
+    }
+
 }
@@ -0,0 +1,187 @@
+@tool @tool_lp @javascript
+Feature: View competencies
+  In order to access competency information
+  As a user
+  I need to view user competencies
+
+  Background:
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | student1  | Student   | first    |
+      | teacher1  | Teacher   | first    |
+    And the following "system role assigns" exist:
+      | user     | role           | contextlevel |
+      | teacher1 | editingteacher | System       |
+    And the following "permission overrides" exist:
+      | capability                 | permission | role           | contextlevel | reference |
+      | moodle/competency:planview | Allow      | editingteacher | System       |           |
+    And the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | student1 | C1     | student        |
+      | teacher1 | C1     | editingteacher |
+    And the following "scales" exist:
+      | name       | scale            |
+      | Test Scale | Bad, Good, Great |
+    And the following "core_competency > frameworks" exist:
+      | shortname | idnumber | scale      |
+      | Cookery   | cookery  | Test Scale |
+      | Literacy  | literacy | Test Scale |
+    And the following "core_competency > competencies" exist:
+      | shortname      | idnumber       | description            | competencyframework |
+      | Salads         | salads         | Salads are important   | cookery             |
+      | Desserts       | desserts       | Desserts are important | cookery             |
+      | Cakes          | cakes          | Cakes are important    | cookery             |
+      | Reading        | reading        | Reading is important   | literacy            |
+      | Writing        | writing        | Writing is important   | literacy            |
+    And the following "core_competency > related_competencies" exist:
+      | competency | relatedcompetency |
+      | desserts   | cakes             |
+    And the following "core_competency > plans" exist:
+      | name     | description           | competencies            | user     |
+      | Cookery  | Cookery is important  | salads, desserts, cakes | student1 |
+      | Literacy | Literacy is important | reading, writing        | student1 |
+    And the following "core_competency > course_competencies" exist:
+      | course | competency |
+      | C1     | salads     |
+      | C1     | desserts   |
+      | C1     | cakes      |
+      | C1     | reading    |
+      | C1     | writing    |
+    And the following "core_competency > user_competency" exist:
+      | competency | user     | grade |
+      | salads     | student1 | Good  |
+      | desserts   | student1 | Great |
+      | cakes      | student1 | Great |
+    And the following "core_competency > user_competency_courses" exist:
+      | course | competency | user     | grade |
+      | C1     | salads     | student1 | Good  |
+      | C1     | desserts   | student1 | Great |
+      | C1     | cakes      | student1 | Great |
+
+  Scenario: Student view
+    # Course competencies
+    Given I am on the "C1" "tool_lp > course competencies" page logged in as "student1"
+    Then I should see "You are proficient in 3 out of 5 competencies in this course"
+
+    And "Salads are important" "tool_lp > competency description" should exist in the "Salads" "tool_lp > competency"
+    And "Good" "tool_lp > competency grade" should exist in the "Salads" "tool_lp > competency"
+
+    And "Desserts are important" "tool_lp > competency description" should exist in the "Desserts" "tool_lp > competency"
+    And "Great" "tool_lp > competency grade" should exist in the "Desserts" "tool_lp > competency"
+
+    And "Cakes are important" "tool_lp > competency description" should exist in the "Cakes" "tool_lp > competency"
+    And "Great" "tool_lp > competency grade" should exist in the "Cakes" "tool_lp > competency"
+
+    And "Reading is important" "tool_lp > competency description" should exist in the "Reading" "tool_lp > competency"
+    And "Good" "tool_lp > competency grade" should not exist in the "Reading" "tool_lp > competency"
+    And "Great" "tool_lp > competency grade" should not exist in the "Reading" "tool_lp > competency"
+    And "Bad" "tool_lp > competency grade" should not exist in the "Reading" "tool_lp > competency"
+
+    And "Writing is important" "tool_lp > competency description" should exist in the "Writing" "tool_lp > competency"
+    And "Good" "tool_lp > competency grade" should not exist in the "Writing" "tool_lp > competency"
+    And "Great" "tool_lp > competency grade" should not exist in the "Writing" "tool_lp > competency"
+    And "Bad" "tool_lp > competency grade" should not exist in the "Writing" "tool_lp > competency"
+
+    # Course competencies details
+    And I click on "Desserts" "link" in the "Desserts" "tool_lp > competency"
+    And I should see "Desserts are important"
+    And "Yes" "tool_lp > competency page proficiency" should exist
+    And "Great" "tool_lp > competency page rating" should exist
+
+    # Course competencies summary
+    And I click on "Cakes" "link"
+    And I should see "Cakes are important"
+
+    # Learning plans
+    And I click on "Close" "button" in the "Cakes" "dialogue"
+    And I follow "Profile" in the user menu
+    And I click on "Learning plans" "link"
+    And I should see "Cookery"
+    And I should see "Literacy"
+
+    # Learning plans details
+    And I click on "Cookery" "link"
+    And I should see "Cookery is important"
+    And I should see "3 out of 3 competencies are proficient"
+
+    And "Good" "tool_lp > learning plan rating" should exist in the "Salads" "tool_lp > learning plan"
+    And "Yes" "tool_lp > learning plan proficiency" should exist in the "Salads" "tool_lp > learning plan"
+
+    And "Great" "tool_lp > learning plan rating" should exist in the "Desserts" "tool_lp > learning plan"
+    And "Yes" "tool_lp > learning plan proficiency" should exist in the "Desserts" "tool_lp > learning plan"
+
+    And "Great" "tool_lp > learning plan rating" should exist in the "Cakes" "tool_lp > learning plan"
+    And "Yes" "tool_lp > learning plan proficiency" should exist in the "Cakes" "tool_lp > learning plan"
+
+    And I should not see "Literacy"
+    And I should not see "Reading"
+    And I should not see "Writing"
+
+    # Learning plans competency details
+    And I click on "Desserts" "link" in the "Desserts" "tool_lp > learning plan"
+    And I should see "Desserts are important"
+    And "Yes" "tool_lp > competency page proficiency" should exist
+    And "Great" "tool_lp > competency page rating" should exist
+
+    # Learning plans competency summary
+    And I click on "Cakes cakes" "link"
+    And I should see "Cakes are important"
+
+  Scenario: Teacher view
+    # Participant competencies
+    Given I am on the "C1" "report_competency > breakdown" page logged in as "teacher1"
+    Then I should see "Student first"
+    And "Good" "report_competency > breakdown rating" should exist in the "Salads" "report_competency > breakdown"
+    And "Great" "report_competency > breakdown rating" should exist in the "Desserts" "report_competency > breakdown"
+    And "Great" "report_competency > breakdown rating" should exist in the "Cakes" "report_competency > breakdown"
+    And "Not rated" "report_competency > breakdown rating" should exist in the "Reading" "report_competency > breakdown"
+    And "Not rated" "report_competency > breakdown rating" should exist in the "Writing" "report_competency > breakdown"
+
+    # Participant competencies details
+    And I click on "Great" "report_competency > breakdown rating" in the "Desserts" "report_competency > breakdown"
+    And "Yes" "tool_lp > competency page proficiency" should exist
+    And "Great" "tool_lp > competency page rating" should exist
+
+    # Participant competencies summary
+    And I click on "Cakes" "tool_lp > competency page related competency"
+    And I should see "Cakes are important"
+
+    # Participant learning plans
+    And I click on "Close" "button" in the "Cakes" "dialogue"
+    And I click on "Close" "button" in the "User competency summary" "dialogue"
+    And I navigate to course participants
+    And I click on "Student first" "link"
+    And I click on "Learning plans" "link"
+    And I should see "Cookery"
+    And I should see "Literacy"
+
+    # Participant learning plans details
+    And I click on "Cookery" "link"
+    And I should see "Cookery is important"
+    And I should see "3 out of 3 competencies are proficient"
+
+    And "Good" "tool_lp > learning plan rating" should exist in the "Salads" "tool_lp > learning plan"
+    And "Yes" "tool_lp > learning plan proficiency" should exist in the "Salads" "tool_lp > learning plan"
+
+    And "Great" "tool_lp > learning plan rating" should exist in the "Desserts" "tool_lp > learning plan"
+    And "Yes" "tool_lp > learning plan proficiency" should exist in the "Desserts" "tool_lp > learning plan"
+
+    And "Great" "tool_lp > learning plan rating" should exist in the "Cakes" "tool_lp > learning plan"
+    And "Yes" "tool_lp > learning plan proficiency" should exist in the "Cakes" "tool_lp > learning plan"
+
+    And I should not see "Literacy"
+    And I should not see "Reading"
+    And I should not see "Writing"
+
+    # Learning plans competency details
+    And I click on "Desserts" "link"
+    And I should see "Desserts are important"
+    And "Yes" "tool_lp > competency page proficiency" should exist
+    And "Great" "tool_lp > competency page rating" should exist
+
+    # Learning plans competency summary
+    And I click on "Cakes" "tool_lp > competency page related competency"
+    And I should see "Cakes are important"
@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_lp'; // Full name of the plugin (used for diagnostics).
@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_lpimportcsv'; // Full name of the plugin (used for diagnostics).
-$plugin->dependencies = array('tool_lp' => 2021052500);
+$plugin->dependencies = array('tool_lp' => 2022041200);

@@ -24,8 +24,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_lpmigrate'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
    'tool_lp' => ANY_VERSION
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500;
-$plugin->requires  = 2021052500;
+$plugin->version   = 2022041900;
+$plugin->requires  = 2022041200;
 $plugin->component = 'tool_messageinbound';
@@ -27,7 +27,8 @@ require_once($CFG->libdir . '/externallib.php');

 $userid = required_param('userid', PARAM_INT);  // The user id the key belongs to (for double-checking).
 $key = required_param('key', PARAM_ALPHANUMEXT);    // The key generated by the tool_mobile_external::get_autologin_key() external function.
-$urltogo = optional_param('urltogo', $CFG->wwwroot, PARAM_URL);    // URL to redirect.
+$urltogo = optional_param('urltogo', $CFG->wwwroot, PARAM_LOCALURL);    // URL to redirect.
+$urltogo = $urltogo ?: $CFG->wwwroot;

 $context = context_system::instance();
 $PAGE->set_context($context);
@@ -504,6 +504,7 @@ class api {
                'NoDelegate_H5POffline' => new lang_string('h5poffline', 'tool_mobile'),
                'NoDelegate_DarkMode' => new lang_string('darkmode', 'tool_mobile'),
                'CoreFilterDelegate' => new lang_string('type_filter_plural', 'plugin'),
+                'CoreReportBuilderDelegate' => new lang_string('reportbuilder', 'core_reportbuilder'),
            ),
            "$mainmenu" => array(
                '$mmSideMenuDelegate_mmaFrontpage' => new lang_string('sitehome'),
@@ -51,5 +51,8 @@ function xmldb_tool_mobile_upgrade($oldversion) {
    // Automatically generated Moodle v3.9.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -23,9 +23,9 @@
 */

 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2021052501; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_mobile'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
-    'webservice_rest' => 2021052500
+    'webservice_rest' => 2022041200
 );
@@ -45,5 +45,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
    // Automatically generated Moodle v3.9.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -14,14 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-/**
- * Unit tests for event observers.
- *
- * @package    tool_monitor
- * @category   test
- * @copyright  2014 onwards Ankit Agarwal <ankit.agrr@gmail.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace tool_monitor;

 defined('MOODLE_INTERNAL') || die();

@@ -30,11 +23,14 @@ require_once($CFG->dirroot . '/blog/locallib.php');
 require_once($CFG->dirroot . '/blog/lib.php');

 /**
- * Class tool_monitor_eventobservers_testcase
+ * Unit tests for event observers.
 *
- * Tests for event observers
+ * @package    tool_monitor
+ * @category   test
+ * @copyright  2014 onwards Ankit Agarwal <ankit.agrr@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_monitor_eventobservers_testcase extends advanced_testcase {
+class eventobservers_test extends \advanced_testcase {
    /**
     * Set up method.
     */
@@ -57,12 +53,12 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $course2 = $this->getDataGenerator()->create_course();
        $monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');

-        $rule = new stdClass();
+        $rule = new \stdClass();
        $rule->userid = $user->id;
        $rule->courseid = $course1->id;
        $rule->plugin = 'test';

-        $sub = new stdClass();
+        $sub = new \stdClass();
        $sub->courseid = $course1->id;
        $sub->userid = $user->id;

@@ -83,7 +79,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        }

        // Add a site rule.
-        $rule = new stdClass();
+        $rule = new \stdClass();
        $rule->userid = $user->id;
        $rule->courseid = 0;
        $rule->plugin = 'core';
@@ -135,7 +131,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        // Fire a bunch of events.
        // Trigger a bunch of other events.
        $eventparams = array(
-            'context' => context_course::instance($course->id)
+            'context' => \context_course::instance($course->id)
        );
        for ($i = 0; $i < 5; $i++) {
            \core\event\course_viewed::create($eventparams)->trigger();
@@ -148,14 +144,14 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $this->assertEquals(0, $DB->count_records('tool_monitor_events'));

        // Now, let's create a rule so an event can be stored.
-        $rule = new stdClass();
+        $rule = new \stdClass();
        $rule->courseid = $course->id;
        $rule->plugin = 'mod_book';
        $rule->eventname = '\mod_book\event\course_module_instance_list_viewed';
        $rule = $monitorgenerator->create_rule($rule);

        // Let's subscribe to this rule.
-        $sub = new stdClass;
+        $sub = new \stdClass;
        $sub->courseid = $course->id;
        $sub->ruleid = $rule->id;
        $sub->userid = $user->id;
@@ -187,14 +183,14 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $DB->delete_records('tool_monitor_events');

        // Now, let's create a site wide rule.
-        $rule = new stdClass();
+        $rule = new \stdClass();
        $rule->courseid = 0;
        $rule->plugin = 'mod_book';
        $rule->eventname = '\mod_book\event\course_module_instance_list_viewed';
        $rule = $monitorgenerator->create_rule($rule);

        // Let's subscribe to this rule.
-        $sub = new stdClass;
+        $sub = new \stdClass;
        $sub->courseid = 0;
        $sub->ruleid = $rule->id;
        $sub->userid = $user->id;
@@ -231,14 +227,14 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $course = $this->getDataGenerator()->create_course();
        $toolgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');

-        $rulerecord = new stdClass();
+        $rulerecord = new \stdClass();
        $rulerecord->courseid = $course->id;
        $rulerecord->eventname = '\mod_book\event\course_module_instance_list_viewed';
        $rulerecord->frequency = 1;

        $rule = $toolgenerator->create_rule($rulerecord);

-        $subrecord = new stdClass();
+        $subrecord = new \stdClass();
        $subrecord->courseid = $course->id;
        $subrecord->ruleid = $rule->id;
        $subrecord->userid = $USER->id;
@@ -279,7 +275,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $DB->delete_records('tool_monitor_events');

        // Now let us create a rule specific to a module instance.
-        $cm = new stdClass();
+        $cm = new \stdClass();
        $cm->course = $course->id;
        $book = $this->getDataGenerator()->create_module('book', $cm);
        $rulerecord->eventname = '\mod_book\event\course_module_viewed';
@@ -290,7 +286,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {

        // Let us trigger events.
        $params = array(
-            'context' => context_module::instance($book->cmid),
+            'context' => \context_module::instance($book->cmid),
            'objectid' => $book->id
        );
        for ($i = 0; $i < 5; $i++) {
@@ -337,10 +333,10 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $toolgenerator->create_subscription($subrecord);

        // Let us trigger events.
-        $blog = new blog_entry();
+        $blog = new \blog_entry();
        $blog->subject = "Subject of blog";
        $blog->userid = $USER->id;
-        $states = blog_entry::get_applicable_publish_states();
+        $states = \blog_entry::get_applicable_publish_states();
        $blog->publishstate = reset($states);
        for ($i = 0; $i < 5; $i++) {
            $newblog = fullclone($blog);
@@ -367,14 +363,14 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $course = $this->getDataGenerator()->create_course();
        $toolgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');

-        $rulerecord = new stdClass();
+        $rulerecord = new \stdClass();
        $rulerecord->courseid = $course->id;
        $rulerecord->eventname = '\mod_book\event\course_module_instance_list_viewed';
        $rulerecord->frequency = 5;

        $rule = $toolgenerator->create_rule($rulerecord);

-        $subrecord = new stdClass();
+        $subrecord = new \stdClass();
        $subrecord->courseid = $course->id;
        $subrecord->ruleid = $rule->id;
        $subrecord->userid = $USER->id;
@@ -416,7 +412,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
     *
     * @param phpunit_message_sink $msgsink Message sink
     */
-    protected function verify_processed_data(phpunit_message_sink $msgsink) {
+    protected function verify_processed_data(\phpunit_message_sink $msgsink) {
        global $DB, $USER;

        $recordexists = $DB->count_records('task_adhoc', array('component' => 'tool_monitor'));
@@ -435,7 +431,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
     *
     * @param phpunit_message_sink $msgsink Message sink
     */
-    protected function verify_message_not_sent_yet(phpunit_message_sink $msgsink) {
+    protected function verify_message_not_sent_yet(\phpunit_message_sink $msgsink) {
        $msgs = $msgsink->get_messages();
        $this->assertCount(0, $msgs);
        $msgsink->clear();
@@ -457,12 +453,12 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $context = \context_user::instance($USER->id, IGNORE_MISSING);

        // Creating book.
-        $cm = new stdClass();
+        $cm = new \stdClass();
        $cm->course = $course->id;
        $book = $this->getDataGenerator()->create_module('book', $cm);

        // Creating rule.
-        $rulerecord = new stdClass();
+        $rulerecord = new \stdClass();
        $rulerecord->courseid = $course->id;
        $rulerecord->eventname = '\mod_book\event\course_module_viewed';
        $rulerecord->cmid = $book->cmid;
@@ -478,7 +474,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $rule = $toolgenerator->create_rule($rulerecord);

        // Creating subscription.
-        $subrecord = new stdClass();
+        $subrecord = new \stdClass();
        $subrecord->courseid = $course->id;
        $subrecord->ruleid = $rule->id;
        $subrecord->userid = $USER->id;
@@ -486,7 +482,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {

        // Now let us trigger the event.
        $params = array(
-            'context' => context_module::instance($book->cmid),
+            'context' => \context_module::instance($book->cmid),
            'objectid' => $book->id
        );

@@ -496,7 +492,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $msgs = $msgsink->get_messages();
        $msg = array_pop($msgs);

-        $modurl = new moodle_url('/mod/book/view.php', array('id' => $book->cmid));
+        $modurl = new \moodle_url('/mod/book/view.php', array('id' => $book->cmid));

        $this->assertMatchesRegularExpression('~<h2>.*' . preg_quote($event->get_url()->out(), '~') . '.*</h2>~',
            $msg->fullmessagehtml);
@@ -529,12 +525,12 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $course2 = $this->getDataGenerator()->create_course();
        $monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');

-        $rule = new stdClass();
+        $rule = new \stdClass();
        $rule->userid = $user->id;
        $rule->courseid = $course1->id;
        $rule->plugin = 'test';

-        $sub = new stdClass();
+        $sub = new \stdClass();
        $sub->courseid = $course1->id;
        $sub->userid = $user->id;

@@ -585,16 +581,16 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
        $monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');

        // Now let us create a rule specific to a module instance.
-        $cm = new stdClass();
+        $cm = new \stdClass();
        $cm->course = $course1->id;
        $book = $this->getDataGenerator()->create_module('book', $cm);

-        $rule = new stdClass();
+        $rule = new \stdClass();
        $rule->userid = $user->id;
        $rule->courseid = $course1->id;
        $rule->plugin = 'test';

-        $sub = new stdClass();
+        $sub = new \stdClass();
        $sub->courseid = $course1->id;
        $sub->userid = $user->id;
        $sub->cmid = $book->cmid;
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

+namespace tool_monitor;
+
 /**
 * Unit tests for rule manager api.
 *
@@ -22,17 +24,7 @@
 * @copyright  2014 onwards Simey Lameze <simey@moodle.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-
-/**
- * Tests for rule manager.
- *
- * Class tool_monitor_rule_manager_testcase
- */
-class tool_monitor_rule_manager_testcase extends advanced_testcase {
+class rule_manager_test extends \advanced_testcase {

    /**
     * Set up method.
@@ -53,7 +45,7 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {
        $course = $this->getDataGenerator()->create_course();
        $now = time();

-        $rule = new stdClass();
+        $rule = new \stdClass();
        $rule->userid = $user->id;
        $rule->courseid = $course->id;
        $rule->name = 'test rule 1';
@@ -98,7 +90,7 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {
        $monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
        $rule = $monitorgenerator->create_rule();

-        $ruledata = new stdClass;
+        $ruledata = new \stdClass;
        $ruledata->id = $rule->id;
        $ruledata->frequency = 25;

@@ -119,10 +111,10 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {
        $course1 = $this->getDataGenerator()->create_course();
        $course2 = $this->getDataGenerator()->create_course();

-        $record = new stdClass();
+        $record = new \stdClass();
        $record->courseid = $course1->id;

-        $record2 = new stdClass();
+        $record2 = new \stdClass();
        $record2->courseid = $course2->id;

        $ruleids = array();
@@ -147,10 +139,10 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {

        $monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');

-        $record = new stdClass();
+        $record = new \stdClass();
        $record->plugin = 'core';

-        $record2 = new stdClass();
+        $record2 = new \stdClass();
        $record2->plugin = 'mod_assign';

        $ruleids = array();
@@ -175,10 +167,10 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {
        $monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
        $rule = $monitorgenerator->create_rule();

-        $record = new stdClass();
+        $record = new \stdClass();
        $record->eventname = '\core\event\calendar_event_created';

-        $record2 = new stdClass();
+        $record2 = new \stdClass();
        $record2->eventname = '\core\event\calendar_event_updated';

        $ruleids = array();
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

+namespace tool_monitor;
+
 /**
 * Unit tests for subscription manager api.
 *
@@ -22,17 +24,7 @@
 * @copyright  2014 onwards Simey Lameze <simey@moodle.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-
-/**
- * Tests for subscription manager.
- *
- * Class tool_monitor_subscription_manager_testcase.
- */
-class tool_monitor_subscription_manager_testcase extends advanced_testcase {
+class subscription_manager_test extends \advanced_testcase {

    /**
     * Test count_rule_subscriptions method.
@@ -56,7 +48,7 @@ class tool_monitor_subscription_manager_testcase extends advanced_testcase {
        $this->assertEquals(0, $subs);

        // Subscribe user 1 to rule 1.
-        $record = new stdClass;
+        $record = new \stdClass;
        $record->ruleid = $rule1->id;
        $record->userid = $user1->id;
        $monitorgenerator->create_subscription($record);
@@ -75,4 +67,4 @@ class tool_monitor_subscription_manager_testcase extends advanced_testcase {
        $this->assertEquals(2, $subs1);
        $this->assertEquals(1, $subs2);
    }
-}
+}
@@ -13,7 +13,8 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-defined('MOODLE_INTERNAL') || exit();
+
+namespace tool_monitor;

 /**
 * Unit tests for the subscription class.
@@ -24,7 +25,7 @@ defined('MOODLE_INTERNAL') || exit();
 * @copyright  2016 Jake Dallimore <jrhdallimore@gmail.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_monitor_subscription_testcase extends advanced_testcase {
+class subscription_test extends \advanced_testcase {

    /**
     * @var \tool_monitor\subscription $subscription object.
@@ -38,7 +39,7 @@ class tool_monitor_subscription_testcase extends advanced_testcase {
        $this->resetAfterTest(true);

        // Create the mock subscription.
-        $sub = new stdClass();
+        $sub = new \stdClass();
        $sub->id = 100;
        $sub->name = 'My test rule';
        $sub->courseid = 20;
@@ -62,7 +63,7 @@ class tool_monitor_subscription_testcase extends advanced_testcase {
     */
    public function test_magic_get() {
        $this->assertEquals(20, $this->subscription->courseid);
-        $this->expectException(coding_exception::class);
+        $this->expectException(\coding_exception::class);
        $this->subscription->ruleid;
    }
 }
@@ -13,7 +13,8 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-defined('MOODLE_INTERNAL') || exit();
+
+namespace tool_monitor;

 /**
 * Unit tests for the tool_monitor clean events task.
@@ -24,7 +25,7 @@ defined('MOODLE_INTERNAL') || exit();
 * @copyright  2016 Jake Dallimore <jrhdallimore@gmail.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
+class task_check_subscriptions_test extends \advanced_testcase {

    private $course;
    private $user;
@@ -45,7 +46,7 @@ class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
        $this->user = $this->getDataGenerator()->create_user();
        $this->course = $this->getDataGenerator()->create_course();

-        $rule = new stdClass();
+        $rule = new \stdClass();
        $rule->userid = 2; // Rule created by admin.
        $rule->courseid = $this->course->id;
        $rule->plugin = 'mod_book';
@@ -54,7 +55,7 @@ class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
        $monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
        $this->rule = $monitorgenerator->create_rule($rule);

-        $sub = new stdClass();
+        $sub = new \stdClass();
        $sub->courseid = $this->course->id;
        $sub->userid = $this->user->id;
        $sub->ruleid = $this->rule->id;
@@ -90,7 +91,7 @@ class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
    public function test_site_level_subscription() {
        // Create a site level subscription.
        $monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
-        $sub = new stdClass();
+        $sub = new \stdClass();
        $sub->userid = $this->user->id;
        $sub->ruleid = $this->rule->id;
        $this->subscription = $monitorgenerator->create_subscription($sub);
@@ -104,7 +105,7 @@ class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
        $this->assertEquals(false, \tool_monitor\subscription_manager::subscription_is_active($this->subscription));

        // Now, assign the user as a teacher role at system context.
-        $this->getDataGenerator()->role_assign($this->teacherrole->id, $this->user->id, context_system::instance());
+        $this->getDataGenerator()->role_assign($this->teacherrole->id, $this->user->id, \context_system::instance());

        // Run the task.
        $task = new \tool_monitor\task\check_subscriptions();
@@ -238,7 +239,7 @@ class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
        $book = $this->getDataGenerator()->create_module('book', array('course' => $this->course->id));

        // And add a subscription to it.
-        $sub = new stdClass();
+        $sub = new \stdClass();
        $sub->courseid = $this->course->id;
        $sub->userid = $this->user->id;
        $sub->ruleid = $this->rule->id;
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

+namespace tool_monitor;
+
 /**
 * Unit tests for the tool_monitor clean events task.
 *
@@ -22,15 +24,7 @@
 * @copyright  2014 Mark Nelson <markn@moodle.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-
-/**
- * Class used to test the tool_monitor clean events task.
- */
-class tool_monitor_task_clean_events_testcase extends advanced_testcase {
+class task_clean_events_test extends \advanced_testcase {

    /**
     * Test set up.
@@ -51,16 +45,16 @@ class tool_monitor_task_clean_events_testcase extends advanced_testcase {
        $course = $this->getDataGenerator()->create_course();
        $bookgenerator = $this->getDataGenerator()->get_plugin_generator('mod_book');
        $book = $this->getDataGenerator()->create_module('book', array('course' => $course->id));
-        $bookcontext = context_module::instance($book->cmid);
+        $bookcontext = \context_module::instance($book->cmid);
        $bookchapter = $bookgenerator->create_chapter(array('bookid' => $book->id));
        $course2 = $this->getDataGenerator()->create_course();
        $book2 = $this->getDataGenerator()->create_module('book', array('course' => $course2->id));
-        $book2context = context_module::instance($book2->cmid);
+        $book2context = \context_module::instance($book2->cmid);
        $book2chapter = $bookgenerator->create_chapter(array('bookid' => $book2->id));
        $monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');

        // Let's set some data for the rules we need before we can generate them.
-        $rule = new stdClass();
+        $rule = new \stdClass();
        $rule->userid = $user->id;
        $rule->courseid = $course->id;
        $rule->plugin = 'mod_book';
@@ -96,7 +90,7 @@ class tool_monitor_task_clean_events_testcase extends advanced_testcase {


        // Let's subscribe to these rules.
-        $sub = new stdClass;
+        $sub = new \stdClass;
        $sub->courseid = $course->id;
        $sub->ruleid = $rule1->id;
        $sub->userid = $user->id;
@@ -133,7 +127,7 @@ class tool_monitor_task_clean_events_testcase extends advanced_testcase {

        // Trigger a bunch of other events.
        $eventparams = array(
-            'context' => context_course::instance($course->id)
+            'context' => \context_course::instance($course->id)
        );
        for ($i = 0; $i < 5; $i++) {
            \mod_quiz\event\course_module_instance_list_viewed::create($eventparams)->trigger();
@@ -164,7 +158,7 @@ class tool_monitor_task_clean_events_testcase extends advanced_testcase {
        $this->assertEquals($course2->id, $event4->courseid);

        // Update the timewindow for two of the rules.
-        $updaterule = new stdClass();
+        $updaterule = new \stdClass();
        $updaterule->id = $rule1->id;
        $updaterule->timewindow = 0;
        \tool_monitor\rule_manager::update_rule($updaterule);
@@ -26,6 +26,6 @@

 defined('MOODLE_INTERNAL') || die;

-$plugin->version   = 2021052500;     // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500;     // Requires this Moodle version.
+$plugin->version   = 2022041900;     // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200;     // Requires this Moodle version.
 $plugin->component = 'tool_monitor'; // Full name of the plugin (used for diagnostics).
@@ -164,5 +164,8 @@ function xmldb_tool_moodlenet_upgrade(int $oldversion) {
        upgrade_plugin_savepoint(true, 2022021601, 'tool', 'moodlenet');
    }

+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -58,9 +58,8 @@ $string['mnetprofiledesc'] = '<p>Enter your MoodleNet profile details here to be
 $string['moodlenetsettings'] = 'MoodleNet settings';
 $string['moodlenetnotenabled'] = 'The MoodleNet integration must be enabled in Site administration / MoodleNet before resource imports can be processed.';
 $string['notification'] = 'You are about to import the content "{$a->name} ({$a->type})" into your site. Select the course in which it should be added, or <a href="{$a->cancellink}">cancel</a>.';
-$string['removedmnetprofilenotification'] = '<p>Due to some recent changes on the MoodleNet platform, users that have previously saved their MoodleNet profile on the site can no longer use this data to authenticate on the MoodleNet platform. The related data has now been removed as it is no longer useful.</p>
-<p>The users will need to reset this information on the site by linking their MoodleNet profile ID which can be found on their MoodleNet profile.</p>';
-$string['removedmnetprofilenotification_subject'] = 'Linked MoodleNet profiles removed.';
+$string['removedmnetprofilenotification'] = 'Due to recent changes on the MoodleNet platform, any users who previously saved their MoodleNet profile ID on the site will need to enter a MoodleNet profile ID in the new format in order to authenticate on the MoodleNet platform.';
+$string['removedmnetprofilenotification_subject'] = 'MoodleNet profile ID format change';
 $string['searchcourses'] = "Search courses";
 $string['selectpagetitle'] = 'Select page';
 $string['pluginname'] = 'MoodleNet';
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

+namespace tool_moodlenet;
+
 /**
 * Unit tests for the import_backup_helper
 *
@@ -22,15 +24,7 @@
 * @copyright  2020 Adrian Greeve <adrian@moodle.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-
-/**
- * Class import_backup_helper tests
- */
-class tool_moodlenet_import_backup_helper_testcase extends advanced_testcase {
+class import_backup_helper_test extends \advanced_testcase {

    /**
     * Test that the first available context with the capability to upload backup files is returned.
@@ -47,7 +41,7 @@ class tool_moodlenet_import_backup_helper_testcase extends advanced_testcase {
        $user5 = $this->getDataGenerator()->create_user();

        $course = $this->getDataGenerator()->create_course();
-        $coursecontext = context_course::instance($course->id);
+        $coursecontext = \context_course::instance($course->id);

        $this->getDataGenerator()->enrol_user($user1->id, $course->id, 'student');
        $this->getDataGenerator()->enrol_user($user2->id, $course->id, 'editingteacher');
@@ -55,12 +49,12 @@ class tool_moodlenet_import_backup_helper_testcase extends advanced_testcase {

        $category = $this->getDataGenerator()->create_category();
        $rolerecord = $DB->get_record('role', ['shortname' => 'manager']);
-        $categorycontext = context_coursecat::instance($category->id);
+        $categorycontext = \context_coursecat::instance($category->id);
        $this->getDataGenerator()->role_assign($rolerecord->id, $user3->id, $categorycontext->id);
        $this->getDataGenerator()->role_assign($rolerecord->id, $user5->id, $categorycontext->id);

        $roleid = $this->getDataGenerator()->create_role();
-        $sitecontext = context_system::instance();
+        $sitecontext = \context_system::instance();
        assign_capability('moodle/restore:uploadfile', CAP_ALLOW, $roleid, $sitecontext->id, true);
        accesslib_clear_all_caches_for_unit_testing();
        $this->getDataGenerator()->role_assign($roleid, $user4->id, $sitecontext->id);
@@ -81,4 +75,4 @@ class tool_moodlenet_import_backup_helper_testcase extends advanced_testcase {
        $this->assertEquals(CONTEXT_COURSECAT, $result->contextlevel);
    }

-}
+}
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

+namespace tool_moodlenet;
+
 /**
 * Unit tests for the profile manager
 *
@@ -22,15 +24,7 @@
 * @copyright  2020 Adrian Greeve <adrian@moodle.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-
-/**
- * Class profile_manager tests
- */
-class tool_moodlenet_profile_manager_testcase extends advanced_testcase {
+class profile_manager_test extends \advanced_testcase {

    /**
     * Test that on this site we use the user table to hold moodle net profile information.
@@ -57,7 +51,7 @@ class tool_moodlenet_profile_manager_testcase extends advanced_testcase {
        $this->resetAfterTest();
        $user = $this->getDataGenerator()->create_user();

-        $this->expectException(moodle_exception::class);
+        $this->expectException(\moodle_exception::class);
        $this->expectExceptionMessage(get_string('invalidmoodlenetprofile', 'tool_moodlenet'));
        $result = new \tool_moodlenet\moodlenet_user_profile("", $user->id);
    }
@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die();

 $plugin->component  = 'tool_moodlenet';
-$plugin->version    = 2022021601;
-$plugin->requires   = 2021052500;
+$plugin->version    = 2022041900;
+$plugin->requires   = 2022041200;
 $plugin->maturity   = MATURITY_ALPHA;
@@ -25,7 +25,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_multilangupgrade'; // Full name of the plugin (used for diagnostics)

@@ -24,7 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_oauth2'; // Full name of the plugin (used for diagnostics).

@@ -24,7 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_phpunit'; // Full name of the plugin (used for diagnostics)

@@ -46,5 +46,8 @@ function xmldb_tool_policy_upgrade($oldversion) {
    // Automatically generated Moodle v3.9.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -56,5 +56,5 @@
     d="m 10.60981,13.748496 q -0.42076,-0.2046 -0.42076,-0.6595 v -2.1834 H 0.36389001 q -0.15919999,0 -0.26154001,-0.102297 Q 0,10.700897 0,10.541796 V 2.5361969 q 0,-0.2388 0.20469002,-0.3297 0.22743999,-0.091 0.39800999,0.045 L 2.7860701,4.0708971 q 0.1250916,0.1024 0.1250916,0.2842998 v 3.639 H 10.18905 V 5.810797 q 0,-0.4548999 0.42076,-0.6596001 0.42075,-0.1932998 0.77327,0.1024 L 15.749821,8.892496 Q 16,9.0971966 16,9.4496973 16,9.8022974 15.749821,10.006998 l -4.366741,3.638798 q -0.36389,0.307 -0.77327,0.102297 z"
     id="path4552"
     inkscape:connector-curvature="0"
-     style="fill:#999999;fill-opacity:1;stroke-width:0.9999997" />
+     style="fill:#888;fill-opacity:1;stroke-width:0.9999997" />
 </svg>
--- a/Show More
+++ b/Show More