Skip to content

Commit 04023c2

Browse files
opitzMatthias Opitz
andauthored
Fixing issues #502 and #507 (#508)
* now using core_external\external_api - fixes #502 * using valid $required parameter VALUE_REQUIRED - fixes #507 --------- Co-authored-by: Matthias Opitz <[email protected]>
1 parent 829c180 commit 04023c2

File tree

1 file changed

+25
-18
lines changed

1 file changed

+25
-18
lines changed

externallib.php

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424
* @since Moodle 3.0
2525
*/
2626

27+
use core_external\external_api;
28+
use core_external\external_function_parameters;
29+
use core_external\external_single_structure;
30+
use core_external\external_value;
31+
use core_external\external_warnings;
32+
33+
2734
defined('MOODLE_INTERNAL') || die;
2835
require_once($CFG->libdir . '/externallib.php');
2936
require_once($CFG->dirroot . '/mod/questionnaire/lib.php');
@@ -38,7 +45,7 @@
3845
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
3946
* @since Moodle 3.0
4047
*/
41-
class mod_questionnaire_external extends \external_api {
48+
class mod_questionnaire_external extends external_api {
4249

4350
/**
4451
* Describes the parameters for submit_questionnaire_response.
@@ -47,22 +54,22 @@ class mod_questionnaire_external extends \external_api {
4754
* @since Moodle 3.0
4855
*/
4956
public static function submit_questionnaire_response_parameters() {
50-
return new \external_function_parameters(
57+
return new external_function_parameters(
5158
[
52-
'questionnaireid' => new \external_value(PARAM_INT, 'Questionnaire instance id'),
53-
'surveyid' => new \external_value(PARAM_INT, 'Survey id'),
54-
'userid' => new \external_value(PARAM_INT, 'User id'),
55-
'cmid' => new \external_value(PARAM_INT, 'Course module id'),
56-
'sec' => new \external_value(PARAM_INT, 'Section number'),
57-
'completed' => new \external_value(PARAM_INT, 'Completed survey or not'),
58-
'rid' => new \external_value(PARAM_INT, 'Existing response id'),
59-
'submit' => new \external_value(PARAM_INT, 'Submit survey or not'),
60-
'action' => new \external_value(PARAM_ALPHA, 'Page action'),
61-
'responses' => new \external_multiple_structure(
62-
new \external_single_structure(
59+
'questionnaireid' => new external_value(PARAM_INT, 'Questionnaire instance id'),
60+
'surveyid' => new external_value(PARAM_INT, 'Survey id'),
61+
'userid' => new external_value(PARAM_INT, 'User id'),
62+
'cmid' => new external_value(PARAM_INT, 'Course module id'),
63+
'sec' => new external_value(PARAM_INT, 'Section number'),
64+
'completed' => new external_value(PARAM_INT, 'Completed survey or not'),
65+
'rid' => new external_value(PARAM_INT, 'Existing response id'),
66+
'submit' => new external_value(PARAM_INT, 'Submit survey or not'),
67+
'action' => new external_value(PARAM_ALPHA, 'Page action'),
68+
'responses' => new external_multiple_structure(
69+
new external_single_structure(
6370
[
64-
'name' => new \external_value(PARAM_RAW, 'data key'),
65-
'value' => new \external_value(PARAM_RAW, 'data value')
71+
'name' => new external_value(PARAM_RAW, 'data key'),
72+
'value' => new external_value(PARAM_RAW, 'data value')
6673
]
6774
),
6875
'The data to be saved', VALUE_DEFAULT, []
@@ -128,10 +135,10 @@ public static function submit_questionnaire_response($questionnaireid, $surveyid
128135
* @since Moodle 3.0
129136
*/
130137
public static function submit_questionnaire_response_returns() {
131-
return new \external_single_structure(
138+
return new external_single_structure(
132139
[
133-
'submitted' => new \external_value(PARAM_BOOL, 'submitted', true, false, false),
134-
'warnings' => new \external_warnings()
140+
'submitted' => new external_value(PARAM_BOOL, 'submitted', VALUE_REQUIRED, false, false),
141+
'warnings' => new external_warnings()
135142
]
136143
);
137144
}

0 commit comments

Comments
 (0)