nextcloud / server

apps/dav/tests/unit/DAV/Sharing/BackendTest.php

Indentation +372 added lines, -372 removed lines

@@ -24,376 +24,376 @@
 
 class BackendTest extends TestCase {
 
-	private IDBConnection|MockObject $db;
-	private IUserManager|MockObject $userManager;
-	private IGroupManager|MockObject $groupManager;
-	private MockObject|Principal $principalBackend;
-	private MockObject|ICache $shareCache;
-	private LoggerInterface|MockObject $logger;
-	private MockObject|ICacheFactory $cacheFactory;
-	private Service|MockObject $calendarService;
-	private CalendarSharingBackend $backend;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->db = $this->createMock(IDBConnection::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->principalBackend = $this->createMock(Principal::class);
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->shareCache = $this->createMock(ICache::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->calendarService = $this->createMock(Service::class);
-		$this->cacheFactory->expects(self::any())
-			->method('createInMemory')
-			->willReturn($this->shareCache);
-
-		$this->backend = new CalendarSharingBackend(
-			$this->userManager,
-			$this->groupManager,
-			$this->principalBackend,
-			$this->cacheFactory,
-			$this->calendarService,
-			$this->logger,
-		);
-	}
-
-	public function testUpdateShareCalendarBob(): void {
-		$shareable = $this->createConfiguredMock(IShareable::class, [
-			'getOwner' => 'principals/users/alice',
-			'getResourceId' => 42,
-		]);
-		$add = [
-			[
-				'href' => 'principal:principals/users/bob',
-				'readOnly' => true,
-			]
-		];
-		$principal = 'principals/users/bob';
-
-		$this->shareCache->expects(self::once())
-			->method('clear');
-		$this->principalBackend->expects(self::once())
-			->method('findByUri')
-			->willReturn($principal);
-		$this->userManager->expects(self::once())
-			->method('userExists')
-			->willReturn(true);
-		$this->groupManager->expects(self::never())
-			->method('groupExists');
-		$this->calendarService->expects(self::once())
-			->method('shareWith')
-			->with($shareable->getResourceId(), $principal, Backend::ACCESS_READ);
-
-		$this->backend->updateShares($shareable, $add, []);
-	}
-
-	public function testUpdateShareCalendarGroup(): void {
-		$shareable = $this->createConfiguredMock(IShareable::class, [
-			'getOwner' => 'principals/users/alice',
-			'getResourceId' => 42,
-		]);
-		$add = [
-			[
-				'href' => 'principal:principals/groups/bob',
-				'readOnly' => true,
-			]
-		];
-		$principal = 'principals/groups/bob';
-
-		$this->shareCache->expects(self::once())
-			->method('clear');
-		$this->principalBackend->expects(self::once())
-			->method('findByUri')
-			->willReturn($principal);
-		$this->userManager->expects(self::never())
-			->method('userExists');
-		$this->groupManager->expects(self::once())
-			->method('groupExists')
-			->willReturn(true);
-		$this->calendarService->expects(self::once())
-			->method('shareWith')
-			->with($shareable->getResourceId(), $principal, Backend::ACCESS_READ);
-
-		$this->backend->updateShares($shareable, $add, []);
-	}
-
-	public function testUpdateShareContactsBob(): void {
-		$shareable = $this->createConfiguredMock(IShareable::class, [
-			'getOwner' => 'principals/users/alice',
-			'getResourceId' => 42,
-		]);
-		$add = [
-			[
-				'href' => 'principal:principals/users/bob',
-				'readOnly' => true,
-			]
-		];
-		$principal = 'principals/users/bob';
-
-		$this->shareCache->expects(self::once())
-			->method('clear');
-		$this->principalBackend->expects(self::once())
-			->method('findByUri')
-			->willReturn($principal);
-		$this->userManager->expects(self::once())
-			->method('userExists')
-			->willReturn(true);
-		$this->groupManager->expects(self::never())
-			->method('groupExists');
-		$this->calendarService->expects(self::once())
-			->method('shareWith')
-			->with($shareable->getResourceId(), $principal, Backend::ACCESS_READ);
-
-		$this->backend->updateShares($shareable, $add, []);
-	}
-
-	public function testUpdateShareContactsGroup(): void {
-		$shareable = $this->createConfiguredMock(IShareable::class, [
-			'getOwner' => 'principals/users/alice',
-			'getResourceId' => 42,
-		]);
-		$add = [
-			[
-				'href' => 'principal:principals/groups/bob',
-				'readOnly' => true,
-			]
-		];
-		$principal = 'principals/groups/bob';
-
-		$this->shareCache->expects(self::once())
-			->method('clear');
-		$this->principalBackend->expects(self::once())
-			->method('findByUri')
-			->willReturn($principal);
-		$this->userManager->expects(self::never())
-			->method('userExists');
-		$this->groupManager->expects(self::once())
-			->method('groupExists')
-			->willReturn(true);
-		$this->calendarService->expects(self::once())
-			->method('shareWith')
-			->with($shareable->getResourceId(), $principal, Backend::ACCESS_READ);
-
-		$this->backend->updateShares($shareable, $add, []);
-	}
-
-	public function testUpdateShareCircle(): void {
-		$shareable = $this->createConfiguredMock(IShareable::class, [
-			'getOwner' => 'principals/users/alice',
-			'getResourceId' => 42,
-		]);
-		$add = [
-			[
-				'href' => 'principal:principals/circles/bob',
-				'readOnly' => true,
-			]
-		];
-		$principal = 'principals/groups/bob';
-
-		$this->shareCache->expects(self::once())
-			->method('clear');
-		$this->principalBackend->expects(self::once())
-			->method('findByUri')
-			->willReturn($principal);
-		$this->userManager->expects(self::never())
-			->method('userExists');
-		$this->groupManager->expects(self::once())
-			->method('groupExists')
-			->willReturn(true);
-		$this->calendarService->expects(self::once())
-			->method('shareWith')
-			->with($shareable->getResourceId(), $principal, Backend::ACCESS_READ);
-
-		$this->backend->updateShares($shareable, $add, []);
-	}
-
-	public function testUnshareBob(): void {
-		$shareable = $this->createConfiguredMock(IShareable::class, [
-			'getOwner' => 'principals/users/alice',
-			'getResourceId' => 42,
-		]);
-		$remove = [
-			'principal:principals/users/bob',
-		];
-		$principal = 'principals/users/bob';
-
-		$this->shareCache->expects(self::once())
-			->method('clear');
-		$this->principalBackend->expects(self::once())
-			->method('findByUri')
-			->willReturn($principal);
-		$this->calendarService->expects(self::once())
-			->method('deleteShare')
-			->with($shareable->getResourceId(), $principal);
-		$this->calendarService->expects(self::never())
-			->method('unshare');
-
-		$this->backend->updateShares($shareable, [], $remove);
-	}
-
-	public function testUnshareWithBobGroup(): void {
-		$shareable = $this->createConfiguredMock(IShareable::class, [
-			'getOwner' => 'principals/users/alice',
-			'getResourceId' => 42,
-		]);
-		$remove = [
-			'principal:principals/users/bob',
-		];
-		$oldShares = [
-			[
-				'href' => 'principal:principals/groups/bob',
-				'commonName' => 'bob',
-				'status' => 1,
-				'readOnly' => true,
-				'{http://owncloud.org/ns}principal' => 'principals/groups/bob',
-				'{http://owncloud.org/ns}group-share' => true,
-			]
-		];
-
-
-		$this->shareCache->expects(self::once())
-			->method('clear');
-		$this->principalBackend->expects(self::once())
-			->method('findByUri')
-			->willReturn('principals/users/bob');
-		$this->calendarService->expects(self::once())
-			->method('deleteShare')
-			->with($shareable->getResourceId(), 'principals/users/bob');
-		$this->calendarService->expects(self::never())
-			->method('unshare');
-
-		$this->backend->updateShares($shareable, [], $remove, $oldShares);
-	}
-
-	public function testGetShares(): void {
-		$resourceId = 42;
-		$principal = 'principals/groups/bob';
-		$rows = [
-			[
-				'principaluri' => $principal,
-				'access' => Backend::ACCESS_READ,
-			]
-		];
-		$expected = [
-			[
-				'href' => 'principal:principals/groups/bob',
-				'commonName' => 'bob',
-				'status' => 1,
-				'readOnly' => true,
-				'{http://owncloud.org/ns}principal' => $principal,
-				'{http://owncloud.org/ns}group-share' => true,
-			]
-		];
-
-
-		$this->shareCache->expects(self::once())
-			->method('get')
-			->with((string)$resourceId)
-			->willReturn(null);
-		$this->calendarService->expects(self::once())
-			->method('getShares')
-			->with($resourceId)
-			->willReturn($rows);
-		$this->principalBackend->expects(self::once())
-			->method('getPrincipalByPath')
-			->with($principal)
-			->willReturn(['uri' => $principal, '{DAV:}displayname' => 'bob']);
-		$this->shareCache->expects(self::once())
-			->method('set')
-			->with((string)$resourceId, $expected);
-
-		$result = $this->backend->getShares($resourceId);
-		$this->assertEquals($expected, $result);
-	}
-
-	public function testGetSharesAddressbooks(): void {
-		$service = $this->createMock(\OCA\DAV\CardDAV\Sharing\Service::class);
-		$backend = new ContactsSharingBackend(
-			$this->userManager,
-			$this->groupManager,
-			$this->principalBackend,
-			$this->cacheFactory,
-			$service,
-			$this->logger);
-		$resourceId = 42;
-		$principal = 'principals/groups/bob';
-		$rows = [
-			[
-				'principaluri' => $principal,
-				'access' => Backend::ACCESS_READ,
-			]
-		];
-		$expected = [
-			[
-				'href' => 'principal:principals/groups/bob',
-				'commonName' => 'bob',
-				'status' => 1,
-				'readOnly' => true,
-				'{http://owncloud.org/ns}principal' => $principal,
-				'{http://owncloud.org/ns}group-share' => true,
-			]
-		];
-
-		$this->shareCache->expects(self::once())
-			->method('get')
-			->with((string)$resourceId)
-			->willReturn(null);
-		$service->expects(self::once())
-			->method('getShares')
-			->with($resourceId)
-			->willReturn($rows);
-		$this->principalBackend->expects(self::once())
-			->method('getPrincipalByPath')
-			->with($principal)
-			->willReturn(['uri' => $principal, '{DAV:}displayname' => 'bob']);
-		$this->shareCache->expects(self::once())
-			->method('set')
-			->with((string)$resourceId, $expected);
-
-		$result = $backend->getShares($resourceId);
-		$this->assertEquals($expected, $result);
-	}
-
-	public function testPreloadShares(): void {
-		$resourceIds = [42, 99];
-		$rows = [
-			[
-				'resourceid' => 42,
-				'principaluri' => 'principals/groups/bob',
-				'access' => Backend::ACCESS_READ,
-			],
-			[
-				'resourceid' => 99,
-				'principaluri' => 'principals/users/carlos',
-				'access' => Backend::ACCESS_READ_WRITE,
-			]
-		];
-		$principalResults = [
-			['uri' => 'principals/groups/bob', '{DAV:}displayname' => 'bob'],
-			['uri' => 'principals/users/carlos', '{DAV:}displayname' => 'carlos'],
-		];
-
-		$this->shareCache->expects(self::exactly(2))
-			->method('get')
-			->willReturn(null);
-		$this->calendarService->expects(self::once())
-			->method('getSharesForIds')
-			->with($resourceIds)
-			->willReturn($rows);
-		$this->principalBackend->expects(self::exactly(2))
-			->method('getPrincipalByPath')
-			->willReturnCallback(function (string $principal) use ($principalResults) {
-				switch ($principal) {
-					case 'principals/groups/bob':
-						return $principalResults[0];
-					default:
-						return $principalResults[1];
-				}
-			});
-		$this->shareCache->expects(self::exactly(2))
-			->method('set');
-
-		$this->backend->preloadShares($resourceIds);
-	}
+    private IDBConnection|MockObject $db;
+    private IUserManager|MockObject $userManager;
+    private IGroupManager|MockObject $groupManager;
+    private MockObject|Principal $principalBackend;
+    private MockObject|ICache $shareCache;
+    private LoggerInterface|MockObject $logger;
+    private MockObject|ICacheFactory $cacheFactory;
+    private Service|MockObject $calendarService;
+    private CalendarSharingBackend $backend;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->db = $this->createMock(IDBConnection::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->principalBackend = $this->createMock(Principal::class);
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->shareCache = $this->createMock(ICache::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->calendarService = $this->createMock(Service::class);
+        $this->cacheFactory->expects(self::any())
+            ->method('createInMemory')
+            ->willReturn($this->shareCache);
+
+        $this->backend = new CalendarSharingBackend(
+            $this->userManager,
+            $this->groupManager,
+            $this->principalBackend,
+            $this->cacheFactory,
+            $this->calendarService,
+            $this->logger,
+        );
+    }
+
+    public function testUpdateShareCalendarBob(): void {
+        $shareable = $this->createConfiguredMock(IShareable::class, [
+            'getOwner' => 'principals/users/alice',
+            'getResourceId' => 42,
+        ]);
+        $add = [
+            [
+                'href' => 'principal:principals/users/bob',
+                'readOnly' => true,
+            ]
+        ];
+        $principal = 'principals/users/bob';
+
+        $this->shareCache->expects(self::once())
+            ->method('clear');
+        $this->principalBackend->expects(self::once())
+            ->method('findByUri')
+            ->willReturn($principal);
+        $this->userManager->expects(self::once())
+            ->method('userExists')
+            ->willReturn(true);
+        $this->groupManager->expects(self::never())
+            ->method('groupExists');
+        $this->calendarService->expects(self::once())
+            ->method('shareWith')
+            ->with($shareable->getResourceId(), $principal, Backend::ACCESS_READ);
+
+        $this->backend->updateShares($shareable, $add, []);
+    }
+
+    public function testUpdateShareCalendarGroup(): void {
+        $shareable = $this->createConfiguredMock(IShareable::class, [
+            'getOwner' => 'principals/users/alice',
+            'getResourceId' => 42,
+        ]);
+        $add = [
+            [
+                'href' => 'principal:principals/groups/bob',
+                'readOnly' => true,
+            ]
+        ];
+        $principal = 'principals/groups/bob';
+
+        $this->shareCache->expects(self::once())
+            ->method('clear');
+        $this->principalBackend->expects(self::once())
+            ->method('findByUri')
+            ->willReturn($principal);
+        $this->userManager->expects(self::never())
+            ->method('userExists');
+        $this->groupManager->expects(self::once())
+            ->method('groupExists')
+            ->willReturn(true);
+        $this->calendarService->expects(self::once())
+            ->method('shareWith')
+            ->with($shareable->getResourceId(), $principal, Backend::ACCESS_READ);
+
+        $this->backend->updateShares($shareable, $add, []);
+    }
+
+    public function testUpdateShareContactsBob(): void {
+        $shareable = $this->createConfiguredMock(IShareable::class, [
+            'getOwner' => 'principals/users/alice',
+            'getResourceId' => 42,
+        ]);
+        $add = [
+            [
+                'href' => 'principal:principals/users/bob',
+                'readOnly' => true,
+            ]
+        ];
+        $principal = 'principals/users/bob';
+
+        $this->shareCache->expects(self::once())
+            ->method('clear');
+        $this->principalBackend->expects(self::once())
+            ->method('findByUri')
+            ->willReturn($principal);
+        $this->userManager->expects(self::once())
+            ->method('userExists')
+            ->willReturn(true);
+        $this->groupManager->expects(self::never())
+            ->method('groupExists');
+        $this->calendarService->expects(self::once())
+            ->method('shareWith')
+            ->with($shareable->getResourceId(), $principal, Backend::ACCESS_READ);
+
+        $this->backend->updateShares($shareable, $add, []);
+    }
+
+    public function testUpdateShareContactsGroup(): void {
+        $shareable = $this->createConfiguredMock(IShareable::class, [
+            'getOwner' => 'principals/users/alice',
+            'getResourceId' => 42,
+        ]);
+        $add = [
+            [
+                'href' => 'principal:principals/groups/bob',
+                'readOnly' => true,
+            ]
+        ];
+        $principal = 'principals/groups/bob';
+
+        $this->shareCache->expects(self::once())
+            ->method('clear');
+        $this->principalBackend->expects(self::once())
+            ->method('findByUri')
+            ->willReturn($principal);
+        $this->userManager->expects(self::never())
+            ->method('userExists');
+        $this->groupManager->expects(self::once())
+            ->method('groupExists')
+            ->willReturn(true);
+        $this->calendarService->expects(self::once())
+            ->method('shareWith')
+            ->with($shareable->getResourceId(), $principal, Backend::ACCESS_READ);
+
+        $this->backend->updateShares($shareable, $add, []);
+    }
+
+    public function testUpdateShareCircle(): void {
+        $shareable = $this->createConfiguredMock(IShareable::class, [
+            'getOwner' => 'principals/users/alice',
+            'getResourceId' => 42,
+        ]);
+        $add = [
+            [
+                'href' => 'principal:principals/circles/bob',
+                'readOnly' => true,
+            ]
+        ];
+        $principal = 'principals/groups/bob';
+
+        $this->shareCache->expects(self::once())
+            ->method('clear');
+        $this->principalBackend->expects(self::once())
+            ->method('findByUri')
+            ->willReturn($principal);
+        $this->userManager->expects(self::never())
+            ->method('userExists');
+        $this->groupManager->expects(self::once())
+            ->method('groupExists')
+            ->willReturn(true);
+        $this->calendarService->expects(self::once())
+            ->method('shareWith')
+            ->with($shareable->getResourceId(), $principal, Backend::ACCESS_READ);
+
+        $this->backend->updateShares($shareable, $add, []);
+    }
+
+    public function testUnshareBob(): void {
+        $shareable = $this->createConfiguredMock(IShareable::class, [
+            'getOwner' => 'principals/users/alice',
+            'getResourceId' => 42,
+        ]);
+        $remove = [
+            'principal:principals/users/bob',
+        ];
+        $principal = 'principals/users/bob';
+
+        $this->shareCache->expects(self::once())
+            ->method('clear');
+        $this->principalBackend->expects(self::once())
+            ->method('findByUri')
+            ->willReturn($principal);
+        $this->calendarService->expects(self::once())
+            ->method('deleteShare')
+            ->with($shareable->getResourceId(), $principal);
+        $this->calendarService->expects(self::never())
+            ->method('unshare');
+
+        $this->backend->updateShares($shareable, [], $remove);
+    }
+
+    public function testUnshareWithBobGroup(): void {
+        $shareable = $this->createConfiguredMock(IShareable::class, [
+            'getOwner' => 'principals/users/alice',
+            'getResourceId' => 42,
+        ]);
+        $remove = [
+            'principal:principals/users/bob',
+        ];
+        $oldShares = [
+            [
+                'href' => 'principal:principals/groups/bob',
+                'commonName' => 'bob',
+                'status' => 1,
+                'readOnly' => true,
+                '{http://owncloud.org/ns}principal' => 'principals/groups/bob',
+                '{http://owncloud.org/ns}group-share' => true,
+            ]
+        ];
+
+
+        $this->shareCache->expects(self::once())
+            ->method('clear');
+        $this->principalBackend->expects(self::once())
+            ->method('findByUri')
+            ->willReturn('principals/users/bob');
+        $this->calendarService->expects(self::once())
+            ->method('deleteShare')
+            ->with($shareable->getResourceId(), 'principals/users/bob');
+        $this->calendarService->expects(self::never())
+            ->method('unshare');
+
+        $this->backend->updateShares($shareable, [], $remove, $oldShares);
+    }
+
+    public function testGetShares(): void {
+        $resourceId = 42;
+        $principal = 'principals/groups/bob';
+        $rows = [
+            [
+                'principaluri' => $principal,
+                'access' => Backend::ACCESS_READ,
+            ]
+        ];
+        $expected = [
+            [
+                'href' => 'principal:principals/groups/bob',
+                'commonName' => 'bob',
+                'status' => 1,
+                'readOnly' => true,
+                '{http://owncloud.org/ns}principal' => $principal,
+                '{http://owncloud.org/ns}group-share' => true,
+            ]
+        ];
+
+
+        $this->shareCache->expects(self::once())
+            ->method('get')
+            ->with((string)$resourceId)
+            ->willReturn(null);
+        $this->calendarService->expects(self::once())
+            ->method('getShares')
+            ->with($resourceId)
+            ->willReturn($rows);
+        $this->principalBackend->expects(self::once())
+            ->method('getPrincipalByPath')
+            ->with($principal)
+            ->willReturn(['uri' => $principal, '{DAV:}displayname' => 'bob']);
+        $this->shareCache->expects(self::once())
+            ->method('set')
+            ->with((string)$resourceId, $expected);
+
+        $result = $this->backend->getShares($resourceId);
+        $this->assertEquals($expected, $result);
+    }
+
+    public function testGetSharesAddressbooks(): void {
+        $service = $this->createMock(\OCA\DAV\CardDAV\Sharing\Service::class);
+        $backend = new ContactsSharingBackend(
+            $this->userManager,
+            $this->groupManager,
+            $this->principalBackend,
+            $this->cacheFactory,
+            $service,
+            $this->logger);
+        $resourceId = 42;
+        $principal = 'principals/groups/bob';
+        $rows = [
+            [
+                'principaluri' => $principal,
+                'access' => Backend::ACCESS_READ,
+            ]
+        ];
+        $expected = [
+            [
+                'href' => 'principal:principals/groups/bob',
+                'commonName' => 'bob',
+                'status' => 1,
+                'readOnly' => true,
+                '{http://owncloud.org/ns}principal' => $principal,
+                '{http://owncloud.org/ns}group-share' => true,
+            ]
+        ];
+
+        $this->shareCache->expects(self::once())
+            ->method('get')
+            ->with((string)$resourceId)
+            ->willReturn(null);
+        $service->expects(self::once())
+            ->method('getShares')
+            ->with($resourceId)
+            ->willReturn($rows);
+        $this->principalBackend->expects(self::once())
+            ->method('getPrincipalByPath')
+            ->with($principal)
+            ->willReturn(['uri' => $principal, '{DAV:}displayname' => 'bob']);
+        $this->shareCache->expects(self::once())
+            ->method('set')
+            ->with((string)$resourceId, $expected);
+
+        $result = $backend->getShares($resourceId);
+        $this->assertEquals($expected, $result);
+    }
+
+    public function testPreloadShares(): void {
+        $resourceIds = [42, 99];
+        $rows = [
+            [
+                'resourceid' => 42,
+                'principaluri' => 'principals/groups/bob',
+                'access' => Backend::ACCESS_READ,
+            ],
+            [
+                'resourceid' => 99,
+                'principaluri' => 'principals/users/carlos',
+                'access' => Backend::ACCESS_READ_WRITE,
+            ]
+        ];
+        $principalResults = [
+            ['uri' => 'principals/groups/bob', '{DAV:}displayname' => 'bob'],
+            ['uri' => 'principals/users/carlos', '{DAV:}displayname' => 'carlos'],
+        ];
+
+        $this->shareCache->expects(self::exactly(2))
+            ->method('get')
+            ->willReturn(null);
+        $this->calendarService->expects(self::once())
+            ->method('getSharesForIds')
+            ->with($resourceIds)
+            ->willReturn($rows);
+        $this->principalBackend->expects(self::exactly(2))
+            ->method('getPrincipalByPath')
+            ->willReturnCallback(function (string $principal) use ($principalResults) {
+                switch ($principal) {
+                    case 'principals/groups/bob':
+                        return $principalResults[0];
+                    default:
+                        return $principalResults[1];
+                }
+            });
+        $this->shareCache->expects(self::exactly(2))
+            ->method('set');
+
+        $this->backend->preloadShares($resourceIds);
+    }
 }

apps/dav/tests/unit/CalDAV/CalendarTest.php

Indentation +479 added lines, -479 removed lines

@@ -19,314 +19,314 @@ 
 
 class CalendarTest extends TestCase {
 
-	/** @var IL10N */
-	protected $l10n;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var MockObject|LoggerInterface */
-	protected $logger;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->l10n = $this->getMockBuilder(IL10N::class)
-			->disableOriginalConstructor()->getMock();
-		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
-				return vsprintf($text, $parameters);
-			});
-	}
-
-	public function testDelete(): void {
-		/** @var CalDavBackend&MockObject $backend */
-		$backend = $this->createMock(CalDavBackend::class);
-		$backend->expects($this->never())
-			->method('updateShares');
-		$backend->expects($this->once())
-			->method('unshare');
-
-		$calendarInfo = [
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-			'principaluri' => 'user2',
-			'id' => 666,
-			'uri' => 'cal',
-		];
-		$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
-		$c->delete();
-	}
-
-
-	public function testDeleteFromGroup(): void {
-		/** @var CalDavBackend&MockObject $backend */
-		$backend = $this->createMock(CalDavBackend::class);
-		$backend->expects($this->never())
-			->method('updateShares');
-		$backend->expects($this->once())
-			->method('unshare');
-
-		$calendarInfo = [
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-			'principaluri' => 'user2',
-			'id' => 666,
-			'uri' => 'cal',
-		];
-		$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
-		$c->delete();
-	}
-
-	public function testDeleteOwn(): void {
-		/** @var MockObject | CalDavBackend $backend */
-		$backend = $this->createMock(CalDavBackend::class);
-		$backend->expects($this->never())->method('updateShares');
-		$backend->expects($this->never())->method('getShares');
-
-		$this->config->expects($this->never())->method('setUserValue');
-
-		$backend->expects($this->once())->method('deleteCalendar')
-			->with(666);
-
-		$calendarInfo = [
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-			'principaluri' => 'user1',
-			'id' => 666,
-			'uri' => 'cal',
-		];
-		$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
-		$c->delete();
-	}
-
-	public function testDeleteBirthdayCalendar(): void {
-		/** @var MockObject | CalDavBackend $backend */
-		$backend = $this->createMock(CalDavBackend::class);
-		$backend->expects($this->once())->method('deleteCalendar')
-			->with(666);
-
-		$this->config->expects($this->once())
-			->method('setUserValue')
-			->with('user1', 'dav', 'generateBirthdayCalendar', 'no');
-
-		$calendarInfo = [
-			'{http://owncloud.org/ns}owner-principal' => 'principals/users/user1',
-			'principaluri' => 'principals/users/user1',
-			'id' => 666,
-			'uri' => 'contact_birthdays',
-			'{DAV:}displayname' => 'Test',
-		];
-
-		$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
-		$c->delete();
-	}
-
-	public function dataPropPatch() {
-		return [
-			['user1', 'user2', [], true],
-			['user1', 'user2', [
-				'{http://owncloud.org/ns}calendar-enabled' => true,
-			], true],
-			['user1', 'user2', [
-				'{DAV:}displayname' => true,
-			], true],
-			['user1', 'user2', [
-				'{DAV:}displayname' => true,
-				'{http://owncloud.org/ns}calendar-enabled' => true,
-			], true],
-			['user1', 'user1', [], false],
-			['user1', 'user1', [
-				'{http://owncloud.org/ns}calendar-enabled' => true,
-			], false],
-			['user1', 'user1', [
-				'{DAV:}displayname' => true,
-			], false],
-			['user1', 'user1', [
-				'{DAV:}displayname' => true,
-				'{http://owncloud.org/ns}calendar-enabled' => true,
-			], false],
-		];
-	}
-
-	/**
-	 * @dataProvider dataPropPatch
-	 */
-	public function testPropPatch($ownerPrincipal, $principalUri, $mutations, $shared): void {
-		/** @var MockObject | CalDavBackend $backend */
-		$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
-		$calendarInfo = [
-			'{http://owncloud.org/ns}owner-principal' => $ownerPrincipal,
-			'principaluri' => $principalUri,
-			'id' => 666,
-			'uri' => 'default'
-		];
-		$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
-		$propPatch = new PropPatch($mutations);
-
-		if (!$shared) {
-			$backend->expects($this->once())
-				->method('updateCalendar')
-				->with(666, $propPatch);
-		}
-		$c->propPatch($propPatch);
-		$this->addToAssertionCount(1);
-	}
-
-	/**
-	 * @dataProvider providesReadOnlyInfo
-	 */
-	public function testAcl($expectsWrite, $readOnlyValue, $hasOwnerSet, $uri = 'default'): void {
-		/** @var MockObject | CalDavBackend $backend */
-		$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
-		$backend->expects($this->any())->method('applyShareAcl')->willReturnArgument(1);
-		$calendarInfo = [
-			'principaluri' => 'user2',
-			'id' => 666,
-			'uri' => $uri
-		];
-		$calendarInfo['{DAV:}displayname'] = 'Test';
-		if (!is_null($readOnlyValue)) {
-			$calendarInfo['{http://owncloud.org/ns}read-only'] = $readOnlyValue;
-		}
-		if ($hasOwnerSet) {
-			$calendarInfo['{http://owncloud.org/ns}owner-principal'] = 'user1';
-		}
-		$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
-		$acl = $c->getACL();
-		$childAcl = $c->getChildACL();
-
-		$expectedAcl = [[
-			'privilege' => '{DAV:}read',
-			'principal' => $hasOwnerSet ? 'user1' : 'user2',
-			'protected' => true
-		], [
-			'privilege' => '{DAV:}read',
-			'principal' => ($hasOwnerSet ? 'user1' : 'user2') . '/calendar-proxy-write',
-			'protected' => true,
-		], [
-			'privilege' => '{DAV:}read',
-			'principal' => ($hasOwnerSet ? 'user1' : 'user2') . '/calendar-proxy-read',
-			'protected' => true,
-		]];
-		if ($uri === BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			$expectedAcl[] = [
-				'privilege' => '{DAV:}write-properties',
-				'principal' => $hasOwnerSet ? 'user1' : 'user2',
-				'protected' => true
-			];
-			$expectedAcl[] = [
-				'privilege' => '{DAV:}write-properties',
-				'principal' => ($hasOwnerSet ? 'user1' : 'user2') . '/calendar-proxy-write',
-				'protected' => true
-			];
-		} else {
-			$expectedAcl[] = [
-				'privilege' => '{DAV:}write',
-				'principal' => $hasOwnerSet ? 'user1' : 'user2',
-				'protected' => true
-			];
-			$expectedAcl[] = [
-				'privilege' => '{DAV:}write',
-				'principal' => ($hasOwnerSet ? 'user1' : 'user2') . '/calendar-proxy-write',
-				'protected' => true
-			];
-		}
-
-		$expectedAcl[] = [
-			'privilege' => '{DAV:}write-properties',
-			'principal' => ($hasOwnerSet ? 'user1' : 'user2') . '/calendar-proxy-read',
-			'protected' => true
-		];
-
-		if ($hasOwnerSet) {
-			$expectedAcl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => 'user2',
-				'protected' => true
-			];
-			if ($expectsWrite) {
-				$expectedAcl[] = [
-					'privilege' => '{DAV:}write',
-					'principal' => 'user2',
-					'protected' => true
-				];
-			} else {
-				$expectedAcl[] = [
-					'privilege' => '{DAV:}write-properties',
-					'principal' => 'user2',
-					'protected' => true
-				];
-			}
-		}
-		$this->assertEquals($expectedAcl, $acl);
-		$this->assertEquals($expectedAcl, $childAcl);
-	}
-
-	public function providesReadOnlyInfo() {
-		return [
-			'read-only property not set' => [true, null, true],
-			'read-only property is false' => [true, false, true],
-			'read-only property is true' => [false, true, true],
-			'read-only property not set and no owner' => [true, null, false],
-			'read-only property is false and no owner' => [true, false, false],
-			'read-only property is true and no owner' => [false, true, false],
-			'birthday calendar' => [false, false, false, BirthdayService::BIRTHDAY_CALENDAR_URI]
-		];
-	}
-
-	/**
-	 * @dataProvider providesConfidentialClassificationData
-	 * @param int $expectedChildren
-	 * @param bool $isShared
-	 */
-	public function testPrivateClassification($expectedChildren, $isShared): void {
-		$calObject0 = ['uri' => 'event-0', 'classification' => CalDavBackend::CLASSIFICATION_PUBLIC];
-		$calObject1 = ['uri' => 'event-1', 'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL];
-		$calObject2 = ['uri' => 'event-2', 'classification' => CalDavBackend::CLASSIFICATION_PRIVATE];
-
-		/** @var MockObject | CalDavBackend $backend */
-		$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
-		$backend->expects($this->any())->method('getCalendarObjects')->willReturn([
-			$calObject0, $calObject1, $calObject2
-		]);
-		$backend->expects($this->any())->method('getMultipleCalendarObjects')
-			->with(666, ['event-0', 'event-1', 'event-2'])
-			->willReturn([
-				$calObject0, $calObject1, $calObject2
-			]);
-		$backend->expects($this->any())->method('getCalendarObject')
-			->willReturn($calObject2)->with(666, 'event-2');
-		$backend->expects($this->any())->method('applyShareAcl')->willReturnArgument(1);
-
-		$calendarInfo = [
-			'principaluri' => 'user2',
-			'id' => 666,
-			'uri' => 'cal',
-		];
-
-		if ($isShared) {
-			$calendarInfo['{http://owncloud.org/ns}owner-principal'] = 'user1';
-		}
-		$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
-		$children = $c->getChildren();
-		$this->assertEquals($expectedChildren, count($children));
-		$children = $c->getMultipleChildren(['event-0', 'event-1', 'event-2']);
-		$this->assertEquals($expectedChildren, count($children));
-
-		$this->assertEquals(!$isShared, $c->childExists('event-2'));
-	}
-
-	/**
-	 * @dataProvider providesConfidentialClassificationData
-	 * @param int $expectedChildren
-	 * @param bool $isShared
-	 */
-	public function testConfidentialClassification($expectedChildren, $isShared): void {
-		$start = '20160609';
-		$end = '20160610';
-
-		$calData = <<<EOD
+    /** @var IL10N */
+    protected $l10n;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var MockObject|LoggerInterface */
+    protected $logger;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->l10n = $this->getMockBuilder(IL10N::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->config = $this->createMock(IConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($text, $parameters = []) {
+                return vsprintf($text, $parameters);
+            });
+    }
+
+    public function testDelete(): void {
+        /** @var CalDavBackend&MockObject $backend */
+        $backend = $this->createMock(CalDavBackend::class);
+        $backend->expects($this->never())
+            ->method('updateShares');
+        $backend->expects($this->once())
+            ->method('unshare');
+
+        $calendarInfo = [
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+            'principaluri' => 'user2',
+            'id' => 666,
+            'uri' => 'cal',
+        ];
+        $c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
+        $c->delete();
+    }
+
+
+    public function testDeleteFromGroup(): void {
+        /** @var CalDavBackend&MockObject $backend */
+        $backend = $this->createMock(CalDavBackend::class);
+        $backend->expects($this->never())
+            ->method('updateShares');
+        $backend->expects($this->once())
+            ->method('unshare');
+
+        $calendarInfo = [
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+            'principaluri' => 'user2',
+            'id' => 666,
+            'uri' => 'cal',
+        ];
+        $c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
+        $c->delete();
+    }
+
+    public function testDeleteOwn(): void {
+        /** @var MockObject | CalDavBackend $backend */
+        $backend = $this->createMock(CalDavBackend::class);
+        $backend->expects($this->never())->method('updateShares');
+        $backend->expects($this->never())->method('getShares');
+
+        $this->config->expects($this->never())->method('setUserValue');
+
+        $backend->expects($this->once())->method('deleteCalendar')
+            ->with(666);
+
+        $calendarInfo = [
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+            'principaluri' => 'user1',
+            'id' => 666,
+            'uri' => 'cal',
+        ];
+        $c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
+        $c->delete();
+    }
+
+    public function testDeleteBirthdayCalendar(): void {
+        /** @var MockObject | CalDavBackend $backend */
+        $backend = $this->createMock(CalDavBackend::class);
+        $backend->expects($this->once())->method('deleteCalendar')
+            ->with(666);
+
+        $this->config->expects($this->once())
+            ->method('setUserValue')
+            ->with('user1', 'dav', 'generateBirthdayCalendar', 'no');
+
+        $calendarInfo = [
+            '{http://owncloud.org/ns}owner-principal' => 'principals/users/user1',
+            'principaluri' => 'principals/users/user1',
+            'id' => 666,
+            'uri' => 'contact_birthdays',
+            '{DAV:}displayname' => 'Test',
+        ];
+
+        $c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
+        $c->delete();
+    }
+
+    public function dataPropPatch() {
+        return [
+            ['user1', 'user2', [], true],
+            ['user1', 'user2', [
+                '{http://owncloud.org/ns}calendar-enabled' => true,
+            ], true],
+            ['user1', 'user2', [
+                '{DAV:}displayname' => true,
+            ], true],
+            ['user1', 'user2', [
+                '{DAV:}displayname' => true,
+                '{http://owncloud.org/ns}calendar-enabled' => true,
+            ], true],
+            ['user1', 'user1', [], false],
+            ['user1', 'user1', [
+                '{http://owncloud.org/ns}calendar-enabled' => true,
+            ], false],
+            ['user1', 'user1', [
+                '{DAV:}displayname' => true,
+            ], false],
+            ['user1', 'user1', [
+                '{DAV:}displayname' => true,
+                '{http://owncloud.org/ns}calendar-enabled' => true,
+            ], false],
+        ];
+    }
+
+    /**
+     * @dataProvider dataPropPatch
+     */
+    public function testPropPatch($ownerPrincipal, $principalUri, $mutations, $shared): void {
+        /** @var MockObject | CalDavBackend $backend */
+        $backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
+        $calendarInfo = [
+            '{http://owncloud.org/ns}owner-principal' => $ownerPrincipal,
+            'principaluri' => $principalUri,
+            'id' => 666,
+            'uri' => 'default'
+        ];
+        $c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
+        $propPatch = new PropPatch($mutations);
+
+        if (!$shared) {
+            $backend->expects($this->once())
+                ->method('updateCalendar')
+                ->with(666, $propPatch);
+        }
+        $c->propPatch($propPatch);
+        $this->addToAssertionCount(1);
+    }
+
+    /**
+     * @dataProvider providesReadOnlyInfo
+     */
+    public function testAcl($expectsWrite, $readOnlyValue, $hasOwnerSet, $uri = 'default'): void {
+        /** @var MockObject | CalDavBackend $backend */
+        $backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
+        $backend->expects($this->any())->method('applyShareAcl')->willReturnArgument(1);
+        $calendarInfo = [
+            'principaluri' => 'user2',
+            'id' => 666,
+            'uri' => $uri
+        ];
+        $calendarInfo['{DAV:}displayname'] = 'Test';
+        if (!is_null($readOnlyValue)) {
+            $calendarInfo['{http://owncloud.org/ns}read-only'] = $readOnlyValue;
+        }
+        if ($hasOwnerSet) {
+            $calendarInfo['{http://owncloud.org/ns}owner-principal'] = 'user1';
+        }
+        $c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
+        $acl = $c->getACL();
+        $childAcl = $c->getChildACL();
+
+        $expectedAcl = [[
+            'privilege' => '{DAV:}read',
+            'principal' => $hasOwnerSet ? 'user1' : 'user2',
+            'protected' => true
+        ], [
+            'privilege' => '{DAV:}read',
+            'principal' => ($hasOwnerSet ? 'user1' : 'user2') . '/calendar-proxy-write',
+            'protected' => true,
+        ], [
+            'privilege' => '{DAV:}read',
+            'principal' => ($hasOwnerSet ? 'user1' : 'user2') . '/calendar-proxy-read',
+            'protected' => true,
+        ]];
+        if ($uri === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            $expectedAcl[] = [
+                'privilege' => '{DAV:}write-properties',
+                'principal' => $hasOwnerSet ? 'user1' : 'user2',
+                'protected' => true
+            ];
+            $expectedAcl[] = [
+                'privilege' => '{DAV:}write-properties',
+                'principal' => ($hasOwnerSet ? 'user1' : 'user2') . '/calendar-proxy-write',
+                'protected' => true
+            ];
+        } else {
+            $expectedAcl[] = [
+                'privilege' => '{DAV:}write',
+                'principal' => $hasOwnerSet ? 'user1' : 'user2',
+                'protected' => true
+            ];
+            $expectedAcl[] = [
+                'privilege' => '{DAV:}write',
+                'principal' => ($hasOwnerSet ? 'user1' : 'user2') . '/calendar-proxy-write',
+                'protected' => true
+            ];
+        }
+
+        $expectedAcl[] = [
+            'privilege' => '{DAV:}write-properties',
+            'principal' => ($hasOwnerSet ? 'user1' : 'user2') . '/calendar-proxy-read',
+            'protected' => true
+        ];
+
+        if ($hasOwnerSet) {
+            $expectedAcl[] = [
+                'privilege' => '{DAV:}read',
+                'principal' => 'user2',
+                'protected' => true
+            ];
+            if ($expectsWrite) {
+                $expectedAcl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => 'user2',
+                    'protected' => true
+                ];
+            } else {
+                $expectedAcl[] = [
+                    'privilege' => '{DAV:}write-properties',
+                    'principal' => 'user2',
+                    'protected' => true
+                ];
+            }
+        }
+        $this->assertEquals($expectedAcl, $acl);
+        $this->assertEquals($expectedAcl, $childAcl);
+    }
+
+    public function providesReadOnlyInfo() {
+        return [
+            'read-only property not set' => [true, null, true],
+            'read-only property is false' => [true, false, true],
+            'read-only property is true' => [false, true, true],
+            'read-only property not set and no owner' => [true, null, false],
+            'read-only property is false and no owner' => [true, false, false],
+            'read-only property is true and no owner' => [false, true, false],
+            'birthday calendar' => [false, false, false, BirthdayService::BIRTHDAY_CALENDAR_URI]
+        ];
+    }
+
+    /**
+     * @dataProvider providesConfidentialClassificationData
+     * @param int $expectedChildren
+     * @param bool $isShared
+     */
+    public function testPrivateClassification($expectedChildren, $isShared): void {
+        $calObject0 = ['uri' => 'event-0', 'classification' => CalDavBackend::CLASSIFICATION_PUBLIC];
+        $calObject1 = ['uri' => 'event-1', 'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL];
+        $calObject2 = ['uri' => 'event-2', 'classification' => CalDavBackend::CLASSIFICATION_PRIVATE];
+
+        /** @var MockObject | CalDavBackend $backend */
+        $backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
+        $backend->expects($this->any())->method('getCalendarObjects')->willReturn([
+            $calObject0, $calObject1, $calObject2
+        ]);
+        $backend->expects($this->any())->method('getMultipleCalendarObjects')
+            ->with(666, ['event-0', 'event-1', 'event-2'])
+            ->willReturn([
+                $calObject0, $calObject1, $calObject2
+            ]);
+        $backend->expects($this->any())->method('getCalendarObject')
+            ->willReturn($calObject2)->with(666, 'event-2');
+        $backend->expects($this->any())->method('applyShareAcl')->willReturnArgument(1);
+
+        $calendarInfo = [
+            'principaluri' => 'user2',
+            'id' => 666,
+            'uri' => 'cal',
+        ];
+
+        if ($isShared) {
+            $calendarInfo['{http://owncloud.org/ns}owner-principal'] = 'user1';
+        }
+        $c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
+        $children = $c->getChildren();
+        $this->assertEquals($expectedChildren, count($children));
+        $children = $c->getMultipleChildren(['event-0', 'event-1', 'event-2']);
+        $this->assertEquals($expectedChildren, count($children));
+
+        $this->assertEquals(!$isShared, $c->childExists('event-2'));
+    }
+
+    /**
+     * @dataProvider providesConfidentialClassificationData
+     * @param int $expectedChildren
+     * @param bool $isShared
+     */
+    public function testConfidentialClassification($expectedChildren, $isShared): void {
+        $start = '20160609';
+        $end = '20160610';
+
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 PRODID:-//ownCloud calendar v1.2.2
 BEGIN:VEVENT
@@ -368,84 +368,84 @@ 
 END:VCALENDAR
 EOD;
 
-		$calObject0 = ['uri' => 'event-0', 'classification' => CalDavBackend::CLASSIFICATION_PUBLIC];
-		$calObject1 = ['uri' => 'event-1', 'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL, 'calendardata' => $calData];
-		$calObject2 = ['uri' => 'event-2', 'classification' => CalDavBackend::CLASSIFICATION_PRIVATE];
-
-		/** @var MockObject | CalDavBackend $backend */
-		$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
-		$backend->expects($this->any())->method('getCalendarObjects')->willReturn([
-			$calObject0, $calObject1, $calObject2
-		]);
-		$backend->expects($this->any())->method('getMultipleCalendarObjects')
-			->with(666, ['event-0', 'event-1', 'event-2'])
-			->willReturn([
-				$calObject0, $calObject1, $calObject2
-			]);
-		$backend->expects($this->any())->method('getCalendarObject')
-			->willReturn($calObject1)->with(666, 'event-1');
-		$backend->expects($this->any())->method('applyShareAcl')->willReturnArgument(1);
-
-		$calendarInfo = [
-			'{http://owncloud.org/ns}owner-principal' => $isShared ? 'user1' : 'user2',
-			'principaluri' => 'user2',
-			'id' => 666,
-			'uri' => 'cal',
-		];
-		$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
-
-		$this->assertEquals(count($c->getChildren()), $expectedChildren);
-
-		// test private event
-		$privateEvent = $c->getChild('event-1');
-		$calData = $privateEvent->get();
-		$event = Reader::read($calData);
-
-		$this->assertEquals($start, $event->VEVENT->DTSTART->getValue());
-		$this->assertEquals($end, $event->VEVENT->DTEND->getValue());
-
-		if ($isShared) {
-			$this->assertEquals('Busy', $event->VEVENT->SUMMARY->getValue());
-			$this->assertArrayNotHasKey('ATTENDEE', $event->VEVENT);
-			$this->assertArrayNotHasKey('LOCATION', $event->VEVENT);
-			$this->assertArrayNotHasKey('DESCRIPTION', $event->VEVENT);
-			$this->assertArrayNotHasKey('ORGANIZER', $event->VEVENT);
-		} else {
-			$this->assertEquals('Test Event', $event->VEVENT->SUMMARY->getValue());
-		}
-
-		// Test l10n
-		$l10n = $this->createMock(IL10N::class);
-		if ($isShared) {
-			$l10n->expects($this->once())
-				->method('t')
-				->with('Busy')
-				->willReturn('Translated busy');
-		} else {
-			$l10n->expects($this->never())
-				->method('t');
-		}
-		$c = new Calendar($backend, $calendarInfo, $l10n, $this->config, $this->logger);
-
-		$calData = $c->getChild('event-1')->get();
-		$event = Reader::read($calData);
-
-		if ($isShared) {
-			$this->assertEquals('Translated busy', $event->VEVENT->SUMMARY->getValue());
-		} else {
-			$this->assertEquals('Test Event', $event->VEVENT->SUMMARY->getValue());
-		}
-	}
-
-	public function providesConfidentialClassificationData() {
-		return [
-			[3, false],
-			[2, true]
-		];
-	}
-
-	public function testRemoveVAlarms(): void {
-		$publicObjectData = <<<EOD
+        $calObject0 = ['uri' => 'event-0', 'classification' => CalDavBackend::CLASSIFICATION_PUBLIC];
+        $calObject1 = ['uri' => 'event-1', 'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL, 'calendardata' => $calData];
+        $calObject2 = ['uri' => 'event-2', 'classification' => CalDavBackend::CLASSIFICATION_PRIVATE];
+
+        /** @var MockObject | CalDavBackend $backend */
+        $backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
+        $backend->expects($this->any())->method('getCalendarObjects')->willReturn([
+            $calObject0, $calObject1, $calObject2
+        ]);
+        $backend->expects($this->any())->method('getMultipleCalendarObjects')
+            ->with(666, ['event-0', 'event-1', 'event-2'])
+            ->willReturn([
+                $calObject0, $calObject1, $calObject2
+            ]);
+        $backend->expects($this->any())->method('getCalendarObject')
+            ->willReturn($calObject1)->with(666, 'event-1');
+        $backend->expects($this->any())->method('applyShareAcl')->willReturnArgument(1);
+
+        $calendarInfo = [
+            '{http://owncloud.org/ns}owner-principal' => $isShared ? 'user1' : 'user2',
+            'principaluri' => 'user2',
+            'id' => 666,
+            'uri' => 'cal',
+        ];
+        $c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
+
+        $this->assertEquals(count($c->getChildren()), $expectedChildren);
+
+        // test private event
+        $privateEvent = $c->getChild('event-1');
+        $calData = $privateEvent->get();
+        $event = Reader::read($calData);
+
+        $this->assertEquals($start, $event->VEVENT->DTSTART->getValue());
+        $this->assertEquals($end, $event->VEVENT->DTEND->getValue());
+
+        if ($isShared) {
+            $this->assertEquals('Busy', $event->VEVENT->SUMMARY->getValue());
+            $this->assertArrayNotHasKey('ATTENDEE', $event->VEVENT);
+            $this->assertArrayNotHasKey('LOCATION', $event->VEVENT);
+            $this->assertArrayNotHasKey('DESCRIPTION', $event->VEVENT);
+            $this->assertArrayNotHasKey('ORGANIZER', $event->VEVENT);
+        } else {
+            $this->assertEquals('Test Event', $event->VEVENT->SUMMARY->getValue());
+        }
+
+        // Test l10n
+        $l10n = $this->createMock(IL10N::class);
+        if ($isShared) {
+            $l10n->expects($this->once())
+                ->method('t')
+                ->with('Busy')
+                ->willReturn('Translated busy');
+        } else {
+            $l10n->expects($this->never())
+                ->method('t');
+        }
+        $c = new Calendar($backend, $calendarInfo, $l10n, $this->config, $this->logger);
+
+        $calData = $c->getChild('event-1')->get();
+        $event = Reader::read($calData);
+
+        if ($isShared) {
+            $this->assertEquals('Translated busy', $event->VEVENT->SUMMARY->getValue());
+        } else {
+            $this->assertEquals('Test Event', $event->VEVENT->SUMMARY->getValue());
+        }
+    }
+
+    public function providesConfidentialClassificationData() {
+        return [
+            [3, false],
+            [2, true]
+        ];
+    }
+
+    public function testRemoveVAlarms(): void {
+        $publicObjectData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Nextcloud calendar v1.5.6
@@ -469,7 +469,7 @@ 
 
 EOD;
 
-		$confidentialObjectData = <<<EOD
+        $confidentialObjectData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Nextcloud calendar v1.5.6
@@ -493,7 +493,7 @@ 
 
 EOD;
 
-		$publicObjectDataWithoutVAlarm = <<<EOD
+        $publicObjectDataWithoutVAlarm = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Nextcloud calendar v1.5.6
@@ -513,7 +513,7 @@ 
 
 EOD;
 
-		$confidentialObjectCleaned = <<<EOD
+        $confidentialObjectCleaned = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Nextcloud calendar v1.5.6
@@ -532,94 +532,94 @@ 
 
 
 
-		$publicObject = ['uri' => 'event-0',
-			'classification' => CalDavBackend::CLASSIFICATION_PUBLIC,
-			'calendardata' => $publicObjectData];
-
-		$confidentialObject = ['uri' => 'event-1',
-			'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL,
-			'calendardata' => $confidentialObjectData];
-
-		/** @var MockObject | CalDavBackend $backend */
-		$backend = $this->createMock(CalDavBackend::class);
-		$backend->expects($this->any())
-			->method('getCalendarObjects')
-			->willReturn([$publicObject, $confidentialObject]);
-
-		$backend->expects($this->any())
-			->method('getMultipleCalendarObjects')
-			->with(666, ['event-0', 'event-1'])
-			->willReturn([$publicObject, $confidentialObject]);
-
-		$backend->expects($this->any())
-			->method('getCalendarObject')
-			->willReturnCallback(function ($cId, $uri) use ($publicObject, $confidentialObject) {
-				switch ($uri) {
-					case 'event-0':
-						return $publicObject;
-
-					case 'event-1':
-						return $confidentialObject;
-
-					default:
-						throw new \Exception('unexpected uri');
-				}
-			});
-
-		$backend->expects($this->any())
-			->method('applyShareAcl')
-			->willReturnArgument(1);
-
-		$calendarInfoOwner = [
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-			'principaluri' => 'user1',
-			'id' => 666,
-			'uri' => 'cal',
-		];
-		$calendarInfoSharedRW = [
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-			'principaluri' => 'user2',
-			'id' => 666,
-			'uri' => 'cal',
-		];
-		$calendarInfoSharedRO = [
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-			'{http://owncloud.org/ns}read-only' => true,
-			'principaluri' => 'user2',
-			'id' => 666,
-			'uri' => 'cal',
-		];
-
-		$ownerCalendar = new Calendar($backend, $calendarInfoOwner, $this->l10n, $this->config, $this->logger);
-		$rwCalendar = new Calendar($backend, $calendarInfoSharedRW, $this->l10n, $this->config, $this->logger);
-		$roCalendar = new Calendar($backend, $calendarInfoSharedRO, $this->l10n, $this->config, $this->logger);
-
-		$this->assertCount(2, $ownerCalendar->getChildren());
-		$this->assertCount(2, $rwCalendar->getChildren());
-		$this->assertCount(2, $roCalendar->getChildren());
-
-		// calendar data shall not be altered for the owner
-		$this->assertEquals($ownerCalendar->getChild('event-0')->get(), $publicObjectData);
-		$this->assertEquals($ownerCalendar->getChild('event-1')->get(), $confidentialObjectData);
-
-		// valarms shall not be removed for read-write shares
-		$this->assertEquals(
-			$this->fixLinebreak($rwCalendar->getChild('event-0')->get()),
-			$this->fixLinebreak($publicObjectData));
-		$this->assertEquals(
-			$this->fixLinebreak($rwCalendar->getChild('event-1')->get()),
-			$this->fixLinebreak($confidentialObjectCleaned));
-
-		// valarms shall be removed for read-only shares
-		$this->assertEquals(
-			$this->fixLinebreak($roCalendar->getChild('event-0')->get()),
-			$this->fixLinebreak($publicObjectDataWithoutVAlarm));
-		$this->assertEquals(
-			$this->fixLinebreak($roCalendar->getChild('event-1')->get()),
-			$this->fixLinebreak($confidentialObjectCleaned));
-	}
-
-	private function fixLinebreak($str) {
-		return preg_replace('~(*BSR_ANYCRLF)\R~', "\r\n", $str);
-	}
+        $publicObject = ['uri' => 'event-0',
+            'classification' => CalDavBackend::CLASSIFICATION_PUBLIC,
+            'calendardata' => $publicObjectData];
+
+        $confidentialObject = ['uri' => 'event-1',
+            'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL,
+            'calendardata' => $confidentialObjectData];
+
+        /** @var MockObject | CalDavBackend $backend */
+        $backend = $this->createMock(CalDavBackend::class);
+        $backend->expects($this->any())
+            ->method('getCalendarObjects')
+            ->willReturn([$publicObject, $confidentialObject]);
+
+        $backend->expects($this->any())
+            ->method('getMultipleCalendarObjects')
+            ->with(666, ['event-0', 'event-1'])
+            ->willReturn([$publicObject, $confidentialObject]);
+
+        $backend->expects($this->any())
+            ->method('getCalendarObject')
+            ->willReturnCallback(function ($cId, $uri) use ($publicObject, $confidentialObject) {
+                switch ($uri) {
+                    case 'event-0':
+                        return $publicObject;
+
+                    case 'event-1':
+                        return $confidentialObject;
+
+                    default:
+                        throw new \Exception('unexpected uri');
+                }
+            });
+
+        $backend->expects($this->any())
+            ->method('applyShareAcl')
+            ->willReturnArgument(1);
+
+        $calendarInfoOwner = [
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+            'principaluri' => 'user1',
+            'id' => 666,
+            'uri' => 'cal',
+        ];
+        $calendarInfoSharedRW = [
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+            'principaluri' => 'user2',
+            'id' => 666,
+            'uri' => 'cal',
+        ];
+        $calendarInfoSharedRO = [
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+            '{http://owncloud.org/ns}read-only' => true,
+            'principaluri' => 'user2',
+            'id' => 666,
+            'uri' => 'cal',
+        ];
+
+        $ownerCalendar = new Calendar($backend, $calendarInfoOwner, $this->l10n, $this->config, $this->logger);
+        $rwCalendar = new Calendar($backend, $calendarInfoSharedRW, $this->l10n, $this->config, $this->logger);
+        $roCalendar = new Calendar($backend, $calendarInfoSharedRO, $this->l10n, $this->config, $this->logger);
+
+        $this->assertCount(2, $ownerCalendar->getChildren());
+        $this->assertCount(2, $rwCalendar->getChildren());
+        $this->assertCount(2, $roCalendar->getChildren());
+
+        // calendar data shall not be altered for the owner
+        $this->assertEquals($ownerCalendar->getChild('event-0')->get(), $publicObjectData);
+        $this->assertEquals($ownerCalendar->getChild('event-1')->get(), $confidentialObjectData);
+
+        // valarms shall not be removed for read-write shares
+        $this->assertEquals(
+            $this->fixLinebreak($rwCalendar->getChild('event-0')->get()),
+            $this->fixLinebreak($publicObjectData));
+        $this->assertEquals(
+            $this->fixLinebreak($rwCalendar->getChild('event-1')->get()),
+            $this->fixLinebreak($confidentialObjectCleaned));
+
+        // valarms shall be removed for read-only shares
+        $this->assertEquals(
+            $this->fixLinebreak($roCalendar->getChild('event-0')->get()),
+            $this->fixLinebreak($publicObjectDataWithoutVAlarm));
+        $this->assertEquals(
+            $this->fixLinebreak($roCalendar->getChild('event-1')->get()),
+            $this->fixLinebreak($confidentialObjectCleaned));
+    }
+
+    private function fixLinebreak($str) {
+        return preg_replace('~(*BSR_ANYCRLF)\R~', "\r\n", $str);
+    }
 }

apps/dav/tests/unit/CalDAV/CalDavBackendTest.php

Indentation +1125 added lines, -1125 removed lines

@@ -32,128 +32,128 @@ 
  * @package OCA\DAV\Tests\unit\CalDAV
  */
 class CalDavBackendTest extends AbstractCalDavBackend {
-	public function testCalendarOperations(): void {
-		$calendarId = $this->createTestCalendar();
-
-		// update its display name
-		$patch = new PropPatch([
-			'{DAV:}displayname' => 'Unit test',
-			'{urn:ietf:params:xml:ns:caldav}calendar-description' => 'Calendar used for unit testing'
-		]);
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->updateCalendar($calendarId, $patch);
-		$patch->commit();
-		$this->assertEquals(1, $this->backend->getCalendarsForUserCount(self::UNIT_TEST_USER));
-		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
-		$this->assertCount(1, $calendars);
-		$this->assertEquals('Unit test', $calendars[0]['{DAV:}displayname']);
-		$this->assertEquals('Calendar used for unit testing', $calendars[0]['{urn:ietf:params:xml:ns:caldav}calendar-description']);
-		$this->assertEquals('User\'s displayname', $calendars[0]['{http://nextcloud.com/ns}owner-displayname']);
-
-		// delete the address book
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->deleteCalendar($calendars[0]['id'], true);
-		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
-		self::assertEmpty($calendars);
-	}
-
-	public function providesSharingData() {
-		return [
-			[true, true, true, false, [
-				[
-					'href' => 'principal:' . self::UNIT_TEST_USER1,
-					'readOnly' => false
-				],
-				[
-					'href' => 'principal:' . self::UNIT_TEST_GROUP,
-					'readOnly' => true
-				]
-			], [
-				self::UNIT_TEST_USER1,
-				self::UNIT_TEST_GROUP,
-			]],
-			[true, true, true, false, [
-				[
-					'href' => 'principal:' . self::UNIT_TEST_GROUP,
-					'readOnly' => true,
-				],
-				[
-					'href' => 'principal:' . self::UNIT_TEST_GROUP2,
-					'readOnly' => false,
-				],
-			], [
-				self::UNIT_TEST_GROUP,
-				self::UNIT_TEST_GROUP2,
-			]],
-			[true, true, true, true, [
-				[
-					'href' => 'principal:' . self::UNIT_TEST_GROUP,
-					'readOnly' => false,
-				],
-				[
-					'href' => 'principal:' . self::UNIT_TEST_GROUP2,
-					'readOnly' => true,
-				],
-			], [
-				self::UNIT_TEST_GROUP,
-				self::UNIT_TEST_GROUP2,
-			]],
-			[true, false, false, false, [
-				[
-					'href' => 'principal:' . self::UNIT_TEST_USER1,
-					'readOnly' => true
-				],
-			], [
-				self::UNIT_TEST_USER1,
-			]],
-
-		];
-	}
-
-	/**
-	 * @dataProvider providesSharingData
-	 */
-	public function testCalendarSharing($userCanRead, $userCanWrite, $groupCanRead, $groupCanWrite, $add, $principals): void {
-		$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-		$config = $this->createMock(IConfig::class);
-
-		$l10n = $this->createMock(IL10N::class);
-		$l10n->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
-				return vsprintf($text, $parameters);
-			});
-
-		$this->userManager->expects($this->any())
-			->method('userExists')
-			->willReturn(true);
-		$this->groupManager->expects($this->any())
-			->method('groupExists')
-			->willReturn(true);
-		$this->principal->expects(self::atLeastOnce())
-			->method('findByUri')
-			->willReturnOnConsecutiveCalls(...$principals);
-
-		$calendarId = $this->createTestCalendar();
-		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
-		$this->assertCount(1, $calendars);
-		$calendar = new Calendar($this->backend, $calendars[0], $l10n, $config, $logger);
-		$this->backend->updateShares($calendar, $add, []);
-		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1);
-		$this->assertCount(1, $calendars);
-		$calendar = new Calendar($this->backend, $calendars[0], $l10n, $config, $logger);
-		$acl = $calendar->getACL();
-		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}read', $acl);
-		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}write', $acl);
-		$this->assertAccess($userCanRead, self::UNIT_TEST_USER1, '{DAV:}read', $acl);
-		$this->assertAccess($userCanWrite, self::UNIT_TEST_USER1, '{DAV:}write', $acl);
-		$this->assertEquals(self::UNIT_TEST_USER, $calendar->getOwner());
-
-		// test acls on the child
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<'EOD'
+    public function testCalendarOperations(): void {
+        $calendarId = $this->createTestCalendar();
+
+        // update its display name
+        $patch = new PropPatch([
+            '{DAV:}displayname' => 'Unit test',
+            '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'Calendar used for unit testing'
+        ]);
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->updateCalendar($calendarId, $patch);
+        $patch->commit();
+        $this->assertEquals(1, $this->backend->getCalendarsForUserCount(self::UNIT_TEST_USER));
+        $calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
+        $this->assertCount(1, $calendars);
+        $this->assertEquals('Unit test', $calendars[0]['{DAV:}displayname']);
+        $this->assertEquals('Calendar used for unit testing', $calendars[0]['{urn:ietf:params:xml:ns:caldav}calendar-description']);
+        $this->assertEquals('User\'s displayname', $calendars[0]['{http://nextcloud.com/ns}owner-displayname']);
+
+        // delete the address book
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->deleteCalendar($calendars[0]['id'], true);
+        $calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
+        self::assertEmpty($calendars);
+    }
+
+    public function providesSharingData() {
+        return [
+            [true, true, true, false, [
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_USER1,
+                    'readOnly' => false
+                ],
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_GROUP,
+                    'readOnly' => true
+                ]
+            ], [
+                self::UNIT_TEST_USER1,
+                self::UNIT_TEST_GROUP,
+            ]],
+            [true, true, true, false, [
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_GROUP,
+                    'readOnly' => true,
+                ],
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_GROUP2,
+                    'readOnly' => false,
+                ],
+            ], [
+                self::UNIT_TEST_GROUP,
+                self::UNIT_TEST_GROUP2,
+            ]],
+            [true, true, true, true, [
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_GROUP,
+                    'readOnly' => false,
+                ],
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_GROUP2,
+                    'readOnly' => true,
+                ],
+            ], [
+                self::UNIT_TEST_GROUP,
+                self::UNIT_TEST_GROUP2,
+            ]],
+            [true, false, false, false, [
+                [
+                    'href' => 'principal:' . self::UNIT_TEST_USER1,
+                    'readOnly' => true
+                ],
+            ], [
+                self::UNIT_TEST_USER1,
+            ]],
+
+        ];
+    }
+
+    /**
+     * @dataProvider providesSharingData
+     */
+    public function testCalendarSharing($userCanRead, $userCanWrite, $groupCanRead, $groupCanWrite, $add, $principals): void {
+        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $config = $this->createMock(IConfig::class);
+
+        $l10n = $this->createMock(IL10N::class);
+        $l10n->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($text, $parameters = []) {
+                return vsprintf($text, $parameters);
+            });
+
+        $this->userManager->expects($this->any())
+            ->method('userExists')
+            ->willReturn(true);
+        $this->groupManager->expects($this->any())
+            ->method('groupExists')
+            ->willReturn(true);
+        $this->principal->expects(self::atLeastOnce())
+            ->method('findByUri')
+            ->willReturnOnConsecutiveCalls(...$principals);
+
+        $calendarId = $this->createTestCalendar();
+        $calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
+        $this->assertCount(1, $calendars);
+        $calendar = new Calendar($this->backend, $calendars[0], $l10n, $config, $logger);
+        $this->backend->updateShares($calendar, $add, []);
+        $calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1);
+        $this->assertCount(1, $calendars);
+        $calendar = new Calendar($this->backend, $calendars[0], $l10n, $config, $logger);
+        $acl = $calendar->getACL();
+        $this->assertAcl(self::UNIT_TEST_USER, '{DAV:}read', $acl);
+        $this->assertAcl(self::UNIT_TEST_USER, '{DAV:}write', $acl);
+        $this->assertAccess($userCanRead, self::UNIT_TEST_USER1, '{DAV:}read', $acl);
+        $this->assertAccess($userCanWrite, self::UNIT_TEST_USER1, '{DAV:}write', $acl);
+        $this->assertEquals(self::UNIT_TEST_USER, $calendar->getOwner());
+
+        // test acls on the child
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -170,35 +170,35 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
-
-		/** @var IACL $child */
-		$child = $calendar->getChild($uri);
-		$acl = $child->getACL();
-		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}read', $acl);
-		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}write', $acl);
-		$this->assertAccess($userCanRead, self::UNIT_TEST_USER1, '{DAV:}read', $acl);
-		$this->assertAccess($userCanWrite, self::UNIT_TEST_USER1, '{DAV:}write', $acl);
-
-		// delete the calendar
-		$this->dispatcher->expects(self::once())
-			->method('dispatchTyped')
-			->with(self::callback(function ($event) {
-				return $event instanceof CalendarDeletedEvent;
-			}));
-		$this->backend->deleteCalendar($calendars[0]['id'], true);
-		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
-		self::assertEmpty($calendars);
-	}
-
-	public function testCalendarObjectsOperations(): void {
-		$calendarId = $this->createTestCalendar();
-
-		// create a card
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<'EOD'
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
+
+        /** @var IACL $child */
+        $child = $calendar->getChild($uri);
+        $acl = $child->getACL();
+        $this->assertAcl(self::UNIT_TEST_USER, '{DAV:}read', $acl);
+        $this->assertAcl(self::UNIT_TEST_USER, '{DAV:}write', $acl);
+        $this->assertAccess($userCanRead, self::UNIT_TEST_USER1, '{DAV:}read', $acl);
+        $this->assertAccess($userCanWrite, self::UNIT_TEST_USER1, '{DAV:}write', $acl);
+
+        // delete the calendar
+        $this->dispatcher->expects(self::once())
+            ->method('dispatchTyped')
+            ->with(self::callback(function ($event) {
+                return $event instanceof CalendarDeletedEvent;
+            }));
+        $this->backend->deleteCalendar($calendars[0]['id'], true);
+        $calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
+        self::assertEmpty($calendars);
+    }
+
+    public function testCalendarObjectsOperations(): void {
+        $calendarId = $this->createTestCalendar();
+
+        // create a card
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -215,30 +215,30 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
-
-		// get all the calendar objects
-		$calendarObjects = $this->backend->getCalendarObjects($calendarId);
-		$this->assertCount(1, $calendarObjects);
-		$this->assertEquals($calendarId, $calendarObjects[0]['calendarid']);
-		$this->assertArrayHasKey('classification', $calendarObjects[0]);
-
-		// get the calendar objects
-		$calendarObject = $this->backend->getCalendarObject($calendarId, $uri);
-		$this->assertNotNull($calendarObject);
-		$this->assertArrayHasKey('id', $calendarObject);
-		$this->assertArrayHasKey('uri', $calendarObject);
-		$this->assertArrayHasKey('lastmodified', $calendarObject);
-		$this->assertArrayHasKey('etag', $calendarObject);
-		$this->assertArrayHasKey('size', $calendarObject);
-		$this->assertArrayHasKey('classification', $calendarObject);
-		$this->assertArrayHasKey('{' . SharingPlugin::NS_NEXTCLOUD . '}deleted-at', $calendarObject);
-		$this->assertEquals($calData, $calendarObject['calendardata']);
-
-		// update the card
-		$calData = <<<'EOD'
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
+
+        // get all the calendar objects
+        $calendarObjects = $this->backend->getCalendarObjects($calendarId);
+        $this->assertCount(1, $calendarObjects);
+        $this->assertEquals($calendarId, $calendarObjects[0]['calendarid']);
+        $this->assertArrayHasKey('classification', $calendarObjects[0]);
+
+        // get the calendar objects
+        $calendarObject = $this->backend->getCalendarObject($calendarId, $uri);
+        $this->assertNotNull($calendarObject);
+        $this->assertArrayHasKey('id', $calendarObject);
+        $this->assertArrayHasKey('uri', $calendarObject);
+        $this->assertArrayHasKey('lastmodified', $calendarObject);
+        $this->assertArrayHasKey('etag', $calendarObject);
+        $this->assertArrayHasKey('size', $calendarObject);
+        $this->assertArrayHasKey('classification', $calendarObject);
+        $this->assertArrayHasKey('{' . SharingPlugin::NS_NEXTCLOUD . '}deleted-at', $calendarObject);
+        $this->assertEquals($calData, $calendarObject['calendardata']);
+
+        // update the card
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -253,28 +253,28 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->updateCalendarObject($calendarId, $uri, $calData);
-		$calendarObject = $this->backend->getCalendarObject($calendarId, $uri);
-		$this->assertEquals($calData, $calendarObject['calendardata']);
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->updateCalendarObject($calendarId, $uri, $calData);
+        $calendarObject = $this->backend->getCalendarObject($calendarId, $uri);
+        $this->assertEquals($calData, $calendarObject['calendardata']);
 
-		// delete the card
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->deleteCalendarObject($calendarId, $uri);
-		$calendarObjects = $this->backend->getCalendarObjects($calendarId);
-		$this->assertCount(0, $calendarObjects);
-	}
+        // delete the card
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->deleteCalendarObject($calendarId, $uri);
+        $calendarObjects = $this->backend->getCalendarObjects($calendarId);
+        $this->assertCount(0, $calendarObjects);
+    }
 
 
-	public function testMultipleCalendarObjectsWithSameUID(): void {
-		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
-		$this->expectExceptionMessage('Calendar object with uid already exists in this calendar collection.');
+    public function testMultipleCalendarObjectsWithSameUID(): void {
+        $this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+        $this->expectExceptionMessage('Calendar object with uid already exists in this calendar collection.');
 
-		$calendarId = $this->createTestCalendar();
+        $calendarId = $this->createTestCalendar();
 
-		$calData = <<<'EOD'
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -291,18 +291,18 @@ 
 END:VCALENDAR
 EOD;
 
-		$uri0 = static::getUniqueID('event');
-		$uri1 = static::getUniqueID('event');
-		$this->backend->createCalendarObject($calendarId, $uri0, $calData);
-		$this->backend->createCalendarObject($calendarId, $uri1, $calData);
-	}
+        $uri0 = static::getUniqueID('event');
+        $uri1 = static::getUniqueID('event');
+        $this->backend->createCalendarObject($calendarId, $uri0, $calData);
+        $this->backend->createCalendarObject($calendarId, $uri1, $calData);
+    }
 
