summaryrefslogtreecommitdiffstats
path: root/modules-available/locationinfo
diff options
context:
space:
mode:
authorSimon Rettberg2025-08-01 13:41:49 +0200
committerSimon Rettberg2025-08-01 13:41:49 +0200
commit429cfb1677ec77c5a945f655d9405d038d3e5a2c (patch)
treeb3fbb729cb2231f4163b96a67046ad878f48d1b4 /modules-available/locationinfo
parent[minilinux] show -> action for POST actions (diff)
downloadslx-admin-429cfb1677ec77c5a945f655d9405d038d3e5a2c.tar.gz
slx-admin-429cfb1677ec77c5a945f655d9405d038d3e5a2c.tar.xz
slx-admin-429cfb1677ec77c5a945f655d9405d038d3e5a2c.zip
Implicitly nullable types are deprecated in PHP 8.3, make explicit
Diffstat (limited to 'modules-available/locationinfo')
-rw-r--r--modules-available/locationinfo/api.inc.php2
-rw-r--r--modules-available/locationinfo/exchange-includes/jamesiarmes/PhpNtlm/SoapClient.php2
-rw-r--r--modules-available/locationinfo/inc/icalparser.inc.php5
-rw-r--r--modules-available/locationinfo/page.inc.php2
4 files changed, 4 insertions, 7 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php
index 7c301f86..1a3bd76e 100644
--- a/modules-available/locationinfo/api.inc.php
+++ b/modules-available/locationinfo/api.inc.php
@@ -39,7 +39,7 @@ function HandleParameters()
$output = Location::getTree(...$locationIds);
} elseif ($get === "calendar") {
$locationIds = LocationInfo::getLocationsOr404($uuid);
- $output = LocationInfo::getCalendar($locationIds);
+ $output = LocationInfo::getCalendar($locationIds, time() + 3);
} elseif ($get === "manifest") {
$output = generateManifest($uuid);
}
diff --git a/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpNtlm/SoapClient.php b/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpNtlm/SoapClient.php
index 98f23dfa..d1097d6e 100644
--- a/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpNtlm/SoapClient.php
+++ b/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpNtlm/SoapClient.php
@@ -46,7 +46,7 @@ class SoapClient extends \SoapClient
* characters are stripped. This has no affect unless strip_bad_chars is
* true.
*/
- public function __construct($wsdl, array $options = null)
+ public function __construct($wsdl, ?array $options = null)
{
// Set missing indexes to their default value.
$options += array(
diff --git a/modules-available/locationinfo/inc/icalparser.inc.php b/modules-available/locationinfo/inc/icalparser.inc.php
index 5b75de5f..208a7344 100644
--- a/modules-available/locationinfo/inc/icalparser.inc.php
+++ b/modules-available/locationinfo/inc/icalparser.inc.php
@@ -1752,12 +1752,9 @@ class ICalParser
* problem for events on, during, or after 29 Jan 2038.
* See https://en.wikipedia.org/wiki/Unix_time#Representing_the_number
*
- * @param string|null $rangeStart
- * @param string|null $rangeEnd
- * @return array
* @throws Exception
*/
- public function eventsFromRange(string $rangeStart = null, string $rangeEnd = null): array
+ public function eventsFromRange(?string $rangeStart = null, ?string $rangeEnd = null): array
{
// Sort events before processing range
$events = $this->sortEventsWithOrder($this->events());
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index 72c2c167..92ce03eb 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -1019,7 +1019,7 @@ class Page_LocationInfo extends Page
* @param string|array $panelOrUuid UUID of panel, or array with keys paneltype and locationds
* @param int[] $additionalLocations
*/
- private function assertPanelPermission($panelOrUuid, string $permission, array $additionalLocations = null): void
+ private function assertPanelPermission($panelOrUuid, string $permission, ?array $additionalLocations = null): void
{
if (is_array($panelOrUuid)) {
$panel = $panelOrUuid;