Merge branch 'master' into extrafields

Author: Laur0r

.github/workflows/moodle-ci.yml

@@ -113,7 +113,7 @@ jobs:
     steps:
       - name: Start MariaDB
         if: matrix.database == 'mariadb'
-        run: docker run -p 3306:3306 -e MYSQL_USER=root -e MYSQL_ALLOW_EMPTY_PASSWORD=true -d mariadb:10
+        run: docker run -p 3306:3306 -e MYSQL_USER=root -e MYSQL_ALLOW_EMPTY_PASSWORD=true -d mariadb:10.5
 
       - name: Start PostgreSQL
         if: matrix.database == 'pgsql'

backup/moodle2/backup_groupmembers_activity_task.class.php

@@ -56,11 +56,11 @@ public static function encode_content_links($content) {
 
         $base = preg_quote($CFG->wwwroot, "/");
 
-        // Link to the list of groupmembers
+        // Link to the list of groupmembers.
         $search = "/(".$base."\/mod\/groupmembers\/index.php\?id\=)([0-9]+)/";
         $content = preg_replace($search, '$@GROUPMEMBERINDEX*$2@$', $content);
 
-        // Link to view by moduleid
+        // Link to view by moduleid.
         $search = "/(".$base."\/mod\/groupmembers\/view.php\?id\=)([0-9]+)/";
         $content = preg_replace($search, '$@GROUPMEMBERVIEWBYID*$2@$', $content);
 

classes/groups.php

@@ -76,4 +76,4 @@ public static function get_groups_and_members($courseid, $groupingid, $userid, $
 
         return $groupsandmembers;
     }
-}
+}

classes/privacy/provider.php

@@ -42,7 +42,7 @@ class provider implements \core_privacy\local\metadata\null_provider {
      *
      * @return  string
      */
-    public static function _get_reason() {
+    public static function get_reason(): string {
         return 'privacy:metadata';
     }
 }

db/events.php

@@ -32,4 +32,4 @@
 course_module_viewed                - user viewed group members
 course_module_instance_list_viewed  - user viewed course module instances
 
-*/
+*/

index.php

@@ -61,4 +61,4 @@
 }
 echo html_writer::alist($linklist);
 
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();

tests/groups_datastructure_test.php

@@ -183,4 +183,4 @@ private static function prepare_basic_data(testing_data_generator $dg) {
 
         return [$course->id, $user1->id, $group1->id, $grouping->id];
     }
-}
+}

version.php

@@ -26,7 +26,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->maturity  = MATURITY_STABLE;
-$plugin->release   = 'v3.7-r1';
-$plugin->version   = 2021061500;         // The current module version (Date: YYYYMMDDXX)
-$plugin->requires  = 2016120500;         // Requires this Moodle version
+$plugin->release   = 'v3.11-r2';
+$plugin->version   = 2021082700;         // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2016120500;         // Requires this Moodle version.
 $plugin->component = 'mod_groupmembers'; // Full name of the plugin (used for diagnostics).

view.php

@@ -31,20 +31,20 @@
 
 // Load course module.
 if (! $cm = get_coursemodule_from_id('groupmembers', $id)) {
-    print_error('invalidcoursemodule');
+    throw new moodle_exception('invalidcoursemodule');
 }
 
 // Load corresponding course.
 if (! $course = $DB->get_record('course', array('id' => $cm->course))) {
-    print_error('coursemisconf');
+    throw new moodle_exception('coursemisconf');
 }
 
 require_course_login($course, false, $cm);
 $context = context_module::instance($cm->id);
 
 // Load groupmembers object.
 if (! $groupmembers = groupmembers_get_groupmembers($cm->instance)) {
-    print_error('invalidcoursemodule');
+    throw new moodle_exception('invalidcoursemodule');
 }
 
 $PAGE->set_title($groupmembers->name);