From e460e2e43fe2523607c24d616a6abb3e14bab298 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Wed, 7 Dec 2022 13:10:17 +0800 Subject: [PATCH] MDL-76583 core_external: Migrate external_format_value class --- .../classes/external_format_value.php | 54 +++++++++++++++++++ lib/externallib.php | 38 +------------ 2 files changed, 55 insertions(+), 37 deletions(-) create mode 100644 lib/external/classes/external_format_value.php diff --git a/lib/external/classes/external_format_value.php b/lib/external/classes/external_format_value.php new file mode 100644 index 00000000000..ae00c3aed98 --- /dev/null +++ b/lib/external/classes/external_format_value.php @@ -0,0 +1,54 @@ +. + +namespace core_external; + +/** + * A pre-filled external_value class for text format. + * + * Default is FORMAT_HTML + * This should be used all the time in external xxx_params()/xxx_returns functions + * as it is the standard way to implement text format param/return values. + * + * @package core_webservice + * @copyright 2012 Jerome Mouneyrac + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.3 + */ +class external_format_value extends external_value { + + /** + * Constructor + * + * @param string $textfieldname Name of the text field + * @param int $required if VALUE_REQUIRED then set standard default FORMAT_HTML + * @param int $default Default value. + * @since Moodle 2.3 + */ + public function __construct($textfieldname, $required = VALUE_REQUIRED, $default = null) { + + if ($default == null && $required == VALUE_DEFAULT) { + $default = FORMAT_HTML; + } + + $desc = $textfieldname . ' format (' . FORMAT_HTML . ' = HTML, ' + . FORMAT_MOODLE . ' = MOODLE, ' + . FORMAT_PLAIN . ' = PLAIN or ' + . FORMAT_MARKDOWN . ' = MARKDOWN)'; + + parent::__construct(PARAM_INT, $desc, $required, $default); + } +} diff --git a/lib/externallib.php b/lib/externallib.php index e176edad57e..08dfc341d1a 100644 --- a/lib/externallib.php +++ b/lib/externallib.php @@ -29,6 +29,7 @@ class_alias(\core_external\external_api::class, 'external_api'); class_alias(\core_external\restricted_context_exception::class, 'restricted_context_exception'); class_alias(\core_external\external_description::class, 'external_description'); class_alias(\core_external\external_value::class, 'external_value'); +class_alias(\core_external\external_format_value::class, 'external_format_value'); class_alias(\core_external\external_single_structure::class, 'external_single_structure'); class_alias(\core_external\external_multiple_structure::class, 'external_multiple_structure'); class_alias(\core_external\external_function_parameters::class, 'external_function_parameters'); @@ -133,43 +134,6 @@ function external_delete_descriptions($component) { $DB->delete_records('external_functions', array('component'=>$component)); } -/** - * A pre-filled external_value class for text format. - * - * Default is FORMAT_HTML - * This should be used all the time in external xxx_params()/xxx_returns functions - * as it is the standard way to implement text format param/return values. - * - * @package core_webservice - * @copyright 2012 Jerome Mouneyrac - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 2.3 - */ -class external_format_value extends external_value { - - /** - * Constructor - * - * @param string $textfieldname Name of the text field - * @param int $required if VALUE_REQUIRED then set standard default FORMAT_HTML - * @param int $default Default value. - * @since Moodle 2.3 - */ - public function __construct($textfieldname, $required = VALUE_REQUIRED, $default = null) { - - if ($default == null && $required == VALUE_DEFAULT) { - $default = FORMAT_HTML; - } - - $desc = $textfieldname . ' format (' . FORMAT_HTML . ' = HTML, ' - . FORMAT_MOODLE . ' = MOODLE, ' - . FORMAT_PLAIN . ' = PLAIN or ' - . FORMAT_MARKDOWN . ' = MARKDOWN)'; - - parent::__construct(PARAM_INT, $desc, $required, $default); - } -} - /** * Validate text field format against known FORMAT_XXX *