chore

Author: tchapi

config/services.yaml

@@ -77,7 +77,6 @@ services:
     App\Services\BirthdayService:
         arguments:
             $birthdayReminderOffset: "%birthday_reminder_offset%"
-            $calendarBackend: null  # will be overridden when instantiated manually
 
     App\Security\ApiKeyAuthenticator:
         arguments:

src/Command/SyncBirthdayCalendars.php

@@ -5,6 +5,7 @@
 use App\Entity\User;
 use App\Services\BirthdayService;
 use Doctrine\Persistence\ManagerRegistry;
+use Sabre\CalDAV\Backend\PDO as CalendarBackend;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputArgument;
@@ -18,6 +19,10 @@ public function __construct(
         private BirthdayService $birthdayService,
     ) {
         parent::__construct();
+
+        $em = $doctrine->getManager();
+        $pdo = $em->getConnection()->getNativeConnection();
+        $this->birthdayService->setBackend(new CalendarBackend($pdo));
     }
 
     protected function configure(): void

src/Plugins/BirthdayCalendarPlugin.php

@@ -3,6 +3,7 @@
 namespace App\Plugins;
 
 use App\Services\BirthdayService;
+use Sabre\CalDAV\Backend\PDO as CalendarBackend;
 use Sabre\CardDAV;
 use Sabre\DAV;
 
@@ -18,9 +19,10 @@ class BirthdayCalendarPlugin extends DAV\ServerPlugin
      */
     protected $server;
 
-    public function __construct(BirthdayService $birthdayService)
+    public function __construct(BirthdayService $birthdayService, CalendarBackend $calendarBackend)
     {
         $this->birthdayService = $birthdayService;
+        $this->birthdayService->setBackend($calendarBackend);
     }
 
     public function initialize(DAV\Server $server)

src/Services/BirthdayService.php

@@ -31,16 +31,20 @@
 
 class BirthdayService
 {
+    /**
+     * @var CalendarBackend
+     */
+    private $calendarBackend;
+
     public function __construct(
         private ManagerRegistry $doctrine,
         private string $birthdayReminderOffset,
-        private ?CalendarBackend $calendarBackend = null,
     ) {
-        if (!$calendarBackend) {
-            $em = $this->doctrine->getManager();
-            $pdo = $em->getConnection()->getNativeConnection();
-            $this->calendarBackend = new CalendarBackend($pdo);
-        }
+    }
+
+    public function setBackend(CalendarBackend $calendarBackend)
+    {
+        $this->calendarBackend = $calendarBackend;
     }
 
     public function onCardChanged(int $addressBookId, string $cardUri, string $cardData): void