From f226c5fbd84be012094b317f17b0745f47f565fe Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Fri, 25 Feb 2022 17:31:41 +0100
Subject: improved fixes for PHP8 warnings

---
 lib/classes/StudipPDO.class.php                | 2 +-
 lib/models/resources/Building.class.php        | 2 +-
 lib/models/resources/Location.class.php        | 2 +-
 lib/models/resources/ResourceRequest.class.php | 4 ++--
 templates/debug/db-log.php                     | 2 +-
 templates/footer.php                           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/classes/StudipPDO.class.php b/lib/classes/StudipPDO.class.php
index 1677223..edda37a 100644
--- a/lib/classes/StudipPDO.class.php
+++ b/lib/classes/StudipPDO.class.php
@@ -43,7 +43,7 @@ class StudipPDO extends PDO
         // method that is executed on every call to the database)
         $this->query_count += 1;
 
-        if (array_key_exists('DEBUG_ALL_DB_QUERIES', $GLOBALS) && $GLOBALS['DEBUG_ALL_DB_QUERIES']) {
+        if (!empty($GLOBALS['DEBUG_ALL_DB_QUERIES'])) {
             $trace = debug_backtrace();
 
             $classes = [];
diff --git a/lib/models/resources/Building.class.php b/lib/models/resources/Building.class.php
index e445731..a28ca63 100644
--- a/lib/models/resources/Building.class.php
+++ b/lib/models/resources/Building.class.php
@@ -35,7 +35,7 @@ class Building extends Resource
 
     protected static function configure($config = [])
     {
-        if (!array_key_exists('additional_fields', $config) || !is_array($config['additional_fields'])) {
+        if (empty($config['additional_fields'])) {
             $config['additional_fields'] = [];
         }
         foreach (self::$required_properties as $property) {
diff --git a/lib/models/resources/Location.class.php b/lib/models/resources/Location.class.php
index 2983318..2fd5f9e 100644
--- a/lib/models/resources/Location.class.php
+++ b/lib/models/resources/Location.class.php
@@ -26,7 +26,7 @@ class Location extends Resource
 
     protected static function configure($config = [])
     {
-        if (!array_key_exists('additional_fields', $config) || !is_array($config['additional_fields'])) {
+        if (empty($config['additional_fields'])) {
             $config['additional_fields'] = [];
         }
         foreach (self::$required_properties as $property) {
diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php
index e5bf331..46e91e1 100644
--- a/lib/models/resources/ResourceRequest.class.php
+++ b/lib/models/resources/ResourceRequest.class.php
@@ -1143,8 +1143,8 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
             if ($with_range) {
                 $interval['range']       = 'CourseDate';
                 $interval['range_id']    = $this->termin_id;
-                $interval['booked_room'] = $this->date->room_booking ? $this->date->room_booking->resource_id : '';
-                $interval['booking_id']  = $this->date->room_booking ? $this->date->room_booking->id : '';
+                $interval['booked_room'] = $this->date->room_booking->resource_id ?? '';
+                $interval['booking_id']  = $this->date->room_booking->id ?? '';
             }
             return [$interval];
         } elseif ($this->metadate_id) {
diff --git a/templates/debug/db-log.php b/templates/debug/db-log.php
index f29000f..9797295 100644
--- a/templates/debug/db-log.php
+++ b/templates/debug/db-log.php
@@ -1,4 +1,4 @@
-<? if (array_key_exists('DEBUG_ALL_DB_QUERIES', $GLOBALS) && $GLOBALS['DEBUG_ALL_DB_QUERIES']) : ?>
+<? if (!empty($GLOBALS['DEBUG_ALL_DB_QUERIES'])) : ?>
     <style>
     #all_db_queries td:first-child {
         border-left: 4px solid transparent;
diff --git a/templates/footer.php b/templates/footer.php
index 3eaa636..7cf392f 100644
--- a/templates/footer.php
+++ b/templates/footer.php
@@ -25,7 +25,7 @@
             /
             <?= sprintf('%.5f sec', microtime(true) - $GLOBALS['STUDIP_STARTUP_TIME']) ?>
         ]
-        <? if (array_key_exists('DEBUG_ALL_DB_QUERIES', $GLOBALS) && $GLOBALS['DEBUG_ALL_DB_QUERIES']) : ?>
+        <? if (!empty($GLOBALS['DEBUG_ALL_DB_QUERIES'])) : ?>
             <a href="" onClick="jQuery('#all_db_queries').toggle(); return false;">
                 <?= Icon::create("code", "info_alt")->asImg(16, ['class' => "text-bottom"]) ?>
             </a>
-- 
cgit v1.0