-	public function testMultiCalendarObjects(): void {
-		$calendarId = $this->createTestCalendar();
+    public function testMultiCalendarObjects(): void {
+        $calendarId = $this->createTestCalendar();
 
-		// create an event
-		$calData = [];
-		$calData[] = <<<'EOD'
+        // create an event
+        $calData = [];
+        $calData[] = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -319,7 +319,7 @@ 
 END:VCALENDAR
 EOD;
 
-		$calData[] = <<<'EOD'
+        $calData[] = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -336,7 +336,7 @@ 
 END:VCALENDAR
 EOD;
 
-		$calData[] = <<<'EOD'
+        $calData[] = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -353,88 +353,88 @@ 
 END:VCALENDAR
 EOD;
 
-		$uri0 = static::getUniqueID('card');
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->createCalendarObject($calendarId, $uri0, $calData[0]);
-		$uri1 = static::getUniqueID('card');
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->createCalendarObject($calendarId, $uri1, $calData[1]);
-		$uri2 = static::getUniqueID('card');
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->createCalendarObject($calendarId, $uri2, $calData[2]);
-
-		// get all the cards
-		$calendarObjects = $this->backend->getCalendarObjects($calendarId);
-		$this->assertCount(3, $calendarObjects);
-
-		// get the cards
-		$calendarObjects = $this->backend->getMultipleCalendarObjects($calendarId, [$uri1, $uri2]);
-		$this->assertCount(2, $calendarObjects);
-		foreach ($calendarObjects as $card) {
-			$this->assertArrayHasKey('id', $card);
-			$this->assertArrayHasKey('uri', $card);
-			$this->assertArrayHasKey('lastmodified', $card);
-			$this->assertArrayHasKey('etag', $card);
-			$this->assertArrayHasKey('size', $card);
-			$this->assertArrayHasKey('classification', $card);
-		}
-
-		usort($calendarObjects, function ($a, $b) {
-			return $a['id'] - $b['id'];
-		});
-
-		$this->assertEquals($calData[1], $calendarObjects[0]['calendardata']);
-		$this->assertEquals($calData[2], $calendarObjects[1]['calendardata']);
-
-		// delete the card
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->deleteCalendarObject($calendarId, $uri0);
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->deleteCalendarObject($calendarId, $uri1);
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-		$this->backend->deleteCalendarObject($calendarId, $uri2);
-		$calendarObjects = $this->backend->getCalendarObjects($calendarId);
-		$this->assertCount(0, $calendarObjects);
-	}
-
-	/**
-	 * @dataProvider providesCalendarQueryParameters
-	 */
-	public function testCalendarQuery($expectedEventsInResult, $propFilters, $compFilter): void {
-		$calendarId = $this->createTestCalendar();
-		$events = [];
-		$events[0] = $this->createEvent($calendarId, '20130912T130000Z', '20130912T140000Z');
-		$events[1] = $this->createEvent($calendarId, '20130912T150000Z', '20130912T170000Z');
-		$events[2] = $this->createEvent($calendarId, '20130912T173000Z', '20130912T220000Z');
-		if (PHP_INT_SIZE > 8) {
-			$events[3] = $this->createEvent($calendarId, '21130912T130000Z', '22130912T130000Z');
-		} else {
-			/* On 32bit we do not support events after 2038 */
-			$events[3] = $this->createEvent($calendarId, '20370912T130000Z', '20370912T130000Z');
-		}
-
-		$result = $this->backend->calendarQuery($calendarId, [
-			'name' => '',
-			'prop-filters' => $propFilters,
-			'comp-filters' => $compFilter
-		]);
-
-		$expectedEventsInResult = array_map(function ($index) use ($events) {
-			return $events[$index];
-		}, $expectedEventsInResult);
-		$this->assertEqualsCanonicalizing($expectedEventsInResult, $result);
-	}
-
-	public function testGetCalendarObjectByUID(): void {
-		$calendarId = $this->createTestCalendar();
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<'EOD'
+        $uri0 = static::getUniqueID('card');
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->createCalendarObject($calendarId, $uri0, $calData[0]);
+        $uri1 = static::getUniqueID('card');
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->createCalendarObject($calendarId, $uri1, $calData[1]);
+        $uri2 = static::getUniqueID('card');
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->createCalendarObject($calendarId, $uri2, $calData[2]);
+
+        // get all the cards
+        $calendarObjects = $this->backend->getCalendarObjects($calendarId);
+        $this->assertCount(3, $calendarObjects);
+
+        // get the cards
+        $calendarObjects = $this->backend->getMultipleCalendarObjects($calendarId, [$uri1, $uri2]);
+        $this->assertCount(2, $calendarObjects);
+        foreach ($calendarObjects as $card) {
+            $this->assertArrayHasKey('id', $card);
+            $this->assertArrayHasKey('uri', $card);
+            $this->assertArrayHasKey('lastmodified', $card);
+            $this->assertArrayHasKey('etag', $card);
+            $this->assertArrayHasKey('size', $card);
+            $this->assertArrayHasKey('classification', $card);
+        }
+
+        usort($calendarObjects, function ($a, $b) {
+            return $a['id'] - $b['id'];
+        });
+
+        $this->assertEquals($calData[1], $calendarObjects[0]['calendardata']);
+        $this->assertEquals($calData[2], $calendarObjects[1]['calendardata']);
+
+        // delete the card
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->deleteCalendarObject($calendarId, $uri0);
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->deleteCalendarObject($calendarId, $uri1);
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+        $this->backend->deleteCalendarObject($calendarId, $uri2);
+        $calendarObjects = $this->backend->getCalendarObjects($calendarId);
+        $this->assertCount(0, $calendarObjects);
+    }
+
+    /**
+     * @dataProvider providesCalendarQueryParameters
+     */
+    public function testCalendarQuery($expectedEventsInResult, $propFilters, $compFilter): void {
+        $calendarId = $this->createTestCalendar();
+        $events = [];
+        $events[0] = $this->createEvent($calendarId, '20130912T130000Z', '20130912T140000Z');
+        $events[1] = $this->createEvent($calendarId, '20130912T150000Z', '20130912T170000Z');
+        $events[2] = $this->createEvent($calendarId, '20130912T173000Z', '20130912T220000Z');
+        if (PHP_INT_SIZE > 8) {
+            $events[3] = $this->createEvent($calendarId, '21130912T130000Z', '22130912T130000Z');
+        } else {
+            /* On 32bit we do not support events after 2038 */
+            $events[3] = $this->createEvent($calendarId, '20370912T130000Z', '20370912T130000Z');
+        }
+
+        $result = $this->backend->calendarQuery($calendarId, [
+            'name' => '',
+            'prop-filters' => $propFilters,
+            'comp-filters' => $compFilter
+        ]);
+
+        $expectedEventsInResult = array_map(function ($index) use ($events) {
+            return $events[$index];
+        }, $expectedEventsInResult);
+        $this->assertEqualsCanonicalizing($expectedEventsInResult, $result);
+    }
+
+    public function testGetCalendarObjectByUID(): void {
+        $calendarId = $this->createTestCalendar();
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -452,175 +452,175 @@ 
 EOD;
 
 
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
-
-		$co = $this->backend->getCalendarObjectByUID(self::UNIT_TEST_USER, '47d15e3ec8');
-		$this->assertNotNull($co);
-	}
-
-	public function providesCalendarQueryParameters() {
-		return [
-			'all' => [[0, 1, 2, 3], [], []],
-			'only-todos' => [[], ['name' => 'VTODO'], []],
-			'only-events' => [[0, 1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => null], 'prop-filters' => []]],],
-			'start' => [[1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
-			'end' => [[0], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC'))], 'prop-filters' => []]],],
-			'future' => [[3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2036-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
-		];
-	}
-
-	public function testCalendarSynchronization(): void {
-
-		// construct calendar for testing
-		$calendarId = $this->createTestCalendar();
-
-		/** test fresh sync state with NO events in calendar */
-		// construct test state
-		$stateTest = ['syncToken' => 1, 'added' => [], 'modified' => [], 'deleted' => []];
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with NO events in calendar');
-
-		/** test delta sync state with NO events in calendar */
-		// construct test state
-		$stateTest = ['syncToken' => 1, 'added' => [], 'modified' => [], 'deleted' => []];
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '2', 1);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with NO events in calendar');
-
-		/** add events to calendar */
-		$event1 = $this->createEvent($calendarId, '20240701T130000Z', '20240701T140000Z');
-		$event2 = $this->createEvent($calendarId, '20240701T140000Z', '20240701T150000Z');
-		$event3 = $this->createEvent($calendarId, '20240701T150000Z', '20240701T160000Z');
-
-		/** test fresh sync state with events in calendar */
-		// construct expected state
-		$stateTest = ['syncToken' => 4, 'added' => [$event1, $event2, $event3], 'modified' => [], 'deleted' => []];
-		sort($stateTest['added']);
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
-		// sort live state results
-		sort($stateLive['added']);
-		sort($stateLive['modified']);
-		sort($stateLive['deleted']);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with events in calendar');
-
-		/** test delta sync state with events in calendar */
-		// construct expected state
-		$stateTest = ['syncToken' => 4, 'added' => [$event2, $event3], 'modified' => [], 'deleted' => []];
-		sort($stateTest['added']);
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '2', 1);
-		// sort live state results
-		sort($stateLive['added']);
-		sort($stateLive['modified']);
-		sort($stateLive['deleted']);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with events in calendar');
-
-		/** modify/delete events in calendar */
-		$this->deleteEvent($calendarId, $event1);
-		$this->modifyEvent($calendarId, $event2, '20250701T140000Z', '20250701T150000Z');
-
-		/** test fresh sync state with modified/deleted events in calendar */
-		// construct expected state
-		$stateTest = ['syncToken' => 6, 'added' => [$event2, $event3], 'modified' => [], 'deleted' => []];
-		sort($stateTest['added']);
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
-		// sort live state results
-		sort($stateLive['added']);
-		sort($stateLive['modified']);
-		sort($stateLive['deleted']);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with modified/deleted events in calendar');
-
-		/** test delta sync state with modified/deleted events in calendar */
-		// construct expected state
-		$stateTest = ['syncToken' => 6, 'added' => [$event3], 'modified' => [$event2], 'deleted' => [$event1]];
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '3', 1);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with modified/deleted events in calendar');
-
-		/** test delta sync state with modified/deleted events in calendar and invalid token */
-		// construct expected state
-		$stateTest = ['syncToken' => 6, 'added' => [], 'modified' => [], 'deleted' => []];
-		// retrieve live state
-		$stateLive = $this->backend->getChangesForCalendar($calendarId, '6', 1);
-		// test live state
-		$this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with modified/deleted events in calendar and invalid token');
-
-	}
-
-	public function testPublications(): void {
-		$this->dispatcher->expects(self::atLeastOnce())
-			->method('dispatchTyped');
-
-		$this->backend->createCalendar(self::UNIT_TEST_USER, 'Example', []);
-
-		$calendarInfo = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER)[0];
-
-		/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject $l10n */
-		$l10n = $this->createMock(IL10N::class);
-		$config = $this->createMock(IConfig::class);
-		$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-		$calendar = new Calendar($this->backend, $calendarInfo, $l10n, $config, $logger);
-		$calendar->setPublishStatus(true);
-		$this->assertNotEquals(false, $calendar->getPublishStatus());
-
-		$publicCalendars = $this->backend->getPublicCalendars();
-		$this->assertCount(1, $publicCalendars);
-		$this->assertEquals(true, $publicCalendars[0]['{http://owncloud.org/ns}public']);
-		$this->assertEquals('User\'s displayname', $publicCalendars[0]['{http://nextcloud.com/ns}owner-displayname']);
-
-		$publicCalendarURI = $publicCalendars[0]['uri'];
-		$publicCalendar = $this->backend->getPublicCalendar($publicCalendarURI);
-		$this->assertEquals(true, $publicCalendar['{http://owncloud.org/ns}public']);
-
-		$calendar->setPublishStatus(false);
-		$this->assertEquals(false, $calendar->getPublishStatus());
-
-		$this->expectException(NotFound::class);
-		$this->backend->getPublicCalendar($publicCalendarURI);
-	}
-
-	public function testSubscriptions(): void {
-		$id = $this->backend->createSubscription(self::UNIT_TEST_USER, 'Subscription', [
-			'{http://calendarserver.org/ns/}source' => new Href('test-source'),
-			'{http://apple.com/ns/ical/}calendar-color' => '#1C4587',
-			'{http://calendarserver.org/ns/}subscribed-strip-todos' => ''
-		]);
-
-		$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
-		$this->assertCount(1, $subscriptions);
-		$this->assertEquals('#1C4587', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
-		$this->assertEquals(true, $subscriptions[0]['{http://calendarserver.org/ns/}subscribed-strip-todos']);
-		$this->assertEquals($id, $subscriptions[0]['id']);
-
-		$patch = new PropPatch([
-			'{DAV:}displayname' => 'Unit test',
-			'{http://apple.com/ns/ical/}calendar-color' => '#ac0606',
-		]);
-		$this->backend->updateSubscription($id, $patch);
-		$patch->commit();
-
-		$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
-		$this->assertCount(1, $subscriptions);
-		$this->assertEquals($id, $subscriptions[0]['id']);
-		$this->assertEquals('Unit test', $subscriptions[0]['{DAV:}displayname']);
-		$this->assertEquals('#ac0606', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
-
-		$this->backend->deleteSubscription($id);
-		$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
-		$this->assertCount(0, $subscriptions);
-	}
-
-	public function providesSchedulingData() {
-		$data = <<<EOS
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
+
+        $co = $this->backend->getCalendarObjectByUID(self::UNIT_TEST_USER, '47d15e3ec8');
+        $this->assertNotNull($co);
+    }
+
+    public function providesCalendarQueryParameters() {
+        return [
+            'all' => [[0, 1, 2, 3], [], []],
+            'only-todos' => [[], ['name' => 'VTODO'], []],
+            'only-events' => [[0, 1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => null], 'prop-filters' => []]],],
+            'start' => [[1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
+            'end' => [[0], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC'))], 'prop-filters' => []]],],
+            'future' => [[3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2036-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
+        ];
+    }
+
+    public function testCalendarSynchronization(): void {
+
+        // construct calendar for testing
+        $calendarId = $this->createTestCalendar();
+
+        /** test fresh sync state with NO events in calendar */
+        // construct test state
+        $stateTest = ['syncToken' => 1, 'added' => [], 'modified' => [], 'deleted' => []];
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with NO events in calendar');
+
+        /** test delta sync state with NO events in calendar */
+        // construct test state
+        $stateTest = ['syncToken' => 1, 'added' => [], 'modified' => [], 'deleted' => []];
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '2', 1);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with NO events in calendar');
+
+        /** add events to calendar */
+        $event1 = $this->createEvent($calendarId, '20240701T130000Z', '20240701T140000Z');
+        $event2 = $this->createEvent($calendarId, '20240701T140000Z', '20240701T150000Z');
+        $event3 = $this->createEvent($calendarId, '20240701T150000Z', '20240701T160000Z');
+
+        /** test fresh sync state with events in calendar */
+        // construct expected state
+        $stateTest = ['syncToken' => 4, 'added' => [$event1, $event2, $event3], 'modified' => [], 'deleted' => []];
+        sort($stateTest['added']);
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
+        // sort live state results
+        sort($stateLive['added']);
+        sort($stateLive['modified']);
+        sort($stateLive['deleted']);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with events in calendar');
+
+        /** test delta sync state with events in calendar */
+        // construct expected state
+        $stateTest = ['syncToken' => 4, 'added' => [$event2, $event3], 'modified' => [], 'deleted' => []];
+        sort($stateTest['added']);
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '2', 1);
+        // sort live state results
+        sort($stateLive['added']);
+        sort($stateLive['modified']);
+        sort($stateLive['deleted']);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with events in calendar');
+
+        /** modify/delete events in calendar */
+        $this->deleteEvent($calendarId, $event1);
+        $this->modifyEvent($calendarId, $event2, '20250701T140000Z', '20250701T150000Z');
+
+        /** test fresh sync state with modified/deleted events in calendar */
+        // construct expected state
+        $stateTest = ['syncToken' => 6, 'added' => [$event2, $event3], 'modified' => [], 'deleted' => []];
+        sort($stateTest['added']);
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '', 1);
+        // sort live state results
+        sort($stateLive['added']);
+        sort($stateLive['modified']);
+        sort($stateLive['deleted']);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test fresh sync state with modified/deleted events in calendar');
+
+        /** test delta sync state with modified/deleted events in calendar */
+        // construct expected state
+        $stateTest = ['syncToken' => 6, 'added' => [$event3], 'modified' => [$event2], 'deleted' => [$event1]];
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '3', 1);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with modified/deleted events in calendar');
+
+        /** test delta sync state with modified/deleted events in calendar and invalid token */
+        // construct expected state
+        $stateTest = ['syncToken' => 6, 'added' => [], 'modified' => [], 'deleted' => []];
+        // retrieve live state
+        $stateLive = $this->backend->getChangesForCalendar($calendarId, '6', 1);
+        // test live state
+        $this->assertEquals($stateTest, $stateLive, 'Failed test delta sync state with modified/deleted events in calendar and invalid token');
+
+    }
+
+    public function testPublications(): void {
+        $this->dispatcher->expects(self::atLeastOnce())
+            ->method('dispatchTyped');
+
+        $this->backend->createCalendar(self::UNIT_TEST_USER, 'Example', []);
+
+        $calendarInfo = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER)[0];
+
+        /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject $l10n */
+        $l10n = $this->createMock(IL10N::class);
+        $config = $this->createMock(IConfig::class);
+        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $calendar = new Calendar($this->backend, $calendarInfo, $l10n, $config, $logger);
+        $calendar->setPublishStatus(true);
+        $this->assertNotEquals(false, $calendar->getPublishStatus());
+
+        $publicCalendars = $this->backend->getPublicCalendars();
+        $this->assertCount(1, $publicCalendars);
+        $this->assertEquals(true, $publicCalendars[0]['{http://owncloud.org/ns}public']);
+        $this->assertEquals('User\'s displayname', $publicCalendars[0]['{http://nextcloud.com/ns}owner-displayname']);
+
+        $publicCalendarURI = $publicCalendars[0]['uri'];
+        $publicCalendar = $this->backend->getPublicCalendar($publicCalendarURI);
+        $this->assertEquals(true, $publicCalendar['{http://owncloud.org/ns}public']);
+
+        $calendar->setPublishStatus(false);
+        $this->assertEquals(false, $calendar->getPublishStatus());
+
+        $this->expectException(NotFound::class);
+        $this->backend->getPublicCalendar($publicCalendarURI);
+    }
+
+    public function testSubscriptions(): void {
+        $id = $this->backend->createSubscription(self::UNIT_TEST_USER, 'Subscription', [
+            '{http://calendarserver.org/ns/}source' => new Href('test-source'),
+            '{http://apple.com/ns/ical/}calendar-color' => '#1C4587',
+            '{http://calendarserver.org/ns/}subscribed-strip-todos' => ''
+        ]);
+
+        $subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
+        $this->assertCount(1, $subscriptions);
+        $this->assertEquals('#1C4587', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
+        $this->assertEquals(true, $subscriptions[0]['{http://calendarserver.org/ns/}subscribed-strip-todos']);
+        $this->assertEquals($id, $subscriptions[0]['id']);
+
+        $patch = new PropPatch([
+            '{DAV:}displayname' => 'Unit test',
+            '{http://apple.com/ns/ical/}calendar-color' => '#ac0606',
+        ]);
+        $this->backend->updateSubscription($id, $patch);
+        $patch->commit();
+
+        $subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
+        $this->assertCount(1, $subscriptions);
+        $this->assertEquals($id, $subscriptions[0]['id']);
+        $this->assertEquals('Unit test', $subscriptions[0]['{DAV:}displayname']);
+        $this->assertEquals('#ac0606', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
+
+        $this->backend->deleteSubscription($id);
+        $subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
+        $this->assertCount(0, $subscriptions);
+    }
+
+    public function providesSchedulingData() {
+        $data = <<<EOS
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Sabre//Sabre VObject 3.5.0//EN
@@ -685,74 +685,74 @@ 
 END:VCALENDAR
 EOS;
 
-		return [
-			'no data' => [''],
-			'failing on postgres' => [$data]
-		];
-	}
+        return [
+            'no data' => [''],
+            'failing on postgres' => [$data]
+        ];
+    }
 
-	/**
-	 * @dataProvider providesSchedulingData
-	 * @param $objectData
-	 */
-	public function testScheduling($objectData): void {
-		$this->backend->createSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule', $objectData);
+    /**
+     * @dataProvider providesSchedulingData
+     * @param $objectData
+     */
+    public function testScheduling($objectData): void {
+        $this->backend->createSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule', $objectData);
 
-		$sos = $this->backend->getSchedulingObjects(self::UNIT_TEST_USER);
-		$this->assertCount(1, $sos);
+        $sos = $this->backend->getSchedulingObjects(self::UNIT_TEST_USER);
+        $this->assertCount(1, $sos);
 
-		$so = $this->backend->getSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule');
-		$this->assertNotNull($so);
+        $so = $this->backend->getSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule');
+        $this->assertNotNull($so);
 
-		$this->backend->deleteSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule');
+        $this->backend->deleteSchedulingObject(self::UNIT_TEST_USER, 'Sample Schedule');
 
-		$sos = $this->backend->getSchedulingObjects(self::UNIT_TEST_USER);
-		$this->assertCount(0, $sos);
-	}
+        $sos = $this->backend->getSchedulingObjects(self::UNIT_TEST_USER);
+        $this->assertCount(0, $sos);
+    }
 
-	/**
-	 * @dataProvider providesCalDataForGetDenormalizedData
-	 */
-	public function testGetDenormalizedData($expected, $key, $calData): void {
-		try {
-			$actual = $this->backend->getDenormalizedData($calData);
-			$this->assertEquals($expected, $actual[$key]);
-		} catch (\Throwable $e) {
-			if (($e->getMessage() === 'Epoch doesn\'t fit in a PHP integer') && (PHP_INT_SIZE < 8)) {
-				$this->markTestSkipped('This fail on 32bits because of PHP limitations in DateTime');
-			}
-			throw $e;
-		}
-	}
+    /**
+     * @dataProvider providesCalDataForGetDenormalizedData
+     */
+    public function testGetDenormalizedData($expected, $key, $calData): void {
+        try {
+            $actual = $this->backend->getDenormalizedData($calData);
+            $this->assertEquals($expected, $actual[$key]);
+        } catch (\Throwable $e) {
+            if (($e->getMessage() === 'Epoch doesn\'t fit in a PHP integer') && (PHP_INT_SIZE < 8)) {
+                $this->markTestSkipped('This fail on 32bits because of PHP limitations in DateTime');
+            }
+            throw $e;
+        }
+    }
 
-	public function providesCalDataForGetDenormalizedData(): array {
-		return [
-			'first occurrence before unix epoch starts' => [0, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nDTSTART;VALUE=DATE:16040222\r\nDTEND;VALUE=DATE:16040223\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
-			'no first occurrence because yearly' => [null, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+    public function providesCalDataForGetDenormalizedData(): array {
+        return [
+            'first occurrence before unix epoch starts' => [0, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nDTSTART;VALUE=DATE:16040222\r\nDTEND;VALUE=DATE:16040223\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+            'no first occurrence because yearly' => [null, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
 
-			'last occurrence is max when only last VEVENT in group is weekly' => [(new DateTime(CalDavBackend::MAX_DATE))->getTimestamp(), 'lastOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200812T103000\r\nDTEND;TZID=America/Los_Angeles:20200812T110000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nRECURRENCE-ID;TZID=America/Los_Angeles:20200811T123000\r\nCREATED:20200626T181848Z\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Weekly 1:1\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200728T123000\r\nDTEND;TZID=America/Los_Angeles:20200728T130000\r\nEXDATE;TZID=America/Los_Angeles:20200818T123000\r\nRRULE:FREQ=WEEKLY;BYDAY=TU\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nCREATED:20200626T181848Z\r\nDESCRIPTION:Setting up recurring time on our calendars\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Weekly 1:1\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+            'last occurrence is max when only last VEVENT in group is weekly' => [(new DateTime(CalDavBackend::MAX_DATE))->getTimestamp(), 'lastOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200812T103000\r\nDTEND;TZID=America/Los_Angeles:20200812T110000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nRECURRENCE-ID;TZID=America/Los_Angeles:20200811T123000\r\nCREATED:20200626T181848Z\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Weekly 1:1\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200728T123000\r\nDTEND;TZID=America/Los_Angeles:20200728T130000\r\nEXDATE;TZID=America/Los_Angeles:20200818T123000\r\nRRULE:FREQ=WEEKLY;BYDAY=TU\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nCREATED:20200626T181848Z\r\nDESCRIPTION:Setting up recurring time on our calendars\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Weekly 1:1\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
 
-			'last occurrence before unix epoch starts' => [0, 'lastOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:19110324\r\nDTEND;VALUE=DATE:19110325\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nCREATED:20200626T181848Z\r\nDESCRIPTION:Very old event\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Some old event\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+            'last occurrence before unix epoch starts' => [0, 'lastOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:19110324\r\nDTEND;VALUE=DATE:19110325\r\nDTSTAMP:20200927T180638Z\r\nUID:asdfasdfasdf@google.com\r\nCREATED:20200626T181848Z\r\nDESCRIPTION:Very old event\r\nLAST-MODIFIED:20200922T192707Z\r\nSUMMARY:Some old event\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
 
-			'first occurrence is found when not first VEVENT in group' => [(new DateTime('2020-09-01T110000', new DateTimeZone('America/Los_Angeles')))->getTimestamp(), 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20201013T110000\r\nDTEND;TZID=America/Los_Angeles:20201013T120000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdf0000@google.com\r\nRECURRENCE-ID;TZID=America/Los_Angeles:20201013T110000\r\nCREATED:20160330T034726Z\r\nLAST-MODIFIED:20200925T042014Z\r\nSTATUS:CONFIRMED\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200901T110000\r\nDTEND;TZID=America/Los_Angeles:20200901T120000\r\nRRULE:FREQ=WEEKLY;BYDAY=TU\r\nEXDATE;TZID=America/Los_Angeles:20200922T110000\r\nEXDATE;TZID=America/Los_Angeles:20200915T110000\r\nEXDATE;TZID=America/Los_Angeles:20200908T110000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdf0000@google.com\r\nCREATED:20160330T034726Z\r\nLAST-MODIFIED:20200915T162810Z\r\nSTATUS:CONFIRMED\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+            'first occurrence is found when not first VEVENT in group' => [(new DateTime('2020-09-01T110000', new DateTimeZone('America/Los_Angeles')))->getTimestamp(), 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.3.0//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20201013T110000\r\nDTEND;TZID=America/Los_Angeles:20201013T120000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdf0000@google.com\r\nRECURRENCE-ID;TZID=America/Los_Angeles:20201013T110000\r\nCREATED:20160330T034726Z\r\nLAST-MODIFIED:20200925T042014Z\r\nSTATUS:CONFIRMED\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nBEGIN:VEVENT\r\nDTSTART;TZID=America/Los_Angeles:20200901T110000\r\nDTEND;TZID=America/Los_Angeles:20200901T120000\r\nRRULE:FREQ=WEEKLY;BYDAY=TU\r\nEXDATE;TZID=America/Los_Angeles:20200922T110000\r\nEXDATE;TZID=America/Los_Angeles:20200915T110000\r\nEXDATE;TZID=America/Los_Angeles:20200908T110000\r\nDTSTAMP:20200927T180638Z\r\nUID:asdf0000@google.com\r\nCREATED:20160330T034726Z\r\nLAST-MODIFIED:20200915T162810Z\r\nSTATUS:CONFIRMED\r\nTRANSP:OPAQUE\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
 
-			'CLASS:PRIVATE' => [CalDavBackend::CLASSIFICATION_PRIVATE, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:PRIVATE\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
+            'CLASS:PRIVATE' => [CalDavBackend::CLASSIFICATION_PRIVATE, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:PRIVATE\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
 
-			'CLASS:PUBLIC' => [CalDavBackend::CLASSIFICATION_PUBLIC, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:PUBLIC\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
+            'CLASS:PUBLIC' => [CalDavBackend::CLASSIFICATION_PUBLIC, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:PUBLIC\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
 
-			'CLASS:CONFIDENTIAL' => [CalDavBackend::CLASSIFICATION_CONFIDENTIAL, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:CONFIDENTIAL\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
+            'CLASS:CONFIDENTIAL' => [CalDavBackend::CLASSIFICATION_CONFIDENTIAL, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:CONFIDENTIAL\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
 
-			'no class set -> public' => [CalDavBackend::CLASSIFICATION_PUBLIC, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nTRANSP:OPAQUE\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
+            'no class set -> public' => [CalDavBackend::CLASSIFICATION_PUBLIC, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nTRANSP:OPAQUE\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
 
-			'unknown class -> private' => [CalDavBackend::CLASSIFICATION_PRIVATE, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:VERTRAULICH\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
-		];
-	}
+            'unknown class -> private' => [CalDavBackend::CLASSIFICATION_PRIVATE, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:VERTRAULICH\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
+        ];
+    }
 
-	public function testCalendarSearch(): void {
-		$calendarId = $this->createTestCalendar();
+    public function testCalendarSearch(): void {
+        $calendarId = $this->createTestCalendar();
 
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<EOD
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -769,24 +769,24 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
 
-		$search1 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
-			'comps' => [
-				'VEVENT',
-				'VTODO'
-			],
-			'props' => [
-				'SUMMARY',
-				'LOCATION'
-			],
-			'search-term' => 'Test',
-		]);
-		$this->assertEquals(count($search1), 1);
+        $search1 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
+            'comps' => [
+                'VEVENT',
+                'VTODO'
+            ],
+            'props' => [
+                'SUMMARY',
+                'LOCATION'
+            ],
+            'search-term' => 'Test',
+        ]);
+        $this->assertEquals(count($search1), 1);
 
 
-		// update the card
-		$calData = <<<'EOD'
+        // update the card
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -802,93 +802,93 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->updateCalendarObject($calendarId, $uri, $calData);
-
-		$search2 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
-			'comps' => [
-				'VEVENT',
-				'VTODO'
-			],
-			'props' => [
-				'SUMMARY',
-				'LOCATION'
-			],
-			'search-term' => 'Test',
-		]);
-		$this->assertEquals(count($search2), 0);
-
-		$search3 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
-			'comps' => [
-				'VEVENT',
-				'VTODO'
-			],
-			'props' => [
-				'SUMMARY',
-				'LOCATION'
-			],
-			'params' => [
-				[
-					'property' => 'ATTENDEE',
-					'parameter' => 'CN'
-				]
-			],
-			'search-term' => 'Test',
-		]);
-		$this->assertEquals(count($search3), 1);
-
-		// t matches both summary and attendee's CN, but we want unique results
-		$search4 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
-			'comps' => [
-				'VEVENT',
-				'VTODO'
-			],
-			'props' => [
-				'SUMMARY',
-				'LOCATION'
-			],
-			'params' => [
-				[
-					'property' => 'ATTENDEE',
-					'parameter' => 'CN'
-				]
-			],
-			'search-term' => 't',
-		]);
-		$this->assertEquals(count($search4), 1);
-
-		$this->backend->deleteCalendarObject($calendarId, $uri);
-
-		$search5 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
-			'comps' => [
-				'VEVENT',
-				'VTODO'
-			],
-			'props' => [
-				'SUMMARY',
-				'LOCATION'
-			],
-			'params' => [
-				[
-					'property' => 'ATTENDEE',
-					'parameter' => 'CN'
-				]
-			],
-			'search-term' => 't',
-		]);
-		$this->assertEquals(count($search5), 0);
-	}
-
-	/**
-	 * @dataProvider searchDataProvider
-	 */
-	public function testSearch(bool $isShared, array $searchOptions, int $count): void {
-		$calendarId = $this->createTestCalendar();
-
-		$uris = [];
-		$calData = [];
-
-		$uris[] = static::getUniqueID('calobj');
-		$calData[] = <<<EOD
+        $this->backend->updateCalendarObject($calendarId, $uri, $calData);
+
+        $search2 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
+            'comps' => [
+                'VEVENT',
+                'VTODO'
+            ],
+            'props' => [
+                'SUMMARY',
+                'LOCATION'
+            ],
+            'search-term' => 'Test',
+        ]);
+        $this->assertEquals(count($search2), 0);
+
+        $search3 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
+            'comps' => [
+                'VEVENT',
+                'VTODO'
+            ],
+            'props' => [
+                'SUMMARY',
+                'LOCATION'
+            ],
+            'params' => [
+                [
+                    'property' => 'ATTENDEE',
+                    'parameter' => 'CN'
+                ]
+            ],
+            'search-term' => 'Test',
+        ]);
+        $this->assertEquals(count($search3), 1);
+
+        // t matches both summary and attendee's CN, but we want unique results
+        $search4 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
+            'comps' => [
+                'VEVENT',
+                'VTODO'
+            ],
+            'props' => [
+                'SUMMARY',
+                'LOCATION'
+            ],
+            'params' => [
+                [
+                    'property' => 'ATTENDEE',
+                    'parameter' => 'CN'
+                ]
+            ],
+            'search-term' => 't',
+        ]);
+        $this->assertEquals(count($search4), 1);
+
+        $this->backend->deleteCalendarObject($calendarId, $uri);
+
+        $search5 = $this->backend->calendarSearch(self::UNIT_TEST_USER, [
+            'comps' => [
+                'VEVENT',
+                'VTODO'
+            ],
+            'props' => [
+                'SUMMARY',
+                'LOCATION'
+            ],
+            'params' => [
+                [
+                    'property' => 'ATTENDEE',
+                    'parameter' => 'CN'
+                ]
+            ],
+            'search-term' => 't',
+        ]);
+        $this->assertEquals(count($search5), 0);
+    }
+
+    /**
+     * @dataProvider searchDataProvider
+     */
+    public function testSearch(bool $isShared, array $searchOptions, int $count): void {
+        $calendarId = $this->createTestCalendar();
+
+        $uris = [];
+        $calData = [];
+
+        $uris[] = static::getUniqueID('calobj');
+        $calData[] = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -905,8 +905,8 @@ 
 END:VCALENDAR
 EOD;
 
-		$uris[] = static::getUniqueID('calobj');
-		$calData[] = <<<EOD
+        $uris[] = static::getUniqueID('calobj');
+        $calData[] = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -924,8 +924,8 @@ 
 END:VCALENDAR
 EOD;
 
-		$uris[] = static::getUniqueID('calobj');
-		$calData[] = <<<EOD
+        $uris[] = static::getUniqueID('calobj');
+        $calData[] = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -943,8 +943,8 @@ 
 END:VCALENDAR
 EOD;
 
-		$uris[] = static::getUniqueID('calobj');
-		$calData[] = <<<EOD
+        $uris[] = static::getUniqueID('calobj');
+        $calData[] = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -962,38 +962,38 @@ 
 END:VCALENDAR
 EOD;
 
-		$uriCount = count($uris);
-		for ($i = 0; $i < $uriCount; $i++) {
-			$this->backend->createCalendarObject($calendarId,
-				$uris[$i], $calData[$i]);
-		}
-
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => $isShared ? 'user2' : 'user1',
-		];
-
-		$result = $this->backend->search($calendarInfo, 'Test',
-			['SUMMARY', 'LOCATION', 'ATTENDEE'], $searchOptions, null, null);
-
-		$this->assertCount($count, $result);
-	}
-
-	public function searchDataProvider() {
-		return [
-			[false, [], 4],
-			[true, ['timerange' => ['start' => new DateTime('2013-09-12 13:00:00'), 'end' => new DateTime('2013-09-12 14:00:00')]], 2],
-			[true, ['timerange' => ['start' => new DateTime('2013-09-12 15:00:00'), 'end' => new DateTime('2013-09-12 16:00:00')]], 0],
-		];
-	}
-
-	public function testSameUriSameIdForDifferentCalendarTypes(): void {
-		$calendarId = $this->createTestCalendar();
-		$subscriptionId = $this->createTestSubscription();
-
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<EOD
+        $uriCount = count($uris);
+        for ($i = 0; $i < $uriCount; $i++) {
+            $this->backend->createCalendarObject($calendarId,
+                $uris[$i], $calData[$i]);
+        }
+
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => $isShared ? 'user2' : 'user1',
+        ];
+
+        $result = $this->backend->search($calendarInfo, 'Test',
+            ['SUMMARY', 'LOCATION', 'ATTENDEE'], $searchOptions, null, null);
+
+        $this->assertCount($count, $result);
+    }
+
+    public function searchDataProvider() {
+        return [
+            [false, [], 4],
+            [true, ['timerange' => ['start' => new DateTime('2013-09-12 13:00:00'), 'end' => new DateTime('2013-09-12 14:00:00')]], 2],
+            [true, ['timerange' => ['start' => new DateTime('2013-09-12 15:00:00'), 'end' => new DateTime('2013-09-12 16:00:00')]], 0],
+        ];
+    }
+
+    public function testSameUriSameIdForDifferentCalendarTypes(): void {
+        $calendarId = $this->createTestCalendar();
+        $subscriptionId = $this->createTestSubscription();
+
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -1010,7 +1010,7 @@ 
 END:VCALENDAR
 EOD;
 
-		$calData2 = <<<EOD
+        $calData2 = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -1027,17 +1027,17 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
-		$this->backend->createCalendarObject($subscriptionId, $uri, $calData2, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
+        $this->backend->createCalendarObject($subscriptionId, $uri, $calData2, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
 
-		$this->assertEquals($calData, $this->backend->getCalendarObject($calendarId, $uri, CalDavBackend::CALENDAR_TYPE_CALENDAR)['calendardata']);
-		$this->assertEquals($calData2, $this->backend->getCalendarObject($subscriptionId, $uri, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION)['calendardata']);
-	}
+        $this->assertEquals($calData, $this->backend->getCalendarObject($calendarId, $uri, CalDavBackend::CALENDAR_TYPE_CALENDAR)['calendardata']);
+        $this->assertEquals($calData2, $this->backend->getCalendarObject($subscriptionId, $uri, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION)['calendardata']);
+    }
 
-	public function testPurgeAllCachedEventsForSubscription(): void {
-		$subscriptionId = $this->createTestSubscription();
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<EOD
+    public function testPurgeAllCachedEventsForSubscription(): void {
+        $subscriptionId = $this->createTestSubscription();
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:ownCloud Calendar
@@ -1054,30 +1054,30 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->backend->createCalendarObject($subscriptionId, $uri, $calData, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-		$this->backend->purgeAllCachedEventsForSubscription($subscriptionId);
+        $this->backend->createCalendarObject($subscriptionId, $uri, $calData, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        $this->backend->purgeAllCachedEventsForSubscription($subscriptionId);
 
-		$this->assertEquals(null, $this->backend->getCalendarObject($subscriptionId, $uri, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION));
-	}
+        $this->assertEquals(null, $this->backend->getCalendarObject($subscriptionId, $uri, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION));
+    }
 
-	public function testCalendarMovement(): void {
-		$this->backend->createCalendar(self::UNIT_TEST_USER, 'Example', []);
+    public function testCalendarMovement(): void {
+        $this->backend->createCalendar(self::UNIT_TEST_USER, 'Example', []);
 
-		$this->assertCount(1, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER));
+        $this->assertCount(1, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER));
 
-		$calendarInfoUser = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER)[0];
+        $calendarInfoUser = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER)[0];
 
-		$this->backend->moveCalendar('Example', self::UNIT_TEST_USER, self::UNIT_TEST_USER1);
-		$this->assertCount(0, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER));
-		$this->assertCount(1, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1));
+        $this->backend->moveCalendar('Example', self::UNIT_TEST_USER, self::UNIT_TEST_USER1);
+        $this->assertCount(0, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER));
+        $this->assertCount(1, $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1));
 
