From 2fcc93981fdf7c39f620f13c93b88715869edca7 Mon Sep 17 00:00:00 2001 From: Nathan Nguyen Date: Wed, 3 Nov 2021 13:53:01 +1100 Subject: [PATCH] MDL-72075 qbank_statistics: fix coding style --- .../classes/columns/discrimination_index.php | 8 +++-- .../columns/discriminative_efficiency.php | 8 +++-- .../classes/columns/facility_index.php | 9 ++++-- question/bank/statistics/classes/helper.php | 11 +++++-- .../statistics/classes/privacy/provider.php | 5 +++- .../bank/statistics/tests/helper_test.php | 30 +++++++++++++------ 6 files changed, 52 insertions(+), 19 deletions(-) diff --git a/question/bank/statistics/classes/columns/discrimination_index.php b/question/bank/statistics/classes/columns/discrimination_index.php index 9110947df59..a0255390607 100644 --- a/question/bank/statistics/classes/columns/discrimination_index.php +++ b/question/bank/statistics/classes/columns/discrimination_index.php @@ -29,14 +29,18 @@ use qbank_statistics\helper; class discrimination_index extends column_base { /** - * {@inheritdoc} + * Title for this column. + * + * @return string column title */ protected function get_title(): string { return get_string('discrimination_index', 'qbank_statistics'); } /** - * {@inheritdoc} + * Column name. + * + * @return string column name */ public function get_name(): string { return 'discrimination_index'; diff --git a/question/bank/statistics/classes/columns/discriminative_efficiency.php b/question/bank/statistics/classes/columns/discriminative_efficiency.php index 381d02a1851..75eeadc9486 100644 --- a/question/bank/statistics/classes/columns/discriminative_efficiency.php +++ b/question/bank/statistics/classes/columns/discriminative_efficiency.php @@ -29,14 +29,18 @@ use qbank_statistics\helper; class discriminative_efficiency extends column_base { /** - * {@inheritdoc} + * Title for this column. + * + * @return string column title */ protected function get_title(): string { return get_string('discriminative_efficiency', 'qbank_statistics'); } /** - * {@inheritdoc} + * Column name. + * + * @return string column name */ public function get_name(): string { return 'discriminative_efficiency'; diff --git a/question/bank/statistics/classes/columns/facility_index.php b/question/bank/statistics/classes/columns/facility_index.php index 8c11b95984b..b862ed03ce9 100644 --- a/question/bank/statistics/classes/columns/facility_index.php +++ b/question/bank/statistics/classes/columns/facility_index.php @@ -29,14 +29,19 @@ use qbank_statistics\helper; class facility_index extends column_base { /** - * {@inheritdoc} + * Title for this column. + * + * @return string column title */ protected function get_title(): string { return get_string('facility_index', 'qbank_statistics'); } + /** - * {@inheritdoc} + * Column name. + * + * @return string column name */ public function get_name(): string { return 'facility_index'; diff --git a/question/bank/statistics/classes/helper.php b/question/bank/statistics/classes/helper.php index 484eb510796..b72f59bfd5e 100644 --- a/question/bank/statistics/classes/helper.php +++ b/question/bank/statistics/classes/helper.php @@ -16,14 +16,17 @@ namespace qbank_statistics; +use core_question\statistics\questions\all_calculated_for_qubaid_condition; +use quiz_statistics_report; + defined('MOODLE_INTERNAL') || die(); + require_once($CFG->dirroot . '/mod/quiz/report/statistics/statisticslib.php'); require_once($CFG->dirroot . '/mod/quiz/report/default.php'); require_once($CFG->dirroot . '/mod/quiz/report/statistics/report.php'); require_once($CFG->dirroot . '/mod/quiz/report/reportlib.php'); require_once($CFG->dirroot . '/mod/quiz/attemptlib.php'); -use core_question\statistics\questions\all_calculated_for_qubaid_condition; -use quiz_statistics_report; + /** * Helper for statistics * @@ -59,7 +62,9 @@ class helper { FROM {quiz_attempts} qa JOIN {question_usages} qu ON qu.id = qa.uniqueid JOIN {question_attempts} qatt ON qatt.questionusageid = qu.id - WHERE qatt.questionid = :questionid", ['questionid' => $questionid]); + WHERE qatt.questionid = :questionid", + ['questionid' => $questionid] + ); return $quizzes; } diff --git a/question/bank/statistics/classes/privacy/provider.php b/question/bank/statistics/classes/privacy/provider.php index 9f11fc2db3c..93f6038e2b1 100644 --- a/question/bank/statistics/classes/privacy/provider.php +++ b/question/bank/statistics/classes/privacy/provider.php @@ -25,8 +25,11 @@ namespace qbank_statistics\privacy; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class provider implements \core_privacy\local\metadata\null_provider { + /** - * {@inheritdoc} + * Explain why qbank_statistics store no data + * + * @return string reason why this plugin store no data */ public static function get_reason(): string { return 'privacy:metadata'; diff --git a/question/bank/statistics/tests/helper_test.php b/question/bank/statistics/tests/helper_test.php index 7dbe71a897f..1660ec5f417 100644 --- a/question/bank/statistics/tests/helper_test.php +++ b/question/bank/statistics/tests/helper_test.php @@ -295,9 +295,13 @@ class helper_test extends \advanced_testcase { * @param array $expectedquiz2facilities expected quiz 2 facilities * @param array $expectedaveragefacilities expected average facilities */ - public function test_load_question_facility(array $quiz1attempts, array $expectedquiz1facilities, - array $quiz2attempts, array $expectedquiz2facilities, - array $expectedaveragefacilities): void { + public function test_load_question_facility( + array $quiz1attempts, + array $expectedquiz1facilities, + array $quiz2attempts, + array $expectedquiz2facilities, + array $expectedaveragefacilities) + : void { $this->resetAfterTest(); list($quiz1, $quiz2, $questions) = $this->prepare_and_submit_quizzes($quiz1attempts, $quiz2attempts); @@ -371,9 +375,13 @@ class helper_test extends \advanced_testcase { * @param array $expectedquiz2discriminativeefficiency expected quiz 2 discriminative efficiency * @param array $expectedaveragediscriminativeefficiency expected average discriminative efficiency */ - public function test_load_question_discriminative_efficiency(array $quiz1attempts, array $expectedquiz1discriminativeefficiency, - array $quiz2attempts, array $expectedquiz2discriminativeefficiency, - array $expectedaveragediscriminativeefficiency): void { + public function test_load_question_discriminative_efficiency( + array $quiz1attempts, + array $expectedquiz1discriminativeefficiency, + array $quiz2attempts, + array $expectedquiz2discriminativeefficiency, + array $expectedaveragediscriminativeefficiency + ): void { $this->resetAfterTest(); list($quiz1, $quiz2, $questions) = $this->prepare_and_submit_quizzes($quiz1attempts, $quiz2attempts); @@ -471,9 +479,13 @@ class helper_test extends \advanced_testcase { * @param array $expectedquiz2discriminationindex expected quiz 2 discrimination index * @param array $expectedaveragediscriminationindex expected average discrimination index */ - public function test_load_question_discrimination_index(array $quiz1attempts, array $expectedquiz1discriminationindex, - array $quiz2attempts, array $expectedquiz2discriminationindex, - array $expectedaveragediscriminationindex): void { + public function test_load_question_discrimination_index( + array $quiz1attempts, + array $expectedquiz1discriminationindex, + array $quiz2attempts, + array $expectedquiz2discriminationindex, + array $expectedaveragediscriminationindex + ): void { $this->resetAfterTest(); list($quiz1, $quiz2, $questions) = $this->prepare_and_submit_quizzes($quiz1attempts, $quiz2attempts);