From 4f920aab111f439ec5c16db94e0d6586fdbfdb2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luca=20B=C3=B6sch?= Date: Mon, 14 Jul 2025 19:13:04 +0200 Subject: [PATCH 1/5] Adopting Moodle Plugin CI for Moodle 5.0 --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7fa8c53d..d09e13ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,15 +30,15 @@ jobs: fail-fast: false matrix: include: + - php: '8.4' + moodle-branch: 'MOODLE_500_STABLE' + database: 'pgsql' - php: '8.3' - moodle-branch: 'MOODLE_405_STABLE' + moodle-branch: 'MOODLE_500_STABLE' database: 'mariadb' - php: '8.2' - moodle-branch: 'MOODLE_405_STABLE' + moodle-branch: 'MOODLE_500_STABLE' database: 'pgsql' - - php: '8.1' - moodle-branch: 'MOODLE_404_STABLE' - database: 'mariadb' steps: - name: Checkout From 9caa3f4319aec690cd0175b94384b7b350b17c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luca=20B=C3=B6sch?= Date: Mon, 14 Jul 2025 19:47:59 +0200 Subject: [PATCH 2/5] Resolved implicitly marking parameter as nullable deprecation --- classes/question/question.php | 4 ++-- classes/question/rate.php | 6 +++--- classes/responsetype/responsetype.php | 4 ++-- tests/behat/behat_mod_questionnaire.php | 2 +- tests/generator/lib.php | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/classes/question/question.php b/classes/question/question.php index ed191496..2c96a833 100644 --- a/classes/question/question.php +++ b/classes/question/question.php @@ -653,9 +653,9 @@ public function update($questionrecord = null, $updatechoices = true) { * Add the question to the database from supplied arguments. * @param \stdClass $questionrecord The required data for adding the question. * @param array $choicerecords An array of choice records with 'content' and 'value' properties. - * @param boolean $calcposition Whether or not to calculate the next available position in the survey. + * @param bool|null $calcposition Whether or not to calculate the next available position in the survey. */ - public function add($questionrecord, array $choicerecords = null, $calcposition = true) { + public function add($questionrecord, ?array $choicerecords = null, ?bool $calcposition = true) { global $DB; // Create new question. diff --git a/classes/question/rate.php b/classes/question/rate.php index 8e0117da..b21bfc55 100644 --- a/classes/question/rate.php +++ b/classes/question/rate.php @@ -1026,9 +1026,9 @@ public function insert_nameddegrees(array $nameddegrees) { * Helper function used to move existing named degree choices for the specified question from the "quest_choice" table to the * "question" table. * @param int $qid - * @param null|\stdClass $questionrec + * @param \stdClass|null $questionrec */ - public static function move_nameddegree_choices(int $qid = 0, \stdClass $questionrec = null) { + public static function move_nameddegree_choices(int $qid = 0, ?\stdClass $questionrec = null) { global $DB; if ($qid !== 0) { @@ -1079,7 +1079,7 @@ public static function move_nameddegree_choices(int $qid = 0, \stdClass $questio * questionnaire before '2018110103'. * @param int|null $surveyid */ - public static function move_all_nameddegree_choices(int $surveyid = null) { + public static function move_all_nameddegree_choices(?int $surveyid = null) { global $DB; // This operation might take a while. Cancel PHP timeouts for this. diff --git a/classes/responsetype/responsetype.php b/classes/responsetype/responsetype.php index aa9c5dd2..1e879781 100644 --- a/classes/responsetype/responsetype.php +++ b/classes/responsetype/responsetype.php @@ -45,9 +45,9 @@ abstract class responsetype { * responsetype constructor. * @param \mod_questionnaire\question\question $question * @param int|null $responseid - * @param array $choices + * @param array|null $choices */ - public function __construct(\mod_questionnaire\question\question $question, int $responseid = null, array $choices = []) { + public function __construct(\mod_questionnaire\question\question $question, ?int $responseid = null, ?array $choices = []) { $this->question = $question; $this->responseid = $responseid; $this->choices = $choices; diff --git a/tests/behat/behat_mod_questionnaire.php b/tests/behat/behat_mod_questionnaire.php index 57c97c58..39b47d51 100644 --- a/tests/behat/behat_mod_questionnaire.php +++ b/tests/behat/behat_mod_questionnaire.php @@ -418,7 +418,7 @@ private function add_response_data($qid, $sid) { * to replace with mapped values. * @return null */ - private function add_data(array $data, $datatable, $mapvar = '', array $replvars = null) { + private function add_data(array $data, $datatable, $mapvar = '', ?array $replvars = null) { global $DB; if ($replvars === null) { diff --git a/tests/generator/lib.php b/tests/generator/lib.php index 447c5246..77b94a90 100644 --- a/tests/generator/lib.php +++ b/tests/generator/lib.php @@ -76,10 +76,10 @@ public function questionnaires() { /** * Create a questionnaire activity. * @param array $record Will be changed in this function. - * @param array $options + * @param array|null $options * @return questionnaire */ - public function create_instance($record = null, array $options = null) { + public function create_instance($record = null, ?array $options = null) { $record = (object)(array)$record; $defaultquestionnairesettings = array( From 4e8402f5bd74a90d19f343b3ebde2fdd7c3b2f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luca=20B=C3=B6sch?= Date: Mon, 14 Jul 2025 19:57:35 +0200 Subject: [PATCH 3/5] Resolved Data Provider method is not static --- tests/custom_completion_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/custom_completion_test.php b/tests/custom_completion_test.php index e46ce656..c266b8a5 100644 --- a/tests/custom_completion_test.php +++ b/tests/custom_completion_test.php @@ -51,7 +51,7 @@ class custom_completion_test extends \advanced_testcase { * * @return array[] */ - public function get_state_provider(): array { + public static function get_state_provider(): array { return [ 'Undefined rule' => [ 'somenonexistentrule', COMPLETION_DISABLED, false, null, coding_exception::class @@ -178,7 +178,7 @@ public function test_is_defined() { * * @return array[] */ - public function get_available_custom_rules_provider(): array { + public static function get_available_custom_rules_provider(): array { return [ 'Completion submit available' => [ COMPLETION_ENABLED, ['completionsubmit'] From 7d19ae74e87d43d7332d1504d7b7376822ed2072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luca=20B=C3=B6sch?= Date: Mon, 14 Jul 2025 22:44:14 +0200 Subject: [PATCH 4/5] Resolved Moodle PHPDoc Checker issues --- .github/workflows/ci.yml | 2 +- classes/output/renderer.php | 6 +++--- classes/question/question.php | 2 +- questionnaire.class.php | 4 ++-- tests/custom_completion_test.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d09e13ea..40a65707 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,7 +88,7 @@ jobs: - name: Moodle PHPDoc Checker if: ${{ always() }} - run: moodle-plugin-ci phpdoc || true + run: moodle-plugin-ci phpdoc - name: Validating if: ${{ always() }} diff --git a/classes/output/renderer.php b/classes/output/renderer.php index 85497f8a..4990105c 100755 --- a/classes/output/renderer.php +++ b/classes/output/renderer.php @@ -570,9 +570,9 @@ public function download_dataformat_selector($label, $base, $name = 'dataformat' } /** - * @param $urlroot - * @param $options - * @param $userview + * @param moodle_url $urlroot + * @param array $options + * @param string $userview * @return string * @throws \coding_exception * @throws \moodle_exception diff --git a/classes/question/question.php b/classes/question/question.php index 2c96a833..4b208695 100644 --- a/classes/question/question.php +++ b/classes/question/question.php @@ -652,7 +652,7 @@ public function update($questionrecord = null, $updatechoices = true) { /** * Add the question to the database from supplied arguments. * @param \stdClass $questionrecord The required data for adding the question. - * @param array $choicerecords An array of choice records with 'content' and 'value' properties. + * @param array|null $choicerecords An array of choice records with 'content' and 'value' properties. * @param bool|null $calcposition Whether or not to calculate the next available position in the survey. */ public function add($questionrecord, ?array $choicerecords = null, ?bool $calcposition = true) { diff --git a/questionnaire.class.php b/questionnaire.class.php index 5fd3bebe..8476c204 100644 --- a/questionnaire.class.php +++ b/questionnaire.class.php @@ -4191,9 +4191,9 @@ public static function get_user_identity_fields($context, $userid) { } /** - * Output the questionnair information. + * Output the questionnaire information. * - * @param array $messages any access messages that should be described. + * @return string */ public function view_information() { $messages = []; diff --git a/tests/custom_completion_test.php b/tests/custom_completion_test.php index c266b8a5..7a9169bb 100644 --- a/tests/custom_completion_test.php +++ b/tests/custom_completion_test.php @@ -75,7 +75,7 @@ public static function get_state_provider(): array { * @dataProvider get_state_provider * @param string $rule The custom completion rule. * @param int $available Whether this rule is available. - * @param bool $submitted + * @param bool|null $submitted * @param int|null $status Expected status. * @param string|null $exception Expected exception. * @throws coding_exception From 626290cf74af949bfc0589990c9555ba5ee37f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luca=20B=C3=B6sch?= Date: Mon, 14 Jul 2025 23:13:40 +0200 Subject: [PATCH 5/5] Resolved Moodle Code Checker issues --- .github/workflows/ci.yml | 3 +- LICENSE.txt | 2 +- backup/moodle1/lib.php | 28 +- .../moodle2/backup_questionnaire_stepslib.php | 86 ++--- ...tore_questionnaire_activity_task.class.php | 18 +- .../restore_questionnaire_stepslib.php | 7 +- classes/completion/custom_completion.php | 5 +- classes/db/bulk_sql_config.php | 2 +- classes/edit_question_form.php | 2 + classes/event/all_responses_saved_as_text.php | 2 +- classes/event/all_responses_viewed.php | 2 +- classes/event/attempt_resumed.php | 2 +- classes/event/attempt_saved.php | 2 +- classes/event/attempt_submitted.php | 2 +- classes/event/non_respondents_viewed.php | 2 +- classes/event/questionnaire_previewed.php | 2 +- classes/event/response_viewed.php | 2 +- classes/feedback_form.php | 6 +- classes/output/mobile.php | 4 +- classes/output/renderer.php | 25 +- classes/privacy/provider.php | 10 +- classes/question/drop.php | 2 +- classes/question/essay.php | 4 +- classes/question/pagebreak.php | 2 +- classes/question/question.php | 17 +- classes/question/rate.php | 20 +- classes/question/sectiontext.php | 4 +- classes/questions_form.php | 55 +-- classes/responsetype/answer/answer.php | 3 +- classes/responsetype/boolean.php | 2 +- classes/responsetype/date.php | 4 +- classes/responsetype/rank.php | 66 ++-- classes/responsetype/response/response.php | 2 +- classes/responsetype/responsetype.php | 6 +- classes/responsetype/single.php | 2 +- classes/responsetype/text.php | 2 +- classes/settings_form.php | 16 +- complete.php | 7 +- db/access.php | 176 ++++----- db/log.php | 10 +- db/messages.php | 2 +- db/mobile.php | 10 +- db/services.php | 8 +- db/tasks.php | 10 +- db/upgrade.php | 72 ++-- drawchart.php | 21 +- externallib.php | 8 +- grade.php | 6 +- index.php | 20 +- lang/en/questionnaire.php | 3 + lib.php | 128 +++---- locallib.php | 84 ++-- mod_form.php | 12 +- myreport.php | 9 +- preview.php | 18 +- print.php | 5 +- qsettings.php | 18 +- questionnaire.class.php | 191 +++++----- questions.php | 22 +- report.php | 63 +-- settings.php | 8 +- show_nonrespondents.php | 51 +-- tabs.php | 34 +- tests/behat/behat_mod_questionnaire.php | 360 +++++++++--------- tests/csvexport_test.php | 11 +- tests/custom_completion_test.php | 30 +- tests/generator/lib.php | 36 +- tests/generator_test.php | 20 +- tests/lib_test.php | 48 +-- tests/privacy_provider_test.php | 17 +- tests/questiontypes_test.php | 72 ++-- tests/responsetypes_test.php | 33 +- view.php | 7 +- 73 files changed, 1049 insertions(+), 1002 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40a65707..c0860be4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,6 +72,7 @@ jobs: MOODLE_BRANCH: ${{ matrix.moodle-branch }} IGNORE_PATHS: 'templates/local/mobile' PHPDOCCHECKER_IGNORE_PATHS: /^vendor/ + CODECHECKER_IGNORE_NAMES: 'mobiledump.txt' - name: PHP Lint if: ${{ always() }} @@ -84,7 +85,7 @@ jobs: - name: Moodle Code Checker if: ${{ always() }} - run: moodle-plugin-ci codechecker || true + run: moodle-plugin-ci codechecker - name: Moodle PHPDoc Checker if: ${{ always() }} diff --git a/LICENSE.txt b/LICENSE.txt index 20d40b6b..94a9ed02 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -671,4 +671,4 @@ into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. \ No newline at end of file +. diff --git a/backup/moodle1/lib.php b/backup/moodle1/lib.php index bd8d7d9b..8ac2f081 100644 --- a/backup/moodle1/lib.php +++ b/backup/moodle1/lib.php @@ -42,22 +42,22 @@ class moodle1_mod_questionnaire_handler extends moodle1_mod_handler { * @return array of convert_path instances */ public function get_paths() { - return array( + return [ new convert_path( 'questionnaire', '/MOODLE_BACKUP/COURSE/MODULES/MOD/QUESTIONNAIRE', - array( - 'renamefields' => array( + [ + 'renamefields' => [ 'summary' => 'intro', - ), - 'newfields' => array( + ], + 'newfields' => [ 'introformat' => 0, - ), - ) + ], + ] ), new convert_path('survey', '/MOODLE_BACKUP/COURSE/MODULES/MOD/QUESTIONNAIRE/SURVEY'), new convert_path('question', '/MOODLE_BACKUP/COURSE/MODULES/MOD/QUESTIONNAIRE/SURVEY/QUESTION'), new convert_path('question_choice', '/MOODLE_BACKUP/COURSE/MODULES/MOD/QUESTIONNAIRE/SURVEY/QUESTION/QUESTION_CHOICE'), - ); + ]; } /** @@ -74,9 +74,9 @@ public function process_questionnaire($data) { // We now have all information needed to start writing into the file. $this->open_xml_writer("activities/questionnaire_{$moduleid}/questionnaire.xml"); - $this->xmlwriter->begin_tag('activity', array('id' => $instanceid, 'moduleid' => $moduleid, - 'modulename' => 'questionnaire', 'contextid' => $contextid)); - $this->xmlwriter->begin_tag('questionnaire', array('id' => $instanceid)); + $this->xmlwriter->begin_tag('activity', ['id' => $instanceid, 'moduleid' => $moduleid, + 'modulename' => 'questionnaire', 'contextid' => $contextid, ]); + $this->xmlwriter->begin_tag('questionnaire', ['id' => $instanceid]); unset($data['id']); // We already write it as attribute, do not repeat it as child element. foreach ($data as $field => $value) { @@ -101,7 +101,7 @@ public function on_questionnaire_end() { * @param array $data */ public function process_survey($data) { - $this->xmlwriter->begin_tag('survey', array('id' => $data['id'])); + $this->xmlwriter->begin_tag('survey', ['id' => $data['id']]); unset($data['id']); // We already write it as attribute, do not repeat it as child element. foreach ($data as $field => $value) { $this->xmlwriter->full_tag($field, $value); @@ -124,7 +124,7 @@ public function on_survey_end() { */ public function process_question($data) { - $this->xmlwriter->begin_tag('question', array('id' => $data['id'])); + $this->xmlwriter->begin_tag('question', ['id' => $data['id']]); unset($data['id']); // We already write it as attribute, do not repeat it as child element. foreach ($data as $field => $value) { @@ -148,6 +148,6 @@ public function on_question_end() { * @param array $data */ public function process_question_choice($data) { - $this->write_xml('quest_choice', $data, array('/question_choice/id')); + $this->write_xml('quest_choice', $data, ['/question_choice/id']); } } diff --git a/backup/moodle2/backup_questionnaire_stepslib.php b/backup/moodle2/backup_questionnaire_stepslib.php index 430fe151..c5df6a20 100644 --- a/backup/moodle2/backup_questionnaire_stepslib.php +++ b/backup/moodle2/backup_questionnaire_stepslib.php @@ -36,78 +36,78 @@ protected function define_structure() { $userinfo = $this->get_setting_value('userinfo'); // Define each element separated. - $questionnaire = new backup_nested_element('questionnaire', array('id'), array( + $questionnaire = new backup_nested_element('questionnaire', ['id'], [ 'course', 'name', 'intro', 'introformat', 'qtype', 'respondenttype', 'resp_eligible', 'resp_view', 'notifications', 'opendate', - 'closedate', 'resume', 'navigate', 'grade', 'sid', 'timemodified', 'completionsubmit', 'autonum', 'removeafter')); + 'closedate', 'resume', 'navigate', 'grade', 'sid', 'timemodified', 'completionsubmit', 'autonum', 'removeafter', ]); $surveys = new backup_nested_element('surveys'); - $survey = new backup_nested_element('survey', array('id'), array( + $survey = new backup_nested_element('survey', ['id'], [ 'name', 'courseid', 'realm', 'status', 'title', 'email', 'subtitle', 'info', 'theme', 'thanks_page', 'thank_head', 'thank_body', 'feedbacksections', - 'feedbacknotes', 'feedbackscores', 'chart_type')); + 'feedbacknotes', 'feedbackscores', 'chart_type', ]); $questions = new backup_nested_element('questions'); - $question = new backup_nested_element('question', array('id'), array('surveyid', 'name', 'type_id', 'result_id', - 'length', 'precise', 'position', 'content', 'required', 'deleted', 'extradata')); + $question = new backup_nested_element('question', ['id'], ['surveyid', 'name', 'type_id', 'result_id', + 'length', 'precise', 'position', 'content', 'required', 'deleted', 'extradata', ]); $questchoices = new backup_nested_element('quest_choices'); - $questchoice = new backup_nested_element('quest_choice', array('id'), array('question_id', 'content', 'value')); + $questchoice = new backup_nested_element('quest_choice', ['id'], ['question_id', 'content', 'value']); $questdependencies = new backup_nested_element('quest_dependencies'); - $questdependency = new backup_nested_element('quest_dependency', array('id'), array( - 'dependquestionid', 'dependchoiceid', 'dependlogic', 'questionid', 'surveyid', 'dependandor')); + $questdependency = new backup_nested_element('quest_dependency', ['id'], [ + 'dependquestionid', 'dependchoiceid', 'dependlogic', 'questionid', 'surveyid', 'dependandor', ]); $fbsections = new backup_nested_element('fb_sections'); - $fbsection = new backup_nested_element('fb_section', array('id'), array( - 'surveyid', 'section', 'scorecalculation', 'sectionlabel', 'sectionheading', 'sectionheadingformat')); + $fbsection = new backup_nested_element('fb_section', ['id'], [ + 'surveyid', 'section', 'scorecalculation', 'sectionlabel', 'sectionheading', 'sectionheadingformat', ]); $feedbacks = new backup_nested_element('feedbacks'); - $feedback = new backup_nested_element('feedback', array('id'), array( - 'sectionid', 'feedbacklabel', 'feedbacktext', 'feedbacktextformat', 'minscore', 'maxscore')); + $feedback = new backup_nested_element('feedback', ['id'], [ + 'sectionid', 'feedbacklabel', 'feedbacktext', 'feedbacktextformat', 'minscore', 'maxscore', ]); $responses = new backup_nested_element('responses'); - $response = new backup_nested_element('response', array('id'), array( - 'questionnaireid', 'submitted', 'complete', 'grade', 'userid')); + $response = new backup_nested_element('response', ['id'], [ + 'questionnaireid', 'submitted', 'complete', 'grade', 'userid', ]); $responsebools = new backup_nested_element('response_bools'); - $responsebool = new backup_nested_element('response_bool', array('id'), array('response_id', 'question_id', 'choice_id')); + $responsebool = new backup_nested_element('response_bool', ['id'], ['response_id', 'question_id', 'choice_id']); $responsedates = new backup_nested_element('response_dates'); - $responsedate = new backup_nested_element('response_date', array('id'), array('response_id', 'question_id', 'response')); + $responsedate = new backup_nested_element('response_date', ['id'], ['response_id', 'question_id', 'response']); $responsemultiples = new backup_nested_element('response_multiples'); - $responsemultiple = new backup_nested_element('response_multiple', array('id'), array( - 'response_id', 'question_id', 'choice_id')); + $responsemultiple = new backup_nested_element('response_multiple', ['id'], [ + 'response_id', 'question_id', 'choice_id', ]); $responseothers = new backup_nested_element('response_others'); - $responseother = new backup_nested_element('response_other', array('id'), array( - 'response_id', 'question_id', 'choice_id', 'response')); + $responseother = new backup_nested_element('response_other', ['id'], [ + 'response_id', 'question_id', 'choice_id', 'response', ]); $responseranks = new backup_nested_element('response_ranks'); - $responserank = new backup_nested_element('response_rank', array('id'), array( - 'response_id', 'question_id', 'choice_id', 'rankvalue')); + $responserank = new backup_nested_element('response_rank', ['id'], [ + 'response_id', 'question_id', 'choice_id', 'rankvalue', ]); $responsesingles = new backup_nested_element('response_singles'); - $responsesingle = new backup_nested_element('response_single', array('id'), array( - 'response_id', 'question_id', 'choice_id')); + $responsesingle = new backup_nested_element('response_single', ['id'], [ + 'response_id', 'question_id', 'choice_id', ]); $responsetexts = new backup_nested_element('response_texts'); - $responsetext = new backup_nested_element('response_text', array('id'), array('response_id', 'question_id', 'response')); + $responsetext = new backup_nested_element('response_text', ['id'], ['response_id', 'question_id', 'response']); // Build the tree. $questionnaire->add_child($surveys); @@ -153,12 +153,12 @@ protected function define_structure() { $responsetexts->add_child($responsetext); // Define sources. - $questionnaire->set_source_table('questionnaire', array('id' => backup::VAR_ACTIVITYID)); + $questionnaire->set_source_table('questionnaire', ['id' => backup::VAR_ACTIVITYID]); // Is current questionnaire based on a public questionnaire? $qid = $this->task->get_activityid(); - $currentquestionnaire = $DB->get_record("questionnaire", array ("id" => $qid)); - $currentsurvey = $DB->get_record("questionnaire_survey", array ("id" => $currentquestionnaire->sid)); + $currentquestionnaire = $DB->get_record("questionnaire", ["id" => $qid]); + $currentsurvey = $DB->get_record("questionnaire_survey", ["id" => $currentquestionnaire->sid]); $haspublic = false; if ($currentsurvey->realm == 'public' && $currentsurvey->courseid != $currentquestionnaire->course) { $haspublic = true; @@ -166,23 +166,23 @@ protected function define_structure() { // If current questionnaire is based on a public one, do not include survey nor questions in backup. if (!$haspublic) { - $survey->set_source_table('questionnaire_survey', array('id' => '../../sid')); - $question->set_source_table('questionnaire_question', array('surveyid' => backup::VAR_PARENTID)); - $fbsection->set_source_table('questionnaire_fb_sections', array('surveyid' => backup::VAR_PARENTID)); - $feedback->set_source_table('questionnaire_feedback', array('sectionid' => backup::VAR_PARENTID)); - $questchoice->set_source_table('questionnaire_quest_choice', array('question_id' => backup::VAR_PARENTID), 'id ASC'); - $questdependency->set_source_table('questionnaire_dependency', array('questionid' => backup::VAR_PARENTID)); + $survey->set_source_table('questionnaire_survey', ['id' => '../../sid']); + $question->set_source_table('questionnaire_question', ['surveyid' => backup::VAR_PARENTID]); + $fbsection->set_source_table('questionnaire_fb_sections', ['surveyid' => backup::VAR_PARENTID]); + $feedback->set_source_table('questionnaire_feedback', ['sectionid' => backup::VAR_PARENTID]); + $questchoice->set_source_table('questionnaire_quest_choice', ['question_id' => backup::VAR_PARENTID], 'id ASC'); + $questdependency->set_source_table('questionnaire_dependency', ['questionid' => backup::VAR_PARENTID]); // All the rest of elements only happen if we are including user info. if ($userinfo) { - $response->set_source_table('questionnaire_response', array('questionnaireid' => backup::VAR_PARENTID)); - $responsebool->set_source_table('questionnaire_response_bool', array('response_id' => backup::VAR_PARENTID)); - $responsedate->set_source_table('questionnaire_response_date', array('response_id' => backup::VAR_PARENTID)); - $responsemultiple->set_source_table('questionnaire_resp_multiple', array('response_id' => backup::VAR_PARENTID)); - $responseother->set_source_table('questionnaire_response_other', array('response_id' => backup::VAR_PARENTID)); - $responserank->set_source_table('questionnaire_response_rank', array('response_id' => backup::VAR_PARENTID)); - $responsesingle->set_source_table('questionnaire_resp_single', array('response_id' => backup::VAR_PARENTID)); - $responsetext->set_source_table('questionnaire_response_text', array('response_id' => backup::VAR_PARENTID)); + $response->set_source_table('questionnaire_response', ['questionnaireid' => backup::VAR_PARENTID]); + $responsebool->set_source_table('questionnaire_response_bool', ['response_id' => backup::VAR_PARENTID]); + $responsedate->set_source_table('questionnaire_response_date', ['response_id' => backup::VAR_PARENTID]); + $responsemultiple->set_source_table('questionnaire_resp_multiple', ['response_id' => backup::VAR_PARENTID]); + $responseother->set_source_table('questionnaire_response_other', ['response_id' => backup::VAR_PARENTID]); + $responserank->set_source_table('questionnaire_response_rank', ['response_id' => backup::VAR_PARENTID]); + $responsesingle->set_source_table('questionnaire_resp_single', ['response_id' => backup::VAR_PARENTID]); + $responsetext->set_source_table('questionnaire_response_text', ['response_id' => backup::VAR_PARENTID]); } // Define id annotations. diff --git a/backup/moodle2/restore_questionnaire_activity_task.class.php b/backup/moodle2/restore_questionnaire_activity_task.class.php index ebb066b7..d5f4efca 100644 --- a/backup/moodle2/restore_questionnaire_activity_task.class.php +++ b/backup/moodle2/restore_questionnaire_activity_task.class.php @@ -48,14 +48,14 @@ protected function define_my_steps() { * processed by the link decoder */ public static function define_decode_contents() { - $contents = array(); + $contents = []; - $contents[] = new restore_decode_content('questionnaire', array('intro'), 'questionnaire'); + $contents[] = new restore_decode_content('questionnaire', ['intro'], 'questionnaire'); $contents[] = new restore_decode_content('questionnaire_survey', - array('info', 'thank_head', 'thank_body', 'thanks_page', 'feedbacknotes'), 'questionnaire_survey'); - $contents[] = new restore_decode_content('questionnaire_question', array('content'), 'questionnaire_question'); - $contents[] = new restore_decode_content('questionnaire_fb_sections', array('sectionheading'), 'questionnaire_fb_sections'); - $contents[] = new restore_decode_content('questionnaire_feedback', array('feedbacktext'), 'questionnaire_feedback'); + ['info', 'thank_head', 'thank_body', 'thanks_page', 'feedbacknotes'], 'questionnaire_survey'); + $contents[] = new restore_decode_content('questionnaire_question', ['content'], 'questionnaire_question'); + $contents[] = new restore_decode_content('questionnaire_fb_sections', ['sectionheading'], 'questionnaire_fb_sections'); + $contents[] = new restore_decode_content('questionnaire_feedback', ['feedbacktext'], 'questionnaire_feedback'); return $contents; } @@ -65,7 +65,7 @@ public static function define_decode_contents() { * to the activity to be executed by the link decoder */ public static function define_decode_rules() { - $rules = array(); + $rules = []; $rules[] = new restore_decode_rule('QUESTIONNAIREVIEWBYID', '/mod/questionnaire/view.php?id=$1', 'course_module'); $rules[] = new restore_decode_rule('QUESTIONNAIREINDEX', '/mod/questionnaire/index.php?id=$1', 'course'); @@ -81,7 +81,7 @@ public static function define_decode_rules() { * of restore_log_rule objects */ public static function define_restore_log_rules() { - $rules = array(); + $rules = []; $rules[] = new restore_log_rule('questionnaire', 'add', 'view.php?id={course_module}', '{questionnaire}'); $rules[] = new restore_log_rule('questionnaire', 'update', 'view.php?id={course_module}', '{questionnaire}'); @@ -104,7 +104,7 @@ public static function define_restore_log_rules() { * activity level. All them are rules not linked to any module instance (cmid = 0) */ public static function define_restore_log_rules_for_course() { - $rules = array(); + $rules = []; // Fix old wrong uses (missing extension). $rules[] = new restore_log_rule('questionnaire', 'view all', 'index?id={course}', null, diff --git a/backup/moodle2/restore_questionnaire_stepslib.php b/backup/moodle2/restore_questionnaire_stepslib.php index d5235635..f52a64b3 100644 --- a/backup/moodle2/restore_questionnaire_stepslib.php +++ b/backup/moodle2/restore_questionnaire_stepslib.php @@ -13,6 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . + use mod_questionnaire\feedback\section; /** @@ -48,7 +49,7 @@ class restore_questionnaire_activity_structure_step extends restore_activity_str */ protected function define_structure() { - $paths = array(); + $paths = []; $userinfo = $this->get_setting_value('userinfo'); $paths[] = new restore_path_element('questionnaire', '/activity/questionnaire'); @@ -150,7 +151,7 @@ protected function process_questionnaire_survey($data) { $this->set_mapping('questionnaire_survey', $oldid, $newitemid, true); // Update the questionnaire record we just created with the new survey id. - $DB->set_field('questionnaire', 'sid', $newitemid, array('id' => $this->get_new_parentid('questionnaire'))); + $DB->set_field('questionnaire', 'sid', $newitemid, ['id' => $this->get_new_parentid('questionnaire')]); } /** @@ -191,7 +192,7 @@ protected function process_questionnaire_fb_sections($data) { // If this questionnaire has separate sections feedbacks. if (isset($data->scorecalculation)) { $scorecalculation = section::decode_scorecalculation($data->scorecalculation); - $newscorecalculation = array(); + $newscorecalculation = []; foreach ($scorecalculation as $qid => $val) { $newqid = $this->get_mappingid('questionnaire_question', $qid); $newscorecalculation[$newqid] = $val; diff --git a/classes/completion/custom_completion.php b/classes/completion/custom_completion.php index 3e7542f8..e946bb3a 100644 --- a/classes/completion/custom_completion.php +++ b/classes/completion/custom_completion.php @@ -13,6 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . + declare(strict_types=1); namespace mod_questionnaire\completion; @@ -57,7 +58,7 @@ public function get_state(string $rule): int { */ public static function get_defined_custom_rules(): array { return [ - 'completionsubmit' + 'completionsubmit', ]; } @@ -68,7 +69,7 @@ public static function get_defined_custom_rules(): array { */ public function get_custom_rule_descriptions(): array { return [ - 'completionsubmit' => get_string('completionsubmit', 'questionnaire') + 'completionsubmit' => get_string('completionsubmit', 'questionnaire'), ]; } diff --git a/classes/db/bulk_sql_config.php b/classes/db/bulk_sql_config.php index dce187cd..ee2dc7d8 100644 --- a/classes/db/bulk_sql_config.php +++ b/classes/db/bulk_sql_config.php @@ -74,7 +74,7 @@ public function get_extra_select() { return [ 'choice_id' => $this->usechoiceid, 'response' => $this->useresponse, - 'rankvalue' => $this->userank + 'rankvalue' => $this->userank, ]; } } diff --git a/classes/edit_question_form.php b/classes/edit_question_form.php index 92098e84..af45970a 100644 --- a/classes/edit_question_form.php +++ b/classes/edit_question_form.php @@ -40,9 +40,11 @@ class edit_question_form extends \moodleform { * Form definition. */ public function definition() { + // phpcs:disable moodle.Commenting.TodoComment // TODO - Find a way to not use globals. Maybe the base class allows more parameters to be passed? global $questionnaire, $question, $SESSION; + // phpcs:disable moodle.Commenting.TodoComment // TODO - Is there a better way to do this without session global? // The 'sticky' required response value for further new questions. if (isset($SESSION->questionnaire->required) && !isset($question->qid)) { diff --git a/classes/event/all_responses_saved_as_text.php b/classes/event/all_responses_saved_as_text.php index 860b27c0..550ab105 100644 --- a/classes/event/all_responses_saved_as_text.php +++ b/classes/event/all_responses_saved_as_text.php @@ -68,7 +68,7 @@ public function get_description() { * @return \moodle_url */ public function get_url() { - $params = array(); + $params = []; $params['action'] = 'vall'; $params['group'] = $this->other['currentgroupid']; return new \moodle_url("/mod/questionnaire/report.php", $params); diff --git a/classes/event/all_responses_viewed.php b/classes/event/all_responses_viewed.php index 98b59ce3..41a6d7c8 100644 --- a/classes/event/all_responses_viewed.php +++ b/classes/event/all_responses_viewed.php @@ -75,7 +75,7 @@ public function get_description() { * @return \moodle_url */ public function get_url() { - $params = array(); + $params = []; $params['id'] = $this->contextinstanceid; if (isset($this->other['action'])) { $params['action'] = $this->other['action']; diff --git a/classes/event/attempt_resumed.php b/classes/event/attempt_resumed.php index c2057e2c..d8db6524 100644 --- a/classes/event/attempt_resumed.php +++ b/classes/event/attempt_resumed.php @@ -68,7 +68,7 @@ public function get_description() { * @return \moodle_url */ public function get_url() { - return new \moodle_url("/mod/questionnaire/view.php", array('id' => $this->contextinstanceid)); + return new \moodle_url("/mod/questionnaire/view.php", ['id' => $this->contextinstanceid]); } } diff --git a/classes/event/attempt_saved.php b/classes/event/attempt_saved.php index c5ca4cea..aa1b7ec7 100644 --- a/classes/event/attempt_saved.php +++ b/classes/event/attempt_saved.php @@ -67,7 +67,7 @@ public function get_description() { * @return \moodle_url */ public function get_url() { - return new \moodle_url("/mod/questionnaire/view.php", array('id' => $this->contextinstanceid)); + return new \moodle_url("/mod/questionnaire/view.php", ['id' => $this->contextinstanceid]); } /** diff --git a/classes/event/attempt_submitted.php b/classes/event/attempt_submitted.php index 274bdcbb..6372f976 100644 --- a/classes/event/attempt_submitted.php +++ b/classes/event/attempt_submitted.php @@ -67,7 +67,7 @@ public function get_description() { * @return \moodle_url */ public function get_url() { - return new \moodle_url("/mod/questionnaire/view.php", array('id' => $this->contextinstanceid)); + return new \moodle_url("/mod/questionnaire/view.php", ['id' => $this->contextinstanceid]); } /** diff --git a/classes/event/non_respondents_viewed.php b/classes/event/non_respondents_viewed.php index cc27edf7..85fb6869 100644 --- a/classes/event/non_respondents_viewed.php +++ b/classes/event/non_respondents_viewed.php @@ -68,7 +68,7 @@ public function get_description() { * @return \moodle_url */ public function get_url() { - $params = array(); + $params = []; $params['id'] = $this->contextinstanceid; return new \moodle_url("/mod/questionnaire/show_nonrespondents.php", $params); } diff --git a/classes/event/questionnaire_previewed.php b/classes/event/questionnaire_previewed.php index c4607e81..8b7d039b 100644 --- a/classes/event/questionnaire_previewed.php +++ b/classes/event/questionnaire_previewed.php @@ -67,7 +67,7 @@ public function get_description() { * @return \moodle_url */ public function get_url() { - $params = array(); + $params = []; $params['id'] = $this->contextinstanceid; return new \moodle_url("/mod/questionnaire/preview.php", $params); } diff --git a/classes/event/response_viewed.php b/classes/event/response_viewed.php index 404f3955..eac00291 100644 --- a/classes/event/response_viewed.php +++ b/classes/event/response_viewed.php @@ -68,7 +68,7 @@ public function get_description() { * @return \moodle_url */ public function get_url() { - $params = array(); + $params = []; $params['action'] = 'vresp'; $params['individualresponse'] = 1; $params['rid'] = $this->other['rid']; diff --git a/classes/feedback_form.php b/classes/feedback_form.php index 25260847..7378aa2a 100644 --- a/classes/feedback_form.php +++ b/classes/feedback_form.php @@ -59,7 +59,7 @@ public function definition() { $chartgroup = []; $charttypes = [null => get_string('none'), 'bipolar' => get_string('chart:bipolar', 'questionnaire'), - 'vprogress' => get_string('chart:vprogress', 'questionnaire')]; + 'vprogress' => get_string('chart:vprogress', 'questionnaire'), ]; $chartgroup[] = $mform->createElement('select', 'chart_type_global', get_string('chart:type', 'questionnaire') . ' (' . get_string('feedbackglobal', 'questionnaire') . ')', $charttypes); @@ -72,7 +72,7 @@ public function definition() { $charttypes = [null => get_string('none'), 'bipolar' => get_string('chart:bipolar', 'questionnaire'), 'hbar' => get_string('chart:hbar', 'questionnaire'), - 'rose' => get_string('chart:rose', 'questionnaire')]; + 'rose' => get_string('chart:rose', 'questionnaire'), ]; $chartgroup[] = $mform->createElement('select', 'chart_type_two_sections', get_string('chart:type', 'questionnaire') . ' (' . get_string('feedbackbysection', 'questionnaire') . ')', $charttypes); @@ -85,7 +85,7 @@ public function definition() { 'bipolar' => get_string('chart:bipolar', 'questionnaire'), 'hbar' => get_string('chart:hbar', 'questionnaire'), 'radar' => get_string('chart:radar', 'questionnaire'), - 'rose' => get_string('chart:rose', 'questionnaire')]; + 'rose' => get_string('chart:rose', 'questionnaire'), ]; $chartgroup[] = $mform->createElement('select', 'chart_type_sections', get_string('chart:type', 'questionnaire') . ' (' . get_string('feedbackbysection', 'questionnaire') . ')', $charttypes); diff --git a/classes/output/mobile.php b/classes/output/mobile.php index 0e3d0d28..a1138f90 100644 --- a/classes/output/mobile.php +++ b/classes/output/mobile.php @@ -183,12 +183,12 @@ public static function mobile_view_activity($args) { 'templates' => [ [ 'id' => 'main', - 'html' => $OUTPUT->render_from_template($template, $data) + 'html' => $OUTPUT->render_from_template($template, $data), ], ], 'javascript' => file_get_contents($CFG->dirroot . '/mod/questionnaire/appjs/uncheckother.js'), 'otherdata' => $responses, - 'files' => null + 'files' => null, ]; return $return; } diff --git a/classes/output/renderer.php b/classes/output/renderer.php index 4990105c..357498d5 100755 --- a/classes/output/renderer.php +++ b/classes/output/renderer.php @@ -382,7 +382,7 @@ public function print_preview_formend($url, $submitstr, $resetstr) { $output = ''; $output .= \html_writer::start_tag('div'); $output .= \html_writer::empty_tag('input', ['type' => 'submit', 'name' => 'submit', 'value' => $submitstr, - 'class' => 'btn btn-primary']); + 'class' => 'btn btn-primary', ]); $output .= ' '; $output .= \html_writer::tag('a', $resetstr, ['href' => $url, 'class' => 'btn btn-secondary mr-1']); $output .= \html_writer::end_tag('div') . "\n"; @@ -415,7 +415,7 @@ public function homelink($url, $text) { public function dependency_warnings($children, $langstring, $strnum) { $msg = '
' . get_string($langstring, 'questionnaire') . '

'; foreach ($children as $child) { - $loopindicator = array(); + $loopindicator = []; foreach ($child as $subchild) { $childname = ''; if ($subchild->name) { @@ -487,6 +487,7 @@ public function get_dependency_html($qid, $dependencies) { $logic = ''; } + // phpcs:disable moodle.Commenting.TodoComment // TODO - Move the HTML generation to the renderer. if ($dependency->dependandor == "and") { $html .= '
get_string('formateditor', 'questionnaire'), - "1" => get_string('formatplain', 'questionnaire')]; + "1" => get_string('formatplain', 'questionnaire'), ]; $mform->addElement('select', 'precise', get_string('responseformat', 'questionnaire'), $responseformats); $mform->setType('precise', PARAM_INT); return $mform; diff --git a/classes/question/pagebreak.php b/classes/question/pagebreak.php index 930639df..70d4e3cd 100644 --- a/classes/question/pagebreak.php +++ b/classes/question/pagebreak.php @@ -16,7 +16,7 @@ namespace mod_questionnaire\question; use mod_questionnaire\edit_question_form; -use \questionnaire; +use questionnaire; /** * This file contains the parent class for pagebreak question types. diff --git a/classes/question/question.php b/classes/question/question.php index 4b208695..8e5c6293 100644 --- a/classes/question/question.php +++ b/classes/question/question.php @@ -17,10 +17,10 @@ namespace mod_questionnaire\question; use mod_questionnaire\edit_question_form; use mod_questionnaire\responsetype\response\response; -use \questionnaire; +use questionnaire; defined('MOODLE_INTERNAL') || die(); -use \html_writer; +use html_writer; /** * This file contains the parent class for questionnaire question types. @@ -100,16 +100,16 @@ abstract class question { /** @var string $allchoices The list of all question's choices. */ public $allchoices = ''; - /** @var boolean $required The required flag. */ + /** @var bool $required The required flag. */ public $required = 'n'; - /** @var boolean $deleted The deleted flag. */ + /** @var bool $deleted The deleted flag. */ public $deleted = 'n'; /** @var mixed $extradata Any custom data for the question type. */ public $extradata = ''; - /** @var boolean $isprint The isprint flag. */ + /** @var bool $isprint The isprint flag. */ public $isprint = false; /** @var array $qtypenames List of all question names. */ @@ -950,6 +950,7 @@ public function questionstart_survey_display($qnum, $response=null) { if ($pagetype == 'mod-questionnaire-preview' || ($nonumbering && ($currenttab == 'mybyresponse' || $currenttab == 'individualresp'))) { // This needs to be done to ensure all dependency data is loaded. + // phpcs:disable moodle.Commenting.TodoComment // TODO - Perhaps this should be a function called by the questionnaire after it loads all questions? $questionnaire->load_parents($this); // Want this to come from the renderer, meaning we need $questionnaire. @@ -969,7 +970,7 @@ public function questionstart_survey_display($qnum, $response=null) { $required .= get_string('required', 'questionnaire'); $required .= html_writer::end_tag('div'); $required .= html_writer::empty_tag('img', ['class' => 'req', 'title' => get_string('required', 'questionnaire'), - 'alt' => get_string('required', 'questionnaire'), 'src' => $OUTPUT->image_url('req')]); + 'alt' => get_string('required', 'questionnaire'), 'src' => $OUTPUT->image_url('req'), ]); } $pagetags->required = $required; // Need to replace this with better renderer / template? } @@ -1581,7 +1582,7 @@ public function supports_mobile() { */ public function mobile_question_display($qnum, $autonum = false) { $options = ['noclean' => true, 'para' => false, 'filter' => true, - 'context' => $this->context, 'overflowdiv' => true]; + 'context' => $this->context, 'overflowdiv' => true, ]; $mobiledata = (object)[ 'id' => $this->id, 'name' => $this->name, @@ -1596,7 +1597,7 @@ public function mobile_question_display($qnum, $autonum = false) { 'fieldkey' => $this->mobile_fieldkey(), 'precise' => $this->precise, 'qnum' => $qnum, - 'errormessage' => get_string('required') . ': ' . $this->name + 'errormessage' => get_string('required') . ': ' . $this->name, ]; $mobiledata->choices = $this->mobile_question_choices_display(); diff --git a/classes/question/rate.php b/classes/question/rate.php index b21bfc55..1e08129f 100644 --- a/classes/question/rate.php +++ b/classes/question/rate.php @@ -42,7 +42,7 @@ class rate extends question { * @param \context $context * @param array $params */ - public function __construct($id = 0, $question = null, $context = null, $params = array()) { + public function __construct($id = 0, $question = null, $context = null, $params = []) { $this->length = 5; parent::__construct($id, $question, $context, $params); $this->add_nameddegrees_from_extradata(); @@ -334,7 +334,7 @@ protected function question_survey_display($response, $descendantsdata, $blankqu $content = $choice->content; $rendercontent = format_text($choice->content, FORMAT_PLAIN); if ($this->osgood_rate_scale()) { - list($content, $contentright) = array_merge(preg_split('/[|]/', $content), array(' ')); + list($content, $contentright) = array_merge(preg_split('/[|]/', $content), [' ']); } if ($choice->is_other_choice()) { $othertext = $choice->other_choice_display(); @@ -347,10 +347,10 @@ protected function question_survey_display($response, $descendantsdata, $blankqu $content = $othertext; $cols[] = ['oname' => $oname, 'oid' => $oid, 'ovalue' => $ovalue, 'colstyle' => 'text-align: ' . $textalign . ';', - 'coltext' => format_text($content, FORMAT_HTML, ['noclean' => true]) . ' ']; + 'coltext' => format_text($content, FORMAT_HTML, ['noclean' => true]) . ' ', ]; } else { $cols[] = ['colstyle' => 'text-align: '.$textalign.';', - 'coltext' => format_text($content, FORMAT_HTML, ['noclean' => true]) . ' ']; + 'coltext' => format_text($content, FORMAT_HTML, ['noclean' => true]) . ' ', ]; } $bg = 'c0 raterow'; @@ -376,7 +376,7 @@ protected function question_survey_display($response, $descendantsdata, $blankqu $colinput['label'] = $this->set_label($rowstart, $rendercontent, self::COL_START, get_string('unanswered', 'questionnaire')); $cols[] = ['colstyle' => 'width:1%;', 'colclass' => $completeclass, 'coltitle' => $title, - 'colinput' => $colinput]; + 'colinput' => $colinput, ]; } if ($nameddegrees > 0) { reset($this->nameddegrees); @@ -462,7 +462,7 @@ protected function response_survey_display($response) { $bg = 'c0'; $nameddegrees = 0; - $cidnamed = array(); + $cidnamed = []; // Max length of potential named degree in column head. $maxndlen = 0; if ($this->osgood_rate_scale()) { @@ -524,7 +524,7 @@ protected function response_survey_display($response) { $content = $contents->text; } if ($this->osgood_rate_scale()) { - list($content, $contentright) = array_merge(preg_split('/[|]/', $content), array(' ')); + list($content, $contentright) = array_merge(preg_split('/[|]/', $content), [' ']); } if ($choice->is_other_choice()) { $content = $choice->other_choice_display(); @@ -710,10 +710,10 @@ protected function form_length(\MoodleQuickForm $mform, $helptext = '') { * @param string $helptext */ protected function form_precise(\MoodleQuickForm $mform, $helptext = '') { - $precoptions = array("0" => get_string('normal', 'questionnaire'), + $precoptions = ["0" => get_string('normal', 'questionnaire'), "1" => get_string('notapplicablecolumn', 'questionnaire'), "2" => get_string('noduplicates', 'questionnaire'), - "3" => get_string('osgood', 'questionnaire')); + "3" => get_string('osgood', 'questionnaire'), ]; $mform->addElement('select', 'precise', get_string('kindofratescale', 'questionnaire'), $precoptions); $mform->addHelpButton('precise', 'kindofratescale', 'questionnaire'); $mform->setType('precise', PARAM_INT); @@ -944,7 +944,7 @@ public function mobile_question_choices_display() { } $extrahtml .= ''; $options = ['noclean' => true, 'para' => false, 'filter' => true, - 'context' => $this->context, 'overflowdiv' => true]; + 'context' => $this->context, 'overflowdiv' => true, ]; $choice->content .= format_text($extrahtml, FORMAT_HTML, $options); } diff --git a/classes/question/sectiontext.php b/classes/question/sectiontext.php index 107e6845..8e10fba4 100644 --- a/classes/question/sectiontext.php +++ b/classes/question/sectiontext.php @@ -75,7 +75,7 @@ public function supports_mobile() { */ public function mobile_question_display($qnum, $autonum = false) { $options = ['noclean' => true, 'para' => false, 'filter' => true, - 'context' => $this->context, 'overflowdiv' => true]; + 'context' => $this->context, 'overflowdiv' => true, ]; $mobiledata = (object)[ 'id' => $this->id, 'name' => $this->name, @@ -90,7 +90,7 @@ public function mobile_question_display($qnum, $autonum = false) { 'fieldkey' => $this->mobile_fieldkey(), 'precise' => $this->precise, 'qnum' => '', - 'errormessage' => get_string('required') . ': ' . $this->name + 'errormessage' => get_string('required') . ': ' . $this->name, ]; $mobiledata->issectiontext = true; diff --git a/classes/questions_form.php b/classes/questions_form.php index 0bb2b469..de2a1c6b 100644 --- a/classes/questions_form.php +++ b/classes/questions_form.php @@ -60,7 +60,7 @@ public function definition() { $strposition = get_string('position', 'questionnaire'); if (!isset($questionnaire->questions)) { - $questionnaire->questions = array(); + $questionnaire->questions = []; } if ($this->moveq) { $moveqposition = $questionnaire->questions[$this->moveq]->position; @@ -69,7 +69,7 @@ public function definition() { $pos = 0; $select = ''; if (!($qtypes = $DB->get_records_select_menu('questionnaire_question_type', $select, null, '', 'typeid,type'))) { - $qtypes = array(); + $qtypes = []; } // Get the names of each question type in the appropriate language. foreach ($qtypes as $key => $qtype) { @@ -81,7 +81,7 @@ public function definition() { } } natsort($qtypes); - $addqgroup = array(); + $addqgroup = []; $addqgroup[] =& $mform->createElement('select', 'type_id', '', $qtypes); // The 'sticky' type_id value for further new questions. @@ -118,7 +118,7 @@ public function definition() { foreach ($questionnaire->questions as $question) { - $manageqgroup = array(); + $manageqgroup = []; $qid = $question->id; $tid = $question->type_id; @@ -127,6 +127,7 @@ public function definition() { // Get displayable list of parents for the questions in questions_form. if ($questionnairehasdependencies) { + // phpcs:disable moodle.Commenting.TodoComment // TODO - Perhaps this should be a function called by the questionnaire after it loads all questions? $questionnaire->load_parents($question); $dependencies = $questionnaire->renderer->get_dependency_html($question->id, $question->dependencies); @@ -141,7 +142,7 @@ public function definition() { $DB->set_field('questionnaire_question', 'deleted', 'y', ['id' => $qid, 'surveyid' => $sid]); if ($records = $DB->get_records_select('questionnaire_question', $select, null, 'position ASC')) { foreach ($records as $record) { - $DB->set_field('questionnaire_question', 'position', $record->position - 1, array('id' => $record->id)); + $DB->set_field('questionnaire_question', 'position', $record->position - 1, ['id' => $record->id]); } } redirect($CFG->wwwroot.'/mod/questionnaire/questions.php?id='.$questionnaire->cm->id); @@ -163,7 +164,7 @@ public function definition() { $content = format_text(file_rewrite_pluginfile_urls($question->content, 'pluginfile.php', $question->context->id, 'mod_questionnaire', 'question', $question->id), FORMAT_HTML, ['noclean' => true]); } - $moveqgroup = array(); + $moveqgroup = []; $spacer = $questionnaire->renderer->image_url('spacer'); @@ -175,19 +176,19 @@ public function definition() { $mform->addElement('html', '
'); // Begin div qn-container. } - $mextra = array('value' => $question->id, + $mextra = ['value' => $question->id, 'alt' => $strmove, - 'title' => $strmove); - $eextra = array('value' => $question->id, + 'title' => $strmove, ]; + $eextra = ['value' => $question->id, 'alt' => get_string('edit', 'questionnaire'), - 'title' => get_string('edit', 'questionnaire')); - $rextra = array('value' => $question->id, + 'title' => get_string('edit', 'questionnaire'), ]; + $rextra = ['value' => $question->id, 'alt' => $strremove, - 'title' => $strremove); + 'title' => $strremove, ]; if ($tid == QUESPAGEBREAK) { $esrc = $spacer; - $eextra = array('disabled' => 'disabled'); + $eextra = ['disabled' => 'disabled']; } else { $esrc = $questionnaire->renderer->image_url('t/edit'); } @@ -209,10 +210,10 @@ public function definition() { if ($maxdown < 4) { $strdisabled = get_string('movedisabled', 'questionnaire'); $msrc = $questionnaire->renderer->image_url('t/block'); - $mextra = array('value' => $question->id, + $mextra = ['value' => $question->id, 'alt' => $strdisabled, - 'title' => $strdisabled); - $mextra += array('disabled' => 'disabled'); + 'title' => $strdisabled, ]; + $mextra += ['disabled' => 'disabled']; } } } @@ -236,17 +237,17 @@ public function definition() { (!empty($previousquestiondependencies) && empty($nextquestiondependencies))) { $strdisabled = get_string('movedisabled', 'questionnaire'); $msrc = $questionnaire->renderer->image_url('t/block'); - $mextra = array('value' => $question->id, + $mextra = ['value' => $question->id, 'alt' => $strdisabled, - 'title' => $strdisabled); - $mextra += array('disabled' => 'disabled'); + 'title' => $strdisabled, ]; + $mextra += ['disabled' => 'disabled']; $rsrc = $msrc; $strdisabled = get_string('deletedisabled', 'questionnaire'); - $rextra = array('value' => $question->id, + $rextra = ['value' => $question->id, 'alt' => $strdisabled, - 'title' => $strdisabled); - $rextra += array('disabled' => 'disabled'); + 'title' => $strdisabled, ]; + $rextra += ['disabled' => 'disabled']; } } } @@ -266,9 +267,9 @@ public function definition() { $strrequired = get_string('notrequired', 'questionnaire'); } $strrequired .= ' '.get_string('clicktoswitch', 'questionnaire'); - $reqextra = array('value' => $question->id, + $reqextra = ['value' => $question->id, 'alt' => $strrequired, - 'title' => $strrequired); + 'title' => $strrequired, ]; $manageqgroup[] =& $mform->createElement('image', 'requiredbutton['.$question->id.']', $reqsrc, $reqextra); } $manageqgroup[] =& $mform->createElement('static', 'closetag_'.$question->id, '', ''); @@ -296,7 +297,7 @@ public function definition() { } } - $typeid = $DB->get_field('questionnaire_question', 'type_id', array('id' => $this->moveq)); + $typeid = $DB->get_field('questionnaire_question', 'type_id', ['id' => $this->moveq]); if ($display) { // Do not move a page break to first position. @@ -306,9 +307,9 @@ public function definition() { if ($this->moveq == $question->id) { $moveqgroup[] =& $mform->createElement('cancel', 'cancelbutton', get_string('cancel')); } else { - $mextra = array('value' => $question->id, + $mextra = ['value' => $question->id, 'alt' => $strmove, - 'title' => $strmovehere.' (position '.$pos.')'); + 'title' => $strmovehere.' (position '.$pos.')', ]; $msrc = $questionnaire->renderer->image_url('movehere'); $moveqgroup[] =& $mform->createElement('static', 'opentag_'.$question->id, '', ''); $moveqgroup[] =& $mform->createElement('image', 'moveherebutton['.$pos.']', $msrc, $mextra); diff --git a/classes/responsetype/answer/answer.php b/classes/responsetype/answer/answer.php index 865c73b1..f0c7a9ea 100644 --- a/classes/responsetype/answer/answer.php +++ b/classes/responsetype/answer/answer.php @@ -55,7 +55,8 @@ class answer { * @param null $otheresponse * @param null $value */ - public function __construct($id = null, $responseid = null, $questionid = null, $choiceid = null, $value = null, $otheresponse = null) { + public function __construct($id = null, $responseid = null, $questionid = null, $choiceid = null, $value = null, + $otheresponse = null) { $this->id = $id; $this->responseid = $responseid; $this->questionid = $questionid; diff --git a/classes/responsetype/boolean.php b/classes/responsetype/boolean.php index 6dbe39de..0bf91279 100644 --- a/classes/responsetype/boolean.php +++ b/classes/responsetype/boolean.php @@ -112,7 +112,7 @@ public function get_results($rids=false, $anonymous=false) { global $DB; $rsql = ''; - $params = array($this->question->id); + $params = [$this->question->id]; if (!empty($rids)) { list($rsql, $rparams) = $DB->get_in_or_equal($rids); $params = array_merge($params, $rparams); diff --git a/classes/responsetype/date.php b/classes/responsetype/date.php index 6fbd2188..b2311c63 100644 --- a/classes/responsetype/date.php +++ b/classes/responsetype/date.php @@ -113,7 +113,7 @@ public function get_results($rids=false, $anonymous=false) { global $DB; $rsql = ''; - $params = array($this->question->id); + $params = [$this->question->id]; if (!empty($rids)) { list($rsql, $rparams) = $DB->get_in_or_equal($rids); $params = array_merge($params, $rparams); @@ -230,7 +230,7 @@ public static function response_select($rid) { foreach ($records as $qid => $row) { unset ($row->id); $row = (array)$row; - $newrow = array(); + $newrow = []; foreach ($row as $key => $val) { if (!is_numeric($key)) { $newrow[] = $val; diff --git a/classes/responsetype/rank.php b/classes/responsetype/rank.php index 4e669761..f41d4337 100644 --- a/classes/responsetype/rank.php +++ b/classes/responsetype/rank.php @@ -146,6 +146,8 @@ public function insert_response($responsedata) { } /** + * Get the results for the question. + * * @param bool $rids * @param bool $anonymous * @return array @@ -167,8 +169,8 @@ public function get_results($rids=false, $anonymous=false) { $select = 'question_id=' . $this->question->id . ' ORDER BY id ASC'; if ($rows = $DB->get_records_select('questionnaire_quest_choice', $select)) { foreach ($rows as $row) { - $nbna = $DB->count_records(static::response_table(), array('question_id' => $this->question->id, - 'choice_id' => $row->id, 'rankvalue' => '-1')); + $nbna = $DB->count_records(static::response_table(), ['question_id' => $this->question->id, + 'choice_id' => $row->id, 'rankvalue' => '-1', ]); if (\mod_questionnaire\question\choice::content_is_other_choice($row->content) && !empty($otherrecs)) { foreach (array_keys($otherrecs) as $key) { $this->counts[$key] = new \stdClass(); @@ -177,7 +179,7 @@ public function get_results($rids=false, $anonymous=false) { } } else { $this->counts[$row->content] = new \stdClass(); - $this->counts[$row->content]->nbna = $nbna; + $this->counts[$row->content]->nbna = $nbna; } } } @@ -216,11 +218,11 @@ public function get_results($rids=false, $anonymous=false) { INNER JOIN (SELECT c2.id, AVG(a2.rankvalue) AS average, COUNT(a2.response_id) AS num FROM {questionnaire_quest_choice} c2, {".static::response_table()."} a2 - WHERE c2.question_id = ? AND a2.question_id = ? AND a2.choice_id = c2.id + WHERE c2.question_id = ? AND a2.question_id = ? AND a2.choice_id = c2.id AND a2.rankvalue >= 0 AND c2.content NOT LIKE '!other%'{$rsql} GROUP BY c2.id) a ON a.id = c.id ORDER BY c.id"; - $results = $DB->get_records_sql($sql, array_merge(array($this->question->id, $this->question->id), $params)); + $results = $DB->get_records_sql($sql, array_merge([$this->question->id, $this->question->id], $params)); // Handle 'other...'. if ($otherrecs) { @@ -256,11 +258,11 @@ public function get_results($rids=false, $anonymous=false) { INNER JOIN (SELECT c2.id, SUM(a2.rankvalue) AS sum, COUNT(a2.response_id) AS num FROM {questionnaire_quest_choice} c2, {".static::response_table()."} a2 - WHERE c2.question_id = ? AND a2.question_id = ? AND a2.choice_id = c2.id + WHERE c2.question_id = ? AND a2.question_id = ? AND a2.choice_id = c2.id AND a2.rankvalue >= 0 AND c2.content NOT LIKE '!other%'{$rsql} GROUP BY c2.id) a ON a.id = c.id"; - $results = $DB->get_records_sql($sql, array_merge(array($this->question->id, $this->question->id), $params)); + $results = $DB->get_records_sql($sql, array_merge([$this->question->id, $this->question->id], $params)); if ($otherrecs) { $i = 1; @@ -496,11 +498,11 @@ public static function response_answers_by_question($rid) { global $DB; $answers = []; - $sql = 'SELECT r.id, - r.response_id AS responseid, - r.question_id AS questionid, - r.choice_id AS choiceid, - r.rankvalue AS value, + $sql = 'SELECT r.id, + r.response_id AS responseid, + r.question_id AS questionid, + r.choice_id AS choiceid, + r.rankvalue AS value, rt.response AS otheresponse FROM {' . static::response_table() . '} r LEFT JOIN {questionnaire_response_other} rt ON rt.choice_id = r.choice_id @@ -628,7 +630,7 @@ private function mkresavg($sort, $stravgvalue='') { // Add an extra column to accomodate lower ranks in this case. $llength += $isrestricted; $width = 100 / $llength; - $n = array(); + $n = []; $nameddegrees = 0; foreach ($this->question->nameddegrees as $degree) { // To take into account languages filter. @@ -660,14 +662,14 @@ private function mkresavg($sort, $stravgvalue='') { $pagetags->averages->choicelabelrow = new \stdClass(); $pagetags->averages->choicelabelrow->innertablewidth = $header2->pdfwidth; $pagetags->averages->choicelabelrow->column1 = (object)['width' => $header1->width, 'align' => $header1->align, - 'text' => '', 'pdfwidth' => $header1->pdfwidth]; + 'text' => '', 'pdfwidth' => $header1->pdfwidth, ]; $pagetags->averages->choicelabelrow->column2 = (object)['width' => $header2->width, 'align' => $header2->align, - 'ranks' => $rankcols, 'pdfwidth' => $header2->pdfwidth]; + 'ranks' => $rankcols, 'pdfwidth' => $header2->pdfwidth, ]; $pagetags->averages->choicelabelrow->column3 = (object)['width' => $header3->width, 'align' => $header3->align, - 'text' => '', 'pdfwidth' => $header3->pdfwidth]; + 'text' => '', 'pdfwidth' => $header3->pdfwidth, ]; if ($isna) { $pagetags->averages->choicelabelrow->column4 = (object)['width' => $header4->width, 'align' => $header4->align, - 'text' => '', 'pdfwidth' => $header4->pdfwidth]; + 'text' => '', 'pdfwidth' => $header4->pdfwidth, ]; } switch ($sort) { @@ -717,7 +719,7 @@ private function mkresavg($sort, $stravgvalue='') { if ($osgood) { // Ensure there are two bits of content. - list($content, $contentright) = array_merge(preg_split('/[|]/', $content), array(' ')); + list($content, $contentright) = array_merge(preg_split('/[|]/', $content), [' ']); } else { $contents = questionnaire_choice_values($content); if ($contents->modname) { @@ -751,7 +753,7 @@ private function mkresavg($sort, $stravgvalue='') { $choicecol3->text = '
' . format_text($contentright, FORMAT_HTML, ['noclean' => true]) . '
'; $pagetags->averages->choiceaverages[] = (object)['column1' => $choicecol1, 'column2' => $choicecol2, - 'column3' => $choicecol3]; + 'column3' => $choicecol3, ]; // JR JUNE 2012 do not display meaningless average rank values for Osgood. } else if ($avg || ($nbna != 0)) { $stravgval = ''; @@ -789,10 +791,10 @@ private function mkresavg($sort, $stravgvalue='') { if ($avg) { if (isset($choicecol4)) { $pagetags->averages->choiceaverages[] = (object)['column1' => $choicecol1, - 'column2' => $choicecol2, 'column3' => $choicecol3, 'column4' => $choicecol4]; + 'column2' => $choicecol2, 'column3' => $choicecol3, 'column4' => $choicecol4, ]; } else { $pagetags->averages->choiceaverages[] = (object)['column1' => $choicecol1, - 'column2' => $choicecol2, 'column3' => $choicecol3]; + 'column2' => $choicecol2, 'column3' => $choicecol3, ]; } } else { $choicecol4 = new \stdClass(); @@ -801,7 +803,7 @@ private function mkresavg($sort, $stravgvalue='') { $choicecol4->align = $header4->align; $choicecol4->text = $nbna; $pagetags->averages->choiceaverages[] = (object)['column1' => $choicecol1, 'column2' => $choicecol2, - 'column3' => $choicecol3]; + 'column3' => $choicecol3, ]; } } } // End if named degrees. @@ -856,8 +858,8 @@ private function mkrescount($rids, $rows, $sort) { // This is question_id. array_push($params, $this->question->id); $sql = "SELECT r.id, - CASE - WHEN c.content = '!other' THEN o.response + CASE + WHEN c.content = '!other' THEN o.response ELSE c.content END as content, r.rankvalue, c.id AS choiceid FROM {questionnaire_quest_choice} c @@ -872,11 +874,11 @@ private function mkrescount($rids, $rows, $sort) { // Sort rows (results) by average value. if ($sort != 'default') { - $sortarray = array(); + $sortarray = []; foreach ($rows as $row) { foreach ($row as $key => $value) { if (!isset($sortarray[$key])) { - $sortarray[$key] = array(); + $sortarray[$key] = []; } $sortarray[$key][] = $value; } @@ -931,7 +933,7 @@ private function mkrescount($rids, $rows, $sort) { $na = ''; } $nameddegrees = 0; - $n = array(); + $n = []; foreach ($this->question->nameddegrees as $degree) { $content = $degree; $n[$nameddegrees] = format_text($content, FORMAT_HTML, ['noclean' => true]); @@ -953,7 +955,7 @@ private function mkrescount($rids, $rows, $sort) { $align = 'left'; } $pagetags->totals->headers[] = (object)['align' => $align, - 'text' => ''.get_string('responses', 'questionnaire').'']; + 'text' => ''.get_string('responses', 'questionnaire').'', ]; // Display the column titles. for ($j = 0; $j < $this->question->length; $j++) { @@ -989,13 +991,13 @@ private function mkrescount($rids, $rows, $sort) { $nbresp = '('.$total.')'; if ($osgood) { // Ensure there are two bits of content. - list($content, $contentright) = array_merge(preg_split('/[|]/', $content), array(' ')); + list($content, $contentright) = array_merge(preg_split('/[|]/', $content), [' ']); $header = reset($pagetags->totals->headers); if (isset($rows[$content]) && isset($rows[$content]->isother) && $rows[$content]->isother) { $content = get_string('other', 'questionnaire') . ' ' . $content; } $totalcols[] = (object)['align' => $header->align, - 'text' => format_text($content, FORMAT_HTML, ['noclean' => true, 'filter' => false])]; + 'text' => format_text($content, FORMAT_HTML, ['noclean' => true, 'filter' => false]), ]; } else { // Eliminate potentially short-named choices. $contents = questionnaire_choice_values($content); @@ -1007,7 +1009,7 @@ private function mkrescount($rids, $rows, $sort) { } $header = reset($pagetags->totals->headers); $totalcols[] = (object)['align' => $header->align, - 'text' => format_text($content, FORMAT_HTML, ['noclean' => true, 'filter' => false])]; + 'text' => format_text($content, FORMAT_HTML, ['noclean' => true, 'filter' => false]), ]; } // Display ranks/rates numbers. $maxrank = max($rank); @@ -1031,7 +1033,7 @@ private function mkrescount($rids, $rows, $sort) { if ($osgood) { $header = next($pagetags->totals->headers); $totalcols[] = (object)['align' => $header->align, - 'text' => format_text($contentright, FORMAT_HTML, ['noclean' => true])]; + 'text' => format_text($contentright, FORMAT_HTML, ['noclean' => true]), ]; } $header = next($pagetags->totals->headers); $totalcols[] = (object)['align' => $header->align, 'text' => $nbresp]; diff --git a/classes/responsetype/response/response.php b/classes/responsetype/response/response.php index 070160d2..97394317 100644 --- a/classes/responsetype/response/response.php +++ b/classes/responsetype/response/response.php @@ -40,7 +40,7 @@ class response { /** @var int $submitted The most recent submission date of this response. */ public $submitted; - /** @var boolean $complete Flag for final submission of this response. */ + /** @var bool $complete Flag for final submission of this response. */ public $complete; /** @var int $grade Numeric grade for this response (if applicable). */ diff --git a/classes/responsetype/responsetype.php b/classes/responsetype/responsetype.php index 1e879781..3cfbc122 100644 --- a/classes/responsetype/responsetype.php +++ b/classes/responsetype/responsetype.php @@ -16,8 +16,8 @@ namespace mod_questionnaire\responsetype; -use \html_writer; -use \html_table; +use html_writer; +use html_table; use mod_questionnaire\db\bulk_sql_config; @@ -70,7 +70,7 @@ public static function response_table() { public static function all_response_tables() { return ['questionnaire_response_bool', 'questionnaire_response_date', 'questionnaire_response_other', 'questionnaire_response_rank', 'questionnaire_response_text', 'questionnaire_resp_multiple', - 'questionnaire_resp_single']; + 'questionnaire_resp_single', ]; } /** diff --git a/classes/responsetype/single.php b/classes/responsetype/single.php index 17bde4af..87f60d52 100644 --- a/classes/responsetype/single.php +++ b/classes/responsetype/single.php @@ -143,7 +143,7 @@ public function get_results($rids=false, $anonymous=false) { global $DB; $rsql = ''; - $params = array($this->question->id); + $params = [$this->question->id]; if (!empty($rids)) { list($rsql, $rparams) = $DB->get_in_or_equal($rids); $params = array_merge($params, $rparams); diff --git a/classes/responsetype/text.php b/classes/responsetype/text.php index 5b2a6752..fc50068f 100644 --- a/classes/responsetype/text.php +++ b/classes/responsetype/text.php @@ -208,7 +208,7 @@ public function get_results_tags($weights, $participants, $respondents, $showtot $pagetags->responses[] = (object)['response' => $response]; $evencolor = !$evencolor; } - // sort table only when row count is greater than one. + // Sort table only when row count is greater than one. if (count($weights) > 1) { $pagetags->sortresponse = true; } diff --git a/classes/settings_form.php b/classes/settings_form.php index c810f0d6..d1cc85fd 100644 --- a/classes/settings_form.php +++ b/classes/settings_form.php @@ -55,18 +55,18 @@ public function definition() { } $mform->setType('realm', PARAM_RAW); - $mform->addElement('text', 'title', get_string('title', 'questionnaire'), array('size' => '60')); + $mform->addElement('text', 'title', get_string('title', 'questionnaire'), ['size' => '60']); $mform->setDefault('title', $questionnaire->survey->title); $mform->setType('title', PARAM_TEXT); $mform->addRule('title', null, 'required', null, 'client'); $mform->addHelpButton('title', 'title', 'questionnaire'); - $mform->addElement('text', 'subtitle', get_string('subtitle', 'questionnaire'), array('size' => '60')); + $mform->addElement('text', 'subtitle', get_string('subtitle', 'questionnaire'), ['size' => '60']); $mform->setDefault('subtitle', $questionnaire->survey->subtitle); $mform->setType('subtitle', PARAM_TEXT); $mform->addHelpButton('subtitle', 'subtitle', 'questionnaire'); - $editoroptions = array('maxfiles' => EDITOR_UNLIMITED_FILES, 'trusttext' => true); + $editoroptions = ['maxfiles' => EDITOR_UNLIMITED_FILES, 'trusttext' => true]; $mform->addElement('editor', 'info', get_string('additionalinfo', 'questionnaire'), null, $editoroptions); $mform->setDefault('info', $questionnaire->survey->info); $mform->setType('info', PARAM_RAW); @@ -74,7 +74,7 @@ public function definition() { $mform->addElement('header', 'submithdr', get_string('submitoptions', 'questionnaire')); - $mform->addElement('text', 'thanks_page', get_string('url', 'questionnaire'), array('size' => '60')); + $mform->addElement('text', 'thanks_page', get_string('url', 'questionnaire'), ['size' => '60']); $mform->setType('thanks_page', PARAM_TEXT); $mform->setDefault('thanks_page', $questionnaire->survey->thanks_page); $mform->addHelpButton('thanks_page', 'url', 'questionnaire'); @@ -82,11 +82,11 @@ public function definition() { $mform->addElement('static', 'confmes', get_string('confalts', 'questionnaire')); $mform->addHelpButton('confmes', 'confpage', 'questionnaire'); - $mform->addElement('text', 'thank_head', get_string('headingtext', 'questionnaire'), array('size' => '30')); + $mform->addElement('text', 'thank_head', get_string('headingtext', 'questionnaire'), ['size' => '30']); $mform->setType('thank_head', PARAM_TEXT); $mform->setDefault('thank_head', $questionnaire->survey->thank_head); - $editoroptions = array('maxfiles' => EDITOR_UNLIMITED_FILES, 'trusttext' => true); + $editoroptions = ['maxfiles' => EDITOR_UNLIMITED_FILES, 'trusttext' => true]; $mform->addElement('editor', 'thank_body', get_string('bodytext', 'questionnaire'), null, $editoroptions); $mform->setType('thank_body', PARAM_RAW); $mform->setDefault('thank_body', $questionnaire->survey->thank_body); @@ -119,12 +119,12 @@ public function definition() { $mform = $this->_form; // Elements in a row need a group. - $buttonarray = array(); + $buttonarray = []; $buttonarray[] = &$mform->createElement('submit', 'submitbutton2', $submit2label); $buttonarray[] = &$mform->createElement('submit', 'submitbutton', $submitlabel); $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); + $mform->addGroup($buttonarray, 'buttonar', '', [' '], false); $mform->setType('buttonar', PARAM_RAW); $mform->closeHeaderBefore('buttonar'); diff --git a/complete.php b/complete.php index 9950770f..3acd6f3f 100644 --- a/complete.php +++ b/complete.php @@ -23,6 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * */ + require_once("../../config.php"); require_once($CFG->libdir . '/completionlib.php'); require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php'); @@ -70,11 +71,11 @@ $context = context_module::instance($questionnaire->cm->id); $anonymous = $questionnaire->respondenttype == 'anonymous'; - $event = \mod_questionnaire\event\attempt_resumed::create(array( + $event = \mod_questionnaire\event\attempt_resumed::create([ 'objectid' => $questionnaire->id, 'anonymous' => $anonymous, - 'context' => $context - )); + 'context' => $context, + ]); $event->trigger(); } diff --git a/db/access.php b/db/access.php index bc95e281..e299fbb7 100644 --- a/db/access.php +++ b/db/access.php @@ -25,217 +25,217 @@ defined('MOODLE_INTERNAL') || die(); -$capabilities = array( +$capabilities = [ // Ability to add a new questionnaire instance to the course. - 'mod/questionnaire:addinstance' => array( + 'mod/questionnaire:addinstance' => [ 'riskbitmask' => RISK_XSS, 'captype' => 'write', 'contextlevel' => CONTEXT_COURSE, - 'archetypes' => array( + 'archetypes' => [ 'editingteacher' => CAP_ALLOW, - 'manager' => CAP_ALLOW - ), - 'clonepermissionsfrom' => 'moodle/course:manageactivities' - ), + 'manager' => CAP_ALLOW, + ], + 'clonepermissionsfrom' => 'moodle/course:manageactivities', + ], // Ability to see that the questionnaire exists, and the basic information // about it. - 'mod/questionnaire:view' => array( + 'mod/questionnaire:view' => [ 'captype' => 'read', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, 'coursecreator' => CAP_ALLOW, - 'manager' => CAP_ALLOW - ) - ), + 'manager' => CAP_ALLOW, + ], + ], // Ability to complete the questionnaire and submit. - 'mod/questionnaire:submit' => array( + 'mod/questionnaire:submit' => [ 'captype' => 'write', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( - 'student' => CAP_ALLOW - ) - ), + 'legacy' => [ + 'student' => CAP_ALLOW, + ], + ], // Ability to view individual responses to the questionnaire. - 'mod/questionnaire:viewsingleresponse' => array( + 'mod/questionnaire:viewsingleresponse' => [ 'captype' => 'read', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'manager' => CAP_ALLOW - ) - ), + 'manager' => CAP_ALLOW, + ], + ], // Receive a notificaton for every submission. - 'mod/questionnaire:submissionnotification' => array( + 'mod/questionnaire:submissionnotification' => [ 'captype' => 'read', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'manager' => CAP_ALLOW - ) - ), + 'manager' => CAP_ALLOW, + ], + ], // Ability to download responses in a CSV file. - 'mod/questionnaire:downloadresponses' => array( + 'mod/questionnaire:downloadresponses' => [ 'captype' => 'read', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'manager' => CAP_ALLOW - ) - ), + 'manager' => CAP_ALLOW, + ], + ], // Ability to delete someone's (or own) previous responses. - 'mod/questionnaire:deleteresponses' => array( + 'mod/questionnaire:deleteresponses' => [ 'captype' => 'write', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'editingteacher' => CAP_ALLOW, - 'manager' => CAP_ALLOW - ) - ), + 'manager' => CAP_ALLOW, + ], + ], // Ability to create and edit surveys. - 'mod/questionnaire:manage' => array( + 'mod/questionnaire:manage' => [ 'riskbitmask' => RISK_XSS, 'captype' => 'write', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'editingteacher' => CAP_ALLOW, 'coursecreator' => CAP_ALLOW, - 'manager' => CAP_ALLOW - ) - ), + 'manager' => CAP_ALLOW, + ], + ], // Ability to edit survey questions. - 'mod/questionnaire:editquestions' => array( + 'mod/questionnaire:editquestions' => [ 'riskbitmask' => RISK_XSS, 'captype' => 'write', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'editingteacher' => CAP_ALLOW, 'coursecreator' => CAP_ALLOW, - 'manager' => CAP_ALLOW - ) - ), + 'manager' => CAP_ALLOW, + ], + ], // Ability to create template surveys which can be copied, but not used. - 'mod/questionnaire:createtemplates' => array( + 'mod/questionnaire:createtemplates' => [ 'captype' => 'write', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'coursecreator' => CAP_ALLOW, - 'manager' => CAP_ALLOW - ) - ), + 'manager' => CAP_ALLOW, + ], + ], // Ability to create public surveys which can be accessed from multiple places. - 'mod/questionnaire:createpublic' => array( + 'mod/questionnaire:createpublic' => [ 'captype' => 'write', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'coursecreator' => CAP_ALLOW, - 'manager' => CAP_ALLOW - ) - ), + 'manager' => CAP_ALLOW, + ], + ], // Ability to read own previous responses to questionnaires. - 'mod/questionnaire:readownresponses' => array( + 'mod/questionnaire:readownresponses' => [ 'captype' => 'read', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'manager' => CAP_ALLOW, - 'student' => CAP_ALLOW - ) - ), + 'student' => CAP_ALLOW, + ], + ], // Ability to read others' previous responses to questionnaires. // Subject to constraints on whether responses can be viewed whilst // questionnaire still open or user has not yet responded themselves. - 'mod/questionnaire:readallresponses' => array( + 'mod/questionnaire:readallresponses' => [ 'captype' => 'read', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'manager' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'student' => CAP_ALLOW - ) - ), + 'student' => CAP_ALLOW, + ], + ], // Ability to read others's responses without the above checks. - 'mod/questionnaire:readallresponseanytime' => array( + 'mod/questionnaire:readallresponseanytime' => [ 'captype' => 'read', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'manager' => CAP_ALLOW, 'teacher' => CAP_ALLOW, - 'editingteacher' => CAP_ALLOW - ) - ), + 'editingteacher' => CAP_ALLOW, + ], + ], // Ability to print a blank questionnaire. - 'mod/questionnaire:printblank' => array( + 'mod/questionnaire:printblank' => [ 'captype' => 'read', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'manager' => CAP_ALLOW, 'coursecreator' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'student' => CAP_ALLOW - ) - ), + 'student' => CAP_ALLOW, + ], + ], // Ability to preview a questionnaire. - 'mod/questionnaire:preview' => array( + 'mod/questionnaire:preview' => [ 'captype' => 'read', 'contextlevel' => CONTEXT_MODULE, - 'legacy' => array( + 'legacy' => [ 'manager' => CAP_ALLOW, 'coursecreator' => CAP_ALLOW, 'teacher' => CAP_ALLOW, - 'editingteacher' => CAP_ALLOW - ) - ), + 'editingteacher' => CAP_ALLOW, + ], + ], // Ability to message students from a questionnaire. - 'mod/questionnaire:message' => array( + 'mod/questionnaire:message' => [ 'riskbitmask' => RISK_SPAM, 'captype' => 'write', 'contextlevel' => CONTEXT_MODULE, - 'archetypes' => array( + 'archetypes' => [ 'manager' => CAP_ALLOW, 'teacher' => CAP_ALLOW, - 'editingteacher' => CAP_ALLOW - ) - ) + 'editingteacher' => CAP_ALLOW, + ], + ], -); +]; diff --git a/db/log.php b/db/log.php index 968e5dc0..d3e46247 100644 --- a/db/log.php +++ b/db/log.php @@ -24,8 +24,8 @@ defined('MOODLE_INTERNAL') || die(); -$logs = array( - array('module' => 'questionnaire', 'action' => 'view all', 'mtable' => 'questionnaire', 'field' => 'name'), - array('module' => 'questionnaire', 'action' => 'submit', 'mtable' => 'questionnaire_response', 'field' => 'id'), - array('module' => 'questionnaire', 'action' => 'view', 'mtable' => 'questionnaire', 'field' => 'name'), -); +$logs = [ + ['module' => 'questionnaire', 'action' => 'view all', 'mtable' => 'questionnaire', 'field' => 'name'], + ['module' => 'questionnaire', 'action' => 'submit', 'mtable' => 'questionnaire_response', 'field' => 'id'], + ['module' => 'questionnaire', 'action' => 'view', 'mtable' => 'questionnaire', 'field' => 'name'], +]; diff --git a/db/messages.php b/db/messages.php index c917e42a..a43ed420 100644 --- a/db/messages.php +++ b/db/messages.php @@ -29,5 +29,5 @@ // Message to nonrespondents. 'message' => [], // Response submissions. - 'notification' => [] + 'notification' => [], ]; diff --git a/db/mobile.php b/db/mobile.php index 01bec8fb..c533bf78 100644 --- a/db/mobile.php +++ b/db/mobile.php @@ -36,9 +36,9 @@ 'method' => 'mobile_view_activity', 'styles' => [ 'url' => $CFG->wwwroot . '/mod/questionnaire/styles_app.css', - 'version' => '1.5' - ] - ] + 'version' => '1.5', + ], + ], ], 'lang' => [ ['yourresponse', 'questionnaire'], @@ -51,7 +51,7 @@ ['nextpage', 'questionnaire'], ['previouspage', 'questionnaire'], ['fullname', 'moodle'], - ['required', 'moodle'] + ['required', 'moodle'], ], - ] + ], ]; diff --git a/db/services.php b/db/services.php index ba55f345..182d4bf0 100644 --- a/db/services.php +++ b/db/services.php @@ -30,8 +30,8 @@ 'mod_questionnaire_ws' => [ 'functions' => ['mod_questionnaire_submit_questionnaire_response'], 'requiredcapability' => '', - 'enabled' => 1 - ] + 'enabled' => 1, + ], ]; $functions = [ @@ -42,6 +42,6 @@ 'description' => 'Questionnaire submit', 'type' => 'write', 'capabilities' => 'mod/questionnaire:submit', - 'services' => [MOODLE_OFFICIAL_MOBILE_SERVICE] - ] + 'services' => [MOODLE_OFFICIAL_MOBILE_SERVICE], + ], ]; diff --git a/db/tasks.php b/db/tasks.php index 40d241ab..3a6aa64f 100644 --- a/db/tasks.php +++ b/db/tasks.php @@ -27,14 +27,14 @@ defined('MOODLE_INTERNAL') || die(); /** @var array $tasks */ -$tasks = array( - array( +$tasks = [ + [ 'classname' => 'mod_questionnaire\task\cleanup', 'blocking' => 0, 'minute' => 'R', 'hour' => '*/12', 'day' => '*', 'month' => '*', - 'dayofweek' => '*' - ) -); + 'dayofweek' => '*', + ], +]; diff --git a/db/upgrade.php b/db/upgrade.php index b07cea8c..1b1a8e61 100644 --- a/db/upgrade.php +++ b/db/upgrade.php @@ -48,9 +48,9 @@ function xmldb_questionnaire_upgrade($oldversion=0) { $field = new xmldb_field('required'); $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, false, null, 'n'); $dbman->change_field_enum($table, $field); - $DB->set_field('questionnaire_question', 'required', 'y', array('required' => 'Y')); - $DB->set_field('questionnaire_question', 'required', 'n', array('required' => 'N')); - $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, array('y', 'n'), 'n'); + $DB->set_field('questionnaire_question', 'required', 'y', ['required' => 'Y']); + $DB->set_field('questionnaire_question', 'required', 'n', ['required' => 'N']); + $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, ['y', 'n'], 'n'); $dbman->change_field_enum($table, $field); $dbman->change_field_default($table, $field); unset($field); @@ -58,9 +58,9 @@ function xmldb_questionnaire_upgrade($oldversion=0) { $field = new xmldb_field('deleted'); $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, false, null, 'n'); $dbman->change_field_enum($table, $field); - $DB->set_field('questionnaire_question', 'deleted', 'y', array('deleted' => 'Y')); - $DB->set_field('questionnaire_question', 'deleted', 'n', array('deleted' => 'N')); - $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, array('y', 'n'), 'n'); + $DB->set_field('questionnaire_question', 'deleted', 'y', ['deleted' => 'Y']); + $DB->set_field('questionnaire_question', 'deleted', 'n', ['deleted' => 'N']); + $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, ['y', 'n'], 'n'); $dbman->change_field_enum($table, $field); $dbman->change_field_default($table, $field); unset($field); @@ -68,9 +68,9 @@ function xmldb_questionnaire_upgrade($oldversion=0) { $field = new xmldb_field('public'); $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, false, null, 'n'); $dbman->change_field_enum($table, $field); - $DB->set_field('questionnaire_question', 'public', 'y', array('public' => 'Y')); - $DB->set_field('questionnaire_question', 'public', 'n', array('public' => 'N')); - $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, array('y', 'n'), 'y'); + $DB->set_field('questionnaire_question', 'public', 'y', ['public' => 'Y']); + $DB->set_field('questionnaire_question', 'public', 'n', ['public' => 'N']); + $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, ['y', 'n'], 'y'); $dbman->change_field_enum($table, $field); $dbman->change_field_default($table, $field); unset($field); @@ -82,9 +82,9 @@ function xmldb_questionnaire_upgrade($oldversion=0) { $field = new xmldb_field('has_choices'); $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, false, null, 'n'); $dbman->change_field_enum($table, $field); - $DB->set_field('questionnaire_question_type', 'has_choices', 'y', array('has_choices' => 'Y')); - $DB->set_field('questionnaire_question_type', 'has_choices', 'n', array('has_choices' => 'N')); - $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, array('y', 'n'), 'y'); + $DB->set_field('questionnaire_question_type', 'has_choices', 'y', ['has_choices' => 'Y']); + $DB->set_field('questionnaire_question_type', 'has_choices', 'n', ['has_choices' => 'N']); + $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, ['y', 'n'], 'y'); $dbman->change_field_enum($table, $field); $dbman->change_field_default($table, $field); unset($field); @@ -96,9 +96,9 @@ function xmldb_questionnaire_upgrade($oldversion=0) { $field = new xmldb_field('complete'); $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, false, null, 'n'); $dbman->change_field_enum($table, $field); - $DB->set_field('questionnaire_response', 'complete', 'y', array('complete' => 'Y')); - $DB->set_field('questionnaire_response', 'complete', 'n', array('complete' => 'N')); - $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, array('y', 'n'), 'n'); + $DB->set_field('questionnaire_response', 'complete', 'y', ['complete' => 'Y']); + $DB->set_field('questionnaire_response', 'complete', 'n', ['complete' => 'N']); + $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, ['y', 'n'], 'n'); $dbman->change_field_enum($table, $field); $dbman->change_field_default($table, $field); unset($field); @@ -110,9 +110,9 @@ function xmldb_questionnaire_upgrade($oldversion=0) { $field = new xmldb_field('choice_id'); $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, false, null, 'n'); $dbman->change_field_enum($table, $field); - $DB->set_field('questionnaire_response_bool', 'choice_id', 'y', array('choice_id' => 'Y')); - $DB->set_field('questionnaire_response_bool', 'choice_id', 'n', array('choice_id' => 'N')); - $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, array('y', 'n'), 'y'); + $DB->set_field('questionnaire_response_bool', 'choice_id', 'y', ['choice_id' => 'Y']); + $DB->set_field('questionnaire_response_bool', 'choice_id', 'n', ['choice_id' => 'N']); + $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, ['y', 'n'], 'y'); $dbman->change_field_enum($table, $field); $dbman->change_field_default($table, $field); unset($field); @@ -124,18 +124,18 @@ function xmldb_questionnaire_upgrade($oldversion=0) { $field = new xmldb_field('public'); $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, false, null, 'n'); $dbman->change_field_enum($table, $field); - $DB->set_field('questionnaire_survey', 'public', 'y', array('public' => 'Y')); - $DB->set_field('questionnaire_survey', 'public', 'n', array('public' => 'N')); - $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, array('y', 'n'), 'y'); + $DB->set_field('questionnaire_survey', 'public', 'y', ['public' => 'Y']); + $DB->set_field('questionnaire_survey', 'public', 'n', ['public' => 'N']); + $field->set_attributes(XMLDB_TYPE_CHAR, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, ['y', 'n'], 'y'); $dbman->change_field_enum($table, $field); $dbman->change_field_default($table, $field); unset($field); // Upgrade question_type table with corrected 'response_table' fields. $DB->set_field('questionnaire_question_type', 'response_table', 'resp_single', - array('response_table' => 'response_single')); + ['response_table' => 'response_single']); $DB->set_field('questionnaire_question_type', 'response_table', 'resp_multiple', - array('response_table' => 'response_multiple')); + ['response_table' => 'response_multiple']); // Questionnaire savepoint reached.. upgrade_mod_savepoint(true, 2007120102, 'questionnaire'); @@ -163,9 +163,9 @@ function xmldb_questionnaire_upgrade($oldversion=0) { FROM {questionnaire} q, {course_modules} cm, {modules} m WHERE m.name='questionnaire' AND m.id=cm.module AND cm.instance=q.id"; if ($rs = $DB->get_recordset_sql($sql)) { - $studentroleid = $DB->get_field('role', 'id', array('shortname' => 'student')); - $editteacherroleid = $DB->get_field('role', 'id', array('shortname' => 'editingteacher')); - $teacherroleid = $DB->get_field('role', 'id', array('shortname' => 'teacher')); + $studentroleid = $DB->get_field('role', 'id', ['shortname' => 'student']); + $editteacherroleid = $DB->get_field('role', 'id', ['shortname' => 'editingteacher']); + $teacherroleid = $DB->get_field('role', 'id', ['shortname' => 'teacher']); $capview = 'mod/questionnaire:view'; $capsubmit = 'mod/questionnaire:submit'; @@ -236,7 +236,7 @@ function xmldb_questionnaire_upgrade($oldversion=0) { if ($oldversion < 2008070703) { $table = new xmldb_table('questionnaire_resp_multiple'); $index = new xmldb_index('response_question'); - $index->set_attributes(XMLDB_INDEX_NOTUNIQUE, array('response_id', 'question_id', 'choice_id')); + $index->set_attributes(XMLDB_INDEX_NOTUNIQUE, ['response_id', 'question_id', 'choice_id']); if (!$dbman->index_exists($table, $index)) { $dbman->add_index($table, $index); } @@ -347,7 +347,7 @@ function xmldb_questionnaire_upgrade($oldversion=0) { // First drop the index. $table = new xmldb_table('questionnaire_survey'); $index = new xmldb_index('name'); - $index->set_attributes(XMLDB_INDEX_NOTUNIQUE, array('name')); + $index->set_attributes(XMLDB_INDEX_NOTUNIQUE, ['name']); $dbman->drop_index($table, $index); // Launch change of precision for field name. @@ -357,7 +357,7 @@ function xmldb_questionnaire_upgrade($oldversion=0) { // Add back in the index. $table = new xmldb_table('questionnaire_survey'); $index = new xmldb_index('name'); - $index->set_attributes(XMLDB_INDEX_NOTUNIQUE, array('name')); + $index->set_attributes(XMLDB_INDEX_NOTUNIQUE, ['name']); $dbman->add_index($table, $index); // Questionnaire savepoint reached. @@ -469,7 +469,7 @@ function xmldb_questionnaire_upgrade($oldversion=0) { $table->add_field('sectionheadingformat', XMLDB_TYPE_INTEGER, '2', null, null, null, '1'); // Adding keys to table questionnaire_fb_sections. - $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id')); + $table->add_key('primary', XMLDB_KEY_PRIMARY, ['id']); // Conditionally launch create table for assign_user_mapping. if (!$dbman->table_exists($table)) { @@ -489,7 +489,7 @@ function xmldb_questionnaire_upgrade($oldversion=0) { $table->add_field('maxscore', XMLDB_TYPE_NUMBER, '10,5', null, null, null, '101.00000'); // Adding keys to table questionnaire_fb_sections. - $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id')); + $table->add_key('primary', XMLDB_KEY_PRIMARY, ['id']); // Conditionally launch create table for assign_user_mapping. if (!$dbman->table_exists($table)) { @@ -534,7 +534,7 @@ function xmldb_questionnaire_upgrade($oldversion=0) { if ($oldversion < 2015051102) { // Conditionally add an index to the question_id field. $table = new xmldb_table('questionnaire_quest_choice'); - $index = new xmldb_index('quest_choice_quesidx', XMLDB_INDEX_NOTUNIQUE, array('question_id')); + $index = new xmldb_index('quest_choice_quesidx', XMLDB_INDEX_NOTUNIQUE, ['question_id']); // Only add the index if it does not exist. if (!$dbman->index_exists($table, $index)) { $dbman->add_index($table, $index); @@ -651,10 +651,10 @@ function xmldb_questionnaire_upgrade($oldversion=0) { $table->add_field('dependandor', XMLDB_TYPE_CHAR, '4', null, XMLDB_NOTNULL, null, null); // Adding keys to table questionnaire_depenencies. - $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id')); + $table->add_key('primary', XMLDB_KEY_PRIMARY, ['id']); // Adding indexes to table questionnaire_dependency. - $table->add_index('quest_dependency_quesidx', XMLDB_INDEX_NOTUNIQUE, array('questionid')); + $table->add_index('quest_dependency_quesidx', XMLDB_INDEX_NOTUNIQUE, ['questionid']); // Conditionally launch create table for questionnaire_dependencies. if (!$dbman->table_exists($table)) { @@ -1051,9 +1051,9 @@ function questionnaire_upgrade_2007120101() { $recstart = 0; $recstoget = 100; while ($recstart < $numrecs) { - if ($records = $dbman->get_records('questionnaire_question_type', array(), '', '*', $recstart, $recstoget)) { + if ($records = $dbman->get_records('questionnaire_question_type', [], '', '*', $recstart, $recstoget)) { foreach ($records as $record) { - $dbman->set_field('questionnaire_question_type', 'typeid', $record->id, array('id' => $record->id)); + $dbman->set_field('questionnaire_question_type', 'typeid', $record->id, ['id' => $record->id]); } } $recstart += $recstoget; diff --git a/drawchart.php b/drawchart.php index ab50fe83..5878ded3 100644 --- a/drawchart.php +++ b/drawchart.php @@ -57,6 +57,7 @@ function draw_chart($feedbacktype, $labels, $groupname, $charttitle2 = $groupname; // Gradient colors if needed. + // phpcs:disable moodle.Commenting.TodoComment // TODO make gradient colors customizable in the settings. $chartcolorsgradient = "['Gradient(white:blue)', 'Gradient(white:red)', 'Gradient(white:green)', 'Gradient(white:pink)', 'Gradient(white:yellow)', 'Gradient(white:cyan)', 'Gradient(white:navy)', @@ -64,7 +65,7 @@ function draw_chart($feedbacktype, $labels, $groupname, // We do not have labels other than global in this feedback type. if ($feedbacktype == 'global') { - $labels = array($globallabel); + $labels = [$globallabel]; } switch ($charttype) { @@ -77,27 +78,27 @@ function draw_chart($feedbacktype, $labels, $groupname, $score = null; } else { $score2 = $score; - $score = array($score2[0]); - $oppositescore = array($score2[1]); + $score = [$score2[0]]; + $oppositescore = [$score2[1]]; } } if ($allscore) { $allscore2 = $allscore; - $allscore = array($allscore2[0]); - $alloppositescore = array($allscore2[1]); + $allscore = [$allscore2[0]]; + $alloppositescore = [$allscore2[1]]; } $nblabels = 1.5; // For a single horizontal bar with 1.5 height. $nbvalues = 1; // Only one hbar. } else { if ($score) { - $oppositescore = array(); + $oppositescore = []; foreach ($score as $sc) { $oppositescore[] = 100 - $sc; } } if ($allscore) { - $alloppositescore = array(); + $alloppositescore = []; foreach ($allscore as $sc) { $alloppositescore[] = 100 - $sc; } @@ -138,8 +139,8 @@ function draw_chart($feedbacktype, $labels, $groupname, // JSON_UNESCAPED_UNICODE available since php 5.4, used to correctly treat French accents etc. // The bar colors :: use green for "positive" (left column) and pink for "negative" (right column). - $chartcolors = array(); - $chartcolors2 = array(); + $chartcolors = []; + $chartcolors2 = []; if ($score) { for ($i = 0; $i < $nbvalues; $i++) { @@ -238,7 +239,7 @@ function draw_chart($feedbacktype, $labels, $groupname, case 'hbar': // The bar colors. - $chartcolors = array(); + $chartcolors = []; $chartcolors = json_encode($chartcolors); $sequential = 'true'; // Global feedback with only one score. diff --git a/externallib.php b/externallib.php index 7715fc1e..3c2a22c5 100644 --- a/externallib.php +++ b/externallib.php @@ -73,11 +73,11 @@ public static function submit_questionnaire_response_parameters() { new external_single_structure( [ 'name' => new external_value(PARAM_RAW, 'data key'), - 'value' => new external_value(PARAM_RAW, 'data value') + 'value' => new external_value(PARAM_RAW, 'data value'), ] ), 'The data to be saved', VALUE_DEFAULT, [] - ) + ), ] ); } @@ -110,7 +110,7 @@ public static function submit_questionnaire_response($questionnaireid, $surveyid 'rid' => $rid, 'submit' => $submit, 'action' => $action, - 'responses' => $responses + 'responses' => $responses, ] ); @@ -142,7 +142,7 @@ public static function submit_questionnaire_response_returns() { return new external_single_structure( [ 'submitted' => new external_value(PARAM_BOOL, 'submitted', VALUE_REQUIRED, false, false), - 'warnings' => new external_warnings() + 'warnings' => new external_warnings(), ] ); } diff --git a/grade.php b/grade.php index 43780fde..7687b1d9 100644 --- a/grade.php +++ b/grade.php @@ -30,12 +30,12 @@ $id = required_param('id', PARAM_INT); $cm = get_coursemodule_from_id('questionnaire', $id, 0, false, MUST_EXIST); -if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $cm->instance))) { +if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $cm->instance])) { throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } -$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); +$course = $DB->get_record('course', ['id' => $cm->course], '*', MUST_EXIST); require_login($course, false, $cm); -$PAGE->set_url('/mod/questionnaire/grade.php', array('id' => $cm->id)); +$PAGE->set_url('/mod/questionnaire/grade.php', ['id' => $cm->id]); if (has_capability('mod/questionnaire:readallresponseanytime', context_module::instance($cm->id))) { redirect('report.php?instance='.$questionnaire->id); diff --git a/index.php b/index.php index 05bce900..ef4684ef 100644 --- a/index.php +++ b/index.php @@ -26,16 +26,16 @@ require_once($CFG->dirroot.'/mod/questionnaire/locallib.php'); $id = required_param('id', PARAM_INT); -$PAGE->set_url('/mod/questionnaire/index.php', array('id' => $id)); -if (! $course = $DB->get_record('course', array('id' => $id))) { +$PAGE->set_url('/mod/questionnaire/index.php', ['id' => $id]); +if (! $course = $DB->get_record('course', ['id' => $id])) { throw new \moodle_exception('Filter has not been set.', 'mod_questionnaire'); } $coursecontext = context_course::instance($id); require_login($course->id); $PAGE->set_pagelayout('incourse'); -$event = \mod_questionnaire\event\course_module_instance_list_viewed::create(array( - 'context' => context_course::instance($course->id))); +$event = \mod_questionnaire\event\course_module_instance_list_viewed::create([ + 'context' => context_course::instance($course->id), ]); $event->trigger(); // Print the header. @@ -63,8 +63,8 @@ } // Configure table for displaying the list of instances. -$headings = array(get_string('name')); -$align = array('left'); +$headings = [get_string('name')]; +$align = ['left']; if ($showclosingheader) { array_push($headings, get_string('questionnairecloses', 'questionnaire')); @@ -98,8 +98,8 @@ $currentsection = ''; foreach ($questionnaires as $questionnaire) { $cmid = $questionnaire->coursemodule; - $data = array(); - $realm = $DB->get_field('questionnaire_survey', 'realm', array('id' => $questionnaire->sid)); + $data = []; + $realm = $DB->get_field('questionnaire_survey', 'realm', ['id' => $questionnaire->sid]); // Template surveys should NOT be displayed as an activity to students. if (!($realm == 'template' && !has_capability('mod/questionnaire:manage', context_module::instance($cmid)))) { // Section number if necessary. @@ -173,10 +173,10 @@ if ($copies = $DB->get_records_select('questionnaire', $select, null, $sort = 'course ASC', $fields = 'id, course, name')) { foreach ($copies as $copy) { - $copycourse = $DB->get_record('course', array('id' => $copy->course)); + $copycourse = $DB->get_record('course', ['id' => $copy->course]); $select = 'course = '.$copycourse->id.' AND sid = '.$questionnaire->sid; $copyquestionnaire = $DB->get_record('questionnaire', - array('id' => $copy->id, 'sid' => $survey->id, 'course' => $copycourse->id)); + ['id' => $copy->id, 'sid' => $survey->id, 'course' => $copycourse->id]); $cm = get_coursemodule_from_instance("questionnaire", $copyquestionnaire->id, $copycourse->id); $context = context_course::instance($copycourse->id, MUST_EXIST); $canviewcopy = has_capability('mod/questionnaire:view', $context, $USER->id, true); diff --git a/lang/en/questionnaire.php b/lang/en/questionnaire.php index e28d9352..34d5484a 100644 --- a/lang/en/questionnaire.php +++ b/lang/en/questionnaire.php @@ -23,6 +23,9 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +// phpcs:disable moodle.Files.LangFilesOrdering.UnexpectedComment +// phpcs:disable moodle.Files.LangFilesOrdering.IncorrectOrder + $string['accessibility:rate:choice'] = 'Row {$a->rowposition}, {$a->choicetitle}: Column {$a->colposition}, {$a->choiceanswer}.'; $string['action'] = 'Action'; $string['activityoverview'] = 'You have questionnaires that are due'; diff --git a/lib.php b/lib.php index 8b2c5fc8..34c6b0cf 100644 --- a/lib.php +++ b/lib.php @@ -65,7 +65,7 @@ function questionnaire_supports($feature) { * @return array all other caps used in module */ function questionnaire_get_extra_capabilities() { - return array('moodle/site:accessallgroups'); + return ['moodle/site:accessallgroups']; } /** @@ -75,7 +75,7 @@ function questionnaire_get_extra_capabilities() { */ function questionnaire_get_instance($questionnaireid) { global $DB; - return $DB->get_record('questionnaire', array('id' => $questionnaireid)); + return $DB->get_record('questionnaire', ['id' => $questionnaireid]); } /** @@ -133,7 +133,7 @@ function questionnaire_add_instance($questionnaire) { $sid = $qobject->sid = $qobject->survey_copy($course->id); // All new questionnaires should be created as "private". // Even if they are *copies* of public or template questionnaires. - $DB->set_field('questionnaire_survey', 'realm', 'private', array('id' => $sid)); + $DB->set_field('questionnaire_survey', 'realm', 'private', ['id' => $sid]); // Need to copy any files from the old questionnaire instance to the new one. $questionnaire->copyid = $copyid; @@ -179,7 +179,7 @@ function questionnaire_update_instance($questionnaire) { // Check the realm and set it to the survey if its set. if (!empty($questionnaire->sid) && !empty($questionnaire->realm)) { - $DB->set_field('questionnaire_survey', 'realm', $questionnaire->realm, array('id' => $questionnaire->sid)); + $DB->set_field('questionnaire_survey', 'realm', $questionnaire->realm, ['id' => $questionnaire->sid]); } $questionnaire->timemodified = time(); @@ -212,24 +212,24 @@ function questionnaire_delete_instance($id) { global $DB, $CFG; require_once($CFG->dirroot.'/mod/questionnaire/locallib.php'); - if (! $questionnaire = $DB->get_record('questionnaire', array('id' => $id))) { + if (! $questionnaire = $DB->get_record('questionnaire', ['id' => $id])) { return false; } $result = true; - if ($events = $DB->get_records('event', array("modulename" => 'questionnaire', "instance" => $questionnaire->id))) { + if ($events = $DB->get_records('event', ["modulename" => 'questionnaire', "instance" => $questionnaire->id])) { foreach ($events as $event) { $event = calendar_event::load($event); $event->delete(); } } - if (! $DB->delete_records('questionnaire', array('id' => $questionnaire->id))) { + if (! $DB->delete_records('questionnaire', ['id' => $questionnaire->id])) { $result = false; } - if ($survey = $DB->get_record('questionnaire_survey', array('id' => $questionnaire->sid))) { + if ($survey = $DB->get_record('questionnaire_survey', ['id' => $questionnaire->sid])) { // If this survey is owned by this course, delete all of the survey records and responses. if ($survey->courseid == $questionnaire->course) { $result = $result && questionnaire_delete_survey($questionnaire->sid, $questionnaire->id); @@ -254,7 +254,7 @@ function questionnaire_get_coursemodule_info($coursemodule) { global $DB; $questionnaire = $DB->get_record('questionnaire', - array('id' => $coursemodule->instance), 'id, name, intro, introformat, + ['id' => $coursemodule->instance], 'id, name, intro, introformat, completionsubmit'); if (!$questionnaire) { return null; @@ -370,7 +370,7 @@ function questionnaire_grades($questionnaireid) { */ function questionnaire_get_user_grades($questionnaire, $userid=0) { global $DB; - $params = array(); + $params = []; $usersql = ''; if (!empty($userid)) { $usersql = "AND u.id = ?"; @@ -399,7 +399,7 @@ function questionnaire_update_grades($questionnaire=null, $userid=0, $nullifnone if ($questionnaire != null) { if ($graderecs = questionnaire_get_user_grades($questionnaire, $userid)) { - $grades = array(); + $grades = []; foreach ($graderecs as $v) { if (!isset($grades[$v->userid])) { $grades[$v->userid] = new stdClass(); @@ -453,9 +453,9 @@ function questionnaire_grade_item_update($questionnaire, $grades = null) { } if ($questionnaire->cmidnumber != '') { - $params = array('itemname' => $questionnaire->name, 'idnumber' => $questionnaire->cmidnumber); + $params = ['itemname' => $questionnaire->name, 'idnumber' => $questionnaire->cmidnumber]; } else { - $params = array('itemname' => $questionnaire->name); + $params = ['itemname' => $questionnaire->name]; } if ($questionnaire->grade > 0) { @@ -469,7 +469,7 @@ function questionnaire_grade_item_update($questionnaire, $grades = null) { } else if ($questionnaire->grade == 0) { // No Grade..be sure to delete the grade item if it exists. $grades = null; - $params = array('deleted' => 1); + $params = ['deleted' => 1]; } else { $params = null; // Allow text comments only. @@ -595,7 +595,7 @@ function questionnaire_extend_settings_navigation(settings_navigation $settings, $cmid = $cm->id; $course = $settings->get_page()->course; - if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $cm->instance))) { + if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $cm->instance])) { throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } @@ -631,7 +631,7 @@ function questionnaire_extend_settings_navigation(settings_navigation $settings, if (has_capability('mod/questionnaire:manage', $context) && $owner) { $url = '/mod/questionnaire/qsettings.php'; $node = navigation_node::create(get_string('advancedsettings'), - new moodle_url($url, array('id' => $cmid)), + new moodle_url($url, ['id' => $cmid]), navigation_node::TYPE_SETTING, null, 'advancedsettings', new pix_icon('t/edit', '')); $questionnairenode->add_node($node, $beforekey); @@ -640,7 +640,7 @@ function questionnaire_extend_settings_navigation(settings_navigation $settings, if (has_capability('mod/questionnaire:editquestions', $context) && $owner) { $url = '/mod/questionnaire/questions.php'; $node = navigation_node::create(get_string('questions', 'questionnaire'), - new moodle_url($url, array('id' => $cmid)), + new moodle_url($url, ['id' => $cmid]), navigation_node::TYPE_SETTING, null, 'questions', new pix_icon('t/edit', '')); $questionnairenode->add_node($node, $beforekey); @@ -649,7 +649,7 @@ function questionnaire_extend_settings_navigation(settings_navigation $settings, if (has_capability('mod/questionnaire:editquestions', $context) && $owner) { $url = '/mod/questionnaire/feedback.php'; $node = navigation_node::create(get_string('feedback', 'questionnaire'), - new moodle_url($url, array('id' => $cmid)), + new moodle_url($url, ['id' => $cmid]), navigation_node::TYPE_SETTING, null, 'feedback', new pix_icon('t/edit', '')); $questionnairenode->add_node($node, $beforekey); @@ -658,7 +658,7 @@ function questionnaire_extend_settings_navigation(settings_navigation $settings, if (has_capability('mod/questionnaire:preview', $context)) { $url = '/mod/questionnaire/preview.php'; $node = navigation_node::create(get_string('preview_label', 'questionnaire'), - new moodle_url($url, array('id' => $cmid)), + new moodle_url($url, ['id' => $cmid]), navigation_node::TYPE_SETTING, null, 'preview', new pix_icon('t/preview', '')); $questionnairenode->add_node($node, $beforekey); @@ -683,33 +683,33 @@ function questionnaire_extend_settings_navigation(settings_navigation $settings, $url = '/mod/questionnaire/myreport.php'; if ($usernumresp > 1) { - $urlargs = array('instance' => $questionnaire->id, 'userid' => $USER->id, - 'byresponse' => 0, 'action' => 'summary', 'group' => $currentgroupid); + $urlargs = ['instance' => $questionnaire->id, 'userid' => $USER->id, + 'byresponse' => 0, 'action' => 'summary', 'group' => $currentgroupid, ]; $node = navigation_node::create(get_string('yourresponses', 'questionnaire'), new moodle_url($url, $urlargs), navigation_node::TYPE_SETTING, null, 'yourresponses'); $myreportnode = $questionnairenode->add_node($node, $beforekey); - $urlargs = array('instance' => $questionnaire->id, 'userid' => $USER->id, - 'byresponse' => 0, 'action' => 'summary', 'group' => $currentgroupid); + $urlargs = ['instance' => $questionnaire->id, 'userid' => $USER->id, + 'byresponse' => 0, 'action' => 'summary', 'group' => $currentgroupid, ]; $myreportnode->add(get_string('summary', 'questionnaire'), new moodle_url($url, $urlargs)); - $urlargs = array('instance' => $questionnaire->id, 'userid' => $USER->id, - 'byresponse' => 1, 'action' => 'vresp', 'group' => $currentgroupid); + $urlargs = ['instance' => $questionnaire->id, 'userid' => $USER->id, + 'byresponse' => 1, 'action' => 'vresp', 'group' => $currentgroupid, ]; $byresponsenode = $myreportnode->add(get_string('viewindividualresponse', 'questionnaire'), new moodle_url($url, $urlargs)); - $urlargs = array('instance' => $questionnaire->id, 'userid' => $USER->id, - 'byresponse' => 0, 'action' => 'vall', 'group' => $currentgroupid); + $urlargs = ['instance' => $questionnaire->id, 'userid' => $USER->id, + 'byresponse' => 0, 'action' => 'vall', 'group' => $currentgroupid, ]; $myreportnode->add(get_string('myresponses', 'questionnaire'), new moodle_url($url, $urlargs)); if ($questionnaire->capabilities->downloadresponses) { - $urlargs = array('instance' => $questionnaire->id, 'user' => $USER->id, - 'action' => 'dwnpg', 'group' => $currentgroupid); + $urlargs = ['instance' => $questionnaire->id, 'user' => $USER->id, + 'action' => 'dwnpg', 'group' => $currentgroupid, ]; $myreportnode->add(get_string('downloadtextformat', 'questionnaire'), new moodle_url('/mod/questionnaire/report.php', $urlargs)); } } else { - $urlargs = array('instance' => $questionnaire->id, 'userid' => $USER->id, - 'byresponse' => 1, 'action' => 'vresp', 'group' => $currentgroupid); + $urlargs = ['instance' => $questionnaire->id, 'userid' => $USER->id, + 'byresponse' => 1, 'action' => 'vresp', 'group' => $currentgroupid, ]; $node = navigation_node::create(get_string('yourresponse', 'questionnaire'), new moodle_url($url, $urlargs), navigation_node::TYPE_SETTING, null, 'yourresponse'); $myreportnode = $questionnairenode->add_node($node, $beforekey); @@ -722,52 +722,52 @@ function questionnaire_extend_settings_navigation(settings_navigation $settings, $url = '/mod/questionnaire/report.php'; $node = navigation_node::create(get_string('viewallresponses', 'questionnaire'), - new moodle_url($url, array('instance' => $questionnaire->id, 'action' => 'vall')), + new moodle_url($url, ['instance' => $questionnaire->id, 'action' => 'vall']), navigation_node::TYPE_SETTING, null, 'vall'); $reportnode = $questionnairenode->add_node($node, $beforekey); if ($questionnaire->capabilities->viewsingleresponse) { $summarynode = $reportnode->add(get_string('summary', 'questionnaire'), new moodle_url('/mod/questionnaire/report.php', - array('instance' => $questionnaire->id, 'action' => 'vall'))); + ['instance' => $questionnaire->id, 'action' => 'vall'])); } else { $summarynode = $reportnode; } $summarynode->add(get_string('order_default', 'questionnaire'), new moodle_url('/mod/questionnaire/report.php', - array('instance' => $questionnaire->id, 'action' => 'vall', 'group' => $currentgroupid))); + ['instance' => $questionnaire->id, 'action' => 'vall', 'group' => $currentgroupid])); $summarynode->add(get_string('order_ascending', 'questionnaire'), new moodle_url('/mod/questionnaire/report.php', - array('instance' => $questionnaire->id, 'action' => 'vallasort', 'group' => $currentgroupid))); + ['instance' => $questionnaire->id, 'action' => 'vallasort', 'group' => $currentgroupid])); $summarynode->add(get_string('order_descending', 'questionnaire'), new moodle_url('/mod/questionnaire/report.php', - array('instance' => $questionnaire->id, 'action' => 'vallarsort', 'group' => $currentgroupid))); + ['instance' => $questionnaire->id, 'action' => 'vallarsort', 'group' => $currentgroupid])); if ($questionnaire->capabilities->deleteresponses) { $summarynode->add(get_string('deleteallresponses', 'questionnaire'), new moodle_url('/mod/questionnaire/report.php', - array('instance' => $questionnaire->id, 'action' => 'delallresp', 'group' => $currentgroupid))); + ['instance' => $questionnaire->id, 'action' => 'delallresp', 'group' => $currentgroupid])); } if ($questionnaire->capabilities->downloadresponses) { $summarynode->add(get_string('downloadtextformat', 'questionnaire'), new moodle_url('/mod/questionnaire/report.php', - array('instance' => $questionnaire->id, 'action' => 'dwnpg', 'group' => $currentgroupid))); + ['instance' => $questionnaire->id, 'action' => 'dwnpg', 'group' => $currentgroupid])); } if ($questionnaire->capabilities->viewsingleresponse) { $byresponsenode = $reportnode->add(get_string('viewbyresponse', 'questionnaire'), new moodle_url('/mod/questionnaire/report.php', - array('instance' => $questionnaire->id, 'action' => 'vresp', 'byresponse' => 1, 'group' => $currentgroupid))); + ['instance' => $questionnaire->id, 'action' => 'vresp', 'byresponse' => 1, 'group' => $currentgroupid])); $byresponsenode->add(get_string('view', 'questionnaire'), new moodle_url('/mod/questionnaire/report.php', - array('instance' => $questionnaire->id, 'action' => 'vresp', 'byresponse' => 1, 'group' => $currentgroupid))); + ['instance' => $questionnaire->id, 'action' => 'vresp', 'byresponse' => 1, 'group' => $currentgroupid])); if ($individualresponse) { $byresponsenode->add(get_string('deleteresp', 'questionnaire'), new moodle_url('/mod/questionnaire/report.php', - array('instance' => $questionnaire->id, 'action' => 'dresp', 'byresponse' => 1, - 'rid' => $rid, 'group' => $currentgroupid, 'individualresponse' => 1))); + ['instance' => $questionnaire->id, 'action' => 'dresp', 'byresponse' => 1, + 'rid' => $rid, 'group' => $currentgroupid, 'individualresponse' => 1, ])); } } } @@ -781,7 +781,7 @@ function questionnaire_extend_settings_navigation(settings_navigation $settings, if ($questionnaire->capabilities->viewsingleresponse && ($canviewallgroups || $canviewgroups)) { $url = '/mod/questionnaire/show_nonrespondents.php'; $node = navigation_node::create(get_string('show_nonrespondents', 'questionnaire'), - new moodle_url($url, array('id' => $cmid)), + new moodle_url($url, ['id' => $cmid]), navigation_node::TYPE_SETTING, null, 'nonrespondents'); $questionnairenode->add_node($node, $beforekey); @@ -796,7 +796,7 @@ function questionnaire_extend_settings_navigation(settings_navigation $settings, * @return string[] */ function questionnaire_get_view_actions() { - return array('view', 'view all'); + return ['view', 'view all']; } /** @@ -804,7 +804,7 @@ function questionnaire_get_view_actions() { * @return string[] */ function questionnaire_get_post_actions() { - return array('submit', 'update'); + return ['submit', 'update']; } /** @@ -904,7 +904,7 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart $usersgroups = null; $aname = format_string($cm->name, true); - $userattempts = array(); + $userattempts = []; foreach ($attempts as $attempt) { if ($questionnaire->respondenttype != 'anonymous') { if (!isset($userattempts[$attempt->lastname])) { @@ -926,7 +926,7 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart if (is_array($usersgroups)) { $usersgroups = array_keys($usersgroups); } else { - $usersgroups = array(); + $usersgroups = []; } } if (!array_intersect($usersgroups, $modinfo->groups[$cm->id])) { @@ -1010,19 +1010,19 @@ function questionnaire_print_recent_mod_activity($activity, $courseid, $detail, $strcannotview = get_string('cannotviewpublicresponses', 'questionnaire'); } echo html_writer::start_tag('div'); - echo html_writer::start_tag('span', array('class' => 'clearfix', - 'style' => 'margin-top:0px; background-color: white; display: inline-block;')); + echo html_writer::start_tag('span', ['class' => 'clearfix', + 'style' => 'margin-top:0px; background-color: white; display: inline-block;', ]); if (!$activity->anonymous && !$activity->cannotview) { - echo html_writer::tag('div', $OUTPUT->user_picture($activity->user, array('courseid' => $courseid)), - array('style' => 'float: left; padding-right: 10px;')); + echo html_writer::tag('div', $OUTPUT->user_picture($activity->user, ['courseid' => $courseid]), + ['style' => 'float: left; padding-right: 10px;']); } if (!$activity->cannotview) { echo html_writer::start_tag('div'); echo html_writer::start_tag('div'); - $urlparams = array('action' => 'vresp', 'instance' => $activity->cminstance, - 'group' => $activity->groupid, 'rid' => $activity->content->attemptid, 'individualresponse' => 1); + $urlparams = ['action' => 'vresp', 'instance' => $activity->cminstance, + 'group' => $activity->groupid, 'rid' => $activity->content->attemptid, 'individualresponse' => 1, ]; $context = context_module::instance($activity->cmid); if (has_capability('mod/questionnaire:viewsingleresponse', $context)) { @@ -1031,7 +1031,7 @@ function questionnaire_print_recent_mod_activity($activity, $courseid, $detail, $report = 'myreport.php'; } echo html_writer::tag('a', get_string('response', 'questionnaire').' '.$activity->nbattempts.$stranonymous, - array('href' => new moodle_url('/mod/questionnaire/'.$report, $urlparams))); + ['href' => new moodle_url('/mod/questionnaire/'.$report, $urlparams)]); echo html_writer::end_tag('div'); } else { echo html_writer::start_tag('div'); @@ -1040,10 +1040,10 @@ function questionnaire_print_recent_mod_activity($activity, $courseid, $detail, echo html_writer::end_tag('div'); } if (!$activity->anonymous && !$activity->cannotview) { - $url = new moodle_url('/user/view.php', array('course' => $courseid, 'id' => $activity->user->id)); + $url = new moodle_url('/user/view.php', ['course' => $courseid, 'id' => $activity->user->id]); $name = $activity->user->fullname; $link = html_writer::link($url, $name); - echo html_writer::start_tag('div', array('class' => 'user')); + echo html_writer::start_tag('div', ['class' => 'user']); echo $link .' - '. userdate($activity->timestamp); echo html_writer::end_tag('div'); } @@ -1162,7 +1162,7 @@ function questionnaire_reset_course_form_definition($mform) { * Function parameters are unused, but API requires them. Suppress PHPMD warning. */ function questionnaire_reset_course_form_defaults($course) { - return array('reset_questionnaire' => 1); + return ['reset_questionnaire' => 1]; } /** @@ -1178,7 +1178,7 @@ function questionnaire_reset_userdata($data) { require_once($CFG->dirroot.'/mod/questionnaire/locallib.php'); $componentstr = get_string('modulenameplural', 'questionnaire'); - $status = array(); + $status = []; if (!empty($data->reset_questionnaire)) { $surveys = questionnaire_get_survey_list($data->courseid, ''); @@ -1194,7 +1194,7 @@ function questionnaire_reset_userdata($data) { $resps = $DB->get_records_sql($sql, [$survey->id]); if (!empty($resps)) { $questionnaire = $DB->get_record("questionnaire", ["sid" => $survey->id, "course" => $survey->courseid]); - $questionnaire->course = $DB->get_record("course", array("id" => $questionnaire->course)); + $questionnaire->course = $DB->get_record("course", ["id" => $questionnaire->course]); foreach ($resps as $response) { questionnaire_delete_response($response, $questionnaire); } @@ -1208,15 +1208,15 @@ function questionnaire_reset_userdata($data) { } } - $status[] = array( + $status[] = [ 'component' => $componentstr, 'item' => get_string('deletedallresp', 'questionnaire'), - 'error' => false); + 'error' => false, ]; - $status[] = array( + $status[] = [ 'component' => $componentstr, 'item' => get_string('gradesdeleted', 'questionnaire'), - 'error' => false); + 'error' => false, ]; } return $status; } @@ -1235,7 +1235,7 @@ function questionnaire_get_completion_state($cm, $userid, $type) { global $DB; // Get questionnaire details. - $questionnaire = $DB->get_record('questionnaire', array('id' => $cm->instance), '*', MUST_EXIST); + $questionnaire = $DB->get_record('questionnaire', ['id' => $cm->instance], '*', MUST_EXIST); // If completion option is enabled, evaluate it and return true/false. if ($questionnaire->completionsubmit) { diff --git a/locallib.php b/locallib.php index 4ed962ec..0dc9fe2f 100644 --- a/locallib.php +++ b/locallib.php @@ -48,33 +48,33 @@ define('QUESTIONNAIRE_DEFAULT_PAGE_COUNT', 20); global $questionnairetypes; -$questionnairetypes = array (QUESTIONNAIREUNLIMITED => get_string('qtypeunlimited', 'questionnaire'), +$questionnairetypes = [QUESTIONNAIREUNLIMITED => get_string('qtypeunlimited', 'questionnaire'), QUESTIONNAIREONCE => get_string('qtypeonce', 'questionnaire'), QUESTIONNAIREDAILY => get_string('qtypedaily', 'questionnaire'), QUESTIONNAIREWEEKLY => get_string('qtypeweekly', 'questionnaire'), - QUESTIONNAIREMONTHLY => get_string('qtypemonthly', 'questionnaire')); + QUESTIONNAIREMONTHLY => get_string('qtypemonthly', 'questionnaire'), ]; global $questionnairerespondents; -$questionnairerespondents = array ('fullname' => get_string('respondenttypefullname', 'questionnaire'), - 'anonymous' => get_string('respondenttypeanonymous', 'questionnaire')); +$questionnairerespondents = ['fullname' => get_string('respondenttypefullname', 'questionnaire'), + 'anonymous' => get_string('respondenttypeanonymous', 'questionnaire'), ]; global $questionnairerealms; -$questionnairerealms = array ('private' => get_string('private', 'questionnaire'), +$questionnairerealms = ['private' => get_string('private', 'questionnaire'), 'public' => get_string('public', 'questionnaire'), - 'template' => get_string('template', 'questionnaire')); + 'template' => get_string('template', 'questionnaire'), ]; global $questionnaireresponseviewers; -$questionnaireresponseviewers = array ( +$questionnaireresponseviewers = [ QUESTIONNAIRE_STUDENTVIEWRESPONSES_WHENANSWERED => get_string('responseviewstudentswhenanswered', 'questionnaire'), QUESTIONNAIRE_STUDENTVIEWRESPONSES_WHENCLOSED => get_string('responseviewstudentswhenclosed', 'questionnaire'), QUESTIONNAIRE_STUDENTVIEWRESPONSES_ALWAYS => get_string('responseviewstudentsalways', 'questionnaire'), - QUESTIONNAIRE_STUDENTVIEWRESPONSES_NEVER => get_string('responseviewstudentsnever', 'questionnaire')); + QUESTIONNAIRE_STUDENTVIEWRESPONSES_NEVER => get_string('responseviewstudentsnever', 'questionnaire'), ]; global $autonumbering; -$autonumbering = array (0 => get_string('autonumberno', 'questionnaire'), +$autonumbering = [0 => get_string('autonumberno', 'questionnaire'), 1 => get_string('autonumberquestions', 'questionnaire'), 2 => get_string('autonumberpages', 'questionnaire'), - 3 => get_string('autonumberpagesandquestions', 'questionnaire')); + 3 => get_string('autonumberpagesandquestions', 'questionnaire'), ]; /** * Return the choice values for the content. @@ -138,7 +138,7 @@ function questionnaire_get_js_module() { 'name' => 'mod_questionnaire', 'fullpath' => '/mod/questionnaire/module.js', 'requires' => ['base', 'dom', 'event-delegate', 'event-key', - 'core_question_engine', 'moodle-core-formchangechecker'], + 'core_question_engine', 'moodle-core-formchangechecker', ], 'strings' => [ ['cancel', 'moodle'], ['flagged', 'question'], @@ -177,7 +177,7 @@ function questionnaire_get_user_responses($questionnaireid, $userid, $complete=t WHERE questionnaireid = ? AND userid = ? ".$andcomplete." - ORDER BY submitted ASC ", array($questionnaireid, $userid)) ?? []; + ORDER BY submitted ASC ", [$questionnaireid, $userid]) ?? []; } /** @@ -317,15 +317,15 @@ function questionnaire_delete_response($response, $questionnaire='') { } // Delete all of the response data for a response. - $DB->delete_records('questionnaire_response_bool', array('response_id' => $rid)); - $DB->delete_records('questionnaire_response_date', array('response_id' => $rid)); - $DB->delete_records('questionnaire_resp_multiple', array('response_id' => $rid)); - $DB->delete_records('questionnaire_response_other', array('response_id' => $rid)); - $DB->delete_records('questionnaire_response_rank', array('response_id' => $rid)); - $DB->delete_records('questionnaire_resp_single', array('response_id' => $rid)); - $DB->delete_records('questionnaire_response_text', array('response_id' => $rid)); + $DB->delete_records('questionnaire_response_bool', ['response_id' => $rid]); + $DB->delete_records('questionnaire_response_date', ['response_id' => $rid]); + $DB->delete_records('questionnaire_resp_multiple', ['response_id' => $rid]); + $DB->delete_records('questionnaire_response_other', ['response_id' => $rid]); + $DB->delete_records('questionnaire_response_rank', ['response_id' => $rid]); + $DB->delete_records('questionnaire_resp_single', ['response_id' => $rid]); + $DB->delete_records('questionnaire_response_text', ['response_id' => $rid]); - $status = $status && $DB->delete_records('questionnaire_response', array('id' => $rid)); + $status = $status && $DB->delete_records('questionnaire_response', ['id' => $rid]); if ($status && $cm) { // Update completion state if necessary. @@ -437,7 +437,7 @@ function questionnaire_get_survey_list($courseid=0, $type='') { function questionnaire_get_survey_select($courseid=0, $type='') { global $OUTPUT, $DB; - $surveylist = array(); + $surveylist = []; if ($surveys = questionnaire_get_survey_list($courseid, $type)) { $strpreview = get_string('preview_questionnaire', 'questionnaire'); @@ -462,7 +462,7 @@ function questionnaire_get_survey_select($courseid=0, $type='') { $link = new moodle_url("/mod/questionnaire/preview.php?{$args}"); $action = new popup_action('click', $link); $label = $OUTPUT->action_link($link, $survey->qname.' ['.$originalcourse->fullname.']', - $action, array('title' => $strpreview)); + $action, ['title' => $strpreview]); $surveylist[$type.'-'.$survey->id] = $label; } } @@ -515,7 +515,7 @@ function questionnaire_get_type ($id) { function questionnaire_set_events($questionnaire) { // Adding the questionnaire to the eventtable. global $DB; - if ($events = $DB->get_records('event', array('modulename' => 'questionnaire', 'instance' => $questionnaire->id))) { + if ($events = $DB->get_records('event', ['modulename' => 'questionnaire', 'instance' => $questionnaire->id])) { foreach ($events as $event) { $event = calendar_event::load($event); $event->delete(); @@ -592,7 +592,7 @@ function questionnaire_get_incomplete_users($cm, $sid, $allusers = array_keys($allusers); // Nnow get all completed questionnaires. - $params = array('questionnaireid' => $cm->instance, 'complete' => 'y'); + $params = ['questionnaireid' => $cm->instance, 'complete' => 'y']; $sql = "SELECT userid FROM {questionnaire_response} " . "WHERE questionnaireid = :questionnaireid AND complete = :complete " . "GROUP BY userid "; @@ -617,14 +617,14 @@ function questionnaire_get_incomplete_users($cm, $sid, * @return array */ function questionnaire_get_editor_options($context) { - return array( + return [ 'subdirs' => 0, 'maxbytes' => 0, 'maxfiles' => -1, 'context' => $context, 'noclean' => 0, - 'trusttext' => 0 - ); + 'trusttext' => 0, + ]; } /** @@ -635,7 +635,7 @@ function questionnaire_get_editor_options($context) { function questionnaire_get_parent ($question) { global $DB; $qid = $question->id; - $parent = array(); + $parent = []; $dependquestion = $DB->get_record('questionnaire_question', ['id' => $question->dependquestionid], 'id, position, name, type_id'); if (is_object($dependquestion)) { @@ -688,7 +688,7 @@ function questionnaire_get_parent ($question) { * @return array An array with Child-ID->Parentposition. */ function questionnaire_get_parent_positions ($questions) { - $parentpositions = array(); + $parentpositions = []; foreach ($questions as $question) { foreach ($question->dependencies as $dependency) { $dependquestion = $dependency->dependquestionid; @@ -716,7 +716,7 @@ function questionnaire_get_parent_positions ($questions) { * @return array An array with Parent-ID->Childposition. */ function questionnaire_get_child_positions ($questions) { - $childpositions = array(); + $childpositions = []; foreach ($questions as $question) { foreach ($question->dependencies as $dependency) { $dependquestion = $dependency->dependquestionid; @@ -746,10 +746,10 @@ function questionnaire_check_page_breaks($questionnaire) { global $DB; $msg = ''; // Store the new page breaks ids. - $newpbids = array(); + $newpbids = []; $delpb = 0; $sid = $questionnaire->survey->id; - $positions = array(); + $positions = []; if ($questions = $DB->get_records('questionnaire_question', ['surveyid' => $sid, 'deleted' => 'n'], 'position')) { foreach ($questions as $key => $qu) { $newqu = new stdClass(); @@ -885,8 +885,8 @@ function questionnaire_prep_for_questionform($questionnaire, $qid, $qtype) { $question->id = $questionnaire->cm->id; $draftideditor = file_get_submitted_draft_itemid('question'); $content = file_prepare_draft_area($draftideditor, $context->id, 'mod_questionnaire', 'question', - $qid, array('subdirs' => true), $question->content); - $question->content = array('text' => $content, 'format' => FORMAT_HTML, 'itemid' => $draftideditor); + $qid, ['subdirs' => true], $question->content); + $question->content = ['text' => $content, 'format' => FORMAT_HTML, 'itemid' => $draftideditor]; if (isset($question->dependencies)) { foreach ($question->dependencies as $dependencies) { @@ -907,8 +907,8 @@ function questionnaire_prep_for_questionform($questionnaire, $qid, $qtype) { $question->type = ''; $draftideditor = file_get_submitted_draft_itemid('question'); $content = file_prepare_draft_area($draftideditor, $context->id, 'mod_questionnaire', 'question', - null, array('subdirs' => true), ''); - $question->content = array('text' => $content, 'format' => FORMAT_HTML, 'itemid' => $draftideditor); + null, ['subdirs' => true], ''); + $question->content = ['text' => $content, 'format' => FORMAT_HTML, 'itemid' => $draftideditor]; } return $question; } @@ -927,19 +927,19 @@ function questionnaire_get_standard_page_items($id = null, $a = null) { throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } - if (! $course = $DB->get_record("course", array("id" => $cm->course))) { + if (! $course = $DB->get_record("course", ["id" => $cm->course])) { throw new \moodle_exception('coursemisconf', 'mod_questionnaire'); } - if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $cm->instance))) { + if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $cm->instance])) { throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } } else { - if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $a))) { + if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $a])) { throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } - if (! $course = $DB->get_record("course", array("id" => $questionnaire->course))) { + if (! $course = $DB->get_record("course", ["id" => $questionnaire->course])) { throw new \moodle_exception('coursemisconf', 'mod_questionnaire'); } if (! $cm = get_coursemodule_from_instance("questionnaire", $questionnaire->id, $course->id)) { @@ -947,7 +947,7 @@ function questionnaire_get_standard_page_items($id = null, $a = null) { } } - return (array($cm, $course, $questionnaire)); + return ([$cm, $course, $questionnaire]); } @@ -994,7 +994,7 @@ function questionnaire_delete_old_responses() { $responsetables = [ 'questionnaire_response_bool', 'questionnaire_response_date', 'questionnaire_resp_multiple', 'questionnaire_response_other', 'questionnaire_response_rank', 'questionnaire_resp_single', - 'questionnaire_response_text']; + 'questionnaire_response_text', ]; // Delete related response data. foreach ($responsetables as $tablename) { diff --git a/mod_form.php b/mod_form.php index 3dbab2fa..9280e685 100644 --- a/mod_form.php +++ b/mod_form.php @@ -43,7 +43,7 @@ protected function definition() { $mform->addElement('header', 'general', get_string('general', 'form')); - $mform->addElement('text', 'name', get_string('name', 'questionnaire'), array('size' => '64')); + $mform->addElement('text', 'name', get_string('name', 'questionnaire'), ['size' => '64']); $mform->setType('name', PARAM_TEXT); $mform->addRule('name', null, 'required', null, 'client'); @@ -67,16 +67,16 @@ protected function definition() { $mform->addElement('select', 'resp_view', get_string('responseview', 'questionnaire'), $questionnaireresponseviewers); $mform->addHelpButton('resp_view', 'responseview', 'questionnaire'); - $notificationoptions = array(0 => get_string('no'), 1 => get_string('notificationsimple', 'questionnaire'), - 2 => get_string('notificationfull', 'questionnaire')); + $notificationoptions = [0 => get_string('no'), 1 => get_string('notificationsimple', 'questionnaire'), + 2 => get_string('notificationfull', 'questionnaire'), ]; $mform->addElement('select', 'notifications', get_string('notifications', 'questionnaire'), $notificationoptions); $mform->addHelpButton('notifications', 'notifications', 'questionnaire'); - $options = array('0' => get_string('no'), '1' => get_string('yes')); + $options = ['0' => get_string('no'), '1' => get_string('yes')]; $mform->addElement('select', 'resume', get_string('resume', 'questionnaire'), $options); $mform->addHelpButton('resume', 'resume', 'questionnaire'); - $options = array('0' => get_string('no'), '1' => get_string('yes')); + $options = ['0' => get_string('no'), '1' => get_string('yes')]; $mform->addElement('select', 'navigate', get_string('navigate', 'questionnaire'), $options); $mform->addHelpButton('navigate', 'navigate', 'questionnaire'); @@ -183,7 +183,7 @@ public function data_preprocessing(&$defaultvalues) { if (!empty($defaultvalues['respondenttype']) && $defaultvalues['respondenttype'] == "anonymous") { // If this questionnaire has responses. $numresp = $DB->count_records('questionnaire_response', - array('questionnaireid' => $defaultvalues['instance'], 'complete' => 'y')); + ['questionnaireid' => $defaultvalues['instance'], 'complete' => 'y']); if ($numresp) { $defaultvalues['cannotchangerespondenttype'] = 1; } diff --git a/myreport.php b/myreport.php index ea8dea75..9b62ab0f 100644 --- a/myreport.php +++ b/myreport.php @@ -23,6 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * */ + require_once("../../config.php"); require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php'); @@ -33,10 +34,10 @@ $action = optional_param('action', 'summary', PARAM_ALPHA); $currentgroupid = optional_param('group', 0, PARAM_INT); // Groupid. -if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $instance))) { +if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $instance])) { throw new \moodle_exception('incorrectquestionnaire', 'mod_questionnaire'); } -if (! $course = $DB->get_record("course", array("id" => $questionnaire->course))) { +if (! $course = $DB->get_record("course", ["id" => $questionnaire->course])) { throw new \moodle_exception('coursemisconf', 'mod_questionnaire'); } if (! $cm = get_coursemodule_from_instance("questionnaire", $questionnaire->id, $course->id)) { @@ -51,7 +52,7 @@ || $userid != $USER->id) { throw new \moodle_exception('nopermissions', 'mod_questionnaire'); } -$url = new moodle_url($CFG->wwwroot.'/mod/questionnaire/myreport.php', array('instance' => $instance)); +$url = new moodle_url($CFG->wwwroot.'/mod/questionnaire/myreport.php', ['instance' => $instance]); if (isset($userid)) { $url->param('userid', $userid); } @@ -251,7 +252,7 @@ $userresps = $resps; $questionnaire->survey_results_navbar_student ($rid, $userid, $instance, $userresps); } - $resps = array(); + $resps = []; // Determine here which "global" responses should get displayed for comparison with current user. // Current user is viewing his own group's results. if (isset($currentgroupresps)) { diff --git a/preview.php b/preview.php index 49245e3e..fc0fe3fc 100644 --- a/preview.php +++ b/preview.php @@ -37,15 +37,15 @@ throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } - if (! $course = $DB->get_record("course", array("id" => $cm->course))) { + if (! $course = $DB->get_record("course", ["id" => $cm->course])) { throw new \moodle_exception('coursemisconf', 'mod_questionnaire'); } - if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $cm->instance))) { + if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $cm->instance])) { throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } } else { - if (! $survey = $DB->get_record("questionnaire_survey", array("id" => $sid))) { + if (! $survey = $DB->get_record("questionnaire_survey", ["id" => $sid])) { throw new \moodle_exception('surveynotexists', 'mod_questionnaire'); } if (! $course = $DB->get_record("course", ["id" => $survey->courseid])) { @@ -138,14 +138,14 @@ $title = get_string('printblanktooltip', 'questionnaire'); $url = '/mod/questionnaire/print.php?qid='.$questionnaire->id.'&rid=0&'.'courseid='. $questionnaire->course->id.'&sec=1'; - $options = array('menubar' => true, 'location' => false, 'scrollbars' => true, 'resizable' => true, - 'height' => 600, 'width' => 800, 'title' => $title); + $options = ['menubar' => true, 'location' => false, 'scrollbars' => true, 'resizable' => true, + 'height' => 600, 'width' => 800, 'title' => $title, ]; $name = 'popup'; $link = new moodle_url($url); $action = new popup_action('click', $link, $name, $options); $class = "floatprinticon"; $questionnaire->page->add_to_page('printblank', - $questionnaire->renderer->action_link($link, $linkname, $action, array('class' => $class, 'title' => $title), + $questionnaire->renderer->action_link($link, $linkname, $action, ['class' => $class, 'title' => $title], new pix_icon('t/print', $title))); } $questionnaire->survey_print_render($course->id, '', 'preview', $rid = 0, $popup); @@ -159,9 +159,9 @@ $context = context_module::instance($questionnaire->cm->id); $anonymous = $questionnaire->respondenttype == 'anonymous'; -$event = \mod_questionnaire\event\questionnaire_previewed::create(array( +$event = \mod_questionnaire\event\questionnaire_previewed::create([ 'objectid' => $questionnaire->id, 'anonymous' => $anonymous, - 'context' => $context -)); + 'context' => $context, +]); $event->trigger(); diff --git a/print.php b/print.php index c5b49a49..ee1ba995 100644 --- a/print.php +++ b/print.php @@ -23,6 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * */ + require_once("../../config.php"); require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php'); @@ -33,10 +34,10 @@ $null = null; $referer = $CFG->wwwroot.'/mod/questionnaire/report.php'; -if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $qid))) { +if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $qid])) { throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } -if (! $course = $DB->get_record("course", array("id" => $questionnaire->course))) { +if (! $course = $DB->get_record("course", ["id" => $questionnaire->course])) { throw new \moodle_exception('coursemisconf', 'mod_questionnaire'); } if (! $cm = get_coursemodule_from_instance("questionnaire", $questionnaire->id, $course->id)) { diff --git a/qsettings.php b/qsettings.php index 16179ab0..8c3bf411 100644 --- a/qsettings.php +++ b/qsettings.php @@ -34,11 +34,11 @@ throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } -if (! $course = $DB->get_record("course", array("id" => $cm->course))) { +if (! $course = $DB->get_record("course", ["id" => $cm->course])) { throw new \moodle_exception('coursemisconf', 'mod_questionnaire'); } -if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $cm->instance))) { +if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $cm->instance])) { throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } @@ -46,7 +46,7 @@ require_course_login($course, true, $cm); $context = context_module::instance($cm->id); -$url = new moodle_url($CFG->wwwroot.'/mod/questionnaire/qsettings.php', array('id' => $id)); +$url = new moodle_url($CFG->wwwroot.'/mod/questionnaire/qsettings.php', ['id' => $id]); $PAGE->set_url($url); $PAGE->set_context($context); if (!isset($SESSION->questionnaire)) { @@ -71,13 +71,13 @@ $draftideditor = file_get_submitted_draft_itemid('info'); $currentinfo = file_prepare_draft_area($draftideditor, $context->id, 'mod_questionnaire', 'info', - $sdata->sid, array('subdirs' => true), $questionnaire->survey->info); -$sdata->info = array('text' => $currentinfo, 'format' => FORMAT_HTML, 'itemid' => $draftideditor); + $sdata->sid, ['subdirs' => true], $questionnaire->survey->info); +$sdata->info = ['text' => $currentinfo, 'format' => FORMAT_HTML, 'itemid' => $draftideditor]; $draftideditor = file_get_submitted_draft_itemid('thankbody'); $currentinfo = file_prepare_draft_area($draftideditor, $context->id, 'mod_questionnaire', 'thankbody', - $sdata->sid, array('subdirs' => true), $questionnaire->survey->thank_body); -$sdata->thank_body = array('text' => $currentinfo, 'format' => FORMAT_HTML, 'itemid' => $draftideditor); + $sdata->sid, ['subdirs' => true], $questionnaire->survey->thank_body); +$sdata->thank_body = ['text' => $currentinfo, 'format' => FORMAT_HTML, 'itemid' => $draftideditor]; $settingsform->set_data($sdata); @@ -97,7 +97,7 @@ $sdata->infoformat = $settings->info['format']; $sdata->info = $settings->info['text']; $sdata->info = file_save_draft_area_files($sdata->infoitemid, $context->id, 'mod_questionnaire', 'info', - $sdata->id, array('subdirs' => true), $sdata->info); + $sdata->id, ['subdirs' => true], $sdata->info); $sdata->theme = ''; // Deprecated theme field. $sdata->thanks_page = $settings->thanks_page; @@ -107,7 +107,7 @@ $sdata->thankformat = $settings->thank_body['format']; $sdata->thank_body = $settings->thank_body['text']; $sdata->thank_body = file_save_draft_area_files($sdata->thankitemid, $context->id, 'mod_questionnaire', 'thankbody', - $sdata->id, array('subdirs' => true), $sdata->thank_body); + $sdata->id, ['subdirs' => true], $sdata->thank_body); $sdata->email = $settings->email; $sdata->courseid = $settings->courseid; diff --git a/questionnaire.class.php b/questionnaire.class.php index 8476c204..dd71c3d8 100644 --- a/questionnaire.class.php +++ b/questionnaire.class.php @@ -69,7 +69,7 @@ public function __construct(&$course, &$cm, $id = 0, $questionnaire = null, $add global $DB; if ($id) { - $questionnaire = $DB->get_record('questionnaire', array('id' => $id)); + $questionnaire = $DB->get_record('questionnaire', ['id' => $id]); } if (is_object($questionnaire)) { @@ -114,7 +114,7 @@ public function add_survey($sid = 0, $survey = null) { global $DB; if ($sid) { - $this->survey = $DB->get_record('questionnaire_survey', array('id' => $sid)); + $this->survey = $DB->get_record('questionnaire_survey', ['id' => $sid]); } else if (is_object($survey)) { $this->survey = clone($survey); } @@ -305,13 +305,13 @@ public function view() { // Log this submitted response. Note this removes the anonymity in the logged event. $context = context_module::instance($this->cm->id); $anonymous = $this->respondenttype == 'anonymous'; - $params = array( + $params = [ 'context' => $context, 'courseid' => $this->course->id, 'relateduserid' => $USER->id, 'anonymous' => $anonymous, - 'other' => array('questionnaireid' => $this->id) - ); + 'other' => ['questionnaireid' => $this->id], + ]; $event = \mod_questionnaire\event\attempt_submitted::create($params); $event->trigger(); @@ -364,7 +364,7 @@ public function commit_submission_response($rid, $quser) { 'courseid' => $this->course->id, 'relateduserid' => $quser, 'anonymous' => $anonymous, - 'other' => array('questionnaireid' => $this->id) + 'other' => ['questionnaireid' => $this->id], ]; $event = \mod_questionnaire\event\attempt_submitted::create($params); $event->trigger(); @@ -653,7 +653,7 @@ public function can_view_response($rid) { global $USER, $DB; if (!empty($rid)) { - $response = $DB->get_record('questionnaire_response', array('id' => $rid)); + $response = $DB->get_record('questionnaire_response', ['id' => $rid]); // If the response was not found, can't view it. if (empty($response)) { @@ -1176,6 +1176,7 @@ public function print_survey($quser, $userid=false) { $msg = ''; $action = $CFG->wwwroot.'/mod/questionnaire/complete.php?id='.$this->cm->id; + // phpcs:disable moodle.Commenting.TodoComment // TODO - Need to rework this. Too much crossover with ->view method. // Skip logic :: if this is page 1, it cannot be the end page with no questions on it! @@ -1250,17 +1251,18 @@ public function print_survey($quser, $userid=false) { $formdatareferer = !empty($formdata->referer) ? htmlspecialchars($formdata->referer) : ''; $formdatarid = isset($formdata->rid) ? $formdata->rid : '0'; $this->page->add_to_page('formstart', $this->renderer->complete_formstart($action, ['referer' => $formdatareferer, - 'a' => $this->id, 'sid' => $this->survey->id, 'rid' => $formdatarid, 'sec' => $formdata->sec, 'sesskey' => sesskey()])); + 'a' => $this->id, 'sid' => $this->survey->id, 'rid' => $formdatarid, 'sec' => $formdata->sec, + 'sesskey' => sesskey(), ])); if (isset($this->questions) && $numsections) { // Sanity check. $this->survey_render($formdata, $formdata->sec, $msg); $controlbuttons = []; if ($formdata->sec > 1) { $controlbuttons['prev'] = ['type' => 'submit', 'class' => 'btn btn-secondary control-button-prev', - 'value' => '<< '.get_string('previouspage', 'questionnaire')]; + 'value' => '<< '.get_string('previouspage', 'questionnaire'), ]; } if ($this->resume) { $controlbuttons['resume'] = ['type' => 'submit', 'class' => 'btn btn-secondary control-button-save', - 'value' => get_string('save_and_exit', 'questionnaire')]; + 'value' => get_string('save_and_exit', 'questionnaire'), ]; } // Add a 'hidden' variable for the mod's 'view.php', and use a language variable for the submit button. @@ -1268,10 +1270,10 @@ public function print_survey($quser, $userid=false) { if ($formdata->sec == $numsections) { $controlbuttons['submittype'] = ['type' => 'hidden', 'value' => 'Submit Survey']; $controlbuttons['submit'] = ['type' => 'submit', 'class' => 'btn btn-primary control-button-submit', - 'value' => get_string('submitsurvey', 'questionnaire')]; + 'value' => get_string('submitsurvey', 'questionnaire'), ]; } else { $controlbuttons['next'] = ['type' => 'submit', 'class' => 'btn btn-secondary control-button-next', - 'value' => get_string('nextpage', 'questionnaire').' >>']; + 'value' => get_string('nextpage', 'questionnaire').' >>', ]; } $this->page->add_to_page('controlbuttons', $this->renderer->complete_controlbuttons($controlbuttons)); } else { @@ -1371,7 +1373,7 @@ private function print_survey_start($message, $section, $numsections, $hasrequir // Available group modes (0 = no groups; 1 = separate groups; 2 = visible groups). if ($rid) { $courseid = $this->course->id; - if ($resp = $DB->get_record('questionnaire_response', array('id' => $rid)) ) { + if ($resp = $DB->get_record('questionnaire_response', ['id' => $rid]) ) { if ($this->respondenttype == 'fullname') { $userid = $resp->userid; // Display name of group(s) that student belongs to... if questionnaire is set to Groups separate or visible. @@ -1393,13 +1395,13 @@ private function print_survey_start($message, $section, $numsections, $hasrequir } } - $params = array( + $params = [ 'objectid' => $this->survey->id, 'context' => $this->context, 'courseid' => $this->course->id, 'relateduserid' => $userid, - 'other' => array('action' => 'vresp', 'currentgroupid' => $currentgroupid, 'rid' => $rid) - ); + 'other' => ['action' => 'vresp', 'currentgroupid' => $currentgroupid, 'rid' => $rid], + ]; $event = \mod_questionnaire\event\response_viewed::create($params); $event->trigger(); } @@ -1408,7 +1410,7 @@ private function print_survey_start($message, $section, $numsections, $hasrequir $ruser = ''; if ($resp && !$blankquestionnaire) { if ($userid) { - if ($user = $DB->get_record('user', array('id' => $userid))) { + if ($user = $DB->get_record('user', ['id' => $userid])) { $ruser = fullname($user); } } @@ -1433,7 +1435,7 @@ private function print_survey_start($message, $section, $numsections, $hasrequir 'instance' => $this->id, 'target' => 'pdf', 'individualresponse' => 1, - 'rid' => $rid + 'rid' => $rid, ] ); $downpdficon = new pix_icon('b/pdfdown', $linkname, 'mod_questionnaire'); @@ -1445,7 +1447,7 @@ private function print_survey_start($message, $section, $numsections, $hasrequir ['action' => 'vresp', 'instance' => $this->id, 'target' => 'print', 'individualresponse' => 1, 'rid' => $rid]); $htmlicon = new pix_icon('t/print', $linkname); $options = ['menubar' => true, 'location' => false, 'scrollbars' => true, 'resizable' => true, - 'height' => 600, 'width' => 800, 'title' => $linkname]; + 'height' => 600, 'width' => 800, 'title' => $linkname, ]; $name = 'popup'; $action = new popup_action('click', $link, $name, $options); $respinfo .= $this->renderer->action_link($link, null, $action, ['title' => $linkname], $htmlicon) . ' '; @@ -1475,14 +1477,14 @@ private function print_survey_start($message, $section, $numsections, $hasrequir $linkname = ' '.get_string('printblank', 'questionnaire'); $title = get_string('printblanktooltip', 'questionnaire'); $url = '/mod/questionnaire/print.php?qid='.$this->id.'&rid=0&'.'courseid='.$this->course->id.'&sec=1'; - $options = array('menubar' => true, 'location' => false, 'scrollbars' => true, 'resizable' => true, - 'height' => 600, 'width' => 800, 'title' => $title); + $options = ['menubar' => true, 'location' => false, 'scrollbars' => true, 'resizable' => true, + 'height' => 600, 'width' => 800, 'title' => $title, ]; $name = 'popup'; $link = new moodle_url($url); $action = new popup_action('click', $link, $name, $options); $class = "floatprinticon"; $this->page->add_to_page('printblank', - $this->renderer->action_link($link, $linkname, $action, array('class' => $class, 'title' => $title), + $this->renderer->action_link($link, $linkname, $action, ['class' => $class, 'title' => $title], new pix_icon('t/print', $title))); } if ($section == 1) { @@ -1537,7 +1539,7 @@ private function print_survey_end($section, $numsections) { public function survey_print_render($courseid, $message = '', $referer='', $rid=0, $blankquestionnaire=false) { global $DB, $CFG; - if (! $course = $DB->get_record("course", array("id" => $courseid))) { + if (! $course = $DB->get_record("course", ["id" => $courseid])) { throw new \moodle_exception('incorrectcourseid', 'mod_questionnaire'); } @@ -1651,13 +1653,14 @@ public function survey_print_render($courseid, $message = '', $referer='', $rid= public function survey_update($sdata) { global $DB; + // phpcs:disable moodle.Commenting.TodoComment $errstr = ''; // TODO: notused! // New survey. if (empty($this->survey->id)) { // Create a new survey in the database. - $fields = array('name', 'realm', 'title', 'subtitle', 'email', 'theme', 'thanks_page', 'thank_head', - 'thank_body', 'feedbacknotes', 'info', 'feedbacksections', 'feedbackscores', 'chart_type'); + $fields = ['name', 'realm', 'title', 'subtitle', 'email', 'theme', 'thanks_page', 'thank_head', + 'thank_body', 'feedbacknotes', 'info', 'feedbacksections', 'feedbackscores', 'chart_type', ]; // Theme field deprecated. $record = new stdClass(); $record->id = 0; @@ -1673,6 +1676,7 @@ public function survey_update($sdata) { $this->add_survey($this->survey->id); if (!$this->survey->id) { + // phpcs:disable moodle.Commenting.TodoComment $errstr = get_string('errnewname', 'questionnaire') .' [ : ]'; // TODO: notused! return(false); } @@ -1684,14 +1688,15 @@ public function survey_update($sdata) { $sdata->chart_type = ''; } - $fields = array('name', 'realm', 'title', 'subtitle', 'email', 'theme', 'thanks_page', - 'thank_head', 'thank_body', 'feedbacknotes', 'info', 'feedbacksections', 'feedbackscores', 'chart_type'); - $name = $DB->get_field('questionnaire_survey', 'name', array('id' => $this->survey->id)); + $fields = ['name', 'realm', 'title', 'subtitle', 'email', 'theme', 'thanks_page', + 'thank_head', 'thank_body', 'feedbacknotes', 'info', 'feedbacksections', 'feedbackscores', 'chart_type', ]; + $name = $DB->get_field('questionnaire_survey', 'name', ['id' => $this->survey->id]); // Trying to change survey name. if (trim($name) != trim(stripslashes($sdata->name))) { // Var $sdata will already have slashes added to it. - $count = $DB->count_records('questionnaire_survey', array('name' => $sdata->name)); + $count = $DB->count_records('questionnaire_survey', ['name' => $sdata->name]); if ($count != 0) { + // phpcs:disable moodle.Commenting.TodoComment $errstr = get_string('errnewname', 'questionnaire'); // TODO: notused! return(false); } @@ -1708,6 +1713,7 @@ public function survey_update($sdata) { $result = $DB->update_record('questionnaire_survey', $surveyrecord); if (!$result) { + // phpcs:disable moodle.Commenting.TodoComment $errstr = get_string('warning', 'questionnaire').' [ : ]'; // TODO: notused! return(false); } @@ -1738,7 +1744,7 @@ public function survey_copy($owner) { // Check for 'name' conflict, and resolve. $i = 0; $name = $survey->name; - while ($DB->count_records('questionnaire_survey', array('name' => $name)) > 0) { + while ($DB->count_records('questionnaire_survey', ['name' => $name]) > 0) { $name = $survey->name.(++$i); } if ($i) { @@ -1753,8 +1759,8 @@ public function survey_copy($owner) { // Make copies of all the questions. $pos = 1; // Skip logic: some changes needed here for dependencies down below. - $qidarray = array(); - $cidarray = array(); + $qidarray = []; + $cidarray = []; foreach ($this->questions as $question) { // Fix some fields first. $oldid = $question->id; @@ -1802,6 +1808,7 @@ public function survey_copy($owner) { } // Replicate any feedback data. + // phpcs:disable moodle.Commenting.TodoComment // TODO: Need to handle image attachments (same for other copies above). if ($fbsections = $DB->get_records('questionnaire_fb_sections', ['surveyid' => $this->survey->id], 'id')) { foreach ($fbsections as $fbsid => $fbsection) { @@ -1929,7 +1936,7 @@ private function response_delete($rid, $sec = null) { $sec = min($numsections , $sec); /* get question_id's in this section */ - $qids = array(); + $qids = []; foreach ($this->questionsbysec[$sec] as $questionid) { $qids[] = $questionid; } @@ -1943,13 +1950,13 @@ private function response_delete($rid, $sec = null) { } else { /* delete all */ $qsql = ''; - $params = array(); + $params = []; } /* delete values */ $select = 'response_id = \'' . $rid . '\' ' . $qsql; - foreach (array('response_bool', 'resp_single', 'resp_multiple', 'response_rank', 'response_text', - 'response_other', 'response_date') as $tbl) { + foreach (['response_bool', 'resp_single', 'resp_multiple', 'response_rank', 'response_text', + 'response_other', 'response_date', ] as $tbl) { $DB->delete_records_select('questionnaire_'.$tbl, $select, $params); } } @@ -2019,14 +2026,14 @@ private function response_select_max_pos($rid) { $max = 0; - foreach (array('response_bool', 'resp_single', 'resp_multiple', 'response_rank', 'response_text', - 'response_other', 'response_date') as $tbl) { + foreach (['response_bool', 'resp_single', 'resp_multiple', 'response_rank', 'response_text', + 'response_other', 'response_date', ] as $tbl) { $sql = 'SELECT MAX(q.position) as num FROM {questionnaire_'.$tbl.'} a, {questionnaire_question} q '. 'WHERE a.response_id = ? AND '. 'q.id = a.question_id AND '. 'q.surveyid = ? AND '. 'q.deleted = \'n\''; - if ($record = $DB->get_record_sql($sql, array($rid, $this->sid))) { + if ($record = $DB->get_record_sql($sql, [$rid, $this->sid])) { $newmax = (int)$record->num; if ($newmax > $max) { $max = $newmax; @@ -2315,7 +2322,7 @@ private function get_formatted_answers_for_emails($answers) { reset($answers); - $formatted = array('plaintext' => '', 'html' => ''); + $formatted = ['plaintext' => '', 'html' => '']; for ($i = 0; $i < count($answers[0]); $i++) { $sep = ' : '; @@ -2427,13 +2434,13 @@ public function response_insert($responsedata, $userid, $resume=false) { // Needed for the event logging. $context = context_module::instance($this->cm->id); $anonymous = $this->respondenttype == 'anonymous'; - $params = array( + $params = [ 'context' => $context, 'courseid' => $this->course->id, 'relateduserid' => $userid, 'anonymous' => $anonymous, - 'other' => array('questionnaireid' => $this->id) - ); + 'other' => ['questionnaireid' => $this->id], + ]; $event = \mod_questionnaire\event\attempt_saved::create($params); $event->trigger(); } @@ -2525,6 +2532,7 @@ private function response_goto_thankyou() { format_text(file_rewrite_pluginfile_urls($thankbody, 'pluginfile.php', $this->context->id, 'mod_questionnaire', 'thankbody', $this->survey->id), FORMAT_HTML, ['noclean' => true])); // Default set currentgroup to view all participants. + // phpcs:disable moodle.Commenting.TodoComment // TODO why not set to current respondent's groupid (if any)? $currentgroupid = 0; $currentgroupid = groups_get_activity_group($this->cm); @@ -2533,7 +2541,7 @@ private function response_goto_thankyou() { } if ($this->capabilities->readownresponses) { $url = new moodle_url('myreport.php', ['id' => $this->cm->id, 'instance' => $this->cm->instance, 'user' => $USER->id, - 'byresponse' => 0, 'action' => 'vresp']); + 'byresponse' => 0, 'action' => 'vresp', ]); $this->page->add_to_page('continue', $this->renderer->single_button($url, get_string('continue'))); } else { $url = new moodle_url('/course/view.php', ['id' => $this->course->id]); @@ -2600,18 +2608,18 @@ public function survey_results_navbar_alpha($currrid, $currentgroupid, $cm, $byr if ($total === 0) { return; } - $rids = array(); + $rids = []; if ($isfullname) { - $ridssub = array(); - $ridsuserfullname = array(); - $ridsuserid = array(); + $ridssub = []; + $ridsuserfullname = []; + $ridsuserid = []; } $i = 0; $currpos = -1; foreach ($responses as $response) { array_push($rids, $response->id); if ($isfullname) { - $user = $DB->get_record('user', array('id' => $response->userid)); + $user = $DB->get_record('user', ['id' => $response->userid]); array_push($ridssub, $response->submitted); array_push($ridsuserfullname, fullname($user)); array_push($ridsuserid, $response->userid); @@ -2677,8 +2685,8 @@ public function survey_results_navbar_alpha($currrid, $currentgroupid, $cm, $byr $url = '/mod/questionnaire/print.php?qid='.$this->id.'&rid='.$currrid. '&courseid='.$this->course->id.'&sec=1'; $title = get_string('printtooltip', 'questionnaire'); - $options = array('menubar' => true, 'location' => false, 'scrollbars' => true, - 'resizable' => true, 'height' => 600, 'width' => 800); + $options = ['menubar' => true, 'location' => false, 'scrollbars' => true, + 'resizable' => true, 'height' => 600, 'width' => 800, ]; $name = 'popup'; $link = new moodle_url($url); $action = new popup_action('click', $link, $name, $options); @@ -2705,6 +2713,7 @@ public function survey_results_navbar_alpha($currrid, $currentgroupid, $cm, $byr $total = count($resparr); $entries = count($resparr); // Default max 3 columns, max 25 lines per column. + // phpcs:disable moodle.Commenting.TodoComment // TODO make this setting customizable. $maxlines = 20; $maxcols = 3; @@ -2755,9 +2764,9 @@ public function survey_results_navbar_student($currrid, $userid, $instance, $res $stranonymous = get_string('anonymous', 'questionnaire'); $total = count($resps); - $rids = array(); - $ridssub = array(); - $ridsusers = array(); + $rids = []; + $ridssub = []; + $ridsusers = []; $i = 0; $currpos = -1; $title = ''; @@ -2832,14 +2841,15 @@ public function survey_results($rid = '', $uid=false, $pdf = false, $currentgrou // Build associative array holding whether each question // type has answer choices or not and the table the answers are in // TO DO - FIX BELOW TO USE STANDARD FUNCTIONS. - $haschoices = array(); - $responsetable = array(); - if (!($types = $DB->get_records('questionnaire_question_type', array(), 'typeid', 'typeid, has_choices, response_table'))) { + $haschoices = []; + $responsetable = []; + if (!($types = $DB->get_records('questionnaire_question_type', [], 'typeid', 'typeid, has_choices, response_table'))) { $errmsg = sprintf('%s [ %s: question_type ]', get_string('errortable', 'questionnaire'), 'Table'); return($errmsg); } foreach ($types as $type) { + // phpcs:disable moodle.Commenting.TodoComment $haschoices[$type->typeid] = $type->has_choices; // TODO is that variable actually used? $responsetable[$type->typeid] = $type->response_table; } @@ -2894,7 +2904,7 @@ public function survey_results($rid = '', $uid=false, $pdf = false, $currentgrou return($errmsg); } - $rids = array(); + $rids = []; foreach ($rows as $row) { array_push($rids, $row->id); } @@ -3127,6 +3137,7 @@ protected function process_csv_row(array &$row, // Moodle: // Determine if the user is a member of a group in this course or not. + // phpcs:disable moodle.Commenting.TodoComment // TODO - review for performance. $groupname = ''; if (groups_get_activity_groupmode($this->cm, $this->course)) { @@ -3230,18 +3241,18 @@ public function generate_csv($currentgroupid, $rid='', $userid='', $choicecodes= raise_memory_limit('1G'); - $output = array(); + $output = []; $stringother = get_string('other', 'questionnaire'); $config = get_config('questionnaire', 'downloadoptions'); - $options = empty($config) ? array() : explode(',', $config); + $options = empty($config) ? [] : explode(',', $config); if ($showincompletes == 1) { $options[] = 'complete'; } - $columns = array(); - $types = array(); + $columns = []; + $types = []; foreach ($options as $option) { - if (in_array($option, array('response', 'submitted', 'id'))) { + if (in_array($option, ['response', 'submitted', 'id'])) { $columns[] = get_string($option, 'questionnaire'); $types[] = 0; } else if ($option == 'useridentityfields') { @@ -3258,7 +3269,7 @@ public function generate_csv($currentgroupid, $rid='', $userid='', $choicecodes= } $nbinfocols = count($columns); - $idtocsvmap = array( + $idtocsvmap = [ '0', // 0: unused '0', // 1: bool -> boolean '1', // 2: text -> string @@ -3271,9 +3282,9 @@ public function generate_csv($currentgroupid, $rid='', $userid='', $choicecodes= '1', // 9: date -> string '0', // 10: numeric -> number. '0', // 11: slider -> number. - ); + ]; - if (!$survey = $DB->get_record('questionnaire_survey', array('id' => $this->survey->id))) { + if (!$survey = $DB->get_record('questionnaire_survey', ['id' => $this->survey->id])) { throw new \moodle_exception('surveynotexists', 'mod_questionnaire'); } @@ -3391,7 +3402,7 @@ public function generate_csv($currentgroupid, $rid='', $userid='', $choicecodes= $nameddegrees++; } else { if ($osgood) { - list($contentleft, $contentright) = array_merge(preg_split('/[|]/', $content), array(' ')); + list($contentleft, $contentright) = array_merge(preg_split('/[|]/', $content), [' ']); $contents = questionnaire_choice_values($contentleft); if ($contents->title) { $contentleft = $contents->title; @@ -3759,7 +3770,7 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre $numsections = count($fbsections); // Get all response ids for all respondents. - $rids = array(); + $rids = []; foreach ($resps as $key => $resp) { $rids[] = $key; } @@ -3824,7 +3835,7 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre $sectionlabel = $fbsections[$sectionid]->sectionlabel; $sectionheading = $fbsections[$sectionid]->sectionheading; - $labels = array(); + $labels = []; if ($feedbacks = $DB->get_records('questionnaire_feedback', ['sectionid' => $sectionid])) { foreach ($feedbacks as $feedback) { if ($feedback->feedbacklabel != '') { @@ -3838,8 +3849,8 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre // To eliminate all potential % chars in heading text (might interfere with the sprintf function). $sectionheading = str_replace('%', '', $sectionheading); // Replace section heading placeholders with their actual value (if any). - $original = array('$scorepercent', '$oppositescorepercent'); - $result = array('%s%%', '%s%%'); + $original = ['$scorepercent', '$oppositescorepercent']; + $result = ['%s%%', '%s%%']; $sectionheading = str_replace($original, $result, $sectionheading); $sectionheading = sprintf($sectionheading , $scorepercent, $oppositescorepercent); $sectionheading = file_rewrite_pluginfile_urls($sectionheading, 'pluginfile.php', @@ -3859,10 +3870,10 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre $feedbackmessages[] = $feedbacktext; $feedbackmessages[] = $this->renderer->box_end(); } - $score = array($scorepercent, 100 - $scorepercent); + $score = [$scorepercent, 100 - $scorepercent]; $allscore = null; if ($compare || $allresponses) { - $allscore = array($allscorepercent, 100 - $allscorepercent); + $allscore = [$allscorepercent, 100 - $allscorepercent]; } $usergraph = get_config('questionnaire', 'usergraph'); if ($usergraph && $this->survey->chart_type) { @@ -3883,9 +3894,9 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre if ($this->survey->feedbackscores) { $table = $table ?? new html_table(); if ($compare) { - $table->data[] = array($sectionlabel, $score[0].'%'.$oppositescore, $allscore[0].'%'.$oppositeallscore); + $table->data[] = [$sectionlabel, $score[0].'%'.$oppositescore, $allscore[0].'%'.$oppositeallscore]; } else { - $table->data[] = array($sectionlabel, $allscore[0].'%'.$oppositeallscore); + $table->data[] = [$sectionlabel, $allscore[0].'%'.$oppositeallscore]; } $this->page->add_to_page('feedbackscores', html_writer::table($table)); @@ -3897,16 +3908,16 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre // Now process scores for more than one section. // Initialize scores and maxscores to 0. - $score = array(); - $allscore = array(); - $maxscore = array(); - $scorepercent = array(); - $allscorepercent = array(); - $oppositescorepercent = array(); - $alloppositescorepercent = array(); - $chartlabels = array(); + $score = []; + $allscore = []; + $maxscore = []; + $scorepercent = []; + $allscorepercent = []; + $oppositescorepercent = []; + $alloppositescorepercent = []; + $chartlabels = []; // Sections where all questions are unseen because of the $advdependencies. - $nanscores = array(); + $nanscores = []; for ($i = 1; $i <= $numsections; $i++) { $score[$i] = 0; @@ -3970,8 +3981,8 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre $sectionheading = str_replace('%', '', $sectionheading); // Replace section heading placeholders with their actual value (if any). - $original = array('$scorepercent', '$oppositescorepercent'); - $result = array("$scorepercent[$section]%", "$oppositescorepercent[$section]%"); + $original = ['$scorepercent', '$oppositescorepercent']; + $result = ["$scorepercent[$section]%", "$oppositescorepercent[$section]%"]; $sectionheading = str_replace($original, $result, $sectionheading); $formatoptions = new stdClass(); $formatoptions->noclean = true; @@ -3982,7 +3993,7 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre $feedbackmessages[] = format_text($sectionheading, FORMAT_HTML, $formatoptions); $feedback = $DB->get_record_select('questionnaire_feedback', 'sectionid = ? AND minscore <= ? AND ? < maxscore', - array($feedbacksectionid, $scorepercent[$section], $scorepercent[$section]), + [$feedbacksectionid, $scorepercent[$section], $scorepercent[$section]], 'id,feedbacktext,feedbacktextformat'); $feedbackmessages[] = $this->renderer->box_end(); if (!empty($feedback->feedbacktext)) { @@ -4026,11 +4037,11 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre // If all questions of $section are unseen then don't show feedbackscores for this section. if ($compare && !is_nan($scorepercent[$key])) { $table = $table ?? new html_table(); - $table->data[] = array($sectionlabel, $scorepercent[$key] . '%' . $oppositescore, - $allscorepercent[$key] . '%' . $oppositeallscore); + $table->data[] = [$sectionlabel, $scorepercent[$key] . '%' . $oppositescore, + $allscorepercent[$key] . '%' . $oppositeallscore, ]; } else if (isset($allscorepercent[$key]) && !is_nan($allscorepercent[$key])) { $table = $table ?? new html_table(); - $table->data[] = array($sectionlabel, $allscorepercent[$key] . '%' . $oppositeallscore); + $table->data[] = [$sectionlabel, $allscorepercent[$key] . '%' . $oppositeallscore]; } } } diff --git a/questions.php b/questions.php index 6175512c..a244dd54 100644 --- a/questions.php +++ b/questions.php @@ -38,11 +38,11 @@ throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } -if (! $course = $DB->get_record("course", array("id" => $cm->course))) { +if (! $course = $DB->get_record("course", ["id" => $cm->course])) { throw new \moodle_exception('coursemisconf', 'mod_questionnaire'); } -if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $cm->instance))) { +if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $cm->instance])) { throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } @@ -101,7 +101,7 @@ if ($records = $DB->get_records_select('questionnaire_question', $select, null, 'position ASC')) { foreach ($records as $record) { - $DB->set_field('questionnaire_question', 'position', $record->position - 1, array('id' => $record->id)); + $DB->set_field('questionnaire_question', 'position', $record->position - 1, ['id' => $record->id]); } } // Delete section breaks without asking for confirmation. @@ -121,11 +121,11 @@ // Log question deleted event. $context = context_module::instance($questionnaire->cm->id); $questiontype = \mod_questionnaire\question\question::qtypename($questionnaire->questions[$qid]->type_id); - $params = array( + $params = [ 'context' => $context, 'courseid' => $questionnaire->course->id, - 'other' => array('questiontype' => $questiontype) - ); + 'other' => ['questiontype' => $questiontype], + ]; $event = \mod_questionnaire\event\question_deleted::create($params); $event->trigger(); @@ -297,11 +297,11 @@ if (isset($qformdata)) { $context = context_module::instance($questionnaire->cm->id); $questiontype = \mod_questionnaire\question\question::qtypename($qformdata->type_id); - $params = array( + $params = [ 'context' => $context, 'courseid' => $questionnaire->course->id, - 'other' => array('questiontype' => $questiontype) - ); + 'other' => ['questiontype' => $questiontype], + ]; $event = \mod_questionnaire\event\question_created::create($params); $event->trigger(); } @@ -362,9 +362,9 @@ // Count responses already saved for that question. $countresps = 0; if ($qtype != QUESSECTIONTEXT) { - $responsetable = $DB->get_field('questionnaire_question_type', 'response_table', array('typeid' => $qtype)); + $responsetable = $DB->get_field('questionnaire_question_type', 'response_table', ['typeid' => $qtype]); if (!empty($responsetable)) { - $countresps = $DB->count_records('questionnaire_'.$responsetable, array('question_id' => $qid)); + $countresps = $DB->count_records('questionnaire_'.$responsetable, ['question_id' => $qid]); } } diff --git a/report.php b/report.php index 5c81c84a..af9cb6b9 100755 --- a/report.php +++ b/report.php @@ -60,10 +60,10 @@ $SESSION->instance = $instance; $usergraph = get_config('questionnaire', 'usergraph'); -if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $instance))) { +if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $instance])) { throw new \moodle_exception('incorrectquestionnaire', 'mod_questionnaire'); } -if (! $course = $DB->get_record("course", array("id" => $questionnaire->course))) { +if (! $course = $DB->get_record("course", ["id" => $questionnaire->course])) { throw new \moodle_exception('coursemisconf', 'mod_questionnaire'); } if (! $cm = get_coursemodule_from_instance("questionnaire", $questionnaire->id, $course->id)) { @@ -228,7 +228,7 @@ throw new \moodle_exception('surveyowner', 'mod_questionnaire'); } else if (!$rid || !is_numeric($rid)) { throw new \moodle_exception('invalidresponse', 'mod_questionnaire'); - } else if (!($resp = $DB->get_record('questionnaire_response', array('id' => $rid)))) { + } else if (!($resp = $DB->get_record('questionnaire_response', ['id' => $rid]))) { throw new \moodle_exception('invalidresponserecord', 'mod_questionnaire'); } @@ -262,10 +262,10 @@ $msg = '
'; $msg .= get_string('confirmdelresp', 'questionnaire', $ruser.$timesubmitted); $msg .= '
'; - $urlyes = new moodle_url('report.php', array('action' => 'dvresp', - 'rid' => $rid, 'individualresponse' => 1, 'instance' => $instance, 'group' => $currentgroupid)); - $urlno = new moodle_url('report.php', array('action' => 'vresp', 'instance' => $instance, - 'rid' => $rid, 'individualresponse' => 1, 'group' => $currentgroupid)); + $urlyes = new moodle_url('report.php', ['action' => 'dvresp', + 'rid' => $rid, 'individualresponse' => 1, 'instance' => $instance, 'group' => $currentgroupid, ]); + $urlno = new moodle_url('report.php', ['action' => 'vresp', 'instance' => $instance, + 'rid' => $rid, 'individualresponse' => 1, 'group' => $currentgroupid, ]); $buttonyes = new single_button($urlyes, get_string('delete'), 'post'); $buttonno = new single_button($urlno, get_string('cancel'), 'get'); $questionnaire->page->add_to_page('notifications', $questionnaire->renderer->confirm($msg, $buttonyes, $buttonno)); @@ -297,9 +297,9 @@ } $msg .= '
'; - $urlyes = new moodle_url('report.php', array('action' => 'dvallresp', 'sid' => $sid, - 'instance' => $instance, 'group' => $currentgroupid)); - $urlno = new moodle_url('report.php', array('instance' => $instance, 'group' => $currentgroupid)); + $urlyes = new moodle_url('report.php', ['action' => 'dvallresp', 'sid' => $sid, + 'instance' => $instance, 'group' => $currentgroupid, ]); + $urlno = new moodle_url('report.php', ['instance' => $instance, 'group' => $currentgroupid]); $buttonyes = new single_button($urlyes, get_string('delete'), 'post'); $buttonno = new single_button($urlno, get_string('cancel'), 'get'); @@ -319,12 +319,12 @@ throw new \moodle_exception('surveyowner', 'mod_questionnaire'); } else if (!$rid || !is_numeric($rid)) { throw new \moodle_exception('invalidresponse', 'mod_questionnaire'); - } else if (!($response = $DB->get_record('questionnaire_response', array('id' => $rid)))) { + } else if (!($response = $DB->get_record('questionnaire_response', ['id' => $rid]))) { throw new \moodle_exception('invalidresponserecord', 'mod_questionnaire'); } if (questionnaire_delete_response($response, $questionnaire)) { - if (!$DB->count_records('questionnaire_response', array('questionnaireid' => $questionnaire->id, 'complete' => 'y'))) { + if (!$DB->count_records('questionnaire_response', ['questionnaireid' => $questionnaire->id, 'complete' => 'y'])) { $redirection = $CFG->wwwroot.'/mod/questionnaire/view.php?id='.$cm->id; } else { $redirection = $CFG->wwwroot.'/mod/questionnaire/report.php?action=vresp&instance='. @@ -332,10 +332,10 @@ } // Log this questionnaire delete single response action. - $params = array('objectid' => $questionnaire->survey->id, + $params = ['objectid' => $questionnaire->survey->id, 'context' => $questionnaire->context, 'courseid' => $questionnaire->course->id, - 'relateduserid' => $response->userid); + 'relateduserid' => $response->userid, ]; $event = \mod_questionnaire\event\response_deleted::create($params); $event->trigger(); @@ -385,7 +385,7 @@ $resp = current($resps); $rid = $resp->id; } else { - $resp = $DB->get_record('questionnaire_response', array('id' => $rid)); + $resp = $DB->get_record('questionnaire_response', ['id' => $rid]); } if (!empty($resp->userid)) { if ($user = $DB->get_record('user', ['id' => $resp->userid])) { @@ -415,11 +415,11 @@ $context = context_module::instance($questionnaire->cm->id); $anonymous = $questionnaire->respondenttype == 'anonymous'; - $event = \mod_questionnaire\event\all_responses_deleted::create(array( + $event = \mod_questionnaire\event\all_responses_deleted::create([ 'objectid' => $questionnaire->id, 'anonymous' => $anonymous, - 'context' => $context - )); + 'context' => $context, + ]); $event->trigger(); redirect($redirection); @@ -469,7 +469,7 @@ 'user' => $user, 'sid' => $sid, 'action' => 'dfs', - 'group' => $currentgroupid + 'group' => $currentgroupid, ]; $extrafields = $questionnaire->renderer->render_from_template('mod_questionnaire/extrafields', []); $output .= $questionnaire->renderer->download_dataformat_selector(get_string('downloadtypes', 'questionnaire'), @@ -482,11 +482,11 @@ echo $questionnaire->renderer->footer('none'); // Log saved as text action. - $params = array('objectid' => $questionnaire->id, + $params = ['objectid' => $questionnaire->id, 'context' => $questionnaire->context, 'courseid' => $course->id, - 'other' => array('action' => $action, 'instance' => $instance, 'currentgroupid' => $currentgroupid) - ); + 'other' => ['action' => $action, 'instance' => $instance, 'currentgroupid' => $currentgroupid], + ]; $event = \mod_questionnaire\event\all_responses_saved_as_text::create($params); $event->trigger(); @@ -566,7 +566,7 @@ } $respinfo = ''; - $resps = array(); + $resps = []; // Enable choose_group if there are questionnaire groups and groupmode is not set to "no groups" // and if there are more goups than 1 (or if user can view all groups). if (is_array($questionnairegroups) && $groupmode > 0) { @@ -626,11 +626,11 @@ } } - $params = array('objectid' => $questionnaire->id, + $params = ['objectid' => $questionnaire->id, 'context' => $context, 'courseid' => $course->id, - 'other' => array('action' => $action, 'instance' => $instance, 'groupid' => $currentgroupid) - ); + 'other' => ['action' => $action, 'instance' => $instance, 'groupid' => $currentgroupid], + ]; if ($outputtarget == 'pdf') { $pdf = questionnaire_report_start_pdf(); @@ -661,17 +661,17 @@ $linkname = get_string('downloadpdf', 'mod_questionnaire'); $link = new moodle_url('/mod/questionnaire/report.php', ['action' => 'vall', 'instance' => $instance, 'group' => $currentgroupid, 'target' => 'pdf', - 'responsestats' => $userview]); + 'responsestats' => $userview, ]); $downpdficon = new pix_icon('f/pdf', $linkname); $respinfo .= $questionnaire->renderer->action_link($link, null, null, null, $downpdficon); $linkname = get_string('print', 'mod_questionnaire'); $link = new \moodle_url('/mod/questionnaire/report.php', ['action' => 'vall', 'instance' => $instance, 'group' => $currentgroupid, 'target' => 'print', - 'responsestats' => $userview]); + 'responsestats' => $userview, ]); $htmlicon = new pix_icon('t/print', $linkname); $options = ['menubar' => true, 'location' => false, 'scrollbars' => true, 'resizable' => true, - 'height' => 600, 'width' => 800, 'title' => $linkname]; + 'height' => 600, 'width' => 800, 'title' => $linkname, ]; $name = 'popup'; $action = new popup_action('click', $link, $name, $options); $class = ''; @@ -805,6 +805,7 @@ } // Print the main part of the page. + // phpcs:disable moodle.Commenting.TodoComment // TODO provide option to select how many columns and/or responses per page. $groupname = get_string('group').': '.groups_get_group_name($currentgroupid).''; @@ -832,6 +833,10 @@ break; } +// phpcs:disable moodle.Commenting.FileExpectedTags.CopyrightTagMissing +// phpcs:disable moodle.Commenting.FileExpectedTags.LicenseTagMissing +// phpcs:disable moodle.Commenting.Package.Missing + /** * Return a pdf object. * @return pdf diff --git a/settings.php b/settings.php index 30e64057..a34a9249 100644 --- a/settings.php +++ b/settings.php @@ -27,7 +27,7 @@ require_once($CFG->dirroot . '/mod/questionnaire/locallib.php'); if ($ADMIN->fulltree) { - $options = array(0 => get_string('no'), 1 => get_string('yes')); + $options = [0 => get_string('no'), 1 => get_string('yes')]; $str = get_string('configusergraphlong', 'questionnaire'); $settings->add(new admin_setting_configselect('questionnaire/usergraph', get_string('configusergraph', 'questionnaire'), @@ -35,7 +35,7 @@ $settings->add(new admin_setting_configtext('questionnaire/maxsections', get_string('configmaxsections', 'questionnaire'), '', 10, PARAM_INT)); - $choices = array( + $choices = [ 'response' => get_string('response', 'questionnaire'), 'submitted' => get_string('submitted', 'questionnaire'), 'institution' => get_string('institution'), @@ -45,8 +45,8 @@ 'id' => get_string('id', 'questionnaire'), 'fullname' => get_string('fullname'), 'username' => get_string('username'), - 'useridentityfields' => get_string('showuseridentity', 'admin') - ); + 'useridentityfields' => get_string('showuseridentity', 'admin'), + ]; $settings->add(new admin_setting_configmultiselect('questionnaire/downloadoptions', get_string('textdownloadoptions', 'questionnaire'), '', array_keys($choices), $choices)); diff --git a/show_nonrespondents.php b/show_nonrespondents.php index 924fd98d..e6532fad 100644 --- a/show_nonrespondents.php +++ b/show_nonrespondents.php @@ -16,6 +16,7 @@ /** * Show the non-respondents to a questionnaire. + * * @author Joseph Rézeau (copied from feedback plugin show_nonrespondents by original author Andreas Grabs) * @copyright 2016 Mike Churchward (mike.churchward@poetopensource.org) * @license http://www.gnu.org/copyleft/gpl.html GNU Public License @@ -55,11 +56,11 @@ throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } - if (! $course = $DB->get_record("course", array("id" => $cm->course))) { + if (! $course = $DB->get_record("course", ["id" => $cm->course])) { throw new \moodle_exception('coursemisconf', 'mod_questionnaire'); } - if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $cm->instance))) { + if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $cm->instance])) { throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire'); } } @@ -75,7 +76,7 @@ require_course_login($course, true, $cm); -$url = new moodle_url('/mod/questionnaire/show_nonrespondents.php', array('id' => $cm->id)); +$url = new moodle_url('/mod/questionnaire/show_nonrespondents.php', ['id' => $cm->id]); $PAGE->set_url($url); $questionnaire = new questionnaire($course, $cm, $sid, $questionnaire); @@ -129,7 +130,7 @@ $shortname = format_string($course->shortname, true, - array('context' => context_course::instance($course->id))); + ['context' => context_course::instance($course->id)]); $strquestionnaires = get_string("modulenameplural", "questionnaire"); $htmlmessage = ""; @@ -147,7 +148,7 @@ if (is_array($messageuser)) { foreach ($messageuser as $userid) { - $senduser = $DB->get_record('user', array('id' => $userid)); + $senduser = $DB->get_record('user', ['id' => $userid]); $eventdata = new \core\message\message(); $eventdata->courseid = $course->id; $eventdata->name = 'message'; @@ -167,7 +168,7 @@ $msg = $questionnaire->renderer->heading(get_string('messagedselectedusersfailed')); } - $url = new moodle_url('/mod/questionnaire/view.php', array('id' => $cm->id)); + $url = new moodle_url('/mod/questionnaire/view.php', ['id' => $cm->id]); redirect($url, $msg, 4); exit; } @@ -198,9 +199,9 @@ // Preparing the table for output. $baseurl = new moodle_url('/mod/questionnaire/show_nonrespondents.php'); - $baseurl->params(array('id' => $cm->id, 'showall' => $showall)); + $baseurl->params(['id' => $cm->id, 'showall' => $showall]); - $tablecolumns = array('userpic', 'fullname'); + $tablecolumns = ['userpic', 'fullname']; // Extra columns copied from participants view. if (class_exists('\core_user\fields')) { @@ -208,7 +209,7 @@ } else { $extrafields = get_extra_user_fields($context); } - $tableheaders = array(get_string('userpic'), get_string('fullnameuser')); + $tableheaders = [get_string('userpic'), get_string('fullnameuser')]; if (in_array('email', $extrafields) || has_capability('moodle/course:viewhiddenuserfields', $context)) { $tablecolumns[] = 'email'; @@ -246,12 +247,12 @@ $table->set_attribute('cellspacing', '0'); $table->set_attribute('id', 'showentrytable'); $table->set_attribute('class', 'flexible generaltable generalbox'); - $table->set_control_variables(array( + $table->set_control_variables([ TABLE_VAR_SORT => 'ssort', TABLE_VAR_IFIRST => 'sifirst', TABLE_VAR_ILAST => 'silast', - TABLE_VAR_PAGE => 'spage' - )); + TABLE_VAR_PAGE => 'spage', + ]); $table->no_sorting('status'); $table->no_sorting('select'); @@ -336,11 +337,11 @@ ob_start(); $buffering = true; foreach ($nonrespondents as $nonrespondent) { - $user = $DB->get_record('user', array('id' => $nonrespondent)); + $user = $DB->get_record('user', ['id' => $nonrespondent]); // Userpicture and link to the profilepage. $profileurl = $CFG->wwwroot.'/user/view.php?id='.$user->id.'&course='.$course->id; $profilelink = ''.fullname($user).''; - $data = array ($questionnaire->renderer->user_picture($user, array('courseid' => $course->id)), $profilelink); + $data = [$questionnaire->renderer->user_picture($user, ['courseid' => $course->id]), $profilelink]; if (in_array('email', $tablecolumns)) { $data[] = $user->email; } @@ -362,7 +363,7 @@ $checkboxaltvalue = ''; if ($resume) { if ($DB->record_exists('questionnaire_response', ['questionnaireid' => $questionnaire->id, - 'userid' => $nonrespondent, 'complete' => 'n']) ) { + 'userid' => $nonrespondent, 'complete' => 'n', ]) ) { $data[] = get_string('started', 'questionnaire'); $checkboxaltvalue = 1; } else { @@ -387,12 +388,12 @@ $allurl->param('showall', 0); $questionnaire->page->add_to_page('formarea', $questionnaire->renderer->container(html_writer::link($allurl, - get_string('showperpage', '', QUESTIONNAIRE_DEFAULT_PAGE_COUNT)), array(), 'showall')); + get_string('showperpage', '', QUESTIONNAIRE_DEFAULT_PAGE_COUNT)), [], 'showall')); } else if ($countnonrespondents > 0 && $perpage < $countnonrespondents) { $allurl->param('showall', 1); $questionnaire->page->add_to_page('formarea', $questionnaire->renderer->container(html_writer::link($allurl, - get_string('showall', '', $countnonrespondents)), array(), 'showall')); + get_string('showall', '', $countnonrespondents)), [], 'showall')); } if (has_capability('mod/questionnaire:message', $context)) { $questionnaire->page->add_to_page('formarea', @@ -475,15 +476,15 @@ $editor = editors_get_preferred_editor(); $editor->use_editor($id, questionnaire_get_editor_options($context)); $texteditor = html_writer::tag('div', html_writer::tag('textarea', $message, - array('id' => $id, 'name' => "message", 'class' => "form-control", 'rows' => '10', 'cols' => '60'))); + ['id' => $id, 'name' => "message", 'class' => "form-control", 'rows' => '10', 'cols' => '60'])); $questionnaire->page->add_to_page('formarea', ''); // Print editor. $table = new html_table(); - $table->align = array('left', 'left'); - $table->data[] = array( ''.get_string('subject', 'questionnaire').'', $subjecteditor); - $table->data[] = array(''.get_string('messagebody').'', $texteditor); + $table->align = ['left', 'left']; + $table->data[] = [ ''.get_string('subject', 'questionnaire').'', $subjecteditor]; + $table->data[] = [''.get_string('messagebody').'', $texteditor]; $questionnaire->page->add_to_page('formarea', html_writer::table($table)); @@ -504,7 +505,7 @@ $questionnaire->page->add_to_page('formarea', html_writer::end_tag('form')); // Include the needed js. - $module = array('name' => 'mod_questionnaire', 'fullpath' => '/mod/questionnaire/module.js'); + $module = ['name' => 'mod_questionnaire', 'fullpath' => '/mod/questionnaire/module.js']; $PAGE->requires->js_init_call('M.mod_questionnaire.init_sendmessage', null, false, $module); } } @@ -518,9 +519,9 @@ $context = context_module::instance($questionnaire->cm->id); $anonymous = $questionnaire->respondenttype == 'anonymous'; -$event = \mod_questionnaire\event\non_respondents_viewed::create(array( +$event = \mod_questionnaire\event\non_respondents_viewed::create([ 'objectid' => $questionnaire->id, 'anonymous' => $anonymous, - 'context' => $context -)); + 'context' => $context, +]); $event->trigger(); diff --git a/tabs.php b/tabs.php index dc560745..eafbda45 100644 --- a/tabs.php +++ b/tabs.php @@ -26,10 +26,10 @@ defined('MOODLE_INTERNAL') || die(); global $DB, $SESSION; -$tabs = array(); -$row = array(); -$inactive = array(); -$activated = array(); +$tabs = []; +$row = []; +$inactive = []; +$activated = []; if (!isset($SESSION->questionnaire)) { $SESSION->questionnaire = new stdClass(); } @@ -74,10 +74,10 @@ $row[] = new tabobject('myreport', $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/myreport.php?'. $argstr), $yourrespstring); - if ($usernumresp > 1 && in_array($currenttab, array('mysummary', 'mybyresponse', 'myvall', 'mydownloadcsv'))) { + if ($usernumresp > 1 && in_array($currenttab, ['mysummary', 'mybyresponse', 'myvall', 'mydownloadcsv'])) { $inactive[] = 'myreport'; $activated[] = 'myreport'; - $row2 = array(); + $row2 = []; $argstr2 = $argstr.'&action=summary'; $row2[] = new tabobject('mysummary', $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/myreport.php?'.$argstr2), get_string('summary', 'questionnaire')); @@ -92,7 +92,7 @@ $link = $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'.$argstr2); $row2[] = new tabobject('mydownloadcsv', $link, get_string('downloadtextformat', 'questionnaire')); } - } else if (in_array($currenttab, array('mybyresponse', 'mysummary'))) { + } else if (in_array($currenttab, ['mybyresponse', 'mysummary'])) { $inactive[] = 'myreport'; $activated[] = 'myreport'; } @@ -121,14 +121,14 @@ $argstr = 'instance='.$questionnaire->id; $row[] = new tabobject('allreport', $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'. $argstr.'&action=vall'), get_string('viewallresponses', 'questionnaire')); - if (in_array($currenttab, array('vall', 'vresp', 'valldefault', 'vallasort', 'vallarsort', 'deleteall', 'downloadcsv', - 'vrespsummary', 'individualresp', 'printresp', 'deleteresp'))) { + if (in_array($currenttab, ['vall', 'vresp', 'valldefault', 'vallasort', 'vallarsort', 'deleteall', 'downloadcsv', + 'vrespsummary', 'individualresp', 'printresp', 'deleteresp', ])) { $inactive[] = 'allreport'; $activated[] = 'allreport'; if ($currenttab == 'vrespsummary' || $currenttab == 'valldefault') { $inactive[] = 'vresp'; } - $row2 = array(); + $row2 = []; $argstr2 = $argstr.'&action=vall&group='.$currentgroupid; $row2[] = new tabobject('vall', $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'.$argstr2), get_string('summary', 'questionnaire')); @@ -143,9 +143,9 @@ } } } - if (in_array($currenttab, array('valldefault', 'vallasort', 'vallarsort', 'deleteall', 'downloadcsv'))) { + if (in_array($currenttab, ['valldefault', 'vallasort', 'vallarsort', 'deleteall', 'downloadcsv'])) { $activated[] = 'vall'; - $row3 = array(); + $row3 = []; $argstr2 = $argstr.'&action=vall&group='.$currentgroupid; $row3[] = new tabobject('valldefault', $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'.$argstr2), @@ -171,7 +171,7 @@ } } - if (in_array($currenttab, array('individualresp', 'deleteresp'))) { + if (in_array($currenttab, ['individualresp', 'deleteresp'])) { $inactive[] = 'vresp'; if ($currenttab != 'deleteresp') { $activated[] = 'vresp'; @@ -187,16 +187,16 @@ $argstr = 'instance='.$questionnaire->id.'&sid='.$questionnaire->sid; $row[] = new tabobject('allreport', $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'. $argstr.'&action=vall&group='.$currentgroupid), get_string('viewallresponses', 'questionnaire')); - if (in_array($currenttab, array('valldefault', 'vallasort', 'vallarsort', 'deleteall', 'downloadcsv'))) { + if (in_array($currenttab, ['valldefault', 'vallasort', 'vallarsort', 'deleteall', 'downloadcsv'])) { $inactive[] = 'vall'; $activated[] = 'vall'; - $row2 = array(); + $row2 = []; $argstr2 = $argstr.'&action=vall&group='.$currentgroupid; $row2[] = new tabobject('valldefault', $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'.$argstr2), get_string('summary', 'questionnaire')); $inactive[] = $currenttab; $activated[] = $currenttab; - $row3 = array(); + $row3 = []; $argstr2 = $argstr.'&action=vall&group='.$currentgroupid; $row3[] = new tabobject('valldefault', $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'.$argstr2), get_string('order_default', 'questionnaire')); @@ -224,7 +224,7 @@ } if ($questionnaire->capabilities->viewsingleresponse && ($canviewallgroups || $canviewgroups)) { - $nonrespondenturl = new moodle_url('/mod/questionnaire/show_nonrespondents.php', array('id' => $questionnaire->cm->id)); + $nonrespondenturl = new moodle_url('/mod/questionnaire/show_nonrespondents.php', ['id' => $questionnaire->cm->id]); $row[] = new tabobject('nonrespondents', $nonrespondenturl->out(), get_string('show_nonrespondents', 'questionnaire')); diff --git a/tests/behat/behat_mod_questionnaire.php b/tests/behat/behat_mod_questionnaire.php index 39b47d51..391cf78d 100644 --- a/tests/behat/behat_mod_questionnaire.php +++ b/tests/behat/behat_mod_questionnaire.php @@ -108,7 +108,7 @@ protected function resolve_page_instance_url(string $type, string $identifier): * @param TableNode $fielddata */ public function i_add_a_question_and_i_fill_the_form_with($questiontype, TableNode $fielddata) { - $validtypes = array( + $validtypes = [ '----- Page Break -----', 'Check Boxes', 'Date', @@ -120,7 +120,7 @@ public function i_add_a_question_and_i_fill_the_form_with($questiontype, TableNo 'Rate (scale 1..5)', 'Text Box', 'Yes/No', - 'Slider'); + 'Slider', ]; if (!in_array($questiontype, $validtypes)) { throw new ExpectationException('Invalid question type specified.', $this->getSession()); @@ -155,7 +155,7 @@ public function i_add_a_question_and_i_fill_the_form_with($questiontype, TableNo $fielddata = new TableNode($rows); } - $this->execute('behat_forms::i_set_the_field_to', array('id_type_id', $questiontype)); + $this->execute('behat_forms::i_set_the_field_to', ['id_type_id', $questiontype]); $this->execute('behat_forms::press_button', 'Add selected question type'); if (isset($hashrows['id_dependquestions_and_1'])) { $this->execute('behat_forms::press_button', 'id_adddependencies_and'); @@ -191,11 +191,11 @@ public function i_click_the_radio_button($radioid) { public function has_questions_and_responses($questionnairename) { global $DB; - if (!$questionnaire = $DB->get_record('questionnaire', array('name' => $questionnairename), 'id,sid')) { + if (!$questionnaire = $DB->get_record('questionnaire', ['name' => $questionnairename], 'id,sid')) { throw new ExpectationException('Invalid questionnaire name specified.', $this->getSession()); } - if (!$DB->record_exists('questionnaire_survey', array('id' => $questionnaire->sid))) { + if (!$DB->record_exists('questionnaire_survey', ['id' => $questionnaire->sid])) { throw new ExpectationException('Questionnaire survey does not exist.', $this->getSession()); } @@ -210,58 +210,58 @@ public function has_questions_and_responses($questionnairename) { * @return null */ private function add_question_data($sid) { - $questiondata = array( - array("id", "surveyid", "name", "type_id", "result_id", "length", "precise", "position", "content", "required", - "deleted", "dependquestion", "dependchoice"), - array("1", $sid, "own car", "1", null, "0", "0", "1", "

