From d674bcfb9f36cdae233f4bc5d5952848860c9bc0 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Thu, 2 Mar 2023 06:20:32 +0000 Subject: prevent php8 warnings, fixes #2235 Closes #2235 Merge request studip/studip!1469 --- app/controllers/search/studiengaenge.php | 2 +- .../resources/room_planning/semester_plan.php | 6 ++--- app/views/search/breadcrumb.php | 8 +++---- app/views/shared/modul/_modul.php | 6 ++--- lib/classes/StudipSemTreeViewSimple.class.php | 7 ++---- lib/classes/sidebar/RoomSearchWidget.class.php | 8 +++++-- lib/models/Abschluss.php | 26 +++++++++++++--------- lib/models/Semester.class.php | 8 +++---- 8 files changed, 38 insertions(+), 33 deletions(-) diff --git a/app/controllers/search/studiengaenge.php b/app/controllers/search/studiengaenge.php index 91d999a..3987ab5 100644 --- a/app/controllers/search/studiengaenge.php +++ b/app/controllers/search/studiengaenge.php @@ -197,7 +197,7 @@ class Search_StudiengaengeController extends MVVController $this->sessSet('selected_semester', $sem); } - $this->with_courses = Request::option('with_courses', ($_SESSION['MVV_SEARCH_SEQUENCE_WITH_COURSES'] ?: null)); + $this->with_courses = Request::option('with_courses', $_SESSION['MVV_SEARCH_SEQUENCE_WITH_COURSES'] ?? null); $_SESSION['MVV_SEARCH_SEQUENCE_WITH_COURSES'] = $this->with_courses; $studiengangTeil = StudiengangTeil::find($stgteil_id); diff --git a/app/views/resources/room_planning/semester_plan.php b/app/views/resources/room_planning/semester_plan.php index f950ed1..11a2f79 100644 --- a/app/views/resources/room_planning/semester_plan.php +++ b/app/views/resources/room_planning/semester_plan.php @@ -85,10 +85,10 @@ _('Semesterplan'), [ 'editable' => true, - 'selectable' => ($fullcalendar_studip_urls['add'] != null), + 'selectable' => isset($fullcalendar_studip_urls['add']), 'studip_urls' => $fullcalendar_studip_urls, - 'minTime' => ($min_time), - 'maxTime' => ($max_time), + 'minTime' => $min_time, + 'maxTime' => $max_time, 'allDaySlot' => false, 'columnHeaderFormat' => ['weekday'=> 'short'], 'header' => [ diff --git a/app/views/search/breadcrumb.php b/app/views/search/breadcrumb.php index acbfbe5..5d74fbc 100644 --- a/app/views/search/breadcrumb.php +++ b/app/views/search/breadcrumb.php @@ -3,9 +3,9 @@ $point):?> - - action_link('' . $point['actn'], $point['id'], $id2); ?> - + + action_link('' . $point['actn'], $point['id'] ?? null, $id2); ?> + getDisplayName() . ' (' . $additional_object->name . ')') ?> @@ -16,7 +16,7 @@ getDisplayName(ModuleManagementModel::DISPLAY_FACH)) ?> - + getDisplayName(0)) ?> diff --git a/app/views/shared/modul/_modul.php b/app/views/shared/modul/_modul.php index c953634..0bf1e21 100644 --- a/app/views/shared/modul/_modul.php +++ b/app/views/shared/modul/_modul.php @@ -9,7 +9,7 @@ code) ?> kp) ?> - fassung_nr): ?> + fassung_nr): ?> @@ -44,7 +44,7 @@ - + @@ -77,7 +77,7 @@ ?>
  • - 9 && $i == 4)) : ?> + 9 && $i == 4) : ?>
    • diff --git a/lib/classes/StudipSemTreeViewSimple.class.php b/lib/classes/StudipSemTreeViewSimple.class.php index 560f7cc..e2dba76 100644 --- a/lib/classes/StudipSemTreeViewSimple.class.php +++ b/lib/classes/StudipSemTreeViewSimple.class.php @@ -175,11 +175,8 @@ class StudipSemTreeViewSimple public function getInfoIcon($item_id) { - if ($item_id === 'root') { - $info = $this->root_content; - } - $ret = $info ? tooltipicon(kill_format($info)) : ''; - return $ret; + $info = $item_id === 'root' ? $this->root_content : ''; + return $info ? tooltipicon(kill_format($info)) : ''; } public function showContent($item_id, $num_all_entries = 0) diff --git a/lib/classes/sidebar/RoomSearchWidget.class.php b/lib/classes/sidebar/RoomSearchWidget.class.php index 8505288..c1a3d6a 100644 --- a/lib/classes/sidebar/RoomSearchWidget.class.php +++ b/lib/classes/sidebar/RoomSearchWidget.class.php @@ -339,8 +339,12 @@ class RoomSearchWidget extends SidebarWidget $properties[$name] = $criteria['value']; } - if ($properties[$name][0] && $properties[$name][1] && - ($properties[$name][0] > $properties[$name][1]) && $name != 'room_category_id') { + if ( + isset($properties[$name][0], $properties[$name][1]) + && $properties[$name][0] && $properties[$name][1] + && $properties[$name][0] > $properties[$name][1] + && $name !== 'room_category_id' + ) { //A range is selected, but the range start is bigger //then the range end. That's an error! diff --git a/lib/models/Abschluss.php b/lib/models/Abschluss.php index 1c4fbe6..a3299c8 100644 --- a/lib/models/Abschluss.php +++ b/lib/models/Abschluss.php @@ -13,7 +13,6 @@ * @category Stud.IP * @since 3.5 */ - class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject { protected static function configure($config = []) @@ -47,16 +46,21 @@ class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject 'order_by' => 'GROUP BY fach_id ORDER BY name' ]; - $config['additional_fields']['count_faecher']['get'] = - function($abschluss) { return $abschluss->count_faecher; }; - $config['additional_fields']['kategorie_name']['get'] = - function($abschluss) { return $abschluss->kategorie_name; }; - $config['additional_fields']['kategorie_id']['get'] = - function($abschluss) { return $abschluss->category_assignment->kategorie_id; }; - $config['additional_fields']['count_studiengaenge']['get'] = - function($abschluss) { return $abschluss->count_studiengaenge; }; - $config['additional_fields']['count_objects']['get'] = - function($abschluss) { return $abschluss->count_objects; }; + $config['additional_fields']['count_faecher']['get'] = function (Abschluss $abschluss) { + return $abschluss->count_faecher; + }; + $config['additional_fields']['kategorie_name']['get'] = function (Abschluss $abschluss) { + return $abschluss->kategorie_name; + }; + $config['additional_fields']['kategorie_id']['get'] = function (Abschluss $abschluss) { + return $abschluss->category_assignment ? $abschluss->category_assignment->kategorie_id : null; + }; + $config['additional_fields']['count_studiengaenge']['get'] = function (Abschluss $abschluss) { + return $abschluss->count_studiengaenge; + }; + $config['additional_fields']['count_objects']['get'] = function (Abschluss $abschluss) { + return $abschluss->count_objects; + }; $config['additional_fields']['count_user']['get'] = 'countUser'; $config['i18n_fields']['name'] = true; diff --git a/lib/models/Semester.class.php b/lib/models/Semester.class.php index 6e55e4e..6934563 100644 --- a/lib/models/Semester.class.php +++ b/lib/models/Semester.class.php @@ -268,6 +268,10 @@ class Semester extends SimpleORMap $use_semester_id = true ) { + $select_attributes = array_merge([ + 'name' => 'sem_select', + ], $select_attributes ?? []); + $semester = Semester::findAllVisible(); unset($semester[0]); @@ -280,10 +284,6 @@ class Semester extends SimpleORMap } $semester = array_reverse($semester, true); - if (!$select_attributes['name']) { - $select_attributes['name'] = 'sem_select'; - } - $template = $GLOBALS['template_factory']->open('shared/semester-selector'); $template->semesters = $semester; $template->select_attributes = $select_attributes; -- cgit v1.0