From b16f5398a513c674ac1ec3966a75406734fcf469 Mon Sep 17 00:00:00 2001
From: Mihail Geshoski <mihail@moodle.com>
Date: Wed, 6 May 2020 10:23:53 +0800
Subject: [PATCH 1/2] MDL-67845 enrol_database: Use course category selection
 setting

We should use admin_settings_coursecat_select instead of
enrol_database_admin_setting_category as the second class is only
being used by the database enrolment plugin settings and can be
removed after this change.
---
 enrol/database/settings.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/enrol/database/settings.php b/enrol/database/settings.php
index f5dde91ead7..28c75044f2f 100644
--- a/enrol/database/settings.php
+++ b/enrol/database/settings.php
@@ -111,9 +111,9 @@ if ($ADMIN->fulltree) {
 
     $settings->add(new admin_setting_configtext('enrol_database/newcoursecategory', get_string('newcoursecategory', 'enrol_database'), '', ''));
 
-    require_once($CFG->dirroot.'/enrol/database/settingslib.php');
-
-    $settings->add(new enrol_database_admin_setting_category('enrol_database/defaultcategory', get_string('defaultcategory', 'enrol_database'), get_string('defaultcategory_desc', 'enrol_database')));
+    $settings->add(new admin_settings_coursecat_select('enrol_database/defaultcategory',
+        get_string('defaultcategory', 'enrol_database'),
+        get_string('defaultcategory_desc', 'enrol_database'), 1));
 
     $settings->add(new admin_setting_configtext('enrol_database/templatecourse', get_string('templatecourse', 'enrol_database'), get_string('templatecourse_desc', 'enrol_database'), ''));
 }

From 9fa46e8a8c55733b88f5f988328b5a15217514a1 Mon Sep 17 00:00:00 2001
From: Mihail Geshoski <mihail@moodle.com>
Date: Wed, 6 May 2020 10:43:00 +0800
Subject: [PATCH 2/2] MDL-67845 enrol_database: Remove
 enrol_database_admin_setting_category

This class was only used by the database enrolment plugin settings and
was replaced by admin_settings_coursecat_select. Also, this class is in
a plugin which we do not expect to be extended and therefore it can be
simply removed without going through the deprecation process.
---
 enrol/database/settingslib.php | 46 ----------------------------------
 enrol/database/upgrade.txt     |  4 +++
 2 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 enrol/database/settingslib.php

diff --git a/enrol/database/settingslib.php b/enrol/database/settingslib.php
deleted file mode 100644
index a1bace8771b..00000000000
--- a/enrol/database/settingslib.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Database enrolment plugin custom settings.
- *
- * @package    enrol_database
- * @copyright  2013 Darko Miletic
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Class implements new specialized setting for course categories that are loaded
- * only when required
- * @author Darko Miletic
- *
- */
-class enrol_database_admin_setting_category extends admin_setting_configselect {
-    public function __construct($name, $visiblename, $description) {
-        parent::__construct($name, $visiblename, $description, 1, null);
-    }
-
-    public function load_choices() {
-        if (is_array($this->choices)) {
-            return true;
-        }
-
-        $this->choices = make_categories_options();
-        return true;
-    }
-}
diff --git a/enrol/database/upgrade.txt b/enrol/database/upgrade.txt
index 8fccd35a67c..53c0931a3c2 100644
--- a/enrol/database/upgrade.txt
+++ b/enrol/database/upgrade.txt
@@ -1,4 +1,8 @@
 This files describes API changes in the enrol_database code.
 
+=== 3.9 ===
+* Class enrol_database_admin_setting_category has been removed. This class was only used by the database
+  enrolment plugin settings and it was replaced by admin_settings_coursecat_select.
+
 === 3.7 ===
 * enrol/database/cli/sync.php script has been deprecated in favour of enrol_database\task\sync_enrolments task.