';
echo '
'.get_string('tempuserslist', 'attendance').'
';
@@ -118,7 +118,7 @@ function attendance_print_tempusers($tempusers, mod_attendance_structure $att) {
echo '
'.format_string($tempuser->fullname).' | ';
echo '
'.format_string($tempuser->email).' | ';
echo '
'.userdate($tempuser->created, get_string('strftimedatetime')).' | ';
- $params = array('userid' => $tempuser->id);
+ $params = ['userid' => $tempuser->id];
$editlink = html_writer::link($att->url_tempedit($params), get_string('edituser', 'attendance'));
$deletelink = html_writer::link($att->url_tempdelete($params), get_string('deleteuser', 'attendance'));
$mergelink = html_writer::link($att->url_tempmerge($params), get_string('mergeuser', 'attendance'));
diff --git a/tests/behat/behat_mod_attendance.php b/tests/behat/behat_mod_attendance.php
index 8058b2e4116..3e767a0bf5b 100644
--- a/tests/behat/behat_mod_attendance.php
+++ b/tests/behat/behat_mod_attendance.php
@@ -70,7 +70,7 @@ protected function resolve_page_instance_url(string $type, string $identifier):
*/
protected function get_attendance_by_name(string $name): stdClass {
global $DB;
- return $DB->get_record('attendance', array('name' => $name), '*', MUST_EXIST);
+ return $DB->get_record('attendance', ['name' => $name], '*', MUST_EXIST);
}
/**
diff --git a/tests/external/external_test.php b/tests/external/external_test.php
index 45a6ea79c27..c5e2689145d 100644
--- a/tests/external/external_test.php
+++ b/tests/external/external_test.php
@@ -51,7 +51,7 @@
* @group mod_attendance
* @runTestsInSeparateProcesses
*/
-class external_test extends externallib_advanced_testcase {
+final class external_test extends externallib_advanced_testcase {
/** @var core_course_category */
protected $category;
/** @var stdClass */
@@ -72,10 +72,10 @@ public function setUp(): void {
global $CFG, $DB;
require_once($CFG->dirroot . '/mod/attendance/externallib.php');
$this->category = $this->getDataGenerator()->create_category();
- $this->course = $this->getDataGenerator()->create_course(array('category' => $this->category->id));
- $att = $this->getDataGenerator()->create_module('attendance', array('course' => $this->course->id));
- $cm = $DB->get_record('course_modules', array('id' => $att->cmid), '*', MUST_EXIST);
- $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+ $this->course = $this->getDataGenerator()->create_course(['category' => $this->category->id]);
+ $att = $this->getDataGenerator()->create_module('attendance', ['course' => $this->course->id]);
+ $cm = $DB->get_record('course_modules', ['id' => $att->cmid], '*', MUST_EXIST);
+ $course = $DB->get_record('course', ['id' => $cm->course], '*', MUST_EXIST);
$this->attendance = new mod_attendance_structure($att, $cm, $course);
$this->create_and_enrol_users();
@@ -100,9 +100,12 @@ public function setUp(): void {
$this->attendance->add_sessions($this->sessions);
}
- /** Creating 10 students and 1 teacher. */
+ /**
+ * Creating 10 students and 1 teacher.
+ * @return void
+ */
protected function create_and_enrol_users() {
- $this->students = array();
+ $this->students = [];
for ($i = 0; $i < 10; $i++) {
$this->students[] = $this->getDataGenerator()->create_and_enrol($this->course, 'student');
}
@@ -110,8 +113,14 @@ protected function create_and_enrol_users() {
$this->teacher = $this->getDataGenerator()->create_and_enrol($this->course, 'editingteacher');
}
- /** test attendance_handler::get_courses_with_today_sessions */
- public function test_get_courses_with_today_sessions() {
+ /**
+ * Test attendance_handler::get_courses_with_today_sessions.
+ *
+ * @covers \mod_attendance\external::get_courses_with_today_sessions
+ * @return void
+ * @throws \invalid_response_exception
+ */
+ public function test_get_courses_with_today_sessions(): void {
$this->resetAfterTest(true);
// Just adding the same session again to check if the method returns the right amount of instances.
@@ -129,15 +138,23 @@ public function test_get_courses_with_today_sessions() {
$this->assertEquals(count($attendanceinstance['today_sessions']), 2);
}
- /** test attendance_handler::get_courses_with_today_sessions multiple */
- public function test_get_courses_with_today_sessions_multiple_instances() {
+ /**
+ * Test attendance_handler::get_courses_with_today_sessions multiple.
+ *
+ * @covers \mod_attendance\external::get_session
+ * @return void
+ * @throws \coding_exception
+ * @throws \dml_exception
+ * @throws \invalid_response_exception
+ */
+ public function test_get_courses_with_today_sessions_multiple_instances(): void {
global $DB;
$this->resetAfterTest(true);
// Make another attendance.
- $att = $this->getDataGenerator()->create_module('attendance', array('course' => $this->course->id));
- $cm = $DB->get_record('course_modules', array('id' => $att->cmid), '*', MUST_EXIST);
- $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+ $att = $this->getDataGenerator()->create_module('attendance', ['course' => $this->course->id]);
+ $cm = $DB->get_record('course_modules', ['id' => $att->cmid], '*', MUST_EXIST);
+ $course = $DB->get_record('course', ['id' => $cm->course], '*', MUST_EXIST);
$second = new mod_attendance_structure($att, $cm, $course);
// Just add the same session.
@@ -155,8 +172,14 @@ public function test_get_courses_with_today_sessions_multiple_instances() {
$this->assertEquals(count($course['attendance_instances']), 2);
}
- /** test attendance_handler::get_session */
- public function test_get_session() {
+ /**
+ * Test attendance_handler::get_session.
+ *
+ * @covers \mod_attendance\external::get_session
+ * @return void
+ * @throws \invalid_response_exception
+ */
+ public function test_get_session(): void {
$this->resetAfterTest(true);
$courseswithsessions = attendance_handler::get_courses_with_today_sessions($this->teacher->id);
@@ -176,8 +199,15 @@ public function test_get_session() {
$this->assertEquals(count($sessioninfo['users']), 10);
}
- /** test get session with group */
- public function test_get_session_with_group() {
+ /**
+ * Test get session with group.
+ *
+ * @covers \mod_attendance\external::get_courses_with_today_sessions
+ * @return void
+ * @throws \coding_exception
+ * @throws \invalid_response_exception
+ */
+ public function test_get_session_with_group(): void {
$this->resetAfterTest(true);
// Create a group in our course, and add some students to it.
@@ -223,8 +253,15 @@ public function test_get_session_with_group() {
$this->assertEquals(count($sessioninfo['users']), 5);
}
- /** test update user status */
- public function test_update_user_status() {
+ /**
+ * Test update user status.
+ *
+ * @covers \mod_attendance\external::update_user_status
+ * @return void
+ * @throws \invalid_parameter_exception
+ * @throws \invalid_response_exception
+ */
+ public function test_update_user_status(): void {
$this->resetAfterTest(true);
$courseswithsessions = attendance_handler::get_courses_with_today_sessions($this->teacher->id);
@@ -256,8 +293,17 @@ public function test_update_user_status() {
$this->assertEquals($status['id'], $log['statusid']);
}
- /** Test adding new attendance record via ws. */
- public function test_add_attendance() {
+ /**
+ * Test adding new attendance record via ws.
+ *
+ * @covers \mod_attendance\external::add_attendance
+ * @return void
+ * @throws \coding_exception
+ * @throws \dml_exception
+ * @throws \invalid_parameter_exception
+ * @throws \invalid_response_exception
+ */
+ public function test_add_attendance(): void {
global $DB;
$this->resetAfterTest(true);
@@ -265,7 +311,7 @@ public function test_add_attendance() {
// Become a teacher.
$teacher = self::getDataGenerator()->create_user();
- $teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
+ $teacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
$this->getDataGenerator()->enrol_user($teacher->id, $course->id, $teacherrole->id);
$this->setUser($teacher);
@@ -305,14 +351,21 @@ public function test_add_attendance() {
$result = mod_attendance_external::add_attendance($course->id, 'test1', 'test1', 100);
}
- /** Test remove attendance va ws. */
- public function test_remove_attendance() {
+ /**
+ * Test remove attendance va ws.
+ *
+ * @covers \mod_attendance\external::remove_attendance
+ * @return void
+ * @throws \dml_exception
+ * @throws \invalid_response_exception
+ */
+ public function test_remove_attendance(): void {
global $DB;
$this->resetAfterTest(true);
// Become a teacher.
$teacher = self::getDataGenerator()->create_user();
- $teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
+ $teacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
$this->getDataGenerator()->enrol_user($teacher->id, $this->course->id, $teacherrole->id);
$this->setUser($teacher);
@@ -329,17 +382,26 @@ public function test_remove_attendance() {
$this->assertCount(0, $DB->get_records('attendance_sessions', ['attendanceid' => $this->attendance->id]));
}
- /** Test add session to existing attendnace via ws. */
- public function test_add_session() {
+ /**
+ * Test add session to existing attendnace via ws.
+ *
+ * @covers \mod_attendance\external::add_session
+ * @return void
+ * @throws \coding_exception
+ * @throws \dml_exception
+ * @throws \invalid_parameter_exception
+ * @throws \invalid_response_exception
+ */
+ public function test_add_session(): void {
global $DB;
$this->resetAfterTest(true);
$course = $this->getDataGenerator()->create_course();
- $group = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
+ $group = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
// Become a teacher.
$teacher = self::getDataGenerator()->create_user();
- $teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
+ $teacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
$this->getDataGenerator()->enrol_user($teacher->id, $course->id, $teacherrole->id);
$this->setUser($teacher);
@@ -372,17 +434,26 @@ public function test_add_session() {
mod_attendance_external::add_session($attendancesepgroups['attendanceid'], 'test', time(), 3600, 0, false);
}
- /** Test add session group in no group - error. */
- public function test_add_session_group_in_no_group_exception() {
+ /**
+ * Test add session group in no group - error.
+ *
+ * @covers \mod_attendance\external::add_session
+ * @return void
+ * @throws \coding_exception
+ * @throws \dml_exception
+ * @throws \invalid_parameter_exception
+ * @throws \invalid_response_exception
+ */
+ public function test_add_session_group_in_no_group_exception(): void {
global $DB;
$this->resetAfterTest(true);
$course = $this->getDataGenerator()->create_course();
- $group = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
+ $group = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
// Become a teacher.
$teacher = self::getDataGenerator()->create_user();
- $teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
+ $teacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
$this->getDataGenerator()->enrol_user($teacher->id, $course->id, $teacherrole->id);
$this->setUser($teacher);
@@ -400,17 +471,26 @@ public function test_add_session_group_in_no_group_exception() {
mod_attendance_external::add_session($attendancenogroups['attendanceid'], 'test', time(), 3600, $group->id, false);
}
- /** Test add sesssion to invalid group. */
- public function test_add_session_invalid_group_exception() {
+ /**
+ * Test add sesssion to invalid group.
+ *
+ * @covers \mod_attendance\external::add_session
+ * @return void
+ * @throws \coding_exception
+ * @throws \dml_exception
+ * @throws \invalid_parameter_exception
+ * @throws \invalid_response_exception
+ */
+ public function test_add_session_invalid_group_exception(): void {
global $DB;
$this->resetAfterTest(true);
$course = $this->getDataGenerator()->create_course();
- $group = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
+ $group = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
// Become a teacher.
$teacher = self::getDataGenerator()->create_user();
- $teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
+ $teacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
$this->getDataGenerator()->enrol_user($teacher->id, $course->id, $teacherrole->id);
$this->setUser($teacher);
@@ -427,8 +507,16 @@ public function test_add_session_invalid_group_exception() {
mod_attendance_external::add_session($attendancevisgroups['attendanceid'], 'test', time(), 3600, $group->id + 100, false);
}
- /** Test remove session via ws. */
- public function test_remove_session() {
+ /**
+ * Test remove session via ws.
+ *
+ * @covers \mod_attendance\external::remove_session
+ * @return void
+ * @throws \dml_exception
+ * @throws \invalid_parameter_exception
+ * @throws \invalid_response_exception
+ */
+ public function test_remove_session(): void {
global $DB;
$this->resetAfterTest(true);
@@ -455,8 +543,15 @@ public function test_remove_session() {
$this->assertCount(0, $DB->get_records('attendance_sessions', ['attendanceid' => $attendance['attendanceid']]));
}
- /** Test session creates cal event. */
- public function test_add_session_creates_calendar_event() {
+ /**
+ * Test session creates cal event.
+ *
+ * @covers \mod_attendance\external::add_attendance
+ * @return void
+ * @throws \invalid_parameter_exception
+ * @throws \invalid_response_exception
+ */
+ public function test_add_session_creates_calendar_event(): void {
global $DB;
$this->resetAfterTest(true);
@@ -493,8 +588,14 @@ public function test_add_session_creates_calendar_event() {
$this->assertInstanceOf('\mod_attendance\event\session_added', $events[1]);
}
- /** Test get sessions. */
- public function test_get_sessions() {
+ /**
+ * Test get sessions.
+ *
+ * @covers \mod_attendance\external::get_sessions
+ * @return void
+ * @throws \invalid_response_exception
+ */
+ public function test_get_sessions(): void {
$this->resetAfterTest(true);
$courseswithsessions = attendance_handler::get_courses_with_today_sessions($this->teacher->id);
diff --git a/tests/generator/lib.php b/tests/generator/lib.php
index 0ad9dbb10b3..8fd9e1662d1 100644
--- a/tests/generator/lib.php
+++ b/tests/generator/lib.php
@@ -14,6 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see
.
+// Let codechecker ignore the sniff for this file for nullable types since the super method of
+// create_instance is not yet rewritten and mod_attendance_generator::create_instance must have an identical signature.
+// phpcs:disable PHPCompatibility.FunctionDeclarations.RemovedImplicitlyNullableParam.Deprecated
+
/**
* mod_attendance data generator
*
@@ -37,7 +41,7 @@ class mod_attendance_generator extends testing_module_generator {
* Create new attendance module instance
*
* @param array|stdClass $record
- * @param array $options
+ * @param null|array $options
* @return stdClass mod_attendance_structure
*/
public function create_instance($record = null, array $options = null) {
diff --git a/view.php b/view.php
index 0bc59bb2129..869ccfd8569 100644
--- a/view.php
+++ b/view.php
@@ -38,8 +38,8 @@
$pageparams->sesscourses = optional_param('sesscourses', 'current', PARAM_ALPHA);
$cm = get_coursemodule_from_id('attendance', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
-$attendance = $DB->get_record('attendance', array('id' => $cm->instance), '*', MUST_EXIST);
+$course = $DB->get_record('course', ['id' => $cm->course], '*', MUST_EXIST);
+$attendance = $DB->get_record('attendance', ['id' => $cm->instance], '*', MUST_EXIST);
require_login($course, true, $cm);
$context = context_module::instance($cm->id);
@@ -51,11 +51,11 @@
// Not specified studentid for displaying attendance?
// Redirect to appropriate page if can.
if (!$pageparams->studentid) {
- $capabilities = array(
+ $capabilities = [
'mod/attendance:manageattendances',
'mod/attendance:takeattendances',
- 'mod/attendance:changeattendances'
- );
+ 'mod/attendance:changeattendances',
+ ];
if (has_any_capability($capabilities, $context)) {
redirect($att->url_manage());
} else if (has_capability('mod/attendance:viewreports', $context)) {
@@ -76,7 +76,7 @@
$PAGE->set_url($url);
$buttons = '';
-$capabilities = array('mod/attendance:takeattendances', 'mod/attendance:changeattendances');
+$capabilities = ['mod/attendance:takeattendances', 'mod/attendance:changeattendances'];
if (has_any_capability($capabilities, $context) &&
$pageparams->mode == mod_attendance_view_page_params::MODE_ALL_SESSIONS) {
@@ -105,12 +105,12 @@
$userdata = new mod_attendance\output\user_data($att, $userid);
// Create url for link in log screen.
-$filterparams = array(
+$filterparams = [
'view' => $userdata->pageparams->view,
'curdate' => $userdata->pageparams->curdate,
'startdate' => $userdata->pageparams->startdate,
- 'enddate' => $userdata->pageparams->enddate
-);
+ 'enddate' => $userdata->pageparams->enddate,
+];
$params = array_merge($userdata->pageparams->get_significant_params(), $filterparams);
@@ -124,20 +124,20 @@
$userdata->take_sessions_from_form_data($formdata);
// Trigger updated event.
- $event = \mod_attendance\event\session_report_updated::create(array(
+ $event = \mod_attendance\event\session_report_updated::create([
'relateduserid' => $relateduserid,
'context' => $context,
- 'other' => $params));
+ 'other' => $params]);
$event->add_record_snapshot('course_modules', $cm);
$event->trigger();
redirect($url, get_string('attendancesuccess', 'attendance'));
} else {
// Trigger viewed event.
- $event = \mod_attendance\event\session_report_viewed::create(array(
+ $event = \mod_attendance\event\session_report_viewed::create([
'relateduserid' => $relateduserid,
'context' => $context,
- 'other' => $params));
+ 'other' => $params]);
$event->add_record_snapshot('course_modules', $cm);
$event->trigger();
}
diff --git a/warnings.php b/warnings.php
index 2b1446774ed..60daab87f89 100644
--- a/warnings.php
+++ b/warnings.php
@@ -48,8 +48,8 @@
} else {
// This is an attendance level config.
$cm = get_coursemodule_from_id('attendance', $id, 0, false, MUST_EXIST);
- $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
- $att = $DB->get_record('attendance', array('id' => $cm->instance), '*', MUST_EXIST);
+ $course = $DB->get_record('course', ['id' => $cm->course], '*', MUST_EXIST);
+ $att = $DB->get_record('attendance', ['id' => $cm->instance], '*', MUST_EXIST);
require_login($course, false, $cm);
$context = context_module::instance($cm->id);
@@ -66,7 +66,7 @@
echo $output->header();
}
-$mform = new mod_attendance\form\addwarning($url, array('notid' => $notid, 'id' => $id));
+$mform = new mod_attendance\form\addwarning($url, ['notid' => $notid, 'id' => $id]);
if ($data = $mform->get_data()) {
if (empty($data->notid)) {
@@ -89,9 +89,9 @@
if (!empty($data->thirdpartyemails)) {
$notify->thirdpartyemails = implode(',', $data->thirdpartyemails);
}
- $existingrecord = $DB->record_exists('attendance_warning', array('idnumber' => $notify->idnumber,
+ $existingrecord = $DB->record_exists('attendance_warning', ['idnumber' => $notify->idnumber,
'warningpercent' => $notify->warningpercent,
- 'warnafter' => $notify->warnafter));
+ 'warnafter' => $notify->warnafter]);
if (empty($existingrecord)) {
$DB->insert_record('attendance_warning', $notify);
echo $OUTPUT->notification(get_string('warningupdated', 'mod_attendance'), 'success');
@@ -100,7 +100,7 @@
}
} else {
- $notify = $DB->get_record('attendance_warning', array('id' => $data->notid));
+ $notify = $DB->get_record('attendance_warning', ['id' => $data->notid]);
if (!empty($id) && $data->idnumber != $att->id) {
// Someone is trying to update a record for a different attendance.
throw new moodle_exception('invalidcoursemodule');
@@ -119,8 +119,8 @@
if (!empty($data->thirdpartyemails)) {
$notify->thirdpartyemails = implode(',', $data->thirdpartyemails);
}
- $existingrecord = $DB->get_record('attendance_warning', array('idnumber' => $notify->idnumber,
- 'warningpercent' => $notify->warningpercent, 'warnafter' => $notify->warnafter));
+ $existingrecord = $DB->get_record('attendance_warning', ['idnumber' => $notify->idnumber,
+ 'warningpercent' => $notify->warningpercent, 'warnafter' => $notify->warnafter]);
if (empty($existingrecord) || $existingrecord->id == $notify->id) {
$DB->update_record('attendance_warning', $notify);
echo $OUTPUT->notification(get_string('warningupdated', 'mod_attendance'), 'success');
@@ -133,13 +133,13 @@
if ($action == 'delete' && !empty($notid)) {
if (!optional_param('confirm', false, PARAM_BOOL)) {
$cancelurl = $url;
- $url->params(array('action' => 'delete', 'notid' => $notid, 'sesskey' => sesskey(), 'confirm' => true, 'id' => $id));
+ $url->params(['action' => 'delete', 'notid' => $notid, 'sesskey' => sesskey(), 'confirm' => true, 'id' => $id]);
echo $OUTPUT->confirm(get_string('deletewarningconfirm', 'mod_attendance'), $url, $cancelurl);
echo $OUTPUT->footer();
exit;
} else {
require_sesskey();
- $params = array('id' => $notid);
+ $params = ['id' => $notid];
if (!empty($att)) {
// Add id/level to array.
$params['idnumber'] = $att->id;
@@ -149,9 +149,9 @@
}
}
if ($action == 'update' && !empty($notid)) {
- $existing = $DB->get_record('attendance_warning', array('id' => $notid));
+ $existing = $DB->get_record('attendance_warning', ['id' => $notid]);
$content = $existing->emailcontent;
- $existing->emailcontent = array();
+ $existing->emailcontent = [];
$existing->emailcontent['text'] = $content;
$existing->emailcontent['format'] = $existing->emailcontentformat;
$existing->notid = $existing->id;
@@ -170,28 +170,28 @@
}
echo $OUTPUT->box($warningdesc, 'generalbox attendancedesc', 'notice');
$existingnotifications = $DB->get_records('attendance_warning',
- array('idnumber' => $idnumber),
+ ['idnumber' => $idnumber],
'warningpercent');
if (!empty($existingnotifications)) {
$table = new html_table();
- $table->head = array(get_string('warningthreshold', 'mod_attendance'),
+ $table->head = [get_string('warningthreshold', 'mod_attendance'),
get_string('numsessions', 'mod_attendance'),
get_string('emailsubject', 'mod_attendance'),
- '');
+ '', ];
foreach ($existingnotifications as $notification) {
- $url->params(array('action' => 'delete', 'notid' => $notification->id, 'id' => $id));
+ $url->params(['action' => 'delete', 'notid' => $notification->id, 'id' => $id]);
$actionbuttons = $OUTPUT->action_icon($url, new pix_icon('t/delete',
get_string('delete', 'attendance')), null, null);
- $url->params(array('action' => 'update', 'notid' => $notification->id, 'id' => $id));
+ $url->params(['action' => 'update', 'notid' => $notification->id, 'id' => $id]);
$actionbuttons .= $OUTPUT->action_icon($url, new pix_icon('t/edit',
get_string('update', 'attendance')), null, null);
- $table->data[] = array($notification->warningpercent, $notification->warnafter,
- $notification->emailsubject, $actionbuttons);
+ $table->data[] = [$notification->warningpercent, $notification->warnafter,
+ $notification->emailsubject, $actionbuttons, ];
}
echo html_writer::table($table);
}
- $addurl = new moodle_url('/mod/attendance/warnings.php', array('action' => 'add', 'id' => $id));
+ $addurl = new moodle_url('/mod/attendance/warnings.php', ['action' => 'add', 'id' => $id]);
echo $OUTPUT->single_button($addurl, get_string('addwarning', 'mod_attendance'));
}