IBX-9060: Updated NotificationQuery references and adjusted NotificationController for stricter type handling

Author: tbialcz

phpstan-baseline.neon

@@ -726,12 +726,6 @@ parameters:
 			count: 1
 			path: src/bundle/Controller/LocationController.php
 
-		-
-			message: '#^Parameter \#1 \$content of class Symfony\\Component\\HttpFoundation\\Response constructor expects string\|null, string\|false given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/bundle/Controller/NotificationController.php
-
 		-
 			message: '#^Argument of an invalid type array\<Ibexa\\Contracts\\Core\\Repository\\Values\\ObjectState\\ObjectState\>\|null supplied for foreach, only iterables are supported\.$#'
 			identifier: foreach.nonIterable

src/bundle/Controller/NotificationController.php

@@ -18,8 +18,9 @@
 use Ibexa\Bundle\AdminUi\Form\Type\SearchType;
 use Ibexa\Contracts\AdminUi\Controller\Controller;
 use Ibexa\Contracts\Core\Repository\NotificationService;
+use Ibexa\Contracts\Core\Repository\Values\Notification\Notification;
 use Ibexa\Contracts\Core\Repository\Values\Notification\Query\Criterion;
-use Ibexa\Contracts\Core\Repository\Values\Notification\Query\Criterion\NotificationQuery;
+use Ibexa\Contracts\Core\Repository\Values\Notification\Query\NotificationQuery;
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\Notification\Renderer\Registry;
 use InvalidArgumentException;
@@ -93,7 +94,7 @@ public function renderNotificationsPageAction(Request $request, int $page): Resp
         $searchForm->handleRequest($request);
 
         $query = new NotificationQuery();
-        if ($searchForm->isSubmitted() && $searchForm->isValid()) {
+        if ($searchForm->isSubmitted() && $searchForm->isValid() && $searchForm->getData() instanceof SearchQueryData) {
             $query = $this->buildQuery($searchForm->getData());
         }
 
@@ -162,12 +163,15 @@ private function buildQuery(SearchQueryData $data): NotificationQuery
         return new NotificationQuery($criteria);
     }
 
+    /**
+     * @param Pagerfanta<\Ibexa\Contracts\Core\Repository\Values\Notification\Notification> $pagerfanta
+     */
     private function createNotificationSelectionData(Pagerfanta $pagerfanta): NotificationSelectionData
     {
         $notifications = [];
 
         foreach ($pagerfanta->getCurrentPageResults() as $notification) {
-            $notifications[$notification->id] = false;
+            $notifications[] = $notification;
         }
 
         return new NotificationSelectionData($notifications);
@@ -200,7 +204,7 @@ public function countNotificationsAction(): JsonResponse
      * server service for websocket connection), so * we need a way to mark notification
      * as read. AJAX call is fine.
      */
-    public function markNotificationAsReadAction(Request $request, mixed $notificationId): JsonResponse
+    public function markNotificationAsReadAction(Request $request, $notificationId): JsonResponse
     {
         $response = new JsonResponse();
 
@@ -283,7 +287,7 @@ public function markAllNotificationsAsReadAction(Request $request): JsonResponse
         }
     }
 
-    public function markNotificationAsUnreadAction(Request $request, mixed $notificationId): JsonResponse
+    public function markNotificationAsUnreadAction(Request $request, $notificationId): JsonResponse
     {
         $response = new JsonResponse();
 
@@ -307,7 +311,7 @@ public function markNotificationAsUnreadAction(Request $request, mixed $notifica
         return $response;
     }
 
-    public function deleteNotificationAction(Request $request, mixed $notificationId): JsonResponse
+    public function deleteNotificationAction(Request $request, $notificationId): JsonResponse
     {
         $response = new JsonResponse();
 

src/lib/Pagination/Pagerfanta/NotificationAdapter.php

@@ -9,7 +9,7 @@
 
 use Ibexa\Contracts\Core\Repository\NotificationService;
 use Ibexa\Contracts\Core\Repository\Values\Notification\NotificationList;
-use Ibexa\Contracts\Core\Repository\Values\Notification\Query\Criterion\NotificationQuery;
+use Ibexa\Contracts\Core\Repository\Values\Notification\Query\NotificationQuery;
 use Pagerfanta\Adapter\AdapterInterface;
 
 /**