diff options
15 files changed, 27 insertions, 495 deletions
diff --git a/apps/dav/composer/composer/autoload_classmap.php b/apps/dav/composer/composer/autoload_classmap.php index 19db47d7cab..17533c9cf74 100644 --- a/apps/dav/composer/composer/autoload_classmap.php +++ b/apps/dav/composer/composer/autoload_classmap.php @@ -255,12 +255,6 @@ return array( 'OCA\\DAV\\Events\\CalendarCreatedEvent' => $baseDir . '/../lib/Events/CalendarCreatedEvent.php', 'OCA\\DAV\\Events\\CalendarDeletedEvent' => $baseDir . '/../lib/Events/CalendarDeletedEvent.php', 'OCA\\DAV\\Events\\CalendarMovedToTrashEvent' => $baseDir . '/../lib/Events/CalendarMovedToTrashEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectCreatedEvent' => $baseDir . '/../lib/Events/CalendarObjectCreatedEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectDeletedEvent' => $baseDir . '/../lib/Events/CalendarObjectDeletedEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectMovedEvent' => $baseDir . '/../lib/Events/CalendarObjectMovedEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectMovedToTrashEvent' => $baseDir . '/../lib/Events/CalendarObjectMovedToTrashEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectRestoredEvent' => $baseDir . '/../lib/Events/CalendarObjectRestoredEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectUpdatedEvent' => $baseDir . '/../lib/Events/CalendarObjectUpdatedEvent.php', 'OCA\\DAV\\Events\\CalendarPublishedEvent' => $baseDir . '/../lib/Events/CalendarPublishedEvent.php', 'OCA\\DAV\\Events\\CalendarRestoredEvent' => $baseDir . '/../lib/Events/CalendarRestoredEvent.php', 'OCA\\DAV\\Events\\CalendarShareUpdatedEvent' => $baseDir . '/../lib/Events/CalendarShareUpdatedEvent.php', diff --git a/apps/dav/composer/composer/autoload_static.php b/apps/dav/composer/composer/autoload_static.php index 2965b78beb2..768fda98443 100644 --- a/apps/dav/composer/composer/autoload_static.php +++ b/apps/dav/composer/composer/autoload_static.php @@ -270,12 +270,6 @@ class ComposerStaticInitDAV 'OCA\\DAV\\Events\\CalendarCreatedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarCreatedEvent.php', 'OCA\\DAV\\Events\\CalendarDeletedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarDeletedEvent.php', 'OCA\\DAV\\Events\\CalendarMovedToTrashEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarMovedToTrashEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectCreatedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectCreatedEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectDeletedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectDeletedEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectMovedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectMovedEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectMovedToTrashEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectMovedToTrashEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectRestoredEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectRestoredEvent.php', - 'OCA\\DAV\\Events\\CalendarObjectUpdatedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectUpdatedEvent.php', 'OCA\\DAV\\Events\\CalendarPublishedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarPublishedEvent.php', 'OCA\\DAV\\Events\\CalendarRestoredEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarRestoredEvent.php', 'OCA\\DAV\\Events\\CalendarShareUpdatedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarShareUpdatedEvent.php', diff --git a/apps/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php index 4db58b0f137..b3aff922ba0 100644 --- a/apps/dav/lib/AppInfo/Application.php +++ b/apps/dav/lib/AppInfo/Application.php @@ -30,12 +30,6 @@ use OCA\DAV\Events\AddressBookUpdatedEvent; use OCA\DAV\Events\CalendarCreatedEvent; use OCA\DAV\Events\CalendarDeletedEvent; use OCA\DAV\Events\CalendarMovedToTrashEvent; -use OCA\DAV\Events\CalendarObjectCreatedEvent; -use OCA\DAV\Events\CalendarObjectDeletedEvent; -use OCA\DAV\Events\CalendarObjectMovedEvent; -use OCA\DAV\Events\CalendarObjectMovedToTrashEvent; -use OCA\DAV\Events\CalendarObjectRestoredEvent; -use OCA\DAV\Events\CalendarObjectUpdatedEvent; use OCA\DAV\Events\CalendarPublishedEvent; use OCA\DAV\Events\CalendarRestoredEvent; use OCA\DAV\Events\CalendarShareUpdatedEvent; @@ -75,6 +69,12 @@ use OCP\AppFramework\Bootstrap\IBootContext; use OCP\AppFramework\Bootstrap\IBootstrap; use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\AppFramework\IAppContainer; +use OCP\Calendar\Events\CalendarObjectCreatedEvent; +use OCP\Calendar\Events\CalendarObjectDeletedEvent; +use OCP\Calendar\Events\CalendarObjectMovedEvent; +use OCP\Calendar\Events\CalendarObjectMovedToTrashEvent; +use OCP\Calendar\Events\CalendarObjectRestoredEvent; +use OCP\Calendar\Events\CalendarObjectUpdatedEvent; use OCP\Calendar\IManager as ICalendarManager; use OCP\Config\BeforePreferenceDeletedEvent; use OCP\Config\BeforePreferenceSetEvent; diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 32a6427052d..349a4ec3630 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -19,12 +19,6 @@ use OCA\DAV\Events\CachedCalendarObjectUpdatedEvent; use OCA\DAV\Events\CalendarCreatedEvent; use OCA\DAV\Events\CalendarDeletedEvent; use OCA\DAV\Events\CalendarMovedToTrashEvent; -use OCA\DAV\Events\CalendarObjectCreatedEvent; -use OCA\DAV\Events\CalendarObjectDeletedEvent; -use OCA\DAV\Events\CalendarObjectMovedEvent; -use OCA\DAV\Events\CalendarObjectMovedToTrashEvent; -use OCA\DAV\Events\CalendarObjectRestoredEvent; -use OCA\DAV\Events\CalendarObjectUpdatedEvent; use OCA\DAV\Events\CalendarPublishedEvent; use OCA\DAV\Events\CalendarRestoredEvent; use OCA\DAV\Events\CalendarShareUpdatedEvent; @@ -34,12 +28,12 @@ use OCA\DAV\Events\SubscriptionCreatedEvent; use OCA\DAV\Events\SubscriptionDeletedEvent; use OCA\DAV\Events\SubscriptionUpdatedEvent; use OCP\AppFramework\Db\TTransactional; -use OCP\Calendar\Events\CalendarObjectCreatedEvent as PublicCalendarObjectCreatedEvent; -use OCP\Calendar\Events\CalendarObjectDeletedEvent as PublicCalendarObjectDeletedEvent; -use OCP\Calendar\Events\CalendarObjectMovedEvent as PublicCalendarObjectMovedEvent; -use OCP\Calendar\Events\CalendarObjectMovedToTrashEvent as PublicCalendarObjectMovedToTrashEvent; -use OCP\Calendar\Events\CalendarObjectRestoredEvent as PublicCalendarObjectRestoredEvent; -use OCP\Calendar\Events\CalendarObjectUpdatedEvent as PublicCalendarObjectUpdatedEvent; +use OCP\Calendar\Events\CalendarObjectCreatedEvent; +use OCP\Calendar\Events\CalendarObjectDeletedEvent; +use OCP\Calendar\Events\CalendarObjectMovedEvent; +use OCP\Calendar\Events\CalendarObjectMovedToTrashEvent; +use OCP\Calendar\Events\CalendarObjectRestoredEvent; +use OCP\Calendar\Events\CalendarObjectUpdatedEvent; use OCP\Calendar\Exceptions\CalendarException; use OCP\DB\Exception; use OCP\DB\QueryBuilder\IQueryBuilder; @@ -1324,7 +1318,6 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $shares = $this->getShares($calendarId); $this->dispatcher->dispatchTyped(new CalendarObjectCreatedEvent($calendarId, $calendarRow, $shares, $objectRow)); - $this->dispatcher->dispatchTyped(new PublicCalendarObjectCreatedEvent($calendarId, $calendarRow, $shares, $objectRow)); } else { $subscriptionRow = $this->getSubscriptionById($calendarId); @@ -1385,7 +1378,6 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $shares = $this->getShares($calendarId); $this->dispatcher->dispatchTyped(new CalendarObjectUpdatedEvent($calendarId, $calendarRow, $shares, $objectRow)); - $this->dispatcher->dispatchTyped(new PublicCalendarObjectUpdatedEvent($calendarId, $calendarRow, $shares, $objectRow)); } else { $subscriptionRow = $this->getSubscriptionById($calendarId); @@ -1447,7 +1439,6 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $targetShares = $this->getShares($targetCalendarId); $sourceCalendarRow = $this->getCalendarById($sourceCalendarId); $this->dispatcher->dispatchTyped(new CalendarObjectMovedEvent($sourceCalendarId, $sourceCalendarRow, $targetCalendarId, $targetCalendarRow, $sourceShares, $targetShares, $object)); - $this->dispatcher->dispatchTyped(new PublicCalendarObjectMovedEvent($sourceCalendarId, $sourceCalendarRow, $targetCalendarId, $targetCalendarRow, $sourceShares, $targetShares, $object)); } return true; }, $this->db); @@ -1506,7 +1497,6 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $shares = $this->getShares($calendarId); $this->dispatcher->dispatchTyped(new CalendarObjectDeletedEvent($calendarId, $calendarRow, $shares, $data)); - $this->dispatcher->dispatchTyped(new PublicCalendarObjectDeletedEvent($calendarId, $calendarRow, $shares, $data)); } else { $subscriptionRow = $this->getSubscriptionById($calendarId); @@ -1556,14 +1546,6 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $data ) ); - $this->dispatcher->dispatchTyped( - new PublicCalendarObjectMovedToTrashEvent( - $calendarId, - $calendarData, - $this->getShares($calendarId), - $data - ) - ); } } @@ -1623,14 +1605,6 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $row ) ); - $this->dispatcher->dispatchTyped( - new PublicCalendarObjectRestoredEvent( - (int)$objectData['calendarid'], - $calendarRow, - $this->getShares((int)$row['calendarid']), - $row - ) - ); }, $this->db); } diff --git a/apps/dav/lib/Events/CalendarObjectCreatedEvent.php b/apps/dav/lib/Events/CalendarObjectCreatedEvent.php deleted file mode 100644 index 187ded2dcd4..00000000000 --- a/apps/dav/lib/Events/CalendarObjectCreatedEvent.php +++ /dev/null @@ -1,70 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: AGPL-3.0-or-later - */ -namespace OCA\DAV\Events; - -use OCP\EventDispatcher\Event; - -/** - * Class CalendarObjectCreatedEvent - * - * @package OCA\DAV\Events - * @since 20.0.0 - */ -class CalendarObjectCreatedEvent extends Event { - - /** - * CalendarObjectCreatedEvent constructor. - * - * @param int $calendarId - * @param array $calendarData - * @param array $shares - * @param array $objectData - * @since 20.0.0 - */ - public function __construct( - private int $calendarId, - private array $calendarData, - private array $shares, - private array $objectData, - ) { - parent::__construct(); - } - - /** - * @return int - * @since 20.0.0 - */ - public function getCalendarId(): int { - return $this->calendarId; - } - - /** - * @return array - * @since 20.0.0 - */ - public function getCalendarData(): array { - return $this->calendarData; - } - - /** - * @return array - * @since 20.0.0 - */ - public function getShares(): array { - return $this->shares; - } - - /** - * @return array - * @since 20.0.0 - */ - public function getObjectData(): array { - return $this->objectData; - } -} diff --git a/apps/dav/lib/Events/CalendarObjectDeletedEvent.php b/apps/dav/lib/Events/CalendarObjectDeletedEvent.php deleted file mode 100644 index 9928080f99b..00000000000 --- a/apps/dav/lib/Events/CalendarObjectDeletedEvent.php +++ /dev/null @@ -1,70 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: AGPL-3.0-or-later - */ -namespace OCA\DAV\Events; - -use OCP\EventDispatcher\Event; - -/** - * Class CalendarObjectDeletedEvent - * - * @package OCA\DAV\Events - * @since 20.0.0 - */ -class CalendarObjectDeletedEvent extends Event { - - /** - * CalendarObjectDeletedEvent constructor. - * - * @param int $calendarId - * @param array $calendarData - * @param array $shares - * @param array $objectData - * @since 20.0.0 - */ - public function __construct( - private int $calendarId, - private array $calendarData, - private array $shares, - private array $objectData, - ) { - parent::__construct(); - } - - /** - * @return int - * @since 20.0.0 - */ - public function getCalendarId(): int { - return $this->calendarId; - } - - /** - * @return array - * @since 20.0.0 - */ - public function getCalendarData(): array { - return $this->calendarData; - } - - /** - * @return array - * @since 20.0.0 - */ - public function getShares(): array { - return $this->shares; - } - - /** - * @return array - * @since 20.0.0 - */ - public function getObjectData(): array { - return $this->objectData; - } -} diff --git a/apps/dav/lib/Events/CalendarObjectMovedEvent.php b/apps/dav/lib/Events/CalendarObjectMovedEvent.php deleted file mode 100644 index 0b57919ddc9..00000000000 --- a/apps/dav/lib/Events/CalendarObjectMovedEvent.php +++ /dev/null @@ -1,90 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: AGPL-3.0-or-later - */ -namespace OCA\DAV\Events; - -use OCP\EventDispatcher\Event; - -/** - * Class CalendarObjectMovedEvent - * - * @package OCA\DAV\Events - * @since 25.0.0 - */ -class CalendarObjectMovedEvent extends Event { - /** - * @since 25.0.0 - */ - public function __construct( - private int $sourceCalendarId, - private array $sourceCalendarData, - private int $targetCalendarId, - private array $targetCalendarData, - private array $sourceShares, - private array $targetShares, - private array $objectData, - ) { - parent::__construct(); - } - - /** - * @return int - * @since 25.0.0 - */ - public function getSourceCalendarId(): int { - return $this->sourceCalendarId; - } - - /** - * @return array - * @since 25.0.0 - */ - public function getSourceCalendarData(): array { - return $this->sourceCalendarData; - } - - /** - * @return int - * @since 25.0.0 - */ - public function getTargetCalendarId(): int { - return $this->targetCalendarId; - } - - /** - * @return array - * @since 25.0.0 - */ - public function getTargetCalendarData(): array { - return $this->targetCalendarData; - } - - /** - * @return array - * @since 25.0.0 - */ - public function getSourceShares(): array { - return $this->sourceShares; - } - - /** - * @return array - * @since 25.0.0 - */ - public function getTargetShares(): array { - return $this->targetShares; - } - - /** - * @return array - * @since 25.0.0 - */ - public function getObjectData(): array { - return $this->objectData; - } -} diff --git a/apps/dav/lib/Events/CalendarObjectMovedToTrashEvent.php b/apps/dav/lib/Events/CalendarObjectMovedToTrashEvent.php deleted file mode 100644 index a26aca4ff2b..00000000000 --- a/apps/dav/lib/Events/CalendarObjectMovedToTrashEvent.php +++ /dev/null @@ -1,65 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: AGPL-3.0-or-later - */ -namespace OCA\DAV\Events; - -use OCP\EventDispatcher\Event; - -/** - * @since 22.0.0 - */ -class CalendarObjectMovedToTrashEvent extends Event { - - /** - * @param int $calendarId - * @param array $calendarData - * @param array $shares - * @param array $objectData - * @since 22.0.0 - */ - public function __construct( - private int $calendarId, - private array $calendarData, - private array $shares, - private array $objectData, - ) { - parent::__construct(); - } - - /** - * @return int - * @since 22.0.0 - */ - public function getCalendarId(): int { - return $this->calendarId; - } - - /** - * @return array - * @since 22.0.0 - */ - public function getCalendarData(): array { - return $this->calendarData; - } - - /** - * @return array - * @since 22.0.0 - */ - public function getShares(): array { - return $this->shares; - } - - /** - * @return array - * @since 22.0.0 - */ - public function getObjectData(): array { - return $this->objectData; - } -} diff --git a/apps/dav/lib/Events/CalendarObjectRestoredEvent.php b/apps/dav/lib/Events/CalendarObjectRestoredEvent.php deleted file mode 100644 index 99d752de466..00000000000 --- a/apps/dav/lib/Events/CalendarObjectRestoredEvent.php +++ /dev/null @@ -1,65 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: AGPL-3.0-or-later - */ -namespace OCA\DAV\Events; - -use OCP\EventDispatcher\Event; - -/** - * @since 22.0.0 - */ -class CalendarObjectRestoredEvent extends Event { - - /** - * @param int $calendarId - * @param array $calendarData - * @param array $shares - * @param array $objectData - * @since 22.0.0 - */ - public function __construct( - private int $calendarId, - private array $calendarData, - private array $shares, - private array $objectData, - ) { - parent::__construct(); - } - - /** - * @return int - * @since 22.0.0 - */ - public function getCalendarId(): int { - return $this->calendarId; - } - - /** - * @return array - * @since 22.0.0 - */ - public function getCalendarData(): array { - return $this->calendarData; - } - - /** - * @return array - * @since 22.0.0 - */ - public function getShares(): array { - return $this->shares; - } - - /** - * @return array - * @since 22.0.0 - */ - public function getObjectData(): array { - return $this->objectData; - } -} diff --git a/apps/dav/lib/Events/CalendarObjectUpdatedEvent.php b/apps/dav/lib/Events/CalendarObjectUpdatedEvent.php deleted file mode 100644 index 8c4b843609d..00000000000 --- a/apps/dav/lib/Events/CalendarObjectUpdatedEvent.php +++ /dev/null @@ -1,70 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: AGPL-3.0-or-later - */ -namespace OCA\DAV\Events; - -use OCP\EventDispatcher\Event; - -/** - * Class CalendarObjectUpdatedEvent - * - * @package OCA\DAV\Events - * @since 20.0.0 - */ -class CalendarObjectUpdatedEvent extends Event { - - /** - * CalendarObjectUpdatedEvent constructor. - * - * @param int $calendarId - * @param array $calendarData - * @param array $shares - * @param array $objectData - * @since 20.0.0 - */ - public function __construct( - private int $calendarId, - private array $calendarData, - private array $shares, - private array $objectData, - ) { - parent::__construct(); - } - - /** - * @return int - * @since 20.0.0 - */ - public function getCalendarId(): int { - return $this->calendarId; - } - - /** - * @return array - * @since 20.0.0 - */ - public function getCalendarData(): array { - return $this->calendarData; - } - - /** - * @return array - * @since 20.0.0 - */ - public function getShares(): array { - return $this->shares; - } - - /** - * @return array - * @since 20.0.0 - */ - public function getObjectData(): array { - return $this->objectData; - } -} diff --git a/apps/dav/lib/Listener/ActivityUpdaterListener.php b/apps/dav/lib/Listener/ActivityUpdaterListener.php index 700bc2f306c..f291e424c41 100644 --- a/apps/dav/lib/Listener/ActivityUpdaterListener.php +++ b/apps/dav/lib/Listener/ActivityUpdaterListener.php @@ -13,14 +13,14 @@ use OCA\DAV\DAV\Sharing\Plugin; use OCA\DAV\Events\CalendarCreatedEvent; use OCA\DAV\Events\CalendarDeletedEvent; use OCA\DAV\Events\CalendarMovedToTrashEvent; -use OCA\DAV\Events\CalendarObjectCreatedEvent; -use OCA\DAV\Events\CalendarObjectDeletedEvent; -use OCA\DAV\Events\CalendarObjectMovedEvent; -use OCA\DAV\Events\CalendarObjectMovedToTrashEvent; -use OCA\DAV\Events\CalendarObjectRestoredEvent; -use OCA\DAV\Events\CalendarObjectUpdatedEvent; use OCA\DAV\Events\CalendarRestoredEvent; use OCA\DAV\Events\CalendarUpdatedEvent; +use OCP\Calendar\Events\CalendarObjectCreatedEvent; +use OCP\Calendar\Events\CalendarObjectDeletedEvent; +use OCP\Calendar\Events\CalendarObjectMovedEvent; +use OCP\Calendar\Events\CalendarObjectMovedToTrashEvent; +use OCP\Calendar\Events\CalendarObjectRestoredEvent; +use OCP\Calendar\Events\CalendarObjectUpdatedEvent; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; use Psr\Log\LoggerInterface; diff --git a/apps/dav/lib/Listener/CalendarContactInteractionListener.php b/apps/dav/lib/Listener/CalendarContactInteractionListener.php index 8e574e150cd..a7f00e452c4 100644 --- a/apps/dav/lib/Listener/CalendarContactInteractionListener.php +++ b/apps/dav/lib/Listener/CalendarContactInteractionListener.php @@ -9,9 +9,9 @@ declare(strict_types=1); namespace OCA\DAV\Listener; use OCA\DAV\Connector\Sabre\Principal; -use OCA\DAV\Events\CalendarObjectCreatedEvent; -use OCA\DAV\Events\CalendarObjectUpdatedEvent; use OCA\DAV\Events\CalendarShareUpdatedEvent; +use OCP\Calendar\Events\CalendarObjectCreatedEvent; +use OCP\Calendar\Events\CalendarObjectUpdatedEvent; use OCP\Contacts\Events\ContactInteractedWithEvent; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventDispatcher; diff --git a/apps/dav/lib/Listener/CalendarObjectReminderUpdaterListener.php b/apps/dav/lib/Listener/CalendarObjectReminderUpdaterListener.php index 544c88af929..a58fb3524ab 100644 --- a/apps/dav/lib/Listener/CalendarObjectReminderUpdaterListener.php +++ b/apps/dav/lib/Listener/CalendarObjectReminderUpdaterListener.php @@ -13,12 +13,12 @@ use OCA\DAV\CalDAV\Reminder\Backend as ReminderBackend; use OCA\DAV\CalDAV\Reminder\ReminderService; use OCA\DAV\Events\CalendarDeletedEvent; use OCA\DAV\Events\CalendarMovedToTrashEvent; -use OCA\DAV\Events\CalendarObjectCreatedEvent; -use OCA\DAV\Events\CalendarObjectDeletedEvent; -use OCA\DAV\Events\CalendarObjectMovedToTrashEvent; -use OCA\DAV\Events\CalendarObjectRestoredEvent; -use OCA\DAV\Events\CalendarObjectUpdatedEvent; use OCA\DAV\Events\CalendarRestoredEvent; +use OCP\Calendar\Events\CalendarObjectCreatedEvent; +use OCP\Calendar\Events\CalendarObjectDeletedEvent; +use OCP\Calendar\Events\CalendarObjectMovedToTrashEvent; +use OCP\Calendar\Events\CalendarObjectRestoredEvent; +use OCP\Calendar\Events\CalendarObjectUpdatedEvent; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; use Psr\Log\LoggerInterface; diff --git a/apps/dav/tests/unit/Listener/ActivityUpdaterListenerTest.php b/apps/dav/tests/unit/Listener/ActivityUpdaterListenerTest.php index 7b517c93d5d..78769c7fb47 100644 --- a/apps/dav/tests/unit/Listener/ActivityUpdaterListenerTest.php +++ b/apps/dav/tests/unit/Listener/ActivityUpdaterListenerTest.php @@ -12,8 +12,8 @@ use OCA\DAV\CalDAV\Activity\Backend as ActivityBackend; use OCA\DAV\CalDAV\Activity\Provider\Event; use OCA\DAV\DAV\Sharing\Plugin as SharingPlugin; use OCA\DAV\Events\CalendarDeletedEvent; -use OCA\DAV\Events\CalendarObjectDeletedEvent; use OCA\DAV\Listener\ActivityUpdaterListener; +use OCP\Calendar\Events\CalendarObjectDeletedEvent; use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; use Test\TestCase; diff --git a/apps/dav/tests/unit/Listener/CalendarContactInteractionListenerTest.php b/apps/dav/tests/unit/Listener/CalendarContactInteractionListenerTest.php index f11438858d7..96d8514da41 100644 --- a/apps/dav/tests/unit/Listener/CalendarContactInteractionListenerTest.php +++ b/apps/dav/tests/unit/Listener/CalendarContactInteractionListenerTest.php @@ -9,9 +9,9 @@ declare(strict_types=1); namespace OCA\DAV\Tests\Unit\Listener; use OCA\DAV\Connector\Sabre\Principal; -use OCA\DAV\Events\CalendarObjectCreatedEvent; use OCA\DAV\Events\CalendarShareUpdatedEvent; use OCA\DAV\Listener\CalendarContactInteractionListener; +use OCP\Calendar\Events\CalendarObjectCreatedEvent; use OCP\Contacts\Events\ContactInteractedWithEvent; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventDispatcher; |