From bcbd018192603938446425e66ebdb1ddd2e2758c Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Thu, 15 Jun 2023 00:09:08 +0800 Subject: [PATCH 1/1] 78159 --- ...resets_admin_setting_configmultiselect.php | 2 ++ ...dminpresets_admin_setting_configselect.php | 1 + .../adminpresets_admin_setting_configtext.php | 2 ++ .../adminpresets_admin_setting_configtime.php | 1 + ...esets_admin_setting_special_backupdays.php | 1 + ...ts_admin_setting_users_with_capability.php | 2 ++ lib/adminlib.php | 19 ++++++++++++------- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php index 7ae72675a3..e1d959a6ba 100644 --- a/admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php +++ b/admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php @@ -26,6 +26,8 @@ namespace core_adminpresets\local\setting; */ class adminpresets_admin_setting_configmultiselect extends adminpresets_setting { + /** @var admin_setting_configmultiselect $settingdata */ + /** * Ensure that the $value values are setting choices. * diff --git a/admin/presets/classes/local/setting/adminpresets_admin_setting_configselect.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configselect.php index d8a9109fa6..e071176c91 100644 --- a/admin/presets/classes/local/setting/adminpresets_admin_setting_configselect.php +++ b/admin/presets/classes/local/setting/adminpresets_admin_setting_configselect.php @@ -25,6 +25,7 @@ namespace core_adminpresets\local\setting; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class adminpresets_admin_setting_configselect extends adminpresets_setting { + /** @var admin_setting_configselect $settingdata */ /** * Sets the setting value cleaning it. diff --git a/admin/presets/classes/local/setting/adminpresets_admin_setting_configtext.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configtext.php index 858c84ad44..f65284e529 100644 --- a/admin/presets/classes/local/setting/adminpresets_admin_setting_configtext.php +++ b/admin/presets/classes/local/setting/adminpresets_admin_setting_configtext.php @@ -26,6 +26,8 @@ namespace core_adminpresets\local\setting; */ class adminpresets_admin_setting_configtext extends adminpresets_setting { + /** @var admin_setting_configtext $settingdata */ + /** * Validates the value using paramtype attribute * diff --git a/admin/presets/classes/local/setting/adminpresets_admin_setting_configtime.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configtime.php index 67e56d5f37..f458430dc3 100644 --- a/admin/presets/classes/local/setting/adminpresets_admin_setting_configtime.php +++ b/admin/presets/classes/local/setting/adminpresets_admin_setting_configtime.php @@ -25,6 +25,7 @@ namespace core_adminpresets\local\setting; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class adminpresets_admin_setting_configtime extends adminpresets_setting { + /** @var admin_setting_configtime $settingdata */ /** * To check that the value is one of the options diff --git a/admin/presets/classes/local/setting/adminpresets_admin_setting_special_backupdays.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_special_backupdays.php index 70739a82ca..e5fcb17cd2 100644 --- a/admin/presets/classes/local/setting/adminpresets_admin_setting_special_backupdays.php +++ b/admin/presets/classes/local/setting/adminpresets_admin_setting_special_backupdays.php @@ -27,6 +27,7 @@ namespace core_adminpresets\local\setting; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class adminpresets_admin_setting_special_backupdays extends adminpresets_setting { + /** @var admin_setting_special_backupdays $settingdata */ protected function set_value($value) { $this->value = clean_param($value, PARAM_SEQUENCE); diff --git a/admin/presets/classes/local/setting/adminpresets_admin_setting_users_with_capability.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_users_with_capability.php index e46db3afba..d65dfbecc0 100644 --- a/admin/presets/classes/local/setting/adminpresets_admin_setting_users_with_capability.php +++ b/admin/presets/classes/local/setting/adminpresets_admin_setting_users_with_capability.php @@ -26,6 +26,8 @@ namespace core_adminpresets\local\setting; */ class adminpresets_admin_setting_users_with_capability extends adminpresets_admin_setting_configmultiselect { + /** @var admin_setting_users_with_capability $settingdata */ + protected function set_behaviors() { $this->behaviors['loadchoices'] = &$this->settingdata; } diff --git a/lib/adminlib.php b/lib/adminlib.php index e8ea3cbd89..4052412973 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -1738,12 +1738,6 @@ abstract class admin_setting { private $dependenton = []; /** @var bool Whether this setting uses a custom form control */ protected $customcontrol = false; - /** @var mixed int means PARAM_XXX type, string is a allowed format in regex. */ - public $paramtype; - /** @var array Array of choices value=>label. */ - public $choices; - /** @var string Used for setting second select (minutes). */ - public $name2; /** * Constructor @@ -2447,6 +2441,8 @@ class admin_setting_description extends admin_setting { * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class admin_setting_configtext extends admin_setting { + /** @var mixed int means PARAM_XXX type, string is a allowed format in regex. */ + public $paramtype; /** @var int default field size */ public $size; @@ -3132,6 +3128,8 @@ class admin_setting_configcheckbox extends admin_setting { class admin_setting_configmulticheckbox extends admin_setting { /** @var callable|null Loader function for choices */ protected $choiceloader = null; + /** @var array Array of choices value=>label */ + public $choices; /** * Constructor: uses parent::__construct @@ -3789,6 +3787,9 @@ class admin_setting_configmultiselect extends admin_setting_configselect { */ class admin_setting_configtime extends admin_setting { + /** @var string Used for setting second select (minutes). */ + public $name2; + /** * Constructor * @param string $hoursname setting for hours @@ -3798,7 +3799,7 @@ class admin_setting_configtime extends admin_setting { * @param array $defaultsetting array representing default time 'h'=>hours, 'm'=>minutes */ public function __construct($hoursname, $minutesname, $visiblename, $description, $defaultsetting) { - $this->name2 = $minutesname; + $this = $minutesname; parent::__construct($hoursname, $visiblename, $description, $defaultsetting); } @@ -4664,6 +4665,8 @@ class admin_setting_bloglevel extends admin_setting_configselect { * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class admin_setting_courselist_frontpage extends admin_setting { + /** @var array Array of choices value=>label */ + public $choices; /** * Construct override, requires one param @@ -6258,6 +6261,8 @@ class admin_setting_special_gradepointmax extends admin_setting_configtext { * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class admin_setting_gradecat_combo extends admin_setting { + /** @var array Array of choices value=>label */ + public $choices; /** * Sets choices and calls parent::__construct with passed arguments -- 2.39.0