Do you own a car?

", "y", "n", "0", "0"), - array("2", $sid, "optional", "2", null, "20", "25", "3", "

What is the colour of your car?

", "y", "n", "121", - "0"), - array("3", $sid, null, "99", null, "0", "0", "2", "break", "n", "n", "0", "0"), - array("4", $sid, "optional2", "1", null, "0", "0", "5", "

Do you sometimes use public transport to go to work?

", - "y", "n", "0", "0"), - array("5", $sid, null, "99", null, "0", "0", "4", "break", "n", "n", "0", "0"), - array("6", $sid, "entertext", "2", null, "20", "10", "6", "

Enter no more than 10 characters.

", "n", "n", "0", - "0"), - array("7", $sid, "q7", "5", null, "0", "0", "7", "

Check all that apply

", "n", "n", "0", "0"), - array("8", $sid, "q8", "9", null, "0", "0", "8", "

Enter today's date

", "n", "n", "0", "0"), - array("9", $sid, "q9", "6", null, "0", "0", "9", "

Choose One

", "n", "n", "0", "0"), - array("10", $sid, "q10", "3", null, "5", "0", "10", "

Write an essay

", "n", "n", "0", "0"), - array("11", $sid, "q11", "10", null, "10", "0", "11", "

Enter a number

", "n", "n", "0", "0"), - array("12", $sid, "q12", "4", null, "1", "0", "13", "

