Merge pull request #153 from marxjohnson/152-moodle-401-fixes

Fixes for Moodle 4.1 compatibility

Author: danmarsden

.github/workflows/ci.yml

@@ -38,8 +38,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { moodle-branch: 'MOODLE_310_STABLE', php: '7.4', node: '14.15.1', database: 'mariadb' }
-          - { moodle-branch: 'MOODLE_310_STABLE', php: '7.4', node: '14.15.1', database: 'pgsql' }
+          - {moodle-branch: 'MOODLE_311_STABLE', php: '7.3', node: '14.15.1', database: 'mariadb'}
+          - {moodle-branch: 'MOODLE_311_STABLE', php: '7.3', node: '14.15.1', database: 'pgsql'}
+          - {moodle-branch: 'MOODLE_400_STABLE', php: '7.3', node: '14.15.1', database: 'mariadb'}
+          - {moodle-branch: 'MOODLE_400_STABLE', php: '7.3', node: '14.15.1', database: 'pgsql'}
+          - {moodle-branch: 'MOODLE_401_STABLE', php: '7.4', node: '14.15.1', database: 'mariadb'}
+          - {moodle-branch: 'MOODLE_401_STABLE', php: '7.4', node: '14.15.1', database: 'pgsql'}
+          - {moodle-branch: 'MOODLE_401_STABLE', php: '8.0', node: '14.15.1', database: 'mariadb'}
+          - {moodle-branch: 'MOODLE_401_STABLE', php: '8.0', node: '14.15.1', database: 'pgsql'}
 
     steps:
       - name: Check out repository code
@@ -58,6 +64,7 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: pgsql, zip, gd, xmlrpc, soap
           coverage: none
+          ini-values: max_input_vars=5000
 
       - name: Initialise moodle-plugin-ci
         run: |

README.md

@@ -8,10 +8,11 @@ Moodle DataCleaner is an anonymiser of your Moodle data.
 
 The following maps the plugin version to use depending on your Moodle version.
 
-| Moodle verion     | Branch             |
-| ----------------- | -------------------|
-| Moodle up to 3.9  | master             |
-| Moodle 3.10       | MOODLE_310_STABLE  |
+| Moodle verion         | Branch             |
+| --------------------- | -------------------|
+| Moodle up to 3.9      | master             |
+| Moodle 3.10           | MOODLE_310_STABLE  |
+| Moodle 3.11 and above | MOODLE_311_STABLE  |
 
 The following maps the plugin version to use depending on your Totara version.
 

cleaner/users/classes/clean.php

@@ -46,6 +46,11 @@ public static function execute() {
 
         self::$idstoupdate = self::create_user_id_list_to_update();
 
+        if (empty(self::$idstoupdate)) {
+            echo "No users to update.\n";
+            return;
+        }
+
         if (self::$options['dryrun']) {
             echo "Dry run mode, no records were updated.\n";
             return;
@@ -124,11 +129,6 @@ private static function set_fixed_fields() {
             'picture'      => 0,
             'description'  => '',
             'lastip'       => '',
-            'icq'          => '',
-            'skype'        => '',
-            'yahoo'        => '',
-            'aim'          => '',
-            'msn'          => '',
             'phone1'       => '',
             'phone2'       => '',
             'idnumber'     => '',

cli/lib.php

@@ -98,7 +98,7 @@ function safety_checks($dryrun) {
                 AND u.deleted = 0";
 
     if ($DB->count_records_sql($csql, $params)) {
-        $namefields = "u." . implode(', u.', get_all_user_name_fields());
+        $namefields = "u." . implode(', u.', \core_user\fields::get_name_fields());
 
         $sql = "SELECT u.id, u.username, {$namefields}
                   FROM {user} u

tests/unit/custom_test.php

@@ -35,6 +35,19 @@
  * @SuppressWarnings(public) Allow as many methods as needed.
  */
 class local_datacleaner_custom_sql_test extends advanced_testcase {
+
+    /**
+     * Initialise a cleaner object to reset static options.
+     *
+     * This prevents impact on other tests which assume default options.
+     *
+     * @return void
+     * @throws coding_exception
+     */
+    public function tearDown(): void {
+        new \cleaner_custom_sql_pre\clean(['verbose' => false, 'dryrun' => false]);
+    }
+
     public function test_executes_sql() {
         global $DB;
 

version.php

@@ -24,8 +24,9 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version   = 2021081900;
-$plugin->release   = '2.3.9';
+$plugin->version   = 2022020300;
+$plugin->release   = '2.3.10';
 $plugin->maturity  = MATURITY_STABLE;
-$plugin->requires  = 2020110900; // Moodle 3.10 release and upwards.
+$plugin->requires  = 2021051700; // Moodle 3.11 release and upwards.
+$plugin->supports  = [311, 401];
 $plugin->component = 'local_datacleaner';