-		$calendarInfoUser1 = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1)[0];
-		$this->assertEquals($calendarInfoUser['id'], $calendarInfoUser1['id']);
-		$this->assertEquals($calendarInfoUser['uri'], $calendarInfoUser1['uri']);
-	}
+        $calendarInfoUser1 = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1)[0];
+        $this->assertEquals($calendarInfoUser['id'], $calendarInfoUser1['id']);
+        $this->assertEquals($calendarInfoUser['uri'], $calendarInfoUser1['uri']);
+    }
 
-	public function testSearchPrincipal(): void {
-		$myPublic = <<<EOD
+    public function testSearchPrincipal(): void {
+        $myPublic = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1113,7 +1113,7 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$myPrivate = <<<EOD
+        $myPrivate = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1149,7 +1149,7 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$myConfidential = <<<EOD
+        $myConfidential = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1186,7 +1186,7 @@ 
 END:VCALENDAR
 EOD;
 
-		$sharerPublic = <<<EOD
+        $sharerPublic = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1222,7 +1222,7 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$sharerPrivate = <<<EOD
+        $sharerPrivate = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1258,7 +1258,7 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$sharerConfidential = <<<EOD
+        $sharerConfidential = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
@@ -1295,81 +1295,81 @@ 
 END:VCALENDAR
 EOD;
 
-		$l10n = $this->createMock(IL10N::class);
-		$l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
-				return vsprintf($text, $parameters);
-			});
-		$config = $this->createMock(IConfig::class);
-		$this->userManager->expects($this->any())
-			->method('userExists')
-			->willReturn(true);
-		$this->groupManager->expects($this->any())
-			->method('groupExists')
-			->willReturn(true);
-		$this->principal->expects(self::atLeastOnce())
-			->method('findByUri')
-			->willReturn(self::UNIT_TEST_USER);
-
-		$me = self::UNIT_TEST_USER;
-		$sharer = self::UNIT_TEST_USER1;
-		$this->backend->createCalendar($me, 'calendar-uri-me', []);
-		$this->backend->createCalendar($sharer, 'calendar-uri-sharer', []);
-
-		$myCalendars = $this->backend->getCalendarsForUser($me);
-		$this->assertCount(1, $myCalendars);
-
-		$sharerCalendars = $this->backend->getCalendarsForUser($sharer);
-		$this->assertCount(1, $sharerCalendars);
-
-		$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-		$sharerCalendar = new Calendar($this->backend, $sharerCalendars[0], $l10n, $config, $logger);
-		$this->backend->updateShares($sharerCalendar, [
-			[
-				'href' => 'principal:' . $me,
-				'readOnly' => false,
-			],
-		], []);
-
-		$this->assertCount(2, $this->backend->getCalendarsForUser($me));
-
-		$this->backend->createCalendarObject($myCalendars[0]['id'], 'event0.ics', $myPublic);
-		$this->backend->createCalendarObject($myCalendars[0]['id'], 'event1.ics', $myPrivate);
-		$this->backend->createCalendarObject($myCalendars[0]['id'], 'event2.ics', $myConfidential);
-
-		$this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event3.ics', $sharerPublic);
-		$this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event4.ics', $sharerPrivate);
-		$this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event5.ics', $sharerConfidential);
-
-		$mySearchResults = $this->backend->searchPrincipalUri($me, 'Test', ['VEVENT'], ['SUMMARY'], []);
-		$sharerSearchResults = $this->backend->searchPrincipalUri($sharer, 'Test', ['VEVENT'], ['SUMMARY'], []);
-
-		$this->assertCount(4, $mySearchResults);
-		$this->assertCount(3, $sharerSearchResults);
-
-		$this->assertEquals($myPublic, $mySearchResults[0]['calendardata']);
-		$this->assertEquals($myPrivate, $mySearchResults[1]['calendardata']);
-		$this->assertEquals($myConfidential, $mySearchResults[2]['calendardata']);
-		$this->assertEquals($sharerPublic, $mySearchResults[3]['calendardata']);
-
-		$this->assertEquals($sharerPublic, $sharerSearchResults[0]['calendardata']);
-		$this->assertEquals($sharerPrivate, $sharerSearchResults[1]['calendardata']);
-		$this->assertEquals($sharerConfidential, $sharerSearchResults[2]['calendardata']);
-	}
-
-	/**
-	 * @throws \OCP\DB\Exception
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function testPruneOutdatedSyncTokens(): void {
-		$calendarId = $this->createTestCalendar();
-		$changes = $this->backend->getChangesForCalendar($calendarId, '', 1);
-		$syncToken = $changes['syncToken'];
-
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<EOD
+        $l10n = $this->createMock(IL10N::class);
+        $l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($text, $parameters = []) {
+                return vsprintf($text, $parameters);
+            });
+        $config = $this->createMock(IConfig::class);
+        $this->userManager->expects($this->any())
+            ->method('userExists')
+            ->willReturn(true);
+        $this->groupManager->expects($this->any())
+            ->method('groupExists')
+            ->willReturn(true);
+        $this->principal->expects(self::atLeastOnce())
+            ->method('findByUri')
+            ->willReturn(self::UNIT_TEST_USER);
+
+        $me = self::UNIT_TEST_USER;
+        $sharer = self::UNIT_TEST_USER1;
+        $this->backend->createCalendar($me, 'calendar-uri-me', []);
+        $this->backend->createCalendar($sharer, 'calendar-uri-sharer', []);
+
+        $myCalendars = $this->backend->getCalendarsForUser($me);
+        $this->assertCount(1, $myCalendars);
+
+        $sharerCalendars = $this->backend->getCalendarsForUser($sharer);
+        $this->assertCount(1, $sharerCalendars);
+
+        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $sharerCalendar = new Calendar($this->backend, $sharerCalendars[0], $l10n, $config, $logger);
+        $this->backend->updateShares($sharerCalendar, [
+            [
+                'href' => 'principal:' . $me,
+                'readOnly' => false,
+            ],
+        ], []);
+
+        $this->assertCount(2, $this->backend->getCalendarsForUser($me));
+
+        $this->backend->createCalendarObject($myCalendars[0]['id'], 'event0.ics', $myPublic);
+        $this->backend->createCalendarObject($myCalendars[0]['id'], 'event1.ics', $myPrivate);
+        $this->backend->createCalendarObject($myCalendars[0]['id'], 'event2.ics', $myConfidential);
+
+        $this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event3.ics', $sharerPublic);
+        $this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event4.ics', $sharerPrivate);
+        $this->backend->createCalendarObject($sharerCalendars[0]['id'], 'event5.ics', $sharerConfidential);
+
+        $mySearchResults = $this->backend->searchPrincipalUri($me, 'Test', ['VEVENT'], ['SUMMARY'], []);
+        $sharerSearchResults = $this->backend->searchPrincipalUri($sharer, 'Test', ['VEVENT'], ['SUMMARY'], []);
+
+        $this->assertCount(4, $mySearchResults);
+        $this->assertCount(3, $sharerSearchResults);
+
+        $this->assertEquals($myPublic, $mySearchResults[0]['calendardata']);
+        $this->assertEquals($myPrivate, $mySearchResults[1]['calendardata']);
+        $this->assertEquals($myConfidential, $mySearchResults[2]['calendardata']);
+        $this->assertEquals($sharerPublic, $mySearchResults[3]['calendardata']);
+
+        $this->assertEquals($sharerPublic, $sharerSearchResults[0]['calendardata']);
+        $this->assertEquals($sharerPrivate, $sharerSearchResults[1]['calendardata']);
+        $this->assertEquals($sharerConfidential, $sharerSearchResults[2]['calendardata']);
+    }
+
+    /**
+     * @throws \OCP\DB\Exception
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function testPruneOutdatedSyncTokens(): void {
+        $calendarId = $this->createTestCalendar();
+        $changes = $this->backend->getChangesForCalendar($calendarId, '', 1);
+        $syncToken = $changes['syncToken'];
+
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1386,10 +1386,10 @@ 
 END:VCALENDAR
 EOD;
 
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
 
-		// update the card
-		$calData = <<<'EOD'
+        // update the card
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1405,29 +1405,29 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->updateCalendarObject($calendarId, $uri, $calData);
+        $this->backend->updateCalendarObject($calendarId, $uri, $calData);
 
-		// Keep everything
-		$deleted = $this->backend->pruneOutdatedSyncTokens(0, 0);
-		self::assertSame(0, $deleted);
+        // Keep everything
+        $deleted = $this->backend->pruneOutdatedSyncTokens(0, 0);
+        self::assertSame(0, $deleted);
 
-		$deleted = $this->backend->pruneOutdatedSyncTokens(0, time());
-		// At least one from the object creation and one from the object update
-		$this->assertGreaterThanOrEqual(2, $deleted);
-		$changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 1);
-		$this->assertEmpty($changes['added']);
-		$this->assertEmpty($changes['modified']);
-		$this->assertEmpty($changes['deleted']);
+        $deleted = $this->backend->pruneOutdatedSyncTokens(0, time());
+        // At least one from the object creation and one from the object update
+        $this->assertGreaterThanOrEqual(2, $deleted);
+        $changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 1);
+        $this->assertEmpty($changes['added']);
+        $this->assertEmpty($changes['modified']);
+        $this->assertEmpty($changes['deleted']);
 
-		// Test that objects remain
+        // Test that objects remain
 
-		// Currently changes are empty
-		$changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
-		$this->assertEquals(0, count($changes['added'] + $changes['modified'] + $changes['deleted']));
+        // Currently changes are empty
+        $changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
+        $this->assertEquals(0, count($changes['added'] + $changes['modified'] + $changes['deleted']));
 
-		// Create card
-		$uri = static::getUniqueID('calobj');
-		$calData = <<<EOD
+        // Create card
+        $uri = static::getUniqueID('calobj');
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1443,16 +1443,16 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
 
-		// We now have one add
-		$changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
-		$this->assertEquals(1, count($changes['added']));
-		$this->assertEmpty($changes['modified']);
-		$this->assertEmpty($changes['deleted']);
+        // We now have one add
+        $changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
+        $this->assertEquals(1, count($changes['added']));
+        $this->assertEmpty($changes['modified']);
+        $this->assertEmpty($changes['deleted']);
 
-		// update the card
-		$calData = <<<'EOD'
+        // update the card
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1468,38 +1468,38 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->updateCalendarObject($calendarId, $uri, $calData);
-
-		// One add, one modify, but shortened to modify
-		$changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
-		$this->assertEmpty($changes['added']);
-		$this->assertEquals(1, count($changes['modified']));
-		$this->assertEmpty($changes['deleted']);
-
-		// Delete all but last change
-		$deleted = $this->backend->pruneOutdatedSyncTokens(1, time());
-		$this->assertEquals(1, $deleted); // We had two changes before, now one
-
-		// Only update should remain
-		$changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
-		$this->assertEmpty($changes['added']);
-		$this->assertEquals(1, count($changes['modified']));
-		$this->assertEmpty($changes['deleted']);
-
-		// Check that no crash occurs when prune is called without current changes
-		$deleted = $this->backend->pruneOutdatedSyncTokens(1, time());
-		self::assertSame(0, $deleted);
-	}
-
-	public function testSearchAndExpandRecurrences(): void {
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-		];
-
-		$calData = <<<'EOD'
+        $this->backend->updateCalendarObject($calendarId, $uri, $calData);
+
+        // One add, one modify, but shortened to modify
+        $changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
+        $this->assertEmpty($changes['added']);
+        $this->assertEquals(1, count($changes['modified']));
+        $this->assertEmpty($changes['deleted']);
+
+        // Delete all but last change
+        $deleted = $this->backend->pruneOutdatedSyncTokens(1, time());
+        $this->assertEquals(1, $deleted); // We had two changes before, now one
+
+        // Only update should remain
+        $changes = $this->backend->getChangesForCalendar($calendarId, $syncToken, 100);
+        $this->assertEmpty($changes['added']);
+        $this->assertEquals(1, count($changes['modified']));
+        $this->assertEmpty($changes['deleted']);
+
+        // Check that no crash occurs when prune is called without current changes
+        $deleted = $this->backend->pruneOutdatedSyncTokens(1, time());
+        self::assertSame(0, $deleted);
+    }
+
+    public function testSearchAndExpandRecurrences(): void {
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+        ];
+
+        $calData = <<<'EOD'
 BEGIN:VCALENDAR
 PRODID:-//IDN nextcloud.com//Calendar app 4.5.0-alpha.2//EN
 CALSCALE:GREGORIAN
@@ -1518,50 +1518,50 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$uri = static::getUniqueID('calobj');
-		$this->backend->createCalendarObject($calendarId, $uri, $calData);
-
-		$start = new DateTimeImmutable('2023-09-20T00:00:00Z');
-		$end = $start->add(new DateInterval('P14D'));
-
-		$results = $this->backend->search(
-			$calendarInfo,
-			'',
-			[],
-			[
-				'timerange' => [
-					'start' => $start,
-					'end' => $end,
-				]
-			],
-			null,
-			null,
-		);
-
-		$this->assertCount(1, $results);
-		$this->assertCount(14, $results[0]['objects']);
-		foreach ($results as $result) {
-			foreach ($result['objects'] as $object) {
-				$this->assertEquals($object['UID'][0], '7b7d5d12-683c-48ce-973a-b3e1cb0bae2a');
-				$this->assertEquals($object['SUMMARY'][0], 'Daily Event');
-				$this->assertGreaterThanOrEqual(
-					$start->getTimestamp(),
-					$object['DTSTART'][0]->getTimestamp(),
-					'Recurrence starting before requested start',
-				);
-				$this->assertLessThanOrEqual(
-					$end->getTimestamp(),
-					$object['DTSTART'][0]->getTimestamp(),
-					'Recurrence starting after requested end',
-				);
-			}
-		}
-	}
-
-	public function testRestoreChanges(): void {
-		$calendarId = $this->createTestCalendar();
-		$uri1 = static::getUniqueID('calobj1') . '.ics';
-		$calData = <<<EOD
+        $uri = static::getUniqueID('calobj');
+        $this->backend->createCalendarObject($calendarId, $uri, $calData);
+
+        $start = new DateTimeImmutable('2023-09-20T00:00:00Z');
+        $end = $start->add(new DateInterval('P14D'));
+
+        $results = $this->backend->search(
+            $calendarInfo,
+            '',
+            [],
+            [
+                'timerange' => [
+                    'start' => $start,
+                    'end' => $end,
+                ]
+            ],
+            null,
+            null,
+        );
+
+        $this->assertCount(1, $results);
+        $this->assertCount(14, $results[0]['objects']);
+        foreach ($results as $result) {
+            foreach ($result['objects'] as $object) {
+                $this->assertEquals($object['UID'][0], '7b7d5d12-683c-48ce-973a-b3e1cb0bae2a');
+                $this->assertEquals($object['SUMMARY'][0], 'Daily Event');
+                $this->assertGreaterThanOrEqual(
+                    $start->getTimestamp(),
+                    $object['DTSTART'][0]->getTimestamp(),
+                    'Recurrence starting before requested start',
+                );
+                $this->assertLessThanOrEqual(
+                    $end->getTimestamp(),
+                    $object['DTSTART'][0]->getTimestamp(),
+                    'Recurrence starting after requested end',
+                );
+            }
+        }
+    }
+
+    public function testRestoreChanges(): void {
+        $calendarId = $this->createTestCalendar();
+        $uri1 = static::getUniqueID('calobj1') . '.ics';
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1577,8 +1577,8 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->createCalendarObject($calendarId, $uri1, $calData);
-		$calData = <<<EOD
+        $this->backend->createCalendarObject($calendarId, $uri1, $calData);
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1595,9 +1595,9 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->updateCalendarObject($calendarId, $uri1, $calData);
-		$uri2 = static::getUniqueID('calobj2') . '.ics';
-		$calData = <<<EOD
+        $this->backend->updateCalendarObject($calendarId, $uri1, $calData);
+        $uri2 = static::getUniqueID('calobj2') . '.ics';
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1613,11 +1613,11 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->createCalendarObject($calendarId, $uri2, $calData);
-		$changesBefore = $this->backend->getChangesForCalendar($calendarId, null, 1);
-		$this->backend->deleteCalendarObject($calendarId, $uri2);
-		$uri3 = static::getUniqueID('calobj3') . '.ics';
-		$calData = <<<EOD
+        $this->backend->createCalendarObject($calendarId, $uri2, $calData);
+        $changesBefore = $this->backend->getChangesForCalendar($calendarId, null, 1);
+        $this->backend->deleteCalendarObject($calendarId, $uri2);
+        $uri3 = static::getUniqueID('calobj3') . '.ics';
+        $calData = <<<EOD
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:Nextcloud Calendar
@@ -1633,261 +1633,261 @@ 
 END:VEVENT
 END:VCALENDAR
 EOD;
-		$this->backend->createCalendarObject($calendarId, $uri3, $calData);
-		$deleteChanges = $this->db->getQueryBuilder();
-		$deleteChanges->delete('calendarchanges')
-			->where($deleteChanges->expr()->eq('calendarid', $deleteChanges->createNamedParameter($calendarId)));
-		$deleteChanges->executeStatement();
-
-		$this->backend->restoreChanges($calendarId);
-
-		$changesAfter = $this->backend->getChangesForCalendar($calendarId, $changesBefore['syncToken'], 1);
-		self::assertEquals([], $changesAfter['added']);
-		self::assertEqualsCanonicalizing([$uri1, $uri3], $changesAfter['modified']);
-		self::assertEquals([$uri2], $changesAfter['deleted']);
-	}
-
-	public function testSearchWithLimitAndTimeRange(): void {
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-		];
-
-		$testFiles = [
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
-		];
-
-		foreach ($testFiles as $testFile) {
-			$objectUri = static::getUniqueID('search-limit-timerange-');
-			$calendarData = \file_get_contents($testFile);
-			$this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
-		}
-
-		$start = new DateTimeImmutable('2024-05-06T00:00:00Z');
-		$end = $start->add(new DateInterval('P14D'));
-
-		$results = $this->backend->search(
-			$calendarInfo,
-			'',
-			[],
-			[
-				'timerange' => [
-					'start' => $start,
-					'end' => $end,
-				]
-			],
-			4,
-			null,
-		);
-
-		$this->assertCount(2, $results);
-
-		$this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
-		$this->assertGreaterThanOrEqual(
-			$start->getTimestamp(),
-			$results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
-			'Recurrence starting before requested start',
-		);
-
-		$this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
-		$this->assertGreaterThanOrEqual(
-			$start->getTimestamp(),
-			$results[1]['objects'][0]['DTSTART'][0]->getTimestamp(),
-			'Recurrence starting before requested start',
-		);
-	}
-
-	public function testSearchWithLimitAndTimeRangeShouldNotReturnMoreObjectsThenLimit(): void {
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-		];
-
-		$testFiles = [
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
-		];
-
-		foreach ($testFiles as $testFile) {
-			$objectUri = static::getUniqueID('search-limit-timerange-');
-			$calendarData = \file_get_contents($testFile);
-			$this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
-		}
-
-		$start = new DateTimeImmutable('2024-05-06T00:00:00Z');
-		$end = $start->add(new DateInterval('P14D'));
-
-		$results = $this->backend->search(
-			$calendarInfo,
-			'',
-			[],
-			[
-				'timerange' => [
-					'start' => $start,
-					'end' => $end,
-				]
-			],
-			1,
-			null,
-		);
-
-		$this->assertCount(1, $results);
-
-		$this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
-		$this->assertGreaterThanOrEqual(
-			$start->getTimestamp(),
-			$results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
-			'Recurrence starting before requested start',
-		);
-	}
-
-	public function testSearchWithLimitAndTimeRangeShouldReturnObjectsInTheSameOrder(): void {
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-		];
-
-		$testFiles = [
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
-		];
-
-		foreach ($testFiles as $testFile) {
-			$objectUri = static::getUniqueID('search-limit-timerange-');
-			$calendarData = \file_get_contents($testFile);
-			$this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
-		}
-
-		$start = new DateTimeImmutable('2024-05-06T00:00:00Z');
-		$end = $start->add(new DateInterval('P14D'));
-
-		$results = $this->backend->search(
-			$calendarInfo,
-			'',
-			[],
-			[
-				'timerange' => [
-					'start' => $start,
-					'end' => $end,
-				]
-			],
-			2,
-			null,
-		);
-
-		$this->assertCount(2, $results);
-
-		$this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
-		$this->assertGreaterThanOrEqual(
-			$start->getTimestamp(),
-			$results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
-			'Recurrence starting before requested start',
-		);
-
-		$this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
-		$this->assertGreaterThanOrEqual(
-			$start->getTimestamp(),
-			$results[1]['objects'][0]['DTSTART'][0]->getTimestamp(),
-			'Recurrence starting before requested start',
-		);
-	}
-
-	public function testSearchShouldReturnObjectsInTheSameOrderMissingDate(): void {
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = [
-			'id' => $calendarId,
-			'principaluri' => 'user1',
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
-		];
-
-		$testFiles = [
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
-			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-missing-start-1.ics',
-			__DIR__ . '/../test_fixtures/caldav-search-missing-start-2.ics',
-		];
-
-		foreach ($testFiles as $testFile) {
-			$objectUri = static::getUniqueID('search-return-objects-in-same-order-');
-			$calendarData = \file_get_contents($testFile);
-			$this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
-		}
-
-		$results = $this->backend->search(
-			$calendarInfo,
-			'',
-			[],
-			[],
-			4,
-			null,
-		);
-
-		$this->assertCount(4, $results);
-
-		$this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
-		$this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
-		$this->assertEquals('Missing DTSTART 1', $results[2]['objects'][0]['SUMMARY'][0]);
-		$this->assertEquals('Missing DTSTART 2', $results[3]['objects'][0]['SUMMARY'][0]);
-	}
-
-	public function testUnshare(): void {
-		$principalGroup = 'principal:' . self::UNIT_TEST_GROUP;
-		$principalUser = 'principal:' . self::UNIT_TEST_USER;
-
-		$l10n = $this->createMock(IL10N::class);
-		$l10n->method('t')
-			->willReturnCallback(fn ($text, $parameters = []) => vsprintf($text, $parameters));
-		$config = $this->createMock(IConfig::class);
-		$logger = new NullLogger();
-
-		$this->principal->expects($this->exactly(2))
-			->method('findByUri')
-			->willReturnMap([
-				[$principalGroup, '', self::UNIT_TEST_GROUP],
-				[$principalUser, '', self::UNIT_TEST_USER],
-			]);
-		$this->groupManager->expects($this->once())
-			->method('groupExists')
-			->willReturn(true);
-		$this->dispatcher->expects($this->exactly(2))
-			->method('dispatchTyped');
-
-		$calendarId = $this->createTestCalendar();
-		$calendarInfo = $this->backend->getCalendarById($calendarId);
-
-		$calendar = new Calendar($this->backend, $calendarInfo, $l10n, $config, $logger);
-
-		$this->backend->updateShares(
-			shareable: $calendar,
-			add: [
-				['href' => $principalGroup, 'readOnly' => false]
-			],
-			remove: []
-		);
-
-		$this->backend->unshare(
-			shareable: $calendar,
-			principal: $principalUser
-		);
-
-	}
+        $this->backend->createCalendarObject($calendarId, $uri3, $calData);
+        $deleteChanges = $this->db->getQueryBuilder();
+        $deleteChanges->delete('calendarchanges')
+            ->where($deleteChanges->expr()->eq('calendarid', $deleteChanges->createNamedParameter($calendarId)));
+        $deleteChanges->executeStatement();
+
+        $this->backend->restoreChanges($calendarId);
+
+        $changesAfter = $this->backend->getChangesForCalendar($calendarId, $changesBefore['syncToken'], 1);
+        self::assertEquals([], $changesAfter['added']);
+        self::assertEqualsCanonicalizing([$uri1, $uri3], $changesAfter['modified']);
+        self::assertEquals([$uri2], $changesAfter['deleted']);
+    }
+
+    public function testSearchWithLimitAndTimeRange(): void {
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+        ];
+
+        $testFiles = [
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
+        ];
+
+        foreach ($testFiles as $testFile) {
+            $objectUri = static::getUniqueID('search-limit-timerange-');
+            $calendarData = \file_get_contents($testFile);
+            $this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
+        }
+
+        $start = new DateTimeImmutable('2024-05-06T00:00:00Z');
+        $end = $start->add(new DateInterval('P14D'));
+
+        $results = $this->backend->search(
+            $calendarInfo,
+            '',
+            [],
+            [
+                'timerange' => [
+                    'start' => $start,
+                    'end' => $end,
+                ]
+            ],
+            4,
+            null,
+        );
+
+        $this->assertCount(2, $results);
+
+        $this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
+        $this->assertGreaterThanOrEqual(
+            $start->getTimestamp(),
+            $results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
+            'Recurrence starting before requested start',
+        );
+
+        $this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
+        $this->assertGreaterThanOrEqual(
+            $start->getTimestamp(),
+            $results[1]['objects'][0]['DTSTART'][0]->getTimestamp(),
+            'Recurrence starting before requested start',
+        );
+    }
+
+    public function testSearchWithLimitAndTimeRangeShouldNotReturnMoreObjectsThenLimit(): void {
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+        ];
+
+        $testFiles = [
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
+        ];
+
+        foreach ($testFiles as $testFile) {
+            $objectUri = static::getUniqueID('search-limit-timerange-');
+            $calendarData = \file_get_contents($testFile);
+            $this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
+        }
+
+        $start = new DateTimeImmutable('2024-05-06T00:00:00Z');
+        $end = $start->add(new DateInterval('P14D'));
+
+        $results = $this->backend->search(
+            $calendarInfo,
+            '',
+            [],
+            [
+                'timerange' => [
+                    'start' => $start,
+                    'end' => $end,
+                ]
+            ],
+            1,
+            null,
+        );
+
+        $this->assertCount(1, $results);
+
+        $this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
+        $this->assertGreaterThanOrEqual(
+            $start->getTimestamp(),
+            $results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
+            'Recurrence starting before requested start',
+        );
+    }
+
+    public function testSearchWithLimitAndTimeRangeShouldReturnObjectsInTheSameOrder(): void {
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+        ];
+
+        $testFiles = [
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
+        ];
+
+        foreach ($testFiles as $testFile) {
+            $objectUri = static::getUniqueID('search-limit-timerange-');
+            $calendarData = \file_get_contents($testFile);
+            $this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
+        }
+
+        $start = new DateTimeImmutable('2024-05-06T00:00:00Z');
+        $end = $start->add(new DateInterval('P14D'));
+
+        $results = $this->backend->search(
+            $calendarInfo,
+            '',
+            [],
+            [
+                'timerange' => [
+                    'start' => $start,
+                    'end' => $end,
+                ]
+            ],
+            2,
+            null,
+        );
+
+        $this->assertCount(2, $results);
+
+        $this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
+        $this->assertGreaterThanOrEqual(
+            $start->getTimestamp(),
+            $results[0]['objects'][0]['DTSTART'][0]->getTimestamp(),
+            'Recurrence starting before requested start',
+        );
+
+        $this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
+        $this->assertGreaterThanOrEqual(
+            $start->getTimestamp(),
+            $results[1]['objects'][0]['DTSTART'][0]->getTimestamp(),
+            'Recurrence starting before requested start',
+        );
+    }
+
+    public function testSearchShouldReturnObjectsInTheSameOrderMissingDate(): void {
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = [
+            'id' => $calendarId,
+            'principaluri' => 'user1',
+            '{http://owncloud.org/ns}owner-principal' => 'user1',
+        ];
+
+        $testFiles = [
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
+            __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-missing-start-1.ics',
+            __DIR__ . '/../test_fixtures/caldav-search-missing-start-2.ics',
+        ];
+
+        foreach ($testFiles as $testFile) {
+            $objectUri = static::getUniqueID('search-return-objects-in-same-order-');
+            $calendarData = \file_get_contents($testFile);
+            $this->backend->createCalendarObject($calendarId, $objectUri, $calendarData);
+        }
+
+        $results = $this->backend->search(
+            $calendarInfo,
+            '',
+            [],
+            [],
+            4,
+            null,
+        );
+
+        $this->assertCount(4, $results);
+
+        $this->assertEquals('Cake Tasting', $results[0]['objects'][0]['SUMMARY'][0]);
+        $this->assertEquals('Pasta Day', $results[1]['objects'][0]['SUMMARY'][0]);
+        $this->assertEquals('Missing DTSTART 1', $results[2]['objects'][0]['SUMMARY'][0]);
+        $this->assertEquals('Missing DTSTART 2', $results[3]['objects'][0]['SUMMARY'][0]);
+    }
+
+    public function testUnshare(): void {
+        $principalGroup = 'principal:' . self::UNIT_TEST_GROUP;
+        $principalUser = 'principal:' . self::UNIT_TEST_USER;
+
+        $l10n = $this->createMock(IL10N::class);
+        $l10n->method('t')
+            ->willReturnCallback(fn ($text, $parameters = []) => vsprintf($text, $parameters));
+        $config = $this->createMock(IConfig::class);
+        $logger = new NullLogger();
+
+        $this->principal->expects($this->exactly(2))
+            ->method('findByUri')
+            ->willReturnMap([
+                [$principalGroup, '', self::UNIT_TEST_GROUP],
+                [$principalUser, '', self::UNIT_TEST_USER],
+            ]);
+        $this->groupManager->expects($this->once())
+            ->method('groupExists')
+            ->willReturn(true);
+        $this->dispatcher->expects($this->exactly(2))
+            ->method('dispatchTyped');
+
+        $calendarId = $this->createTestCalendar();
+        $calendarInfo = $this->backend->getCalendarById($calendarId);
+
+        $calendar = new Calendar($this->backend, $calendarInfo, $l10n, $config, $logger);
+
+        $this->backend->updateShares(
+            shareable: $calendar,
+            add: [
+                ['href' => $principalGroup, 'readOnly' => false]
+            ],
+            remove: []
+        );
+
+        $this->backend->unshare(
+            shareable: $calendar,
+            principal: $principalUser
+        );
+
+    }
 }

apps/dav/tests/integration/DAV/Sharing/CalDavSharingBackendTest.php

Indentation +196 added lines, -196 removed lines

@@ -28,222 +28,222 @@
  */
 class CalDavSharingBackendTest extends TestCase {
 
-	private IDBConnection $db;
-	private IUserManager $userManager;
-	private IGroupManager $groupManager;
-	private Principal $principalBackend;
-	private ICacheFactory $cacheFactory;
-	private LoggerInterface $logger;
-	private SharingMapper $sharingMapper;
-	private SharingService $sharingService;
-	private Backend $sharingBackend;
-
-	private $resourceIds = [10001];
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->db = Server::get(IDBConnection::class);
-
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->principalBackend = $this->createMock(Principal::class);
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->cacheFactory->method('createInMemory')
-			->willReturn(new \OC\Memcache\NullCache());
-		$this->logger = new \Psr\Log\NullLogger();
-
-		$this->sharingMapper = new SharingMapper($this->db);
-		$this->sharingService = new \OCA\DAV\CalDAV\Sharing\Service($this->sharingMapper);
-
-		$this->sharingBackend = new \OCA\DAV\CalDAV\Sharing\Backend(
-			$this->userManager,
-			$this->groupManager,
-			$this->principalBackend,
-			$this->cacheFactory,
-			$this->sharingService,
-			$this->logger
-		);
-
-		$this->removeFixtures();
-	}
-
-	protected function tearDown(): void {
-		$this->removeFixtures();
-	}
-
-	protected function removeFixtures(): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('dav_shares')
-			->where($qb->expr()->in('resourceid', $qb->createNamedParameter($this->resourceIds, IQueryBuilder::PARAM_INT_ARRAY)));
-		$qb->executeStatement();
-	}
-
-	public function testShareCalendarWithGroup(): void {
-		$calendar = $this->createMock(Calendar::class);
-		$calendar->method('getResourceId')
-			->willReturn(10001);
-		$calendar->method('getOwner')
-			->willReturn('principals/users/admin');
-
-		$this->principalBackend->method('findByUri')
-			->willReturn('principals/groups/alice_bob');
-
-		$this->groupManager->method('groupExists')
-			->willReturn(true);
-
-		$this->sharingBackend->updateShares(
-			$calendar,
-			[['href' => 'principals/groups/alice_bob']],
-			[],
-			[]
-		);
-
-		$this->assertCount(1, $this->sharingService->getShares(10001));
-	}
-
-	public function testUnshareCalendarFromGroup(): void {
-		$calendar = $this->createMock(Calendar::class);
-		$calendar->method('getResourceId')
-			->willReturn(10001);
-		$calendar->method('getOwner')
-			->willReturn('principals/users/admin');
-
-		$this->principalBackend->method('findByUri')
-			->willReturn('principals/groups/alice_bob');
-
-		$this->groupManager->method('groupExists')
-			->willReturn(true);
-
-		$this->sharingBackend->updateShares(
-			shareable: $calendar,
-			add: [['href' => 'principals/groups/alice_bob']],
-			remove: [],
-		);
-
-		$this->assertCount(1, $this->sharingService->getShares(10001));
-
-		$this->sharingBackend->updateShares(
-			shareable: $calendar,
-			add: [],
-			remove: ['principals/groups/alice_bob'],
-		);
-
-		$this->assertCount(0, $this->sharingService->getShares(10001));
-	}
-
-	public function testShareCalendarWithGroupAndUnshareAsUser(): void {
-		$calendar = $this->createMock(Calendar::class);
-		$calendar->method('getResourceId')
-			->willReturn(10001);
-		$calendar->method('getOwner')
-			->willReturn('principals/users/admin');
-
-		$this->principalBackend->method('findByUri')
-			->willReturnMap([
-				['principals/groups/alice_bob', '', 'principals/groups/alice_bob'],
-				['principals/users/bob', '', 'principals/users/bob'],
-			]);
-		$this->principalBackend->method('getGroupMembership')
-			->willReturn([
-				'principals/groups/alice_bob',
-			]);
-		$this->principalBackend->method('getCircleMembership')
-			->willReturn([]);
-
-		$this->groupManager->method('groupExists')
-			->willReturn(true);
-
-		/*
+    private IDBConnection $db;
+    private IUserManager $userManager;
+    private IGroupManager $groupManager;
+    private Principal $principalBackend;
+    private ICacheFactory $cacheFactory;
+    private LoggerInterface $logger;
+    private SharingMapper $sharingMapper;
+    private SharingService $sharingService;
+    private Backend $sharingBackend;
+
+    private $resourceIds = [10001];
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->db = Server::get(IDBConnection::class);
+
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->principalBackend = $this->createMock(Principal::class);
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->cacheFactory->method('createInMemory')
+            ->willReturn(new \OC\Memcache\NullCache());
+        $this->logger = new \Psr\Log\NullLogger();
+
+        $this->sharingMapper = new SharingMapper($this->db);
+        $this->sharingService = new \OCA\DAV\CalDAV\Sharing\Service($this->sharingMapper);
+
+        $this->sharingBackend = new \OCA\DAV\CalDAV\Sharing\Backend(
+            $this->userManager,
+            $this->groupManager,
+            $this->principalBackend,
+            $this->cacheFactory,
+            $this->sharingService,
+            $this->logger
+        );
+
+        $this->removeFixtures();
+    }
+
+    protected function tearDown(): void {
+        $this->removeFixtures();
+    }
+
+    protected function removeFixtures(): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('dav_shares')
+            ->where($qb->expr()->in('resourceid', $qb->createNamedParameter($this->resourceIds, IQueryBuilder::PARAM_INT_ARRAY)));
+        $qb->executeStatement();
+    }
+
+    public function testShareCalendarWithGroup(): void {
+        $calendar = $this->createMock(Calendar::class);
+        $calendar->method('getResourceId')
+            ->willReturn(10001);
+        $calendar->method('getOwner')
+            ->willReturn('principals/users/admin');
+
+        $this->principalBackend->method('findByUri')
+            ->willReturn('principals/groups/alice_bob');
+
+        $this->groupManager->method('groupExists')
+            ->willReturn(true);
+
+        $this->sharingBackend->updateShares(
+            $calendar,
+            [['href' => 'principals/groups/alice_bob']],
+            [],
+            []
+        );
+
+        $this->assertCount(1, $this->sharingService->getShares(10001));
+    }
+
+    public function testUnshareCalendarFromGroup(): void {
+        $calendar = $this->createMock(Calendar::class);
+        $calendar->method('getResourceId')
+            ->willReturn(10001);
+        $calendar->method('getOwner')
+            ->willReturn('principals/users/admin');
+
+        $this->principalBackend->method('findByUri')
+            ->willReturn('principals/groups/alice_bob');
+
+        $this->groupManager->method('groupExists')
+            ->willReturn(true);
+
+        $this->sharingBackend->updateShares(
+            shareable: $calendar,
+            add: [['href' => 'principals/groups/alice_bob']],
+            remove: [],
+        );
+
+        $this->assertCount(1, $this->sharingService->getShares(10001));
+
+        $this->sharingBackend->updateShares(
+            shareable: $calendar,
+            add: [],
+            remove: ['principals/groups/alice_bob'],
+        );
+
+        $this->assertCount(0, $this->sharingService->getShares(10001));
+    }
+
+    public function testShareCalendarWithGroupAndUnshareAsUser(): void {
+        $calendar = $this->createMock(Calendar::class);
+        $calendar->method('getResourceId')
+            ->willReturn(10001);
+        $calendar->method('getOwner')
+            ->willReturn('principals/users/admin');
+
+        $this->principalBackend->method('findByUri')
+            ->willReturnMap([
+                ['principals/groups/alice_bob', '', 'principals/groups/alice_bob'],
+                ['principals/users/bob', '', 'principals/users/bob'],
+            ]);
+        $this->principalBackend->method('getGroupMembership')
+            ->willReturn([
+                'principals/groups/alice_bob',
+            ]);
+        $this->principalBackend->method('getCircleMembership')
+            ->willReturn([]);
+
+        $this->groupManager->method('groupExists')
+            ->willReturn(true);
+
+        /*
 		 * Owner is sharing the calendar with a group.
 		 */
-		$this->sharingBackend->updateShares(
-			shareable: $calendar,
-			add: [['href' => 'principals/groups/alice_bob']],
-			remove: [],
-		);
+        $this->sharingBackend->updateShares(
+            shareable: $calendar,
+            add: [['href' => 'principals/groups/alice_bob']],
+            remove: [],
+        );
 
-		$this->assertCount(1, $this->sharingService->getShares(10001));
+        $this->assertCount(1, $this->sharingService->getShares(10001));
 
-		/*
+        /*
 		 * Member of the group unshares the calendar.
 		 */
-		$this->sharingBackend->unshare(
-			shareable: $calendar,
-			principalUri: 'principals/users/bob'
-		);
-
-		$this->assertCount(1, $this->sharingService->getShares(10001));
-		$this->assertCount(1, $this->sharingService->getUnshares(10001));
-	}
-
-	/**
-	 * Tests the functionality of sharing a calendar with a user, then with a group (that includes the shared user),
-	 * and subsequently unsharing it from the individual user. Verifies that the unshare operation correctly removes the specific user share
-	 * without creating an additional unshare entry.
-	 */
-	public function testShareCalendarWithUserThenGroupThenUnshareUser(): void {
-		$calendar = $this->createMock(Calendar::class);
-		$calendar->method('getResourceId')
-			->willReturn(10001);
-		$calendar->method('getOwner')
-			->willReturn('principals/users/admin');
-
-		$this->principalBackend->method('findByUri')
-			->willReturnMap([
-				['principals/groups/alice_bob', '', 'principals/groups/alice_bob'],
-				['principals/users/bob', '', 'principals/users/bob'],
-			]);
-		$this->principalBackend->method('getGroupMembership')
-			->willReturn([
-				'principals/groups/alice_bob',
-			]);
-		$this->principalBackend->method('getCircleMembership')
-			->willReturn([]);
-
-		$this->userManager->method('userExists')
-			->willReturn(true);
-		$this->groupManager->method('groupExists')
-			->willReturn(true);
-
-		/*
+        $this->sharingBackend->unshare(
+            shareable: $calendar,
+            principalUri: 'principals/users/bob'
+        );
+
+        $this->assertCount(1, $this->sharingService->getShares(10001));
+        $this->assertCount(1, $this->sharingService->getUnshares(10001));
+    }
+
+    /**
+     * Tests the functionality of sharing a calendar with a user, then with a group (that includes the shared user),
+     * and subsequently unsharing it from the individual user. Verifies that the unshare operation correctly removes the specific user share
+     * without creating an additional unshare entry.
+     */
+    public function testShareCalendarWithUserThenGroupThenUnshareUser(): void {
+        $calendar = $this->createMock(Calendar::class);
+        $calendar->method('getResourceId')
+            ->willReturn(10001);
+        $calendar->method('getOwner')
+            ->willReturn('principals/users/admin');
+
+        $this->principalBackend->method('findByUri')
+            ->willReturnMap([
+                ['principals/groups/alice_bob', '', 'principals/groups/alice_bob'],
+                ['principals/users/bob', '', 'principals/users/bob'],
+            ]);
+        $this->principalBackend->method('getGroupMembership')
+            ->willReturn([
+                'principals/groups/alice_bob',
+            ]);
+        $this->principalBackend->method('getCircleMembership')
+            ->willReturn([]);
+
+        $this->userManager->method('userExists')
+            ->willReturn(true);
+        $this->groupManager->method('groupExists')
+            ->willReturn(true);
+
+        /*
 		 * Step 1) The owner shares the calendar with a user.
 		 */
-		$this->sharingBackend->updateShares(
-			shareable: $calendar,
-			add: [['href' => 'principals/users/bob']],
-			remove: [],
-		);
+        $this->sharingBackend->updateShares(
+            shareable: $calendar,
+            add: [['href' => 'principals/users/bob']],
+            remove: [],
+        );
 
-		$this->assertCount(1, $this->sharingService->getShares(10001));
+        $this->assertCount(1, $this->sharingService->getShares(10001));
 
-		/*
+        /*
 		 * Step 2) The owner shares the calendar with a group that includes the
 		 * user from step 1 as a member.
 		 */
-		$this->sharingBackend->updateShares(
-			shareable: $calendar,
-			add: [['href' => 'principals/groups/alice_bob']],
-			remove: [],
-		);
+        $this->sharingBackend->updateShares(
+            shareable: $calendar,
+            add: [['href' => 'principals/groups/alice_bob']],
+            remove: [],
+        );
 
-		$this->assertCount(2, $this->sharingService->getShares(10001));
+        $this->assertCount(2, $this->sharingService->getShares(10001));
 
-		/*
+        /*
 		 * Step 3) Unshare the calendar from user as owner.
 		 */
-		$this->sharingBackend->updateShares(
-			shareable: $calendar,
-			add: [],
-			remove: ['principals/users/bob'],
-		);
+        $this->sharingBackend->updateShares(
+            shareable: $calendar,
+            add: [],
+            remove: ['principals/users/bob'],
+        );
 
-		/*
+        /*
 		 * The purpose of this test is to ensure that removing a user from a share, as the owner, does not result in an "unshare" row being added.
 		 * Instead, the actual user share should be removed.
 		 */
-		$this->assertCount(1, $this->sharingService->getShares(10001));
-		$this->assertCount(0, $this->sharingService->getUnshares(10001));
-	}
+        $this->assertCount(1, $this->sharingService->getShares(10001));
+        $this->assertCount(0, $this->sharingService->getUnshares(10001));
+    }
 
 }