Choose a colour

", "n", "n", "0", "0"), - array("13", $sid, "q13", "8", null, "5", "1", "14", "

Rate this.

", "n", "n", "0", "0"), - array("14", $sid, null, "99", null, "0", "0", "12", "break", "n", "y", "0", "0"), - array("15", $sid, null, "99", null, "0", "0", "12", "break", "n", "n", "0", "0"), - array("16", $sid, "Q1", "10", null, "3", "2", "15", "Enter a number


", "y", "n", "0", "0") - ); - - $choicedata = array( - array("id", "question_id", "content", "value"), - array("1", "7", "1", null), - array("2", "7", "2", null), - array("3", "7", "3", null), - array("4", "7", "4", null), - array("5", "7", "5", null), - array("6", "9", "1", null), - array("7", "9", "One", null), - array("8", "9", "2", null), - array("9", "9", "Two", null), - array("10", "9", "3", null), - array("11", "9", "Three", null), - array("12", "12", "Red", null), - array("13", "12", "Toyota", null), - array("14", "12", "Bird", null), - array("15", "12", "Blew", null), - array("16", "13", "Good", null), - array("17", "13", "Great", null), - array("18", "13", "So-so", null), - array("19", "13", "Lamp", null), - array("20", "13", "Huh?", null), - array("21", "7", "!other=Another number", null), - array("22", "12", "!other=Something else", null) - ); + $questiondata = [ + ["id", "surveyid", "name", "type_id", "result_id", "length", "precise", "position", "content", "required", + "deleted", "dependquestion", "dependchoice", ], + ["1", $sid, "own car", "1", null, "0", "0", "1", "

