From 20ebf68a5481623b362374ba1c0cd7025f2f6dfe Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 16 Dec 2022 13:38:25 +0000
Subject: [PATCH] fix php8 warnings, fixes #1911
Closes #1911
Merge request studip/studip!1255
---
lib/classes/MyRealmModel.php | 6 +++---
lib/classes/ResponsiveHelper.php | 2 +-
lib/classes/URLHelper.php | 2 +-
templates/header.php | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/classes/MyRealmModel.php b/lib/classes/MyRealmModel.php
index ebc09cb6cae..d905ca9b5f7 100644
--- a/lib/classes/MyRealmModel.php
+++ b/lib/classes/MyRealmModel.php
@@ -163,8 +163,8 @@ class MyRealmModel
public static function getCourses($min_sem_key, $max_sem_key, $params = [])
{
// init
- $order_by = $params['order_by'];
- $order = $params['order'];
+ $order_by = $params['order_by'] ?? null;
+ $order = $params['order'] ?? null;
$deputies_enabled = $params['deputies_enabled'];
$sem_data = Semester::getAllAsArray();
@@ -179,7 +179,7 @@ class MyRealmModel
}
$semesters = Semester::findMany($semester_ids);
- $studygroup_filter = !$params['studygroups_enabled'] ? false : true;
+ $studygroup_filter = !empty($params['studygroups_enabled']);
$ordering = '';
// create ordering
if (!$order_by) {
diff --git a/lib/classes/ResponsiveHelper.php b/lib/classes/ResponsiveHelper.php
index eea89815458..bb07add4ce6 100644
--- a/lib/classes/ResponsiveHelper.php
+++ b/lib/classes/ResponsiveHelper.php
@@ -195,7 +195,7 @@ class ResponsiveHelper
$currentIndex = -1;
foreach ($sem_data as $index => $semester) {
- if ($semester['current']) {
+ if (!empty($semester['current'])) {
$currentIndex = $index;
break;
}
diff --git a/lib/classes/URLHelper.php b/lib/classes/URLHelper.php
index 732ce995dac..4421fdf7718 100644
--- a/lib/classes/URLHelper.php
+++ b/lib/classes/URLHelper.php
@@ -67,7 +67,7 @@ class URLHelper
return $url;
}
- if ($url[0] === '/') {
+ if (isset($url[0]) && $url[0] === '/') {
preg_match('%^[a-z]+://[\w:.-]+%', $base_url, $host);
$base_url = $host[0] ?? '';
}
diff --git a/templates/header.php b/templates/header.php
index c8aeb1cacd9..c0181e69998 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -287,7 +287,7 @@ if ($navigation) {
<nav id="navigation-level-2" aria-current="page" aria-label="<?= _('Zweite Navigationsebene') ?>">
<? if (PageLayout::isHeaderEnabled() /*&& isset($navigation)*/) : ?>
- <?= $this->render_partial('tabs', compact('navigation', 'membership')) ?>
+ <?= $this->render_partial('tabs', compact('navigation')) ?>
<? endif; ?>
</nav>
<? endif; ?>
--
GitLab