Support PHP 8.5

application/forms/MoveRotationForm.php

@@ -35,7 +35,7 @@ class MoveRotationForm extends Form
      *
      * @param ?Connection $db
      */
-    public function __construct(Connection $db = null)
+    public function __construct(?Connection $db = null)
     {
         $this->db = $db;
     }

application/forms/RotationConfigForm.php

@@ -584,9 +584,11 @@ public function removeRotation(int $id): void
     /**
      * Remove all versions of the rotation from the database
      *
+     * @param ?int $priority
+     *
      * @return void
      */
-    public function wipeRotation(int $priority = null): void
+    public function wipeRotation(?int $priority = null): void
     {
         $priority = $priority ?? $this->getValue('priority');
         if ($priority === null) {

library/Notifications/Api/Middleware/MiddlewarePipeline.php

@@ -82,7 +82,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
      *
      * @return ResponseInterface
      */
-    public function execute(ServerRequestInterface $request = null): ResponseInterface
+    public function execute(?ServerRequestInterface $request = null): ResponseInterface
     {
         if ($request === null) {
             $request = new ServerRequest('GET', '/'); // initial dummy request

library/Notifications/Api/OpenApiDescriptionElement/Response/Error404Response.php

@@ -13,7 +13,7 @@
 
 class Error404Response extends Response
 {
-    public function __construct(string $endpointName = null)
+    public function __construct(?string $endpointName = null)
     {
         parent::__construct(
             response: 404,

library/Notifications/Api/V1/ContactGroups.php

@@ -763,7 +763,7 @@ public function prepareRow(stdClass $row): void
      *
      * @throws HttpException if the username already exists
      */
-    private function assertUniqueName(string $name, int $contactgroupId = null): void
+    private function assertUniqueName(string $name, ?int $contactgroupId = null): void
     {
         $stmt = (new Select())
             ->from('contactgroup')

library/Notifications/Api/V1/Contacts.php

@@ -860,7 +860,7 @@ private function removeContact(int $id): void
      *
      * @throws HttpException if the username already exists
      */
-    private function assertUniqueUsername(string $username, int $contactId = null): void
+    private function assertUniqueUsername(string $username, ?int $contactId = null): void
     {
         $stmt = (new Select())
             ->from('contact')

library/Notifications/Common/Database.php

@@ -78,7 +78,15 @@ private static function getConnection(): Connection
 
         $config->options = [PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ];
         if ($config->db === 'mysql') {
-            $config->options[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET SESSION SQL_MODE='STRICT_TRANS_TABLES"
+            // As of PHP 8.5, driver-specific constants of the PDO class are deprecated,
+            // but the replacement constants are only available since PHP 8.4.
+            if (version_compare(PHP_VERSION, '8.4.0', '<')) {
+                $mysqlAttrInitCommand = PDO::MYSQL_ATTR_INIT_COMMAND;
+            } else {
+                $mysqlAttrInitCommand = Pdo\Mysql::ATTR_INIT_COMMAND;
+            }
+
+            $config->options[$mysqlAttrInitCommand] = "SET SESSION SQL_MODE='STRICT_TRANS_TABLES"
                 . ",NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'";
         }
 

library/Notifications/Daemon/Daemon.php

@@ -22,8 +22,7 @@
 use React\EventLoop\Loop;
 use React\EventLoop\LoopInterface;
 
-use function Clue\React\Block\await;
-use function React\Promise\Timer\sleep;
+use function React\Async\delay;
 
 class Daemon extends EventEmitter
 {
@@ -264,7 +263,7 @@ protected function processNotifications(): void
         /** @var IncidentHistory $notification */
         $notificationsToProcess = [];
         foreach ($notifications as $notification) {
-            if (isset($connections[$notification->contact_id])) {
+            if ($notification->contact_id !== null && isset($connections[$notification->contact_id])) {
                 ObjectsRendererHook::register($notification->incident->object);
                 $notificationsToProcess[] = $notification;
 
@@ -323,8 +322,8 @@ protected function run(): void
 
                 $endMs = (int) (microtime(true) * 1000);
                 if (($endMs - $beginMs) < 3000) {
-                    // run took less than 3 seconds; sleep for the remaining duration to prevent heavy db loads
-                    await(sleep((3000 - ($endMs - $beginMs)) / 1000));
+                    // run took less than 3 seconds; delay for the remaining duration to prevent heavy db loads
+                    delay((3000 - ($endMs - $beginMs)) / 1000);
                 }
             }
             self::$logger::debug(self::PREFIX . "cancellation triggered; exiting loop");

library/Notifications/Web/Form/ContactForm.php

@@ -176,7 +176,7 @@ protected function assemble()
 
         $contact->registerElement($defaultChannel);
 
-        $this->addAddressElements($availableTypes, $channelTypes[$defaultChannel->getValue()] ?? null);
+        $this->addAddressElements($availableTypes, $channelTypes[$defaultChannel->getValue() ?? ''] ?? null);
 
         $this->addHtml(new HtmlElement('hr'));
 

library/Notifications/Widget/Detail/IncidentQuickActions.php

@@ -221,7 +221,7 @@ protected function unsubscribe(IncidentContact $incidentContact): void
      *
      * @return void
      */
-    protected function updateHistory(IncidentContact $incidentContact, string $newRole = null): void
+    protected function updateHistory(IncidentContact $incidentContact, ?string $newRole = null): void
     {
         $oldRole = $incidentContact->role;
         $contactId = $incidentContact->contact_id ?? $this->currentUserId;

library/Notifications/Widget/ShowMore.php

@@ -24,7 +24,7 @@ class ShowMore extends BaseHtmlElement
 
     protected $label;
 
-    public function __construct(ResultSet $resultSet, Url $url, string $label = null)
+    public function __construct(ResultSet $resultSet, Url $url, ?string $label = null)
     {
         $this->label = $label;
         $this->resultSet = $resultSet;

library/Notifications/Widget/TimeGrid/BaseGrid.php

@@ -253,7 +253,7 @@ final protected function yieldFlowingEntries(Traversable $entries): Generator
                 $cellOccupiers[$rowStart][$column][] = spl_object_id($entry);
             }
 
-            $occupiedCells->attach($entry, $rows);
+            $occupiedCells->offsetSet($entry, $rows);
         }
 
         $rowPlacements = [];

library/Notifications/Widget/Timeline.php

@@ -222,7 +222,7 @@ public function getEntries(): Traversable
         foreach ($occupiedCells as $cell => $entry) {
             $cells = $entryToCellsMap[$entry] ?? [];
             $cells[] = $cell;
-            $entryToCellsMap->attach($entry, $cells);
+            $entryToCellsMap->offsetSet($entry, $cells);
         }
 
         foreach ($entryToCellsMap as $entry) {