Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Nov 4, 2024

Backport of #48723

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot added bug 3. to review Waiting for reviews feature: caldav Related to CalDAV internals labels Nov 4, 2024
@backportbot backportbot bot added this to the Nextcloud 30.0.2 milestone Nov 4, 2024
@st3iny st3iny added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Nov 12, 2024
@st3iny st3iny force-pushed the backport/48723/stable30 branch from eb98aab to 87ff49e Compare November 12, 2024 17:45
@st3iny st3iny added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 12, 2024
@st3iny st3iny marked this pull request as ready for review November 12, 2024 17:45
Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict was a single line with only white-space changes.

$this->baseEventDuration = $this->baseEvent->DURATION->getDateInterval();
$this->baseEventEndDate = ((clone $this->baseEventStartDate)->add($this->baseEventDuration));
$this->baseEventEndDate = DateTimeImmutable::createFromInterface($this->baseEventStartDate)
->add($this->baseEvent->DURATION->getDateInterval());

Check notice

Code scanning / Psalm

PossiblyUndefinedMethod Note

Method Sabre\VObject\Property::getDateInterval does not exist
@SebastianKrupinski SebastianKrupinski merged commit 1eba1a9 into stable30 Nov 14, 2024
170 checks passed
@SebastianKrupinski SebastianKrupinski deleted the backport/48723/stable30 branch November 14, 2024 18:19
@skjnldsv skjnldsv mentioned this pull request Nov 27, 2024
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews bug feature: caldav Related to CalDAV internals

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants