Remove all legacy event dispatchers from CalDAV & CardDAV backends

Move them to proper EventListeners and test them

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

1 files changed, 1 insertions, 7 deletions

diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
index ec966248e01..b04f8701c23 100644
--- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
+++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
@@ -7,6 +7,7 @@
  * @author Joas Schilling <coding@schilljs.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Citharel <nextcloud@tcit.fr>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @license AGPL-3.0
@@ -42,7 +43,6 @@ use OCP\Share\IManager as ShareManager;
 use Psr\Log\LoggerInterface;
 use Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet;
 use Sabre\DAV\Xml\Property\Href;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Test\TestCase;
 
 /**
@@ -65,8 +65,6 @@ abstract class AbstractCalDavBackend extends TestCase {
 	protected $groupManager;
 	/** @var IEventDispatcher|\PHPUnit\Framework\MockObject\MockObject */
 	protected $dispatcher;
-	/** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */
-	protected $legacyDispatcher;
 
 	/** @var ISecureRandom */
 	private $random;
@@ -84,7 +82,6 @@ abstract class AbstractCalDavBackend extends TestCase {
 		$this->userManager = $this->createMock(IUserManager::class);
 		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->dispatcher = $this->createMock(IEventDispatcher::class);
-		$this->legacyDispatcher = $this->createMock(EventDispatcherInterface::class);
 		$this->principal = $this->getMockBuilder(Principal::class)
 			->setConstructorArgs([
 				$this->userManager,
@@ -120,7 +117,6 @@ abstract class AbstractCalDavBackend extends TestCase {
 			$this->random,
 			$this->logger,
 			$this->dispatcher,
-			$this->legacyDispatcher,
 			$this->config
 		);
 
@@ -147,8 +143,6 @@ abstract class AbstractCalDavBackend extends TestCase {
 		$calendars = $this->backend->getCalendarsForUser($principal);
 		$this->dispatcher->expects(self::any())
 			->method('dispatchTyped');
-		$this->legacyDispatcher->expects(self::any())
-			->method('dispatch');
 		foreach ($calendars as $calendar) {
 			$this->backend->deleteCalendar($calendar['id'], true);
 		}