refactor: drop fallback for availability coordinator

Fallback can go because Mail 4.0 requires at least Nextcloud 30.

Signed-off-by: Daniel Kesselberg <[email protected]>

lib/Service/OutOfOfficeService.php

@@ -25,27 +25,18 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IUser;
 use OCP\User\IAvailabilityCoordinator;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
 class OutOfOfficeService {
-	private ?IAvailabilityCoordinator $availabilityCoordinator;
 
 	public function __construct(
 		private OutOfOfficeParser $outOfOfficeParser,
 		private SieveService $sieveService,
 		private LoggerInterface $logger,
 		private AliasesService $aliasesService,
 		private ITimeFactory $timeFactory,
-		ContainerInterface $container,
+		private IAvailabilityCoordinator $availabilityCoordinator,
 	) {
-		// TODO: inject directly if we only support Nextcloud >= 28
-		try {
-			$this->availabilityCoordinator = $container->get(IAvailabilityCoordinator::class);
-		} catch (ContainerExceptionInterface $e) {
-			$this->availabilityCoordinator = null;
-		}
 	}
 
 	/**
@@ -102,10 +93,6 @@ public function update(MailAccount $account, OutOfOfficeState $state): void {
 	 * @throws InvalidArgumentException If the given mail account doesn't follow out-of-office settings
 	 */
 	public function updateFromSystem(MailAccount $mailAccount, IUser $user): ?OutOfOfficeState {
-		if ($this->availabilityCoordinator === null) {
-			throw new ServiceException('System out-of-office data is only available in Nextcloud >= 28');
-		}
-
 		if (!$mailAccount->getOutOfOfficeFollowsSystem()) {
 			throw new InvalidArgumentException('The mail account does not follow system out-of-office settings');
 		}

tests/Unit/Service/OutOfOfficeServiceTest.php

@@ -37,19 +37,6 @@ class OutOfOfficeServiceTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		if (!interface_exists(IAvailabilityCoordinator::class)
-			|| !interface_exists(IOutOfOfficeData::class)) {
-			$this->markTestSkipped('Out-of-office feature is not available');
-		}
-
-		$this->container = $this->createMock(ContainerInterface::class);
-		$this->availabilityCoordinator = $this->createMock(IAvailabilityCoordinator::class);
-
-		$this->container->expects(self::once())
-			->method('get')
-			->with(IAvailabilityCoordinator::class)
-			->willReturn($this->availabilityCoordinator);
-
 		$this->serviceMock = $this->createServiceMock(OutOfOfficeService::class, [
 			'container' => $this->container,
 		]);