Fix PHP8 warnings

This commit is contained in:
Aleksander Machniak 2023-06-23 13:15:51 +02:00
parent e72b765d20
commit 5863bcc947

View file

@ -519,6 +519,10 @@ abstract class kolab_format_xcal extends kolab_format
$valarm_hashes = array(); $valarm_hashes = array();
if (!empty($object['valarms'])) { if (!empty($object['valarms'])) {
foreach ($object['valarms'] as $valarm) { foreach ($object['valarms'] as $valarm) {
if (empty($valarm['action']) || empty($valarm['trigger'])) {
continue;
}
if (!array_key_exists($valarm['action'], $this->alarm_type_map)) { if (!array_key_exists($valarm['action'], $this->alarm_type_map)) {
continue; // skip unknown alarm types continue; // skip unknown alarm types
} }
@ -548,10 +552,10 @@ abstract class kolab_format_xcal extends kolab_format
} }
else { else {
// action == DISPLAY // action == DISPLAY
$alarm = new Alarm(strval($valarm['summary'] ?: $object['title'])); $alarm = new Alarm(strval(!empty($valarm['summary']) ? $valarm['summary'] : $object['title']));
} }
if (is_object($valarm['trigger']) && $valarm['trigger'] instanceof DateTimeInterface) { if ($valarm['trigger'] instanceof DateTimeInterface) {
$alarm->setStart(self::get_datetime($valarm['trigger'], new DateTimeZone('UTC'))); $alarm->setStart(self::get_datetime($valarm['trigger'], new DateTimeZone('UTC')));
} }
else if (preg_match('/^@([0-9]+)$/', $valarm['trigger'], $m)) { else if (preg_match('/^@([0-9]+)$/', $valarm['trigger'], $m)) {
@ -584,7 +588,8 @@ abstract class kolab_format_xcal extends kolab_format
$alarm->setDuration($duration, intval($valarm['repeat'] ?? 0)); $alarm->setDuration($duration, intval($valarm['repeat'] ?? 0));
} }
catch (Exception $e) { catch (Exception $e) {
// ignore // ignore, but log
rcube::raise_error($e, true);
} }
} }