Do you own a car?

", "y", "n", "0", "0"], + ["2", $sid, "optional", "2", null, "20", "25", "3", "

What is the colour of your car?

", "y", "n", "121", + "0", ], + ["3", $sid, null, "99", null, "0", "0", "2", "break", "n", "n", "0", "0"], + ["4", $sid, "optional2", "1", null, "0", "0", "5", "

Do you sometimes use public transport to go to work?

", + "y", "n", "0", "0", ], + ["5", $sid, null, "99", null, "0", "0", "4", "break", "n", "n", "0", "0"], + ["6", $sid, "entertext", "2", null, "20", "10", "6", "

Enter no more than 10 characters.

", "n", "n", "0", + "0", ], + ["7", $sid, "q7", "5", null, "0", "0", "7", "

Check all that apply

", "n", "n", "0", "0"], + ["8", $sid, "q8", "9", null, "0", "0", "8", "

Enter today's date

", "n", "n", "0", "0"], + ["9", $sid, "q9", "6", null, "0", "0", "9", "

Choose One

", "n", "n", "0", "0"], + ["10", $sid, "q10", "3", null, "5", "0", "10", "

Write an essay

", "n", "n", "0", "0"], + ["11", $sid, "q11", "10", null, "10", "0", "11", "

Enter a number

