From 279ae4d5b335b9c4f055b1b146c3762b0832ef41 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Wed, 7 Dec 2022 12:13:48 +0800 Subject: [PATCH] MDL-76583 core_external: Migrate external_multiple_structure class --- lib/external/classes/external_api.php | 1 - .../classes/external_multiple_structure.php | 50 +++++++++++++++++++ lib/externallib.php | 30 +---------- 3 files changed, 51 insertions(+), 30 deletions(-) create mode 100644 lib/external/classes/external_multiple_structure.php diff --git a/lib/external/classes/external_api.php b/lib/external/classes/external_api.php index 5124161e508..00f44ae17bf 100644 --- a/lib/external/classes/external_api.php +++ b/lib/external/classes/external_api.php @@ -24,7 +24,6 @@ use core_component; use core_php_time_limit; use external_description; use external_function_parameters; -use external_multiple_structure; use external_single_structure; use external_value; use invalid_parameter_exception; diff --git a/lib/external/classes/external_multiple_structure.php b/lib/external/classes/external_multiple_structure.php new file mode 100644 index 00000000000..f2a3d62f1eb --- /dev/null +++ b/lib/external/classes/external_multiple_structure.php @@ -0,0 +1,50 @@ +. + +namespace core_external; + +/** + * Bulk array description class. + * + * @package core_external + * @copyright 2009 Petr Skodak + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.0 + */ +class external_multiple_structure extends external_description { + + /** @var external_description content */ + public $content; + + /** + * Constructor + * + * @param external_description $content + * @param string $desc + * @param bool $required + * @param array $default + * @since Moodle 2.0 + */ + public function __construct( + external_description $content, + $desc = '', + $required = VALUE_REQUIRED, + $default = null + ) { + parent::__construct($desc, $required, $default); + $this->content = $content; + } +} diff --git a/lib/externallib.php b/lib/externallib.php index 4df06fadc0c..dd48056946d 100644 --- a/lib/externallib.php +++ b/lib/externallib.php @@ -48,35 +48,7 @@ class_alias(\core_external\external_api::class, 'external_api'); class_alias(\core_external\external_description::class, 'external_description'); class_alias(\core_external\external_value::class, 'external_value'); class_alias(\core_external\external_single_structure::class, 'external_single_structure'); - -/** - * Bulk array description class. - * - * @package core_webservice - * @copyright 2009 Petr Skodak - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 2.0 - */ -class external_multiple_structure extends external_description { - - /** @var external_description content */ - public $content; - - /** - * Constructor - * - * @param external_description $content - * @param string $desc - * @param bool $required - * @param array $default - * @since Moodle 2.0 - */ - public function __construct(external_description $content, $desc='', - $required=VALUE_REQUIRED, $default=null) { - parent::__construct($desc, $required, $default); - $this->content = $content; - } -} +class_alias(\core_external\external_multiple_structure::class, 'external_multiple_structure'); /** * Description of top level - PHP function parameters.