Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"php-amqplib/php-amqplib": "^3.3",
"php": ">=8.4",
"sabre/dav": "4.7.1",
"sabre/vobject": "dev-linagora-waiting-merges-4.5#df65b241c18c4c08cca31fb4dc71b82d231dfc06 as 4.5.7",
"sabre/vobject": "dev-linagora-waiting-merges-5.0.0#5b725565a9aeff4d9072f80e57392c70919642e9",
"mongodb/mongodb": "^2.2",
"monolog/monolog": "^2.9",
"firebase/php-jwt": "^7.0"
Expand Down
4 changes: 2 additions & 2 deletions lib/CalDAV/NullableUri.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
class NullableUri extends Uri
{
#[\ReturnTypeWillChange]
public function offsetSet($name, $value)
public function offsetSet($name, $value): void
{
if (!$this->isNullableProperty()
&& strtoupper((string)$name) === 'VALUE'
Expand All @@ -20,7 +20,7 @@ public function offsetSet($name, $value)
parent::offsetSet($name, $value);
}

public function setJsonValue(array $value)
public function setJsonValue(array $value): void
{
parent::setJsonValue($this->isNullableProperty() && [null] === $value ? [''] : $value);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/CalDAV/Schedule/ITipPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function iTip($request)
$message->component = 'VEVENT';
$message->uid = $payload->uid;
$message->method = $issetdef('method', 'REQUEST');
$message->sequence = $issetdef('sequence', '0');
$message->sequence = (int) $issetdef('sequence', 0);
$message->message = VObject\Reader::read($payload->ical);
// Events coming from an external system carry the video conference link in the
// OpenPaaS property only: expose it to the recipient's clients as well.
Expand Down
2 changes: 1 addition & 1 deletion lib/CalDAV/Schedule/Plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function deliver(ITip\Message $iTipMessage) {
$iTipMessage->message->VEVENT->SEQUENCE =0;
}

if (!is_string($iTipMessage->recipient)) {
if (!isset($iTipMessage->recipient)) {
$iTipMessage->recipient = '';
}

Expand Down
2 changes: 1 addition & 1 deletion tests/CalDAV/ImportPluginTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private function newItipMessage($sequence) {

$message->component = 'VEVENT';
$message->uid = 'UID';
$message->sequence = $sequence;
$message->sequence = (int) $sequence;
$message->method = 'REQUEST';
$message->sender = 'mailto:a@a.com';
$message->recipient = 'mailto:b@b.com';
Expand Down
7 changes: 4 additions & 3 deletions tests/CalDAV/Schedule/SchedulePluginTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ function testShouldPreservePublicAgendaMetadataOnOutgoingMinimalMessage() {
$this->assertStringContainsString('X-OPENPAAS-BOOKING-LINK:booking-link-id', $serializedMessage);
}

function testDeliverShouldNotCrashWhenRecipientIsNull() {
function testDeliverShouldNotCrashWhenRecipientIsMissing() {
$message = $this->newItipMessage('1');
$message->recipient = null;
unset($message->recipient);

$this->plugin->deliver($message);

Expand Down Expand Up @@ -1019,7 +1019,7 @@ private function newItipMessage($sequence) {

$message->component = 'VEVENT';
$message->uid = 'UID';
$message->sequence = $sequence;
$message->sequence = $sequence === '' ? null : (int) $sequence;
$message->method = 'REQUEST';
$message->sender = 'mailto:a@a.com';
$message->recipient = 'mailto:b@b.com';
Expand Down Expand Up @@ -1508,6 +1508,7 @@ private function initializePluginForTeamCalendarDelivery(array $teamCalendarPriv

private function newReplyMessage(string $uid, string $recipient): Message {
$message = new Message();
$message->component = 'VEVENT';
$message->method = 'REPLY';
$message->uid = $uid;
$message->recipient = $recipient;
Expand Down