", "n", "n", "0", "0"], + ["12", $sid, "q12", "4", null, "1", "0", "13", "

Choose a colour

", "n", "n", "0", "0"], + ["13", $sid, "q13", "8", null, "5", "1", "14", "

Rate this.

", "n", "n", "0", "0"], + ["14", $sid, null, "99", null, "0", "0", "12", "break", "n", "y", "0", "0"], + ["15", $sid, null, "99", null, "0", "0", "12", "break", "n", "n", "0", "0"], + ["16", $sid, "Q1", "10", null, "3", "2", "15", "Enter a number


", "y", "n", "0", "0"], + ]; + + $choicedata = [ + ["id", "question_id", "content", "value"], + ["1", "7", "1", null], + ["2", "7", "2", null], + ["3", "7", "3", null], + ["4", "7", "4", null], + ["5", "7", "5", null], + ["6", "9", "1", null], + ["7", "9", "One", null], + ["8", "9", "2", null], + ["9", "9", "Two", null], + ["10", "9", "3", null], + ["11", "9", "Three", null], + ["12", "12", "Red", null], + ["13", "12", "Toyota", null], + ["14", "12", "Bird", null], + ["15", "12", "Blew", null], + ["16", "13", "Good", null], + ["17", "13", "Great", null], + ["18", "13", "So-so", null], + ["19", "13", "Lamp", null], + ["20", "13", "Huh?", null], + ["21", "7", "!other=Another number", null], + ["22", "12", "!other=Something else", null], + ]; $this->add_data($questiondata, 'questionnaire_question', 'questionmap'); - $this->add_data($choicedata, 'questionnaire_quest_choice', 'choicemap', array('questionmap' => 'question_id')); + $this->add_data($choicedata, 'questionnaire_quest_choice', 'choicemap', ['questionmap' => 'question_id']); } /** @@ -274,138 +274,138 @@ private function add_question_data($sid) { private function add_response_data($qid, $sid) { global $DB; - $responses = array( - array("id", "questionnaireid", "submitted", "complete", "grade", "userid"), - array("1", $qid, "1419011935", "y", "0", "2"), - array("2", $qid, "1449064371", "y", "0", "2"), - array("3", $qid, "1449258520", "y", "0", "2"), - array("4", $qid, "1452020444", "y", "0", "2"), - array("5", $qid, "1452804783", "y", "0", "2"), - array("6", $qid, "1452806547", "y", "0", "2"), - array("7", $qid, "1465415731", "n", "0", "2") - ); + $responses = [ + ["id", "questionnaireid", "submitted", "complete", "grade", "userid"], + ["1", $qid, "1419011935", "y", "0", "2"], + ["2", $qid, "1449064371", "y", "0", "2"], + ["3", $qid, "1449258520", "y", "0", "2"], + ["4", $qid, "1452020444", "y", "0", "2"], + ["5", $qid, "1452804783", "y", "0", "2"], + ["6", $qid, "1452806547", "y", "0", "2"], + ["7", $qid, "1465415731", "n", "0", "2"], + ]; $this->add_data($responses, 'questionnaire_response', 'responsemap'); - $responsebool = array( - array("id", "response_id", "question_id", "choice_id"), - array("", "1", "1", "y"), - array("", "1", "4", "n"), - array("", "2", "1", "y"), - array("", "2", "4", "n"), - array("", "3", "1", "n"), - array("", "3", "4", "y"), - array("", "4", "1", "y"), - array("", "4", "4", "n"), - array("", "5", "1", "n"), - array("", "5", "4", "n"), - array("", "6", "1", "n"), - array("", "6", "4", "n"), - array("", "7", "1", "y"), - array("", "7", "4", "y") - ); + $responsebool = [ + ["id", "response_id", "question_id", "choice_id"], + ["", "1", "1", "y"], + ["", "1", "4", "n"], + ["", "2", "1", "y"], + ["", "2", "4", "n"], + ["", "3", "1", "n"], + ["", "3", "4", "y"], + ["", "4", "1", "y"], + ["", "4", "4", "n"], + ["", "5", "1", "n"], + ["", "5", "4", "n"], + ["", "6", "1", "n"], + ["", "6", "4", "n"], + ["", "7", "1", "y"], + ["", "7", "4", "y"], + ]; $this->add_data($responsebool, 'questionnaire_response_bool', '', - array('responsemap' => 'response_id', 'questionmap' => 'question_id')); - - $responsedate = array( - array("id", "response_id", "question_id", "response"), - array("", "1", "8", "2014-12-19"), - array("", "2", "8", "2015-12-02"), - array("", "3", "8", "2015-12-04"), - array("", "4", "8", "2016-01-06"), - array("", "5", "8", "2016-01-13"), - array("", "6", "8", "2016-01-13") - ); + ['responsemap' => 'response_id', 'questionmap' => 'question_id']); + + $responsedate = [ + ["id", "response_id", "question_id", "response"], + ["", "1", "8", "2014-12-19"], + ["", "2", "8", "2015-12-02"], + ["", "3", "8", "2015-12-04"], + ["", "4", "8", "2016-01-06"], + ["", "5", "8", "2016-01-13"], + ["", "6", "8", "2016-01-13"], + ]; $this->add_data($responsedate, 'questionnaire_response_date', '', - array('responsemap' => 'response_id', 'questionmap' => 'question_id')); - - $responseother = array( - array("id", "response_id", "question_id", "choice_id", "response"), - array("", "5", "7", "21", "Forty-four"), - array("", "6", "12", "22", "Green"), - array("", "7", "7", "21", "5") - ); + ['responsemap' => 'response_id', 'questionmap' => 'question_id']); + + $responseother = [ + ["id", "response_id", "question_id", "choice_id", "response"], + ["", "5", "7", "21", "Forty-four"], + ["", "6", "12", "22", "Green"], + ["", "7", "7", "21", "5"], + ]; $this->add_data($responseother, 'questionnaire_response_other', '', - array('responsemap' => 'response_id', 'questionmap' => 'question_id', 'choicemap' => 'choice_id')); - - $responserank = array( - array("id", "response_id", "question_id", "choice_id", "rankvalue"), - array("", "1", "13", "16", "0"), - array("", "1", "13", "17", "1"), - array("", "1", "13", "18", "2"), - array("", "1", "13", "19", "3"), - array("", "1", "13", "20", "4"), - array("", "2", "13", "16", "0"), - array("", "2", "13", "17", "1"), - array("", "2", "13", "18", "2"), - array("", "2", "13", "19", "3"), - array("", "2", "13", "20", "4"), - array("", "3", "13", "16", "4"), - array("", "3", "13", "17", "0"), - array("", "3", "13", "18", "3"), - array("", "3", "13", "19", "1"), - array("", "3", "13", "20", "2"), - array("", "4", "13", "16", "2"), - array("", "4", "13", "17", "2"), - array("", "4", "13", "18", "2"), - array("", "4", "13", "19", "2"), - array("", "4", "13", "20", "2"), - array("", "5", "13", "16", "1"), - array("", "5", "13", "17", "1"), - array("", "5", "13", "18", "1"), - array("", "5", "13", "19", "1"), - array("", "5", "13", "20", "-1"), - array("", "6", "13", "16", "2"), - array("", "6", "13", "17", "3"), - array("", "6", "13", "18", "-1"), - array("", "6", "13", "19", "1"), - array("", "6", "13", "20", "-1"), - array("", "7", "13", "16", "-999"), - array("", "7", "13", "17", "-999"), - array("", "7", "13", "18", "-999"), - array("", "7", "13", "19", "-999"), - array("", "7", "13", "20", "-999") - ); + ['responsemap' => 'response_id', 'questionmap' => 'question_id', 'choicemap' => 'choice_id']); + + $responserank = [ + ["id", "response_id", "question_id", "choice_id", "rankvalue"], + ["", "1", "13", "16", "0"], + ["", "1", "13", "17", "1"], + ["", "1", "13", "18", "2"], + ["", "1", "13", "19", "3"], + ["", "1", "13", "20", "4"], + ["", "2", "13", "16", "0"], + ["", "2", "13", "17", "1"], + ["", "2", "13", "18", "2"], + ["", "2", "13", "19", "3"], + ["", "2", "13", "20", "4"], + ["", "3", "13", "16", "4"], + ["", "3", "13", "17", "0"], + ["", "3", "13", "18", "3"], + ["", "3", "13", "19", "1"], + ["", "3", "13", "20", "2"], + ["", "4", "13", "16", "2"], + ["", "4", "13", "17", "2"], + ["", "4", "13", "18", "2"], + ["", "4", "13", "19", "2"], + ["", "4", "13", "20", "2"], + ["", "5", "13", "16", "1"], + ["", "5", "13", "17", "1"], + ["", "5", "13", "18", "1"], + ["", "5", "13", "19", "1"], + ["", "5", "13", "20", "-1"], + ["", "6", "13", "16", "2"], + ["", "6", "13", "17", "3"], + ["", "6", "13", "18", "-1"], + ["", "6", "13", "19", "1"], + ["", "6", "13", "20", "-1"], + ["", "7", "13", "16", "-999"], + ["", "7", "13", "17", "-999"], + ["", "7", "13", "18", "-999"], + ["", "7", "13", "19", "-999"], + ["", "7", "13", "20", "-999"], + ]; $this->add_data($responserank, 'questionnaire_response_rank', '', - array('responsemap' => 'response_id', 'questionmap' => 'question_id', 'choicemap' => 'choice_id')); - - $respmultiple = array( - array("id", "response_id", "question_id", "choice_id"), - array("", "1", "7", "1"), - array("", "1", "7", "3"), - array("", "1", "7", "5"), - array("", "2", "7", "4"), - array("", "3", "7", "2"), - array("", "3", "7", "4"), - array("", "4", "7", "2"), - array("", "4", "7", "4"), - array("", "4", "7", "5"), - array("", "5", "7", "2"), - array("", "5", "7", "3"), - array("", "5", "7", "21"), - array("", "6", "7", "2"), - array("", "6", "7", "5"), - array("", "7", "7", "21") - ); + ['responsemap' => 'response_id', 'questionmap' => 'question_id', 'choicemap' => 'choice_id']); + + $respmultiple = [ + ["id", "response_id", "question_id", "choice_id"], + ["", "1", "7", "1"], + ["", "1", "7", "3"], + ["", "1", "7", "5"], + ["", "2", "7", "4"], + ["", "3", "7", "2"], + ["", "3", "7", "4"], + ["", "4", "7", "2"], + ["", "4", "7", "4"], + ["", "4", "7", "5"], + ["", "5", "7", "2"], + ["", "5", "7", "3"], + ["", "5", "7", "21"], + ["", "6", "7", "2"], + ["", "6", "7", "5"], + ["", "7", "7", "21"], + ]; $this->add_data($respmultiple, 'questionnaire_resp_multiple', '', - array('responsemap' => 'response_id', 'questionmap' => 'question_id', 'choicemap' => 'choice_id')); - - $respsingle = array( - array("id", "response_id", "question_id", "choice_id"), - array("", "1", "9", "7"), - array("", "1", "12", "15"), - array("", "2", "9", "7"), - array("", "2", "12", "14"), - array("", "3", "9", "11"), - array("", "3", "12", "15"), - array("", "4", "9", "6"), - array("", "4", "12", "12"), - array("", "5", "9", "6"), - array("", "5", "12", "13"), - array("", "6", "9", "7"), - array("", "6", "12", "22") - ); + ['responsemap' => 'response_id', 'questionmap' => 'question_id', 'choicemap' => 'choice_id']); + + $respsingle = [ + ["id", "response_id", "question_id", "choice_id"], + ["", "1", "9", "7"], + ["", "1", "12", "15"], + ["", "2", "9", "7"], + ["", "2", "12", "14"], + ["", "3", "9", "11"], + ["", "3", "12", "15"], + ["", "4", "9", "6"], + ["", "4", "12", "12"], + ["", "5", "9", "6"], + ["", "5", "12", "13"], + ["", "6", "9", "7"], + ["", "6", "12", "22"], + ]; $this->add_data($respsingle, 'questionnaire_resp_single', '', - array('responsemap' => 'response_id', 'questionmap' => 'question_id', 'choicemap' => 'choice_id')); + ['responsemap' => 'response_id', 'questionmap' => 'question_id', 'choicemap' => 'choice_id']); } /** @@ -422,7 +422,7 @@ private function add_data(array $data, $datatable, $mapvar = '', ?array $replvar global $DB; if ($replvars === null) { - $replvars = array(); + $replvars = []; } $fields = array_shift($data); foreach ($data as $row) { diff --git a/tests/csvexport_test.php b/tests/csvexport_test.php index bf90dbef..e771e6eb 100644 --- a/tests/csvexport_test.php +++ b/tests/csvexport_test.php @@ -29,10 +29,11 @@ * Unit tests for questionnaire_csvexport_test. * @group mod_questionnaire */ -class csvexport_test extends \advanced_testcase { +final class csvexport_test extends \advanced_testcase { public function setUp(): void { global $CFG; + parent::setUp(); require_once($CFG->dirroot.'/lib/testing/generator/data_generator.php'); require_once($CFG->dirroot.'/lib/testing/generator/component_generator_base.php'); @@ -63,7 +64,7 @@ private function get_csv_text(array $rows) { * * @covers \questionnaire::generate_csv */ - public function test_csvexport() { + public function test_csvexport(): void { $this->resetAfterTest(); $dg = $this->getDataGenerator(); $qdg = $dg->get_plugin_generator('mod_questionnaire'); @@ -96,7 +97,7 @@ public function test_csvexport() { * * @covers \questionnaire::generate_csv */ - public function test_csvexport_identity_fields() { + public function test_csvexport_identity_fields(): void { global $DB; $this->resetAfterTest(); @@ -214,7 +215,7 @@ private function expected_complete_output() { " Test course 1 Testy Lastname3 username3 Test answer Some header textSome paragraph text 83 " . "27/12/2017 wind three 0 0 0 0 0 0 0 0 0 1 1 2 3 4 5 1 2 3 4 5", " Test course 1 Testy Lastname4 username4 Test answer Some header textSome paragraph text 83 " . - "27/12/2017 wind three 0 0 0 0 0 0 0 0 0 1 1 2 3 4 5 1 2 3 4 5"]; + "27/12/2017 wind three 0 0 0 0 0 0 0 0 0 1 1 2 3 4 5 1 2 3 4 5", ]; } /** @@ -240,6 +241,6 @@ private function expected_incomplete_output() { " Test course 1 Testy Lastname4 username4 y Test answer Some header textSome paragraph text 83 " . "27/12/2017 wind three 0 0 0 0 0 0 0 0 0 1 1 2 3 4 5 1 2 3 4 5", " Test course 1 Testy Lastname5 username5 n Test answer Some header textSome paragraph text 83 " . - "27/12/2017 wind three 0 0 0 0 0 0 0 0 0 1 1 2 3 4 5 1 2 3 4 5"]; + "27/12/2017 wind three 0 0 0 0 0 0 0 0 0 1 1 2 3 4 5 1 2 3 4 5", ]; } } diff --git a/tests/custom_completion_test.php b/tests/custom_completion_test.php index 7a9169bb..cfb63110 100644 --- a/tests/custom_completion_test.php +++ b/tests/custom_completion_test.php @@ -44,7 +44,7 @@ * @copyright 2022 The Open University * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class custom_completion_test extends \advanced_testcase { +final class custom_completion_test extends \advanced_testcase { /** * Data provider for get_state(). @@ -54,16 +54,16 @@ class custom_completion_test extends \advanced_testcase { public static function get_state_provider(): array { return [ 'Undefined rule' => [ - 'somenonexistentrule', COMPLETION_DISABLED, false, null, coding_exception::class + 'somenonexistentrule', COMPLETION_DISABLED, false, null, coding_exception::class, ], 'Rule not available' => [ - 'completionsubmit', COMPLETION_DISABLED, false, null, moodle_exception::class + 'completionsubmit', COMPLETION_DISABLED, false, null, moodle_exception::class, ], 'Rule available, user has not submitted' => [ - 'completionsubmit', COMPLETION_ENABLED, false, COMPLETION_INCOMPLETE, null + 'completionsubmit', COMPLETION_ENABLED, false, COMPLETION_INCOMPLETE, null, ], 'Rule available, user has submitted' => [ - 'completionsubmit', COMPLETION_ENABLED, true, COMPLETION_COMPLETE, null + 'completionsubmit', COMPLETION_ENABLED, true, COMPLETION_COMPLETE, null, ], ]; } @@ -82,7 +82,7 @@ public static function get_state_provider(): array { * * @covers \mod_questionnaire\completion\custom_completion */ - public function test_get_state(string $rule, int $available, ?bool $submitted, ?int $status, ?string $exception) { + public function test_get_state(string $rule, int $available, ?bool $submitted, ?int $status, ?string $exception): void { if (!is_null($exception)) { $this->expectException($exception); } @@ -93,7 +93,7 @@ public function test_get_state(string $rule, int $available, ?bool $submitted, ? $course = $this->getDataGenerator()->create_course(['enablecompletion' => 1]); $student = $this->getDataGenerator()->create_and_enrol($course, 'student'); $questionnaire = $generator->create_instance(['course' => $course->id, 'completion' => COMPLETION_TRACKING_AUTOMATIC, - $rule => $available]); + $rule => $available, ]); $questiondata['type_id'] = 1; $questiondata['surveyid'] = $questionnaire->sid; @@ -119,7 +119,7 @@ public function test_get_state(string $rule, int $available, ?bool $submitted, ? * * @covers \mod_questionnaire\completion\custom_completion */ - public function test_get_defined_custom_rules() { + public function test_get_defined_custom_rules(): void { $rules = custom_completion::get_defined_custom_rules(); $this->assertCount(1, $rules); $this->assertEquals('completionsubmit', reset($rules)); @@ -130,7 +130,7 @@ public function test_get_defined_custom_rules() { * * @covers \mod_questionnaire\completion\custom_completion */ - public function test_get_custom_rule_descriptions() { + public function test_get_custom_rule_descriptions(): void { // Get defined custom rules. $rules = custom_completion::get_defined_custom_rules(); @@ -158,7 +158,7 @@ public function test_get_custom_rule_descriptions() { * * @covers \mod_questionnaire\completion\custom_completion */ - public function test_is_defined() { + public function test_is_defined(): void { // Build a mock cm_info instance. $mockcminfo = $this->getMockBuilder(cm_info::class) ->disableOriginalConstructor() @@ -181,10 +181,10 @@ public function test_is_defined() { public static function get_available_custom_rules_provider(): array { return [ 'Completion submit available' => [ - COMPLETION_ENABLED, ['completionsubmit'] + COMPLETION_ENABLED, ['completionsubmit'], ], 'Completion submit not available' => [ - COMPLETION_DISABLED, [] + COMPLETION_DISABLED, [], ], ]; } @@ -199,11 +199,11 @@ public static function get_available_custom_rules_provider(): array { * * @covers \mod_questionnaire\completion\custom_completion */ - public function test_get_available_custom_rules(int $status, array $expected) { + public function test_get_available_custom_rules(int $status, array $expected): void { $customdataval = [ 'customcompletionrules' => [ - 'completionsubmit' => $status - ] + 'completionsubmit' => $status, + ], ]; // Build a mock cm_info instance. diff --git a/tests/generator/lib.php b/tests/generator/lib.php index 77b94a90..e4c08455 100644 --- a/tests/generator/lib.php +++ b/tests/generator/lib.php @@ -82,7 +82,7 @@ public function questionnaires() { public function create_instance($record = null, ?array $options = null) { $record = (object)(array)$record; - $defaultquestionnairesettings = array( + $defaultquestionnairesettings = [ 'qtype' => 0, 'respondenttype' => 'fullname', 'resp_eligible' => 'all', @@ -97,7 +97,7 @@ public function create_instance($record = null, ?array $options = null) { 'completionsubmit' => 0, 'autonum' => 3, 'create' => 'new-0', // Used in form only to indicate a new, empty instance. - ); + ]; foreach ($defaultquestionnairesettings as $name => $value) { if (!isset($record->{$name})) { @@ -121,10 +121,10 @@ public function create_instance($record = null, ?array $options = null) { * @param array $record * @return bool|int */ - public function create_content($questionnaire, $record = array()) { + public function create_content($questionnaire, $record = []) { global $DB; - $survey = $DB->get_record('questionnaire_survey', array('id' => $questionnaire->sid), '*', MUST_EXIST); + $survey = $DB->get_record('questionnaire_survey', ['id' => $questionnaire->sid], '*', MUST_EXIST); foreach ($record as $name => $value) { $survey->{$name} = $value; } @@ -210,8 +210,8 @@ public function create_question(questionnaire $questionnaire, $record = null, $d * @param null|array|stdClass $choicedata * @return questionnaire */ - public function create_test_questionnaire($course, $qtype = null, $questiondata = array(), $choicedata = null) { - $questionnaire = $this->create_instance(array('course' => $course->id)); + public function create_test_questionnaire($course, $qtype = null, $questiondata = [], $choicedata = null) { + $questionnaire = $this->create_instance(['course' => $course->id]); $cm = get_coursemodule_from_instance('questionnaire', $questionnaire->id); if ($qtype !== null) { $questiondata['type_id'] = $qtype; @@ -242,7 +242,7 @@ public function create_question_response($questionnaire, $question, $respval, $u $respdata = (object)(array_merge(['sec' => $section, 'rid' => $currentrid, 'a' => $questionnaire->id], $respval)); $responseid = $questionnaire->response_insert($respdata, $userid); $this->response_commit($questionnaire, $responseid); - return $DB->get_record('questionnaire_response', array('id' => $responseid)); + return $DB->get_record('questionnaire_response', ['id' => $responseid]); } /** @@ -330,13 +330,13 @@ protected function add_question_choices($question, $data) { if (!is_object($content)) { $content = (object)[ 'content' => $content, - 'value' => $content + 'value' => $content, ]; } $record = (object)[ 'question_id' => $question->id, 'content' => $content->content, - 'value' => $content->value + 'value' => $content->value, ]; $question->add_choice($record); } @@ -507,7 +507,7 @@ protected function add_response_choice($questionresponse, $responseid) { 'response_id' => $responseid, 'question_id' => $questionresponse->questionid, 'choice_id' => $choiceid, - 'rankvalue' => $questionresponse->response->rankvalue + 'rankvalue' => $questionresponse->response->rankvalue, ] ); } else { @@ -519,7 +519,7 @@ protected function add_response_choice($questionresponse, $responseid) { $DB->insert_record($instable, [ 'response_id' => $responseid, 'question_id' => $questionresponse->questionid, - 'choice_id' => $choiceid + 'choice_id' => $choiceid, ] ); } @@ -527,7 +527,7 @@ protected function add_response_choice($questionresponse, $responseid) { $DB->insert_record('questionnaire_response_text', [ 'response_id' => $responseid, 'question_id' => $questionresponse->questionid, - 'response' => $questionresponse->response + 'response' => $questionresponse->response, ] ); } @@ -698,7 +698,7 @@ public function create_and_fully_populate($coursecount = 4, $studentcount = 20, $fields = []; foreach ($profilefields as $field => $name) { $dg->create_custom_profile_field(['datatype' => 'text', - 'shortname' => $field, 'name' => $name]); + 'shortname' => $field, 'name' => $name, ]); $fields[] = "profile_field_{$field}"; } set_config('showuseridentity', implode(',', $fields)); @@ -721,9 +721,9 @@ public function create_and_fully_populate($coursecount = 4, $studentcount = 20, $courses[] = $course; // Enrol students on course. - $manualenrol = $DB->get_record('enrol', array('courseid' => $course->id, 'enrol' => 'manual')); + $manualenrol = $DB->get_record('enrol', ['courseid' => $course->id, 'enrol' => 'manual']); foreach ($students as $student) { - $studentrole = $DB->get_record('role', array('shortname' => 'student')); + $studentrole = $DB->get_record('role', ['shortname' => 'student']); $manplugin->enrol_user($manualenrol, $student->id, $studentrole->id); } } @@ -742,7 +742,7 @@ public function create_and_fully_populate($coursecount = 4, $studentcount = 20, [ 'surveyid' => $questionnaire->sid, 'name' => $qdg->type_name($questiontype), - 'type_id' => QUESSECTIONTEXT + 'type_id' => QUESSECTIONTEXT, ] ); // Create questions. @@ -756,7 +756,7 @@ public function create_and_fully_populate($coursecount = 4, $studentcount = 20, [ 'surveyid' => $questionnaire->sid, 'name' => $qdg->type_name($questiontype).' '.$qname++, - 'type_id' => $questiontype + 'type_id' => $questiontype, ], $opts ); @@ -767,7 +767,7 @@ public function create_and_fully_populate($coursecount = 4, $studentcount = 20, [ 'surveyid' => $questionnaire->sid, 'name' => 'pagebreak '.$qname++, - 'type_id' => QUESPAGEBREAK + 'type_id' => QUESPAGEBREAK, ] ); } diff --git a/tests/generator_test.php b/tests/generator_test.php index 707ecf6a..455230e8 100644 --- a/tests/generator_test.php +++ b/tests/generator_test.php @@ -29,7 +29,7 @@ * Unit tests for questionnaire_generator_testcase. * @group mod_questionnaire */ -class generator_test extends \advanced_testcase { +final class generator_test extends \advanced_testcase { /** * Test generator create_instance function. * @@ -39,20 +39,20 @@ class generator_test extends \advanced_testcase { * * @covers \mod_questionnaire\generator\ */ - public function test_create_instance() { + public function test_create_instance(): void { global $DB; $this->resetAfterTest(true); $course = $this->getDataGenerator()->create_course(); - $this->assertFalse($DB->record_exists('questionnaire', array('course' => $course->id))); + $this->assertFalse($DB->record_exists('questionnaire', ['course' => $course->id])); /** @var mod_questionnaire_generator $generator */ $generator = $this->getDataGenerator()->get_plugin_generator('mod_questionnaire'); $this->assertInstanceOf('mod_questionnaire_generator', $generator); $this->assertEquals('questionnaire', $generator->get_modulename()); - $questionnaire = $generator->create_instance(array('course' => $course->id)); + $questionnaire = $generator->create_instance(['course' => $course->id]); $this->assertEquals(1, $DB->count_records('questionnaire')); $cm = get_coursemodule_from_instance('questionnaire', $questionnaire->id); @@ -63,7 +63,7 @@ public function test_create_instance() { $context = \context_module::instance($cm->id); $this->assertEquals($questionnaire->cmid, $context->instanceid); - $survey = $DB->get_record('questionnaire_survey', array('id' => $questionnaire->sid)); + $survey = $DB->get_record('questionnaire_survey', ['id' => $questionnaire->sid]); $this->assertEquals($survey->id, $questionnaire->sid); $this->assertEquals($questionnaire->name, $survey->name); $this->assertEquals($questionnaire->name, $survey->title); @@ -82,18 +82,18 @@ public function test_create_instance() { * * @covers \mod_questionnaire\generator\ */ - public function test_create_content() { + public function test_create_content(): void { global $DB; $this->resetAfterTest(true); $course = $this->getDataGenerator()->create_course(); $generator = $this->getDataGenerator()->get_plugin_generator('mod_questionnaire'); - $questionnaire = $generator->create_instance(array('course' => $course->id)); + $questionnaire = $generator->create_instance(['course' => $course->id]); $cm = get_coursemodule_from_instance('questionnaire', $questionnaire->id); $questionnaire = new \questionnaire($course, $cm, $questionnaire->id, null, false); - $newcontent = array( + $newcontent = [ 'title' => 'New title', 'email' => 'test@email.com', 'subtitle' => 'New subtitle', @@ -101,10 +101,10 @@ public function test_create_content() { 'thanks_page' => 'http://thankurl.com', 'thank_head' => 'New thank header', 'thank_body' => 'New thank body', - ); + ]; $sid = $generator->create_content($questionnaire, $newcontent); $this->assertEquals($sid, $questionnaire->sid); - $survey = $DB->get_record('questionnaire_survey', array('id' => $sid)); + $survey = $DB->get_record('questionnaire_survey', ['id' => $sid]); foreach ($newcontent as $name => $value) { $this->assertEquals($survey->{$name}, $value); } diff --git a/tests/lib_test.php b/tests/lib_test.php index 4f828306..aec46dd3 100644 --- a/tests/lib_test.php +++ b/tests/lib_test.php @@ -37,7 +37,7 @@ * Unit tests for questionnaire_lib_testcase. * @group mod_questionnaire */ -class lib_test extends \advanced_testcase { +final class lib_test extends \advanced_testcase { /** * Test for questionnaire_supports. @@ -46,7 +46,7 @@ class lib_test extends \advanced_testcase { * * @covers \questionnaire_supports */ - public function test_questionnaire_supports() { + public function test_questionnaire_supports(): void { $this->assertTrue(questionnaire_supports(FEATURE_BACKUP_MOODLE2)); $this->assertFalse(questionnaire_supports(FEATURE_COMPLETION_TRACKS_VIEWS)); $this->assertTrue(questionnaire_supports(FEATURE_COMPLETION_HAS_RULES)); @@ -66,7 +66,7 @@ public function test_questionnaire_supports() { * * @covers \questionnaire_get_extra_capabilities */ - public function test_questionnaire_get_extra_capabilities() { + public function test_questionnaire_get_extra_capabilities(): void { $caps = questionnaire_get_extra_capabilities(); $this->assertIsArray($caps); $this->assertEquals(1, count($caps)); @@ -81,7 +81,7 @@ public function test_questionnaire_get_extra_capabilities() { * * @covers \questionnaire_add_instance */ - public function test_add_instance() { + public function test_add_instance(): void { $this->resetAfterTest(); $this->setAdminUser(); $course = $this->getDataGenerator()->create_course(); @@ -119,7 +119,7 @@ public function test_add_instance() { * * @covers \questionnaire_update_instance */ - public function test_update_instance() { + public function test_update_instance(): void { global $DB; $this->resetAfterTest(); @@ -128,7 +128,7 @@ public function test_update_instance() { /** @var mod_questionnaire_generator $generator */ $generator = $this->getDataGenerator()->get_plugin_generator('mod_questionnaire'); /** @var questionnaire $questionnaire */ - $questionnaire = $generator->create_instance(array('course' => $course->id, 'sid' => 1)); + $questionnaire = $generator->create_instance(['course' => $course->id, 'sid' => 1]); $qid = $questionnaire->id; $this->assertTrue($qid > 0); @@ -157,7 +157,7 @@ public function test_update_instance() { $this->assertTrue(questionnaire_update_instance($qrow)); - $questrecord = $DB->get_record('questionnaire', array('id' => $qid)); + $questrecord = $DB->get_record('questionnaire', ['id' => $qid]); $this->assertNotEmpty($questrecord); $this->assertEquals($qrow->qtype, $questrecord->qtype); $this->assertEquals($qrow->respondenttype, $questrecord->respondenttype); @@ -184,14 +184,14 @@ public function test_update_instance() { * * @covers \questionnaire_delete_instance */ - public function test_delete_instance() { + public function test_delete_instance(): void { global $DB; $this->resetAfterTest(); $this->setAdminUser(); // Set up a new questionnaire. - $questiondata = array(); + $questiondata = []; $questiondata['content'] = 'Enter yes or no'; $course = $this->getDataGenerator()->create_course(); $generator = $this->getDataGenerator()->get_plugin_generator('mod_questionnaire'); @@ -203,16 +203,16 @@ public function test_delete_instance() { $response = $generator->create_question_response($questionnaire, $question, 'y'); // Get records for database deletion confirmation. - $survey = $DB->get_record('questionnaire_survey', array('id' => $questionnaire->sid)); + $survey = $DB->get_record('questionnaire_survey', ['id' => $questionnaire->sid]); // Now delete it all. $this->assertTrue(questionnaire_delete_instance($questionnaire->id)); - $this->assertEmpty($DB->get_record('questionnaire', array('id' => $questionnaire->id))); - $this->assertEmpty($DB->get_record('questionnaire_survey', array('id' => $questionnaire->sid))); - $this->assertEmpty($DB->get_records('questionnaire_question', array('surveyid' => $survey->id))); - $this->assertEmpty($DB->get_records('questionnaire_response', array('questionnaireid' => $questionnaire->id))); - $this->assertEmpty($DB->get_records('questionnaire_response_bool', array('response_id' => $response->id))); - $this->assertEmpty($DB->get_records('event', array("modulename" => 'questionnaire', "instance" => $questionnaire->id))); + $this->assertEmpty($DB->get_record('questionnaire', ['id' => $questionnaire->id])); + $this->assertEmpty($DB->get_record('questionnaire_survey', ['id' => $questionnaire->sid])); + $this->assertEmpty($DB->get_records('questionnaire_question', ['surveyid' => $survey->id])); + $this->assertEmpty($DB->get_records('questionnaire_response', ['questionnaireid' => $questionnaire->id])); + $this->assertEmpty($DB->get_records('questionnaire_response_bool', ['response_id' => $response->id])); + $this->assertEmpty($DB->get_records('event', ["modulename" => 'questionnaire', "instance" => $questionnaire->id])); } /** @@ -223,13 +223,13 @@ public function test_delete_instance() { * * @covers \questionnaire_user_outline */ - public function test_questionnaire_user_outline() { + public function test_questionnaire_user_outline(): void { $this->resetAfterTest(); $this->setAdminUser(); $user = $this->getDataGenerator()->create_user(); $course = $this->getDataGenerator()->create_course(); $generator = $this->getDataGenerator()->get_plugin_generator('mod_questionnaire'); - $questiondata = array(); + $questiondata = []; $questiondata['content'] = 'Enter yes or no'; $questionnaire = $generator->create_test_questionnaire($course, QUESYESNO, $questiondata); @@ -251,7 +251,7 @@ public function test_questionnaire_user_outline() { * * @covers \questionnaire_user_complete */ - public function test_questionnaire_user_complete() { + public function test_questionnaire_user_complete(): void { $this->resetAfterTest(); $this->setAdminUser(); $user = $this->getDataGenerator()->create_user(); @@ -270,7 +270,7 @@ public function test_questionnaire_user_complete() { * * @covers \questionnaire_print_recent_activity */ - public function test_questionnaire_print_recent_activity() { + public function test_questionnaire_print_recent_activity(): void { $this->resetAfterTest(); $this->setAdminUser(); $this->assertFalse(questionnaire_print_recent_activity(null, null, null)); @@ -283,7 +283,7 @@ public function test_questionnaire_print_recent_activity() { * * @covers \questionnaire_grades */ - public function test_questionnaire_grades() { + public function test_questionnaire_grades(): void { $this->resetAfterTest(); $this->setAdminUser(); $this->assertNull(questionnaire_grades(null)); @@ -296,7 +296,7 @@ public function test_questionnaire_grades() { * * @covers \questionnaire_get_user_grades */ - public function test_questionnaire_get_user_grades() { + public function test_questionnaire_get_user_grades(): void { $this->resetAfterTest(); $this->setAdminUser(); @@ -321,7 +321,7 @@ public function test_questionnaire_get_user_grades() { * * @covers \questionnaire_update_grades */ - public function test_questionnaire_update_grades() { + public function test_questionnaire_update_grades(): void { // Don't know how to test this yet! It doesn't return anything. $this->assertNull(questionnaire_update_grades()); } @@ -333,7 +333,7 @@ public function test_questionnaire_update_grades() { * * @covers \questionnaire_grade_item_update */ - public function test_questionnaire_grade_item_update() { + public function test_questionnaire_grade_item_update(): void { $this->resetAfterTest(); $this->setAdminUser(); $course = $this->getDataGenerator()->create_course(); diff --git a/tests/privacy_provider_test.php b/tests/privacy_provider_test.php index 0cdd6122..4500bd96 100644 --- a/tests/privacy_provider_test.php +++ b/tests/privacy_provider_test.php @@ -25,7 +25,7 @@ namespace mod_questionnaire; -use \mod_questionnaire\privacy\provider; +use mod_questionnaire\privacy\provider; /** * Privacy test for the mod questionnaire. @@ -36,11 +36,12 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @group mod_questionnaire */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +final class privacy_provider_test extends \core_privacy\tests\provider_testcase { /** * Tests set up. */ public function setUp(): void { + parent::setUp(); $this->resetAfterTest(); $this->setAdminUser(); } @@ -50,7 +51,7 @@ public function setUp(): void { * * @covers \mod_questionnaire\privacy\provider::get_contexts_for_userid */ - public function test_get_contexts_for_userid() { + public function test_get_contexts_for_userid(): void { global $DB; $this->resetAfterTest(); @@ -76,7 +77,7 @@ public function test_get_contexts_for_userid() { * * @covers \mod_questionnaire\privacy\provider::get_users_in_context */ - public function test_get_users_in_context() { + public function test_get_users_in_context(): void { global $DB; $this->resetAfterTest(); @@ -109,7 +110,7 @@ public function test_get_users_in_context() { * * @covers \mod_questionnaire\privacy\provider::export_user_data */ - public function test_export_user_data() { + public function test_export_user_data(): void { global $DB; $this->resetAfterTest(); @@ -146,7 +147,7 @@ public function test_export_user_data() { * * @covers \mod_questionnaire\privacy\provider::delete_data_for_all_users_in_context */ - public function test_delete_data_for_all_users_in_context() { + public function test_delete_data_for_all_users_in_context(): void { global $DB; $this->resetAfterTest(); @@ -172,7 +173,7 @@ public function test_delete_data_for_all_users_in_context() { * * @covers \mod_questionnaire\privacy\provider::delete_data_for_user */ - public function test_delete_data_for_user() { + public function test_delete_data_for_user(): void { global $DB; $this->resetAfterTest(); @@ -203,7 +204,7 @@ public function test_delete_data_for_user() { * * @covers \mod_questionnaire\privacy\provider::delete_data_for_users */ - public function test_delete_data_for_users() { + public function test_delete_data_for_users(): void { global $DB; $this->resetAfterTest(); diff --git a/tests/questiontypes_test.php b/tests/questiontypes_test.php index 53944a09..8ff6b825 100644 --- a/tests/questiontypes_test.php +++ b/tests/questiontypes_test.php @@ -37,7 +37,7 @@ * Unit tests for questionnaire_questiontypes_testcase. * @group mod_questionnaire */ -class questiontypes_test extends \advanced_testcase { +final class questiontypes_test extends \advanced_testcase { /** * Create a check boxes test question. @@ -46,9 +46,9 @@ class questiontypes_test extends \advanced_testcase { * * @covers \mod_questionnaire\questiontypes_test::create_test_question */ - public function test_create_question_checkbox() { + public function test_create_question_checkbox(): void { $this->create_test_question_with_choices(QUESCHECK, - '\\mod_questionnaire\\question\\check', array('content' => 'Check one')); + '\\mod_questionnaire\\question\\check', ['content' => 'Check one']); } /** @@ -58,8 +58,8 @@ public function test_create_question_checkbox() { * * @covers \mod_questionnaire\questiontypes_test::create_test_question */ - public function test_create_question_date() { - $this->create_test_question(QUESDATE, '\\mod_questionnaire\\question\\date', array('content' => 'Enter a date')); + public function test_create_question_date(): void { + $this->create_test_question(QUESDATE, '\\mod_questionnaire\\question\\date', ['content' => 'Enter a date']); } /** @@ -69,8 +69,8 @@ public function test_create_question_date() { * * @covers \mod_questionnaire\questiontypes_test::create_test_question */ - public function test_create_question_dropdown() { - $this->create_test_question_with_choices(QUESDROP, '\\mod_questionnaire\\question\\drop', array('content' => 'Select one')); + public function test_create_question_dropdown(): void { + $this->create_test_question_with_choices(QUESDROP, '\\mod_questionnaire\\question\\drop', ['content' => 'Select one']); } /** @@ -80,11 +80,11 @@ public function test_create_question_dropdown() { * * @covers \mod_questionnaire\questiontypes_test::create_test_question */ - public function test_create_question_essay() { - $questiondata = array( + public function test_create_question_essay(): void { + $questiondata = [ 'content' => 'Enter an essay', 'length' => 0, - 'precise' => 5); + 'precise' => 5, ]; $this->create_test_question(QUESESSAY, '\\mod_questionnaire\\question\\essay', $questiondata); } @@ -95,9 +95,9 @@ public function test_create_question_essay() { * * @covers \mod_questionnaire\questiontypes_test::create_test_question */ - public function test_create_question_sectiontext() { + public function test_create_question_sectiontext(): void { $this->create_test_question(QUESSECTIONTEXT, '\\mod_questionnaire\\question\\sectiontext', - array('name' => null, 'content' => 'This a section label.')); + ['name' => null, 'content' => 'This a section label.']); } /** @@ -107,11 +107,11 @@ public function test_create_question_sectiontext() { * * @covers \mod_questionnaire\questiontypes_test::create_test_question */ - public function test_create_question_numeric() { - $questiondata = array( + public function test_create_question_numeric(): void { + $questiondata = [ 'content' => 'Enter a number', 'length' => 10, - 'precise' => 0); + 'precise' => 0, ]; $this->create_test_question(QUESNUMERIC, '\\mod_questionnaire\\question\\numerical', $questiondata); } @@ -122,9 +122,9 @@ public function test_create_question_numeric() { * * @covers \mod_questionnaire\questiontypes_test::create_test_question */ - public function test_create_question_radiobuttons() { + public function test_create_question_radiobuttons(): void { $this->create_test_question_with_choices(QUESRADIO, - '\\mod_questionnaire\\question\\radio', array('content' => 'Choose one')); + '\\mod_questionnaire\\question\\radio', ['content' => 'Choose one']); } /** @@ -134,8 +134,8 @@ public function test_create_question_radiobuttons() { * * @covers \mod_questionnaire\questiontypes_test::create_test_question */ - public function test_create_question_ratescale() { - $this->create_test_question_with_choices(QUESRATE, '\\mod_questionnaire\\question\\rate', array('content' => 'Rate these')); + public function test_create_question_ratescale(): void { + $this->create_test_question_with_choices(QUESRATE, '\\mod_questionnaire\\question\\rate', ['content' => 'Rate these']); } /** @@ -145,11 +145,11 @@ public function test_create_question_ratescale() { * * @covers \mod_questionnaire\questiontypes_test::create_test_question */ - public function test_create_question_textbox() { - $questiondata = array( + public function test_create_question_textbox(): void { + $questiondata = [ 'content' => 'Enter some text', 'length' => 20, - 'precise' => 25); + 'precise' => 25, ]; $this->create_test_question(QUESTEXT, '\\mod_questionnaire\\question\\text', $questiondata); } @@ -160,9 +160,9 @@ public function test_create_question_textbox() { * * @covers \mod_questionnaire\questiontypes_test::create_test_question */ - public function test_create_question_slider() { - $questiondata = array( - 'content' => 'Enter a number'); + public function test_create_question_slider(): void { + $questiondata = [ + 'content' => 'Enter a number', ]; $this->create_test_question(QUESSLIDER, '\\mod_questionnaire\\question\\slider', $questiondata); } @@ -173,8 +173,8 @@ public function test_create_question_slider() { * * @covers \mod_questionnaire\questiontypes_test::create_test_question */ - public function test_create_question_yesno() { - $this->create_test_question(QUESYESNO, '\\mod_questionnaire\\question\\yesno', array('content' => 'Enter yes or no')); + public function test_create_question_yesno(): void { + $this->create_test_question(QUESYESNO, '\\mod_questionnaire\\question\\yesno', ['content' => 'Enter yes or no']); } @@ -187,14 +187,14 @@ public function test_create_question_yesno() { * @param array $questiondata * @param null|array $choicedata */ - private function create_test_question($qtype, $questionclass, $questiondata = array(), $choicedata = null) { + private function create_test_question($qtype, $questionclass, $questiondata = [], $choicedata = null) { global $DB; $this->resetAfterTest(); $course = $this->getDataGenerator()->create_course(); $generator = $this->getDataGenerator()->get_plugin_generator('mod_questionnaire'); - $questionnaire = $generator->create_instance(array('course' => $course->id)); + $questionnaire = $generator->create_instance(['course' => $course->id]); $cm = get_coursemodule_from_instance('questionnaire', $questionnaire->id); $questiondata['type_id'] = $qtype; @@ -215,7 +215,7 @@ private function create_test_question($qtype, $questionclass, $questiondata = ar $this->assertEquals(count($choicedata), count($question->choices)); $choicedatum = reset($choicedata); foreach ($question->choices as $cid => $choice) { - $this->assertTrue($DB->record_exists('questionnaire_quest_choice', array('id' => $cid))); + $this->assertTrue($DB->record_exists('questionnaire_quest_choice', ['id' => $cid])); $this->assertEquals($choice->content, $choicedatum->content); $this->assertEquals($choice->value, $choicedatum->value); $choicedatum = next($choicedata); @@ -224,7 +224,7 @@ private function create_test_question($qtype, $questionclass, $questiondata = ar // Questionnaire object should now have question record(s). $questionnaire = new \questionnaire($course, $cm, $questionnaire->id, null, true); - $this->assertTrue($DB->record_exists('questionnaire_question', array('id' => $question->id))); + $this->assertTrue($DB->record_exists('questionnaire_question', ['id' => $question->id])); $this->assertEquals('array', gettype($questionnaire->questions)); $this->assertTrue(array_key_exists($question->id, $questionnaire->questions)); $this->assertEquals(1, count($questionnaire->questions)); @@ -240,12 +240,12 @@ private function create_test_question($qtype, $questionclass, $questiondata = ar * @param array $questiondata * @param null|array $choicedata */ - private function create_test_question_with_choices($qtype, $questionclass, $questiondata = array(), $choicedata = null) { + private function create_test_question_with_choices($qtype, $questionclass, $questiondata = [], $choicedata = null) { if ($choicedata === null) { - $choicedata = array( - (object)array('content' => 'One', 'value' => 1), - (object)array('content' => 'Two', 'value' => 2), - (object)array('content' => 'Three', 'value' => 3)); + $choicedata = [ + (object)['content' => 'One', 'value' => 1], + (object)['content' => 'Two', 'value' => 2], + (object)['content' => 'Three', 'value' => 3], ]; } $this->create_test_question($qtype, $questionclass, $questiondata, $choicedata); } diff --git a/tests/responsetypes_test.php b/tests/responsetypes_test.php index dec7782e..dc081cec 100644 --- a/tests/responsetypes_test.php +++ b/tests/responsetypes_test.php @@ -39,7 +39,7 @@ * Unit tests for questionnaire_responsetypes_testcase. * @group mod_questionnaire */ -class responsetypes_test extends \advanced_testcase { +final class responsetypes_test extends \advanced_testcase { /** * Test responses in a yes/no question. * @@ -48,7 +48,7 @@ class responsetypes_test extends \advanced_testcase { * * @covers \mod_questionnaire\question\yesno */ - public function test_create_response_boolean() { + public function test_create_response_boolean(): void { global $DB; $this->resetAfterTest(); @@ -82,7 +82,7 @@ public function test_create_response_boolean() { * * @covers \mod_questionnaire\question\essay */ - public function test_create_response_text() { + public function test_create_response_text(): void { global $DB; $this->resetAfterTest(); @@ -117,7 +117,7 @@ public function test_create_response_text() { * * @covers \mod_questionnaire\question\slider */ - public function test_create_response_slider() { + public function test_create_response_slider(): void { global $DB; $this->resetAfterTest(); @@ -152,7 +152,7 @@ public function test_create_response_slider() { * * @covers \mod_questionnaire\question\date */ - public function test_create_response_date() { + public function test_create_response_date(): void { global $DB; $this->resetAfterTest(); @@ -188,7 +188,7 @@ public function test_create_response_date() { * * @covers \mod_questionnaire\question\radio */ - public function test_create_response_single() { + public function test_create_response_single(): void { global $DB; $this->resetAfterTest(); @@ -203,7 +203,7 @@ public function test_create_response_single() { (object)['content' => 'One', 'value' => 1], (object)['content' => 'Two', 'value' => 2], (object)['content' => 'Three', 'value' => 3], - (object)['content' => '!other=Something else', 'value' => 4] + (object)['content' => '!other=Something else', 'value' => 4], ]; $questionnaire = $generator->create_test_questionnaire($course, QUESRADIO, ['content' => 'Select one'], $choicedata); @@ -234,7 +234,7 @@ public function test_create_response_single() { } } $vals = ['q'.$question->id => $val, - 'q'.$question->id. \mod_questionnaire\question\choice::id_other_choice_name($val) => 'Forty-four']; + 'q'.$question->id. \mod_questionnaire\question\choice::id_other_choice_name($val) => 'Forty-four', ]; $userid = 2; $response = $generator->create_question_response($questionnaire, $question, $vals, $userid); @@ -265,7 +265,7 @@ public function test_create_response_single() { * * @covers \mod_questionnaire\question\rate */ - public function test_create_response_multiple() { + public function test_create_response_multiple(): void { global $DB; $this->resetAfterTest(); @@ -280,7 +280,7 @@ public function test_create_response_multiple() { (object)['content' => 'One', 'value' => 1], (object)['content' => 'Two', 'value' => 2], (object)['content' => 'Three', 'value' => 3], - (object)['content' => '!other=Another number', 'value' => 4] + (object)['content' => '!other=Another number', 'value' => 4], ]; $questionnaire = $generator->create_test_questionnaire($course, QUESCHECK, ['content' => 'Select any'], $choicedata); @@ -328,7 +328,7 @@ public function test_create_response_multiple() { * * @covers \mod_questionnaire\question\rate */ - public function test_create_response_rank() { + public function test_create_response_rank(): void { global $DB; $this->resetAfterTest(); @@ -342,7 +342,7 @@ public function test_create_response_rank() { $choicedata = [ (object)['content' => 'One', 'value' => 1], (object)['content' => 'Two', 'value' => 2], - (object)['content' => 'Three', 'value' => 3] + (object)['content' => 'Three', 'value' => 3], ]; $questiondata = ['content' => 'Rank these', 'length' => 5, 'precise' => 0]; $questionnaire = $generator->create_test_questionnaire($course, QUESRATE, $questiondata, $choicedata); @@ -420,7 +420,14 @@ private function response_tests($questionnaireid, $responseid, $userid, $this->assertEquals($responseid, $responses[$responseid]->id); } - public function test_create_old_response_boolean() { + /** + * Test that old responses are deleted for boolean questions. + * + * @return void + * + * @covers \questionnaire_delete_old_responses + */ + public function test_create_old_response_boolean(): void { global $DB; $this->resetAfterTest(); diff --git a/view.php b/view.php index c0181ce5..1ed5446c 100644 --- a/view.php +++ b/view.php @@ -23,6 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * */ + require_once("../../config.php"); require_once($CFG->dirroot.'/mod/questionnaire/locallib.php'); require_once($CFG->libdir . '/completionlib.php'); @@ -120,11 +121,11 @@ $context = context_module::instance($questionnaire->cm->id); $anonymous = $questionnaire->respondenttype == 'anonymous'; -$event = \mod_questionnaire\event\course_module_viewed::create(array( +$event = \mod_questionnaire\event\course_module_viewed::create([ 'objectid' => $questionnaire->id, 'anonymous' => $anonymous, - 'context' => $context -)); + 'context' => $context, +]); $event->trigger(); $usernumresp = $questionnaire->count_submissions($USER->id);