Release 2.23.0 (#5075)

src/Repository/Query/BaseQuery.php

@@ -285,7 +285,7 @@ class BaseQuery
         return $this;
     }
 
-    public function setBookmark(Bookmark $bookmark): void
+    public function setBookmark(?Bookmark $bookmark): void
     {
         $this->bookmark = $bookmark;
     }

src/Repository/Query/TimesheetQuery.php

@@ -128,18 +128,6 @@ class TimesheetQuery extends ActivityQuery implements BillableInterface, DateRan
         $this->timesheetUser = $user;
     }
 
-    /**
-     * @return array<int>
-     */
-    public function getActivityIds(): array
-    {
-        return array_values(array_filter(array_unique(array_map(function (Activity $activity) {
-            return $activity->getId();
-        }, $this->activities)), function ($id) {
-            return $id !== null;
-        }));
-    }
-
     /**
      * @return array<Activity>
      */

src/Repository/TimesheetRepository.php

@@ -620,7 +620,7 @@ class TimesheetRepository extends EntityRepository
 
         if ($query->hasActivities()) {
             $qb->andWhere($qb->expr()->in('t.activity', ':activity'))
-                ->setParameter('activity', $query->getActivityIds());
+                ->setParameter('activity', $query->getActivities());
         }
 
         if ($query->hasProjects()) {