From 9461e2b7d0c1c9c25955e523a186e613f2cd344c Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Fri, 19 Apr 2024 15:44:26 +0200 Subject: adjust core classes to new interface signatures, fixes #4043 --- lib/modules/Blubber.php | 26 ++++++++++++++++---------- lib/modules/ConsultationModule.php | 10 ++++------ lib/modules/CoreAdmin.php | 8 ++++---- lib/modules/CoreCalendar.php | 10 +++++----- lib/modules/CoreDocuments.php | 8 ++++---- lib/modules/CoreForum.php | 8 ++++---- lib/modules/CoreOverview.php | 8 ++++---- lib/modules/CoreParticipants.php | 10 +++++----- lib/modules/CorePersonal.php | 8 ++++---- lib/modules/CoreSchedule.php | 8 ++++---- lib/modules/CoreScm.php | 10 +++++----- lib/modules/CoreStudygroupAdmin.php | 8 ++++---- lib/modules/CoreStudygroupParticipants.php | 8 ++++---- lib/modules/CoreWiki.php | 16 ++++++++-------- lib/modules/CoursewareModule.php | 22 +++++++++++----------- lib/modules/FeedbackModule.php | 8 ++++---- lib/modules/GradebookModule.php | 20 ++++++++++---------- lib/modules/IliasInterfaceModule.php | 14 +++++++------- lib/modules/LtiToolModule.php | 8 ++++---- 19 files changed, 111 insertions(+), 107 deletions(-) diff --git a/lib/modules/Blubber.php b/lib/modules/Blubber.php index 4dd2f99..ecf6838 100644 --- a/lib/modules/Blubber.php +++ b/lib/modules/Blubber.php @@ -16,10 +16,12 @@ class Blubber extends CorePlugin implements StudipModule { /** * Returns a navigation for the tab displayed in the course. + * * @param string $course_id of the course - * @return \Navigation + * + * @return array */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id) :array { $tab = new Navigation( _('Blubber'), @@ -32,12 +34,14 @@ class Blubber extends CorePlugin implements StudipModule /** * Returns a navigation-object with the grey/red icon for displaying in the * my_courses.php page. - * @param string $course_id - * @param int $last_visit - * @param string|null $user_id - * @return \Navigation + * + * @param string $course_id + * @param int $last_visit + * @param string $user_id + * + * @return Navigation|null */ - public function getIconNavigation($course_id, $last_visit, $user_id = null) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { $user_id || $user_id = $GLOBALS['user']->id; $icon = new Navigation( @@ -103,10 +107,12 @@ class Blubber extends CorePlugin implements StudipModule /** * Returns no template, because this plugin doesn't want to insert an * info-template in the course-overview. + * * @param string $course_id - * @return null + * + * @return Flexi_Template|null */ - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { return null; } @@ -114,7 +120,7 @@ class Blubber extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'displayname' => _('Blubber'), diff --git a/lib/modules/ConsultationModule.php b/lib/modules/ConsultationModule.php index c68f8ca..bac33e1 100644 --- a/lib/modules/ConsultationModule.php +++ b/lib/modules/ConsultationModule.php @@ -91,17 +91,15 @@ class ConsultationModule extends CorePlugin implements StudipModule, SystemPlugi /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { - // TODO - return null; } /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { if ($GLOBALS['user']->id !== 'nobody') { $navigation = new ConsultationNavigation(RangeFactory::find($course_id)); @@ -115,7 +113,7 @@ class ConsultationModule extends CorePlugin implements StudipModule, SystemPlugi /** * {@inheritdoc} */ - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { return null; } @@ -132,7 +130,7 @@ class ConsultationModule extends CorePlugin implements StudipModule, SystemPlugi /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Generische Terminvergabe'), diff --git a/lib/modules/CoreAdmin.php b/lib/modules/CoreAdmin.php index 8941cf2..6fbe22d 100644 --- a/lib/modules/CoreAdmin.php +++ b/lib/modules/CoreAdmin.php @@ -12,7 +12,7 @@ class CoreAdmin extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation($course_id, $last_visit, $user_id): ?Navigation { $navigation = new Navigation(_('Verwaltung'), 'dispatch.php/course/management'); $navigation->setImage(Icon::create('admin', Icon::ROLE_CLICKABLE, ['title' => _('Verwaltung')])); @@ -22,7 +22,7 @@ class CoreAdmin extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation($course_id): array { $range = RangeFactory::find($course_id); @@ -134,7 +134,7 @@ class CoreAdmin extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'displayname' => _('Verwaltung'), @@ -144,7 +144,7 @@ class CoreAdmin extends CorePlugin implements StudipModule ]; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { // TODO: Implement getInfoTemplate() method. return null; diff --git a/lib/modules/CoreCalendar.php b/lib/modules/CoreCalendar.php index 318a2ba..044ef09 100644 --- a/lib/modules/CoreCalendar.php +++ b/lib/modules/CoreCalendar.php @@ -14,7 +14,7 @@ class CoreCalendar extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { if (!Config::get()->CALENDAR_GROUP_ENABLE) { return null; @@ -28,10 +28,10 @@ class CoreCalendar extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { if (!Config::get()->CALENDAR_GROUP_ENABLE) { - return null; + return []; } $navigation = new Navigation(_('Kalender'), 'dispatch.php/calendar/calendar/course/' . $course_id); @@ -43,7 +43,7 @@ class CoreCalendar extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Kalender'), @@ -58,7 +58,7 @@ class CoreCalendar extends CorePlugin implements StudipModule return Config::get()->CALENDAR_GROUP_ENABLE && $context->getRangeType() === 'course'; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { return null; } diff --git a/lib/modules/CoreDocuments.php b/lib/modules/CoreDocuments.php index 96afa47..48970bc 100644 --- a/lib/modules/CoreDocuments.php +++ b/lib/modules/CoreDocuments.php @@ -106,7 +106,7 @@ class CoreDocuments extends CorePlugin implements StudipModule, OERModule /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { $range_type = get_object_type($course_id, ['sem', 'inst']) === 'sem' ? 'course' : 'institute'; $navigation = new Navigation( @@ -143,7 +143,7 @@ class CoreDocuments extends CorePlugin implements StudipModule, OERModule /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { $range_type = get_object_type($course_id, ['sem', 'inst']) === 'sem' ? 'course' : 'institute'; $newFilesNavigation = new Navigation(_('Dateien'), "dispatch.php/{$range_type}/files"); @@ -155,7 +155,7 @@ class CoreDocuments extends CorePlugin implements StudipModule, OERModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Austausch von Dateien, Hausaufgabenordner & Terminordner'), @@ -201,7 +201,7 @@ class CoreDocuments extends CorePlugin implements StudipModule, OERModule ]; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { // TODO: Implement getInfoTemplate() method. return null; diff --git a/lib/modules/CoreForum.php b/lib/modules/CoreForum.php index 0283a09..3880fef 100644 --- a/lib/modules/CoreForum.php +++ b/lib/modules/CoreForum.php @@ -26,7 +26,7 @@ NotificationCenter::addObserver('ForumIssue', 'unlinkIssue', 'ForumBeforeDelete' class CoreForum extends CorePlugin implements ForumModule { /* interface method */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { $navigation = new Navigation(_('Forum'), 'dispatch.php/course/forum/index'); $navigation->setImage(Icon::create('forum', 'info_alt')); @@ -49,7 +49,7 @@ class CoreForum extends CorePlugin implements ForumModule } /* interface method */ - public function getIconNavigation($course_id, $last_visit, $user_id = null) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { if ($GLOBALS['perm']->have_studip_perm('user', $course_id)) { $num_entries = ForumVisit::getCount($course_id, ForumVisit::getVisit($course_id)); @@ -100,7 +100,7 @@ class CoreForum extends CorePlugin implements ForumModule ForumAbo::removeForCourseAndUser($course_id, $user_id); } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { return null; } @@ -187,7 +187,7 @@ class CoreForum extends CorePlugin implements ForumModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Veranstaltungsbegleitender Meinungsaustausch zu bestimmten Themen'), diff --git a/lib/modules/CoreOverview.php b/lib/modules/CoreOverview.php index 8d4606d..a7c2552 100644 --- a/lib/modules/CoreOverview.php +++ b/lib/modules/CoreOverview.php @@ -14,7 +14,7 @@ class CoreOverview extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { $sql = "SELECT COUNT(nw.news_id) AS count, COUNT(IF((nw.chdate > IFNULL(b.visitdate, :threshold) AND nw.user_id !=:user_id), nw.news_id, NULL)) AS neue @@ -73,7 +73,7 @@ class CoreOverview extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { $object_type = get_object_type($course_id, ['sem', 'inst']); if ($object_type === 'sem') { @@ -118,7 +118,7 @@ class CoreOverview extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'displayname' => _('Übersicht'), @@ -128,7 +128,7 @@ class CoreOverview extends CorePlugin implements StudipModule ]; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { // TODO: Implement getInfoTemplate() method. return null; diff --git a/lib/modules/CoreParticipants.php b/lib/modules/CoreParticipants.php index b2f1948..669cd9e 100644 --- a/lib/modules/CoreParticipants.php +++ b/lib/modules/CoreParticipants.php @@ -14,7 +14,7 @@ class CoreParticipants extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { if ($user_id === 'nobody') { return null; @@ -124,7 +124,7 @@ class CoreParticipants extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { if ($GLOBALS['user']->id === 'nobody') { return []; @@ -152,13 +152,13 @@ class CoreParticipants extends CorePlugin implements StudipModule $navigation->addSubNavigation('additional', new Navigation(_('Zusatzangaben'), 'dispatch.php/course/members/additional')); } - return count($navigation->getSubNavigation()) > 0 ? ['members' => $navigation] : null; + return count($navigation->getSubNavigation()) > 0 ? ['members' => $navigation] : []; } /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Liste aller Teilnehmenden einschließlich Nachrichtenfunktionen'), @@ -211,7 +211,7 @@ class CoreParticipants extends CorePlugin implements StudipModule return false; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { // TODO: Implement getInfoTemplate() method. return null; diff --git a/lib/modules/CorePersonal.php b/lib/modules/CorePersonal.php index 71aaa6b..6c20fe5 100644 --- a/lib/modules/CorePersonal.php +++ b/lib/modules/CorePersonal.php @@ -10,12 +10,12 @@ class CorePersonal extends CorePlugin implements StudipModule { - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { return null; } - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { if ($GLOBALS['user']->id != 'nobody') { $navigation = new Navigation(_('Personal')); @@ -41,7 +41,7 @@ class CorePersonal extends CorePlugin implements StudipModule /** * @see StudipModule::getMetadata() */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Liste aller MitarbeiterInnen'), @@ -53,7 +53,7 @@ class CorePersonal extends CorePlugin implements StudipModule ]; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { // TODO: Implement getInfoTemplate() method. return null; diff --git a/lib/modules/CoreSchedule.php b/lib/modules/CoreSchedule.php index 601b618..0d2e23e 100644 --- a/lib/modules/CoreSchedule.php +++ b/lib/modules/CoreSchedule.php @@ -14,7 +14,7 @@ class CoreSchedule extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { $query = "SELECT COUNT(termin_id) AS count, COUNT(IF((chdate > IFNULL(ouv.visitdate, :threshold) AND autor_id != :user_id), termin_id, NULL)) AS neue @@ -68,7 +68,7 @@ class CoreSchedule extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { $navigation = new Navigation(_('Ablaufplan')); $navigation->setImage(Icon::create('schedule', Icon::ROLE_INFO_ALT)); @@ -83,7 +83,7 @@ class CoreSchedule extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Anzeige aller Termine der Veranstaltung'), @@ -117,7 +117,7 @@ class CoreSchedule extends CorePlugin implements StudipModule ]; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { // TODO: Implement getInfoTemplate() method. return null; diff --git a/lib/modules/CoreScm.php b/lib/modules/CoreScm.php index db1131d..5832a02 100644 --- a/lib/modules/CoreScm.php +++ b/lib/modules/CoreScm.php @@ -14,7 +14,7 @@ class CoreScm extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { if (!Config::get()->SCM_ENABLE) { return null; @@ -83,10 +83,10 @@ class CoreScm extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { if (!Config::get()->SCM_ENABLE) { - return null; + return []; } $temp = StudipScmEntry::findByRange_id($course_id, 'ORDER BY position ASC'); @@ -110,7 +110,7 @@ class CoreScm extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Die Lehrenden bestimmen, wie Titel und Inhalt dieser Seite aussehen.'), @@ -150,7 +150,7 @@ class CoreScm extends CorePlugin implements StudipModule ]; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { // TODO: Implement getInfoTemplate() method. return null; diff --git a/lib/modules/CoreStudygroupAdmin.php b/lib/modules/CoreStudygroupAdmin.php index 60819c9..1f99f14 100644 --- a/lib/modules/CoreStudygroupAdmin.php +++ b/lib/modules/CoreStudygroupAdmin.php @@ -15,7 +15,7 @@ class CoreStudygroupAdmin extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { $navigation = new Navigation(_('Verwaltung'), "dispatch.php/course/studygroup/edit/?cid={$course_id}"); $navigation->setImage(Icon::create('admin', Icon::ROLE_CLICKABLE), ['title' => _('Verwaltung')]); @@ -25,7 +25,7 @@ class CoreStudygroupAdmin extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { if (!$GLOBALS['perm']->have_studip_perm('dozent', $course_id)) { return []; @@ -50,7 +50,7 @@ class CoreStudygroupAdmin extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'displayname' => _('Verwaltung') @@ -62,7 +62,7 @@ class CoreStudygroupAdmin extends CorePlugin implements StudipModule return false; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { // TODO: Implement getInfoTemplate() method. return null; diff --git a/lib/modules/CoreStudygroupParticipants.php b/lib/modules/CoreStudygroupParticipants.php index 334f84a..eb1e832 100644 --- a/lib/modules/CoreStudygroupParticipants.php +++ b/lib/modules/CoreStudygroupParticipants.php @@ -14,7 +14,7 @@ class CoreStudygroupParticipants extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { $navigation = new Navigation(_('Teilnehmende'), "dispatch.php/course/studygroup/members/{$course_id}"); $navigation->setImage(Icon::create('persons', Icon::ROLE_CLICKABLE)); @@ -27,7 +27,7 @@ class CoreStudygroupParticipants extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { $navigation = new Navigation(_('Teilnehmende'), "dispatch.php/course/studygroup/members/".$course_id); $navigation->setImage(Icon::create('persons', Icon::ROLE_INFO_ALT)); @@ -38,7 +38,7 @@ class CoreStudygroupParticipants extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Liste aller Teilnehmenden einschließlich Nachrichtenfunktionen'), @@ -48,7 +48,7 @@ class CoreStudygroupParticipants extends CorePlugin implements StudipModule ]; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { // TODO: Implement getInfoTemplate() method. return null; diff --git a/lib/modules/CoreWiki.php b/lib/modules/CoreWiki.php index a447451..e63d833 100644 --- a/lib/modules/CoreWiki.php +++ b/lib/modules/CoreWiki.php @@ -14,7 +14,7 @@ class CoreWiki extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getIconNavigation($range_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { if (!Config::get()->WIKI_ENABLE) { return null; @@ -38,7 +38,7 @@ class CoreWiki extends CorePlugin implements StudipModule "); $statement->execute([ - 'range_id' => $range_id, + 'range_id' => $course_id, 'user_id' => $user_id, 'perm' => $perm ]); @@ -47,7 +47,7 @@ class CoreWiki extends CorePlugin implements StudipModule return null; } - $visit_date = object_get_visit($range_id, $this->getPluginId(), 'visitdate') ?? $last_visit; + $visit_date = object_get_visit($course_id, $this->getPluginId(), 'visitdate') ?? $last_visit; $statement = DBManager::get()->prepare(" SELECT COUNT(*) AS `neue` @@ -105,10 +105,10 @@ class CoreWiki extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getTabNavigation($range_id) + public function getTabNavigation(string $course_id): array { if (!Config::get()->WIKI_ENABLE) { - return null; + return []; } $navigation = new Navigation(_('Wiki')); @@ -116,7 +116,7 @@ class CoreWiki extends CorePlugin implements StudipModule $navigation->setActiveImage(Icon::create('wiki', Icon::ROLE_INFO)); $navigation->addSubNavigation('start', new Navigation(_('Wiki-Startseite'), 'dispatch.php/course/wiki/page')); - if (WikiPage::countBySQL('`range_id` = ?', [$range_id]) > 0) { + if (WikiPage::countBySQL('`range_id` = ?', [$course_id]) > 0) { $navigation->addSubNavigation('listnew', new Navigation(_('Neue Seiten'), 'dispatch.php/course/wiki/newpages')); $navigation->addSubNavigation('allpages', new Navigation(_('Alle Seiten'), 'dispatch.php/course/wiki/allpages')); } @@ -126,7 +126,7 @@ class CoreWiki extends CorePlugin implements StudipModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Gemeinsames Erstellen und Bearbeiten von Texten'), @@ -171,7 +171,7 @@ class CoreWiki extends CorePlugin implements StudipModule ]; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { return null; } diff --git a/lib/modules/CoursewareModule.php b/lib/modules/CoursewareModule.php index 8deeda7..7612cf3 100644 --- a/lib/modules/CoursewareModule.php +++ b/lib/modules/CoursewareModule.php @@ -36,7 +36,7 @@ class CoursewareModule extends CorePlugin implements SystemPlugin, StudipModule * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function getInfoTemplate($courseId) + public function getInfoTemplate($course_id): ?Flexi_Template { return null; } @@ -44,7 +44,7 @@ class CoursewareModule extends CorePlugin implements SystemPlugin, StudipModule /** * {@inheritdoc} */ - public function getTabNavigation($courseId) + public function getTabNavigation(string $course_id): array { if ($GLOBALS['user']->id === 'nobody') { return []; @@ -52,28 +52,28 @@ class CoursewareModule extends CorePlugin implements SystemPlugin, StudipModule $navigation = new Navigation( _('Courseware'), - URLHelper::getURL('dispatch.php/course/courseware/?cid='.$courseId) + URLHelper::getURL('dispatch.php/course/courseware/?cid='.$course_id) ); $navigation->setImage(Icon::create('courseware', Icon::ROLE_INFO_ALT)); $navigation->addSubNavigation( 'shelf', - new Navigation(_('Lernmaterialien'), 'dispatch.php/course/courseware/?cid=' . $courseId) + new Navigation(_('Lernmaterialien'), 'dispatch.php/course/courseware/?cid=' . $course_id) ); $navigation->addSubNavigation( 'unit', - new Navigation(_('Inhalt'), 'dispatch.php/course/courseware/courseware?cid=' . $courseId) + new Navigation(_('Inhalt'), 'dispatch.php/course/courseware/courseware?cid=' . $course_id) ); $navigation->addSubNavigation( 'activities', - new Navigation(_('Aktivitäten'), 'dispatch.php/course/courseware/activities?cid=' . $courseId) + new Navigation(_('Aktivitäten'), 'dispatch.php/course/courseware/activities?cid=' . $course_id) ); $navigation->addSubNavigation( 'tasks', - new Navigation(_('Aufgaben'), 'dispatch.php/course/courseware/tasks?cid=' . $courseId) + new Navigation(_('Aufgaben'), 'dispatch.php/course/courseware/tasks?cid=' . $course_id) ); $navigation->addSubNavigation( 'comments', - new Navigation(_('Kommentare und Anmerkungen'), 'dispatch.php/course/courseware/comments_overview?cid=' . $courseId) + new Navigation(_('Kommentare und Anmerkungen'), 'dispatch.php/course/courseware/comments_overview?cid=' . $course_id) ); return ['courseware' => $navigation]; @@ -82,7 +82,7 @@ class CoursewareModule extends CorePlugin implements SystemPlugin, StudipModule /** * {@inheritdoc} */ - public function getIconNavigation($courseId, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { if ($user_id === 'nobody') { return null; @@ -101,7 +101,7 @@ class CoursewareModule extends CorePlugin implements SystemPlugin, StudipModule "); $statement->execute([ - 'range_id' => $courseId, + 'range_id' => $course_id, 'last_visit' => $last_visit, 'user_id' => $user_id ]); @@ -132,7 +132,7 @@ class CoursewareModule extends CorePlugin implements SystemPlugin, StudipModule /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Lerninhalte erstellen, verteilen und erleben'), diff --git a/lib/modules/FeedbackModule.php b/lib/modules/FeedbackModule.php index 2fc657d..2c0cbf5 100644 --- a/lib/modules/FeedbackModule.php +++ b/lib/modules/FeedbackModule.php @@ -16,7 +16,7 @@ class FeedbackModule extends CorePlugin implements StudipModule, SystemPlugin /** * {@inheritdoc} */ - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { return null; } @@ -24,7 +24,7 @@ class FeedbackModule extends CorePlugin implements StudipModule, SystemPlugin /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { return null; } @@ -32,7 +32,7 @@ class FeedbackModule extends CorePlugin implements StudipModule, SystemPlugin /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { if (Feedback::hasAdminPerm($course_id)) { $navigation = new Navigation(_('Feedback')); @@ -45,7 +45,7 @@ class FeedbackModule extends CorePlugin implements StudipModule, SystemPlugin /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Einholen von Feedback zu Inhaltselementen'), diff --git a/lib/modules/GradebookModule.php b/lib/modules/GradebookModule.php index 45cd93e..331819a 100644 --- a/lib/modules/GradebookModule.php +++ b/lib/modules/GradebookModule.php @@ -33,7 +33,7 @@ class GradebookModule extends CorePlugin implements SystemPlugin, StudipModule * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function getInfoTemplate($courseId) + public function getInfoTemplate($course_id): ?Flexi_Template { return null; } @@ -43,24 +43,24 @@ class GradebookModule extends CorePlugin implements SystemPlugin, StudipModule * * @SuppressWarnings(PHPMD.Superglobals) */ - public function getIconNavigation($courseId, $lastVisit, $userId) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { - if ($userId === 'nobody') { + if ($user_id === 'nobody') { return null; } $title = _('Gradebook'); - if ($GLOBALS['perm']->have_studip_perm('tutor', $courseId, $userId)) { + if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id, $user_id)) { $changed = Instance::countBySQL( 'INNER JOIN grading_definitions gd ON(gd.id = definition_id) '. 'WHERE gd.course_id = ? AND grading_instances.chdate > ?', - [$courseId, $lastVisit] + [$course_id, $last_visit] ); } else { $changed = Instance::countBySQL( 'INNER JOIN grading_definitions gd ON(gd.id = definition_id) '. 'WHERE gd.course_id = ? AND grading_instances.chdate > ? AND user_id = ?', - [$courseId, $lastVisit, $userId] + [$course_id, $last_visit, $user_id] ); } @@ -79,7 +79,7 @@ class GradebookModule extends CorePlugin implements SystemPlugin, StudipModule * * @SuppressWarnings(PHPMD.Superglobals) */ - public function getTabNavigation($cid) + public function getTabNavigation(string $course_id): array { if ('nobody' === $GLOBALS['user']->id) { return []; @@ -88,8 +88,8 @@ class GradebookModule extends CorePlugin implements SystemPlugin, StudipModule $gradebook = new Navigation('Gradebook'); $gradebook->addSubNavigation('index', new Navigation(_('Erbrachte Leistungen'), 'dispatch.php/course/gradebook/overview')); - if ($GLOBALS['perm']->have_studip_perm('tutor', $cid)) { - $this->addTabNavigationOfLecturers($gradebook, $cid); + if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id)) { + $this->addTabNavigationOfLecturers($gradebook, $course_id); } return compact('gradebook'); @@ -149,7 +149,7 @@ class GradebookModule extends CorePlugin implements SystemPlugin, StudipModule * * @return array metadata containg description and/or url */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Noten- und Fortschrittserfassung (Gradebook)'), diff --git a/lib/modules/IliasInterfaceModule.php b/lib/modules/IliasInterfaceModule.php index a8cafbf..9d4970b 100644 --- a/lib/modules/IliasInterfaceModule.php +++ b/lib/modules/IliasInterfaceModule.php @@ -33,15 +33,15 @@ class IliasInterfaceModule extends CorePlugin implements StudipModule, SystemPlu return Config::get()->ILIAS_INTERFACE_ENABLE && $context->getRangeType() === 'course'; } - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { return null; } - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { if (!Config::get()->ILIAS_INTERFACE_ENABLE) { - return; + return null; } $sql = "SELECT COUNT(IF(a.module_type != 'crs', module_id, NULL)) AS count_modules, @@ -107,14 +107,14 @@ class IliasInterfaceModule extends CorePlugin implements StudipModule, SystemPlu return $nav; } - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { if (!Config::get()->ILIAS_INTERFACE_ENABLE) { - return null; + return []; } $ilias_interface_config = Config::get()->ILIAS_INTERFACE_BASIC_SETTINGS; if (count($ilias_interface_config) === 0) { - return null; + return []; } $moduletitle = Config::get()->ILIAS_INTERFACE_MODULETITLE; @@ -139,7 +139,7 @@ class IliasInterfaceModule extends CorePlugin implements StudipModule, SystemPlu /** * @see StudipModule::getMetadata() */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Zugang zu extern erstellten ILIAS-Lernobjekten'), diff --git a/lib/modules/LtiToolModule.php b/lib/modules/LtiToolModule.php index 74fd70a..052214b 100644 --- a/lib/modules/LtiToolModule.php +++ b/lib/modules/LtiToolModule.php @@ -35,7 +35,7 @@ class LtiToolModule extends CorePlugin implements StudipModule, SystemPlugin, Pr /** * {@inheritdoc} */ - public function getIconNavigation($course_id, $last_visit, $user_id) + public function getIconNavigation(string $course_id, int $last_visit, string $user_id): ?Navigation { if ($user_id === 'nobody') { return null; @@ -57,7 +57,7 @@ class LtiToolModule extends CorePlugin implements StudipModule, SystemPlugin, Pr /** * {@inheritdoc} */ - public function getTabNavigation($course_id) + public function getTabNavigation(string $course_id): array { if ($GLOBALS['user']->id === 'nobody') { return []; @@ -81,7 +81,7 @@ class LtiToolModule extends CorePlugin implements StudipModule, SystemPlugin, Pr /** * {@inheritdoc} */ - public function getInfoTemplate($course_id) + public function getInfoTemplate($course_id): ?Flexi_Template { return null; } @@ -100,7 +100,7 @@ class LtiToolModule extends CorePlugin implements StudipModule, SystemPlugin, Pr /** * {@inheritdoc} */ - public function getMetadata() + public function getMetadata(): array { return [ 'summary' => _('Verlinkung auf Inhalte in externen Anwendungen (LTI-Tool)'), -- cgit v1.0