prepare release 2.16.0

Modernisation fonctionnement module Evénement

Closes #149, #150, and #225

See merge request Chill-Projet/chill-bundles!621

.changes/v2.16.0.md

@@ -0,0 +1,15 @@
+## v2.16.0 - 2024-02-08
+### Feature
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
+* Modernize the event bundle, with some new fields and multiple improvements 
+### Fixed
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
+### UX
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 

.gitlab-ci.yml

@@ -34,6 +34,8 @@ variables:
     DEFAULT_CARRIER_CODE: BE
     # force a timezone
     TZ: Europe/Brussels
+    # avoid direct deprecations (using symfony phpunit bridge: https://symfony.com/doc/4.x/components/phpunit_bridge.html#internal-deprecations
+    SYMFONY_DEPRECATIONS_HELPER: max[total]=99999999&max[self]=0&max[direct]=0&verbose=0
 
 stages:
     - Composer install

CHANGELOG.md

@@ -6,6 +6,22 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v2.16.0 - 2024-02-08
+### Feature
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
+* Modernize the event bundle, with some new fields and multiple improvements 
+### Fixed
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
+### UX
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 
+
 ## v2.15.2 - 2024-01-11
 ### Fixed
 * Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 

docs/source/installation/index.rst

@@ -48,7 +48,7 @@ Clone or download the chill-skeleton project and `cd` into the main directory.
 
 .. code-block:: bash
 
-   git clone https://gitlab.com/Chill-Projet/chill-skeleton-basic.git
+   git clone https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic.git
    cd chill-skeleton-basic
 
 

exports_alias_conventions.md

@@ -5,72 +5,74 @@ Add condition with distinct alias on each export join clauses (Indicators + Filt
 
 These are alias conventions :
 
-| Entity                                  | Join                                    | Attribute                                  | Alias                                  |
-|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:---------------------------------------|
-| AccompanyingPeriod::class               |                                         |                                            | acp                                    |
-|                                         | AccompanyingPeriodWork::class           | acp.works                                  | acpw                                   |
-|                                         | AccompanyingPeriodParticipation::class  | acp.participations                         | acppart                                |
-|                                         | Location::class                         | acp.administrativeLocation                 | acploc                                 |
-|                                         | ClosingMotive::class                    | acp.closingMotive                          | acpmotive                              |
-|                                         | UserJob::class                          | acp.job                                    | acpjob                                 |
-|                                         | Origin::class                           | acp.origin                                 | acporigin                              |
-|                                         | Scope::class                            | acp.scopes                                 | acpscope                               |
-|                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                         |
-|                                         | User::class                             | acp.user                                   | acpuser                                |
-|                                         | AccompanyingPeriopStepHistory::class    | acp.stepHistories                          | acpstephistories                       |
-|                                         | AccompanyingPeriodInfo::class           | not existing (using custom WITH clause)    | acpinfo                                |
-| AccompanyingPeriodWork::class           |                                         |                                            | acpw                                   |
-|                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                               |
-|                                         | SocialAction::class                     | acpw.socialAction                          | acpwsocialaction                       |
-|                                         | Goal::class                             | acpw.goals                                 | goal                                   |
-|                                         | Result::class                           | acpw.results                               | result                                 |
-| AccompanyingPeriodParticipation::class  |                                         |                                            | acppart                                |
-|                                         | Person::class                           | acppart.person                             | partperson                             |
-| AccompanyingPeriodWorkEvaluation::class |                                         |                                            | workeval                               |
-|                                         | Evaluation::class                       | workeval.evaluation                        | eval                                   |
-| AccompanyingPeriodInfo::class           |                                         |                                            | acpinfo                                |
-|                                         | User::class                             | acpinfo.user                               | acpinfo_user                           |
-| Goal::class                             |                                         |                                            | goal                                   |
-|                                         | Result::class                           | goal.results                               | goalresult                             |
-| Person::class                           |                                         |                                            | person                                 |
-|                                         | Center::class                           | person.center                              | center                                 |
-|                                         | HouseholdMember::class                  | partperson.householdParticipations         | householdmember                        |
-|                                         | MaritalStatus::class                    | person.maritalStatus                       | personmarital                          |
-|                                         | VendeePerson::class                     |                                            | vp                                     |
-|                                         | VendeePersonMineur::class               |                                            | vpm                                    |
-|                                         | CurrentPersonAddress::class             | person.currentPersonAddress                | currentPersonAddress (on a given date) |
-| ResidentialAddress::class               |                                         |                                            | resaddr                                |
-|                                         | ThirdParty::class                       | resaddr.hostThirdParty                     | tparty                                 |
-| ThirdParty::class                       |                                         |                                            | tparty                                 |
-|                                         | ThirdPartyCategory::class               | tparty.categories                          | tpartycat                              |
-| HouseholdMember::class                  |                                         |                                            | householdmember                        |
-|                                         | Household::class                        | householdmember.household                  | household                              |
-|                                         | Person::class                           | householdmember.person                     | memberperson                           |
-|                                         |                                         | memberperson.center                        | membercenter                           |
-| Household::class                        |                                         |                                            | household                              |
-|                                         | HouseholdComposition::class             | household.compositions                     | composition                            |
-| Activity::class                         |                                         |                                            | activity                               |
-|                                         | Person::class                           | activity.person                            | actperson                              |
-|                                         | AccompanyingPeriod::class               | activity.accompanyingPeriod                | acp                                    |
-|                                         | Person::class                           | activity\_person\_having\_activity.person  | person\_person\_having\_activity       |
-|                                         | ActivityReason::class                   | activity\_person\_having\_activity.reasons | reasons\_person\_having\_activity      |
-|                                         | ActivityType::class                     | activity.activityType                      | acttype                                |
-|                                         | Location::class                         | activity.location                          | actloc                                 |
-|                                         | SocialAction::class                     | activity.socialActions                     | actsocialaction                        |
-|                                         | SocialIssue::class                      | activity.socialIssues                      | actsocialssue                          |
-|                                         | ThirdParty::class                       | activity.thirdParties                      | acttparty                              |
-|                                         | User::class                             | activity.user                              | actuser                                |
-|                                         | User::class                             | activity.users                             | actusers                               |
-|                                         | ActivityReason::class                   | activity.reasons                           | actreasons                             |
-|                                         | Center::class                           | actperson.center                           | actcenter                              |
-|                                         | Person::class                           | activity.createdBy                         | actcreator                             |
-| ActivityReason::class                   |                                         |                                            | actreasons                             |
-|                                         | ActivityReasonCategory::class           | actreason.category                         | actreasoncat                           |
-| Calendar::class                         |                                         |                                            | cal                                    |
-|                                         | CancelReason::class                     | cal.cancelReason                           | calcancel                              |
-|                                         | Location::class                         | cal.location                               | calloc                                 |
-|                                         | User::class                             | cal.user                                   | caluser                                |
-| VendeePerson::class                     |                                         |                                            | vp                                     |
-|                                         | SituationProfessionelle::class          | vp.situationProfessionelle                 | vpprof                                 |
-|                                         | StatutLogement::class                   | vp.statutLogement                          | vplog                                  |
-|                                         | TempsDeTravail::class                   | vp.tempsDeTravail                          | vptt                                   |
+| Entity                                  | Join                                    | Attribute                                  | Alias                                      |
+|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:-------------------------------------------|
+| AccompanyingPeriodStepHistory::class    |                                         |                                            | acpstephistory (contexte ACP_STEP_HISTORY) |
+|                                         | AccompanyingPeriod::class               | acpstephistory.period                      | acp                                        |
+| AccompanyingPeriod::class               |                                         |                                            | acp                                        |
+|                                         | AccompanyingPeriodWork::class           | acp.works                                  | acpw                                       |
+|                                         | AccompanyingPeriodParticipation::class  | acp.participations                         | acppart                                    |
+|                                         | Location::class                         | acp.administrativeLocation                 | acploc                                     |
+|                                         | ClosingMotive::class                    | acp.closingMotive                          | acpmotive                                  |
+|                                         | UserJob::class                          | acp.job                                    | acpjob                                     |
+|                                         | Origin::class                           | acp.origin                                 | acporigin                                  |
+|                                         | Scope::class                            | acp.scopes                                 | acpscope                                   |
+|                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                             |
+|                                         | User::class                             | acp.user                                   | acpuser                                    |
+|                                         | AccompanyingPeriopStepHistory::class    | acp.stepHistories                          | acpstephistories                           |
+|                                         | AccompanyingPeriodInfo::class           | not existing (using custom WITH clause)    | acpinfo                                    |
+| AccompanyingPeriodWork::class           |                                         |                                            | acpw                                       |
+|                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                                   |
+|                                         | SocialAction::class                     | acpw.socialAction                          | acpwsocialaction                           |
+|                                         | Goal::class                             | acpw.goals                                 | goal                                       |
+|                                         | Result::class                           | acpw.results                               | result                                     |
+| AccompanyingPeriodParticipation::class  |                                         |                                            | acppart                                    |
+|                                         | Person::class                           | acppart.person                             | partperson                                 |
+| AccompanyingPeriodWorkEvaluation::class |                                         |                                            | workeval                                   |
+|                                         | Evaluation::class                       | workeval.evaluation                        | eval                                       |
+| AccompanyingPeriodInfo::class           |                                         |                                            | acpinfo                                    |
+|                                         | User::class                             | acpinfo.user                               | acpinfo_user                               |
+| Goal::class                             |                                         |                                            | goal                                       |
+|                                         | Result::class                           | goal.results                               | goalresult                                 |
+| Person::class                           |                                         |                                            | person                                     |
+|                                         | Center::class                           | person.center                              | center                                     |
+|                                         | HouseholdMember::class                  | partperson.householdParticipations         | householdmember                            |
+|                                         | MaritalStatus::class                    | person.maritalStatus                       | personmarital                              |
+|                                         | VendeePerson::class                     |                                            | vp                                         |
+|                                         | VendeePersonMineur::class               |                                            | vpm                                        |
+|                                         | CurrentPersonAddress::class             | person.currentPersonAddress                | currentPersonAddress (on a given date)     |
+| ResidentialAddress::class               |                                         |                                            | resaddr                                    |
+|                                         | ThirdParty::class                       | resaddr.hostThirdParty                     | tparty                                     |
+| ThirdParty::class                       |                                         |                                            | tparty                                     |
+|                                         | ThirdPartyCategory::class               | tparty.categories                          | tpartycat                                  |
+| HouseholdMember::class                  |                                         |                                            | householdmember                            |
+|                                         | Household::class                        | householdmember.household                  | household                                  |
+|                                         | Person::class                           | householdmember.person                     | memberperson                               |
+|                                         |                                         | memberperson.center                        | membercenter                               |
+| Household::class                        |                                         |                                            | household                                  |
+|                                         | HouseholdComposition::class             | household.compositions                     | composition                                |
+| Activity::class                         |                                         |                                            | activity                                   |
+|                                         | Person::class                           | activity.person                            | actperson                                  |
+|                                         | AccompanyingPeriod::class               | activity.accompanyingPeriod                | acp                                        |
+|                                         | Person::class                           | activity\_person\_having\_activity.person  | person\_person\_having\_activity           |
+|                                         | ActivityReason::class                   | activity\_person\_having\_activity.reasons | reasons\_person\_having\_activity          |
+|                                         | ActivityType::class                     | activity.activityType                      | acttype                                    |
+|                                         | Location::class                         | activity.location                          | actloc                                     |
+|                                         | SocialAction::class                     | activity.socialActions                     | actsocialaction                            |
+|                                         | SocialIssue::class                      | activity.socialIssues                      | actsocialssue                              |
+|                                         | ThirdParty::class                       | activity.thirdParties                      | acttparty                                  |
+|                                         | User::class                             | activity.user                              | actuser                                    |
+|                                         | User::class                             | activity.users                             | actusers                                   |
+|                                         | ActivityReason::class                   | activity.reasons                           | actreasons                                 |
+|                                         | Center::class                           | actperson.center                           | actcenter                                  |
+|                                         | Person::class                           | activity.createdBy                         | actcreator                                 |
+| ActivityReason::class                   |                                         |                                            | actreasons                                 |
+|                                         | ActivityReasonCategory::class           | actreason.category                         | actreasoncat                               |
+| Calendar::class                         |                                         |                                            | cal                                        |
+|                                         | CancelReason::class                     | cal.cancelReason                           | calcancel                                  |
+|                                         | Location::class                         | cal.location                               | calloc                                     |
+|                                         | User::class                             | cal.user                                   | caluser                                    |
+| VendeePerson::class                     |                                         |                                            | vp                                         |
+|                                         | SituationProfessionelle::class          | vp.situationProfessionelle                 | vpprof                                     |
+|                                         | StatutLogement::class                   | vp.statutLogement                          | vplog                                      |
+|                                         | TempsDeTravail::class                   | vp.tempsDeTravail                          | vptt                                       |

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -291,7 +291,11 @@ class ActivityType
     public function checkSocialActionsVisibility(ExecutionContextInterface $context, mixed $payload)
     {
         if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
-            if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) {
+            // if social issues are invisible then social actions cannot be optional or required + if social issues are optional then social actions shouldn't be required
+            if (
+                (0 === $this->socialIssuesVisible && (1 === $this->socialActionsVisible || 2 === $this->socialActionsVisible))
+                || (1 === $this->socialIssuesVisible && 2 === $this->socialActionsVisible)
+            ) {
                 $context
                     ->buildViolation('The socialActionsVisible value is not compatible with the socialIssuesVisible value')
                     ->atPath('socialActionsVisible')

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityTypeAggregator.php

@@ -57,7 +57,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, mixed $data)
     {
-        return function (null|int|string $value): string {
+        return function (int|string|null $value): string {
             if ('_header' === $value) {
                 return 'export.aggregator.acp.by_activity_type.activity_type';
             }

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityPresenceAggregator.php

@@ -35,7 +35,7 @@ final readonly class ActivityPresenceAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, mixed $data)
     {
-        return function (null|int|string $value): string {
+        return function (int|string|null $value): string {
             if ('_header' === $value) {
                 return 'export.aggregator.activity.by_activity_presence.header';
             }

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
@@ -25,8 +25,11 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    public function __construct(protected ActivityReasonCategoryRepository $activityReasonCategoryRepository, protected ActivityReasonRepository $activityReasonRepository, protected TranslatableStringHelper $translatableStringHelper)
-    {
+    public function __construct(
+        protected ActivityReasonCategoryRepository $activityReasonCategoryRepository,
+        protected ActivityReasonRepository $activityReasonRepository,
+        protected TranslatableStringHelper $translatableStringHelper
+    ) {
     }
 
     public function addRole(): ?string
@@ -51,7 +54,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
 
         // make a jointure only if needed
         if (!\in_array('actreasons', $qb->getAllAliases(), true)) {
-            $qb->innerJoin('activity.reasons', 'actreasons');
+            $qb->leftJoin('activity.reasons', 'actreasons');
         }
 
         // join category if necessary
@@ -62,19 +65,12 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
             }
         }
 
-        // add the "group by" part
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (\count($groupBy) > 0) {
-            $qb->addGroupBy($alias);
-        } else {
-            $qb->groupBy($alias);
-        }
+        $qb->addGroupBy($alias);
     }
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_PERSON;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -96,7 +92,9 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
 
     public function getFormDefaultData(): array
     {
-        return [];
+        return [
+            'level' => 'reasons',
+        ];
     }
 
     public function getLabels($key, array $values, $data)

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php

@@ -58,7 +58,7 @@ class ActivityTypeAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, $data): \Closure
     {
-        return function (null|int|string $value): string {
+        return function (int|string|null $value): string {
             if ('_header' === $value) {
                 return 'Activity type';
             }

src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php

@@ -36,14 +36,14 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
     ) {
     }
 
-    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface
+    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface
     {
         $query = $this->buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext($person, $startDate, $endDate, $content);
 
         return $this->addFetchQueryByPersonACL($query, $person);
     }
 
-    public function buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    public function buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
         $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -72,7 +72,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         return $this->addWhereClauses($query, $startDate, $endDate, $content);
     }
 
-    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
         $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -123,7 +123,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         return $this->addWhereClauses($query, $startDate, $endDate, $content);
     }
 
-    private function addWhereClauses(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    private function addWhereClauses(FetchQuery $query, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
 

src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepositoryInterface.php

@@ -25,12 +25,12 @@ interface ActivityDocumentACLAwareRepositoryInterface
      *
      * This method must check the rights to see a document: the user must be allowed to see the given activities
      */
-    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface;
+    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface;
 
     /**
      * Return a fetch query for querying document's activities for an activity in accompanying periods, but for a given person.
      *
      * This method must check the rights to see a document: the user must be allowed to see the given accompanying periods
      */
-    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery;
+    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery;
 }

src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php

@@ -34,7 +34,7 @@ class ActivityPresenceRepository implements ActivityPresenceRepositoryInterface
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php

@@ -25,7 +25,7 @@ interface ActivityPresenceRepositoryInterface
     /**
      * @return array|ActivityPresence[]
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
 
     public function findOneBy(array $criteria): ?ActivityPresence;
 

src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php

@@ -48,7 +48,7 @@ final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
     /**
      * @return array|ActivityType[]
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php

@@ -37,7 +37,7 @@ final readonly class AccompanyingPeriodActivityGenericDocProvider implements Gen
     ) {
     }
 
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
         $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -100,7 +100,7 @@ final readonly class AccompanyingPeriodActivityGenericDocProvider implements Gen
         return $this->security->isGranted(AccompanyingPeriodVoter::SEE, $person);
     }
 
-    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         return $this->activityDocumentACLAwareRepository
             ->buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext($person, $startDate, $endDate, $content);

src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php

@@ -28,7 +28,7 @@ final readonly class PersonActivityGenericDocProvider implements GenericDocForPe
     ) {
     }
 
-    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         return $this->personActivityDocumentACLAwareRepository->buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(
             $person,

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php

@@ -9,10 +9,10 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\PersonAggregators;
+namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;
+use Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -33,14 +33,14 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
         self::bootKernel();
 
         $this->aggregator = self::$container->get(ActivityReasonAggregator::class);
+        /*
+                $request = $this->prophesize()
+                    ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
 
-        $request = $this->prophesize()
-            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+                $request->getLocale()->willReturn('fr');
 
-        $request->getLocale()->willReturn('fr');
-
-        self::$container->get('request_stack')
-            ->push($request->reveal());
+                self::$container->get('request_stack')
+                    ->push($request->reveal());*/
     }
 
     public function getAggregator()
@@ -65,7 +65,12 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
-                ->from(Activity::class, 'activity'),
+                ->from(Activity::class, 'activity')
+                ->join('activity.person', 'person'),
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'accompanyingPeriod'),
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')

src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php

@@ -157,7 +157,7 @@ final class ActivityVoterTest extends KernelTestCase
      *
      * @return \Symfony\Component\Security\Core\Authentication\Token\TokenInterface
      */
-    protected function prepareToken(User $user = null)
+    protected function prepareToken(?User $user = null)
     {
         $token = $this->prophet->prophesize();
         $token

src/Bundle/ChillActivityBundle/config/services/export.yaml

@@ -153,7 +153,7 @@ services:
 
 
     ## Aggregators
-    Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator:
+    Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator:
         tags:
             - { name: chill.export_aggregator, alias: activity_reason_aggregator }
 

src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php

@@ -49,7 +49,7 @@ final class AsideActivityController extends CRUDController
         return $asideActivity;
     }
 
-    protected function buildQueryEntities(string $action, Request $request, FilterOrderHelper $filterOrder = null)
+    protected function buildQueryEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null)
     {
         $qb = parent::buildQueryEntities($action, $request);
 

src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php

@@ -32,7 +32,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
      *
      * @Assert\NotBlank
      */
-    private \Chill\MainBundle\Entity\User $agent;
+    private User $agent;
 
     /**
      * @ORM\Column(type="datetime")
@@ -44,7 +44,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
      *
      * @ORM\JoinColumn(nullable=false)
      */
-    private \Chill\MainBundle\Entity\User $createdBy;
+    private User $createdBy;
 
     /**
      * @ORM\Column(type="datetime")
@@ -82,7 +82,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
      *
      * @ORM\JoinColumn(nullable=false)
      */
-    private ?\Chill\AsideActivityBundle\Entity\AsideActivityCategory $type = null;
+    private ?AsideActivityCategory $type = null;
 
     /**
      * @ORM\Column(type="datetime", nullable=true)
@@ -92,7 +92,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      */
-    private \Chill\MainBundle\Entity\User $updatedBy;
+    private User $updatedBy;
 
     public function getAgent(): ?User
     {

src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php

@@ -49,7 +49,7 @@ class AsideActivityCategoryRepository implements ObjectRepository
      *
      * @return AsideActivityCategory[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php

@@ -132,14 +132,14 @@ abstract class AbstractElement
         return $this;
     }
 
-    public function setComment(string $comment = null): self
+    public function setComment(?string $comment = null): self
     {
         $this->comment = $comment;
 
         return $this;
     }
 
-    public function setEndDate(\DateTimeInterface $endDate = null): self
+    public function setEndDate(?\DateTimeInterface $endDate = null): self
     {
         if ($endDate instanceof \DateTime) {
             $this->endDate = \DateTimeImmutable::createFromMutable($endDate);

src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php

@@ -66,7 +66,7 @@ final class ChargeKindRepository implements ChargeKindRepositoryInterface
      *
      * @return array<ChargeKind>
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php

@@ -36,7 +36,7 @@ interface ChargeKindRepositoryInterface extends ObjectRepository
     /**
      * @return array<ChargeKind>
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
 
     public function findOneBy(array $criteria): ?ChargeKind;
 

src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php

@@ -71,7 +71,7 @@ final class ResourceKindRepository implements ResourceKindRepositoryInterface
      *
      * @return list<ResourceKind>
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepositoryInterface.php

@@ -36,7 +36,7 @@ interface ResourceKindRepositoryInterface extends ObjectRepository
     /**
      * @return list<ResourceKind>
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
 
     public function findOneBy(array $criteria): ?ResourceKind;
 

src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php

@@ -32,7 +32,7 @@ final class Version20221207105407 extends AbstractMigration implements Container
         return 'Use new budget admin entities';
     }
 
-    public function setContainer(ContainerInterface $container = null)
+    public function setContainer(?ContainerInterface $container = null)
     {
         $this->container = $container;
     }

src/Bundle/ChillCalendarBundle/Exception/UserAbsenceSyncException.php

@@ -13,7 +13,7 @@ namespace Chill\CalendarBundle\Exception;
 
 class UserAbsenceSyncException extends \LogicException
 {
-    public function __construct(string $message = '', int $code = 20_230_706, \Throwable $previous = null)
+    public function __construct(string $message = '', int $code = 20_230_706, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php

@@ -33,7 +33,7 @@ final readonly class MSUserAbsenceReader implements MSUserAbsenceReaderInterface
     /**
      * @throw UserAbsenceSyncException when the data cannot be reached or is not valid from microsoft
      */
-    public function isUserAbsent(User $user): null|bool
+    public function isUserAbsent(User $user): bool|null
     {
         $id = $this->mapCalendarToUser->getUserId($user);
 

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderInterface.php

@@ -18,5 +18,5 @@ interface MSUserAbsenceReaderInterface
     /**
      * @throw UserAbsenceSyncException when the data cannot be reached or is not valid from microsoft
      */
-    public function isUserAbsent(User $user): null|bool;
+    public function isUserAbsent(User $user): bool|null;
 }

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php

@@ -29,7 +29,7 @@ class MachineHttpClient implements HttpClientInterface
 
     private readonly HttpClientInterface $decoratedClient;
 
-    public function __construct(private readonly MachineTokenStorage $machineTokenStorage, HttpClientInterface $decoratedClient = null)
+    public function __construct(private readonly MachineTokenStorage $machineTokenStorage, ?HttpClientInterface $decoratedClient = null)
     {
         $this->decoratedClient = $decoratedClient ?? \Symfony\Component\HttpClient\HttpClient::create();
     }
@@ -68,7 +68,7 @@ class MachineHttpClient implements HttpClientInterface
         return $this->decoratedClient->request($method, $url, $options);
     }
 
-    public function stream($responses, float $timeout = null): ResponseStreamInterface
+    public function stream($responses, ?float $timeout = null): ResponseStreamInterface
     {
         return $this->decoratedClient->stream($responses, $timeout);
     }

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php

@@ -178,8 +178,8 @@ class MapCalendarToUser
     public function writeSubscriptionMetadata(
         User $user,
         int $expiration,
-        string $id = null,
-        string $secret = null
+        ?string $id = null,
+        ?string $secret = null
     ): void {
         $user->setAttributeByDomain(self::METADATA_KEY, self::EXPIRATION_SUBSCRIPTION_EVENT, $expiration);
 

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php

@@ -29,7 +29,7 @@ class OnBehalfOfUserHttpClient
 
     private readonly HttpClientInterface $decoratedClient;
 
-    public function __construct(private readonly OnBehalfOfUserTokenStorage $tokenStorage, HttpClientInterface $decoratedClient = null)
+    public function __construct(private readonly OnBehalfOfUserTokenStorage $tokenStorage, ?HttpClientInterface $decoratedClient = null)
     {
         $this->decoratedClient = $decoratedClient ?? \Symfony\Component\HttpClient\HttpClient::create();
     }
@@ -63,7 +63,7 @@ class OnBehalfOfUserHttpClient
         return $this->decoratedClient->request($method, $url, $options);
     }
 
-    public function stream($responses, float $timeout = null): ResponseStreamInterface
+    public function stream($responses, ?float $timeout = null): ResponseStreamInterface
     {
         return $this->decoratedClient->stream($responses, $timeout);
     }

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php

@@ -171,7 +171,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         }
     }
 
-    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, CalendarRange $associatedCalendarRange = null): void
+    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, ?CalendarRange $associatedCalendarRange = null): void
     {
         if ('' === $remoteId) {
             return;

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php

@@ -46,7 +46,7 @@ class NullRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         return [];
     }
 
-    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, CalendarRange $associatedCalendarRange = null): void
+    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, ?CalendarRange $associatedCalendarRange = null): void
     {
     }
 

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php

@@ -47,7 +47,7 @@ interface RemoteCalendarConnectorInterface
      */
     public function listEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array;
 
-    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, CalendarRange $associatedCalendarRange = null): void;
+    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, ?CalendarRange $associatedCalendarRange = null): void;
 
     public function removeCalendarRange(string $remoteId, array $remoteAttributes, User $user): void;
 

src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php

@@ -159,7 +159,7 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
     /**
      * @return array|Calendar[]
      */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array
     {
         $qb = $this->buildQueryByAccompanyingPeriod($period, $startDate, $endDate)->select('c');
 
@@ -178,7 +178,7 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
         return $qb->getQuery()->getResult();
     }
 
-    public function findByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array
+    public function findByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array
     {
         $qb = $this->buildQueryByPerson($person, $startDate, $endDate)
             ->select('c');

src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php

@@ -46,7 +46,7 @@ interface CalendarACLAwareRepositoryInterface
     /**
      * @return array|Calendar[]
      */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array;
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array;
 
     /**
      * Return all the calendars which are associated with a person, either on @see{Calendar::person} or within.
@@ -58,5 +58,5 @@ interface CalendarACLAwareRepositoryInterface
      *
      * @return array|Calendar[]
      */
-    public function findByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array;
+    public function findByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array;
 }

src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php

@@ -35,7 +35,7 @@ class CalendarDocRepository implements ObjectRepository, CalendarDocRepositoryIn
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepositoryInterface.php

@@ -25,7 +25,7 @@ interface CalendarDocRepositoryInterface
     /**
      * @return array|CalendarDoc[]
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null);
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null);
 
     public function findOneBy(array $criteria): ?CalendarDoc;
 

src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php

@@ -52,7 +52,7 @@ class CalendarRangeRepository implements ObjectRepository
     /**
      * @return array|CalendarRange[]
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -64,8 +64,8 @@ class CalendarRangeRepository implements ObjectRepository
         User $user,
         \DateTimeImmutable $from,
         \DateTimeImmutable $to,
-        int $limit = null,
-        int $offset = null
+        ?int $limit = null,
+        ?int $offset = null
     ): array {
         $qb = $this->buildQueryAvailableRangesForUser($user, $from, $to);
 

src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php

@@ -46,7 +46,7 @@ class CalendarRepository implements ObjectRepository
             ->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -67,7 +67,7 @@ class CalendarRepository implements ObjectRepository
     /**
      * @return array|Calendar[]
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -75,7 +75,7 @@ class CalendarRepository implements ObjectRepository
     /**
      * @return array|Calendar[]
      */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $orderBy = null, int $limit = null, int $offset = null): array
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->findBy(
             [
@@ -87,7 +87,7 @@ class CalendarRepository implements ObjectRepository
         );
     }
 
-    public function findByNotificationAvailable(\DateTimeImmutable $startDate, \DateTimeImmutable $endDate, int $limit = null, int $offset = null): array
+    public function findByNotificationAvailable(\DateTimeImmutable $startDate, \DateTimeImmutable $endDate, ?int $limit = null, ?int $offset = null): array
     {
         $qb = $this->queryByNotificationAvailable($startDate, $endDate)->select('c');
 
@@ -105,7 +105,7 @@ class CalendarRepository implements ObjectRepository
     /**
      * @return array|Calendar[]
      */
-    public function findByUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to, int $limit = null, int $offset = null): array
+    public function findByUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to, ?int $limit = null, ?int $offset = null): array
     {
         $qb = $this->buildQueryByUser($user, $from, $to)->select('c');
 

src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php

@@ -41,7 +41,7 @@ class InviteRepository implements ObjectRepository
     /**
      * @return array|Invite[]
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
     {
         return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php

@@ -44,7 +44,7 @@ final readonly class AccompanyingPeriodCalendarGenericDocProvider implements Gen
     /**
      * @throws MappingException
      */
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         $classMetadata = $this->em->getClassMetadata(CalendarDoc::class);
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
@@ -91,7 +91,7 @@ final readonly class AccompanyingPeriodCalendarGenericDocProvider implements Gen
         return $this->security->isGranted(CalendarVoter::SEE, $accompanyingPeriod);
     }
 
-    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         $classMetadata = $this->em->getClassMetadata(CalendarDoc::class);
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);

src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/PersonCalendarGenericDocProvider.php

@@ -40,7 +40,7 @@ final readonly class PersonCalendarGenericDocProvider implements GenericDocForPe
     ) {
     }
 
-    private function addWhereClausesToQuery(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    private function addWhereClausesToQuery(FetchQuery $query, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
 
@@ -74,7 +74,7 @@ final readonly class PersonCalendarGenericDocProvider implements GenericDocForPe
     /**
      * @throws MappingException
      */
-    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         $classMetadata = $this->em->getClassMetadata(CalendarDoc::class);
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);

src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php

@@ -202,8 +202,8 @@ final class CalendarContextTest extends TestCase
     }
 
     private function buildCalendarContext(
-        EntityManagerInterface $entityManager = null,
-        NormalizerInterface $normalizer = null
+        ?EntityManagerInterface $entityManager = null,
+        ?NormalizerInterface $normalizer = null
     ): CalendarContext {
         $baseContext = $this->prophesize(BaseContextData::class);
         $baseContext->getData(null)->willReturn(['base_context' => 'data']);

src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php

@@ -363,7 +363,7 @@ class CustomFieldsGroupController extends AbstractController
      *
      * @return \Symfony\Component\Form\Form
      */
-    private function createMakeDefaultForm(CustomFieldsGroup $group = null)
+    private function createMakeDefaultForm(?CustomFieldsGroup $group = null)
     {
         return $this->createFormBuilder($group, [
             'method' => 'POST',

src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php

@@ -156,7 +156,7 @@ class CustomFieldChoice extends AbstractCustomField
         return $serialized;
     }
 
-    public function extractOtherValue(CustomField $cf, array $data = null)
+    public function extractOtherValue(CustomField $cf, ?array $data = null)
     {
         return $data['_other'];
     }
@@ -355,7 +355,7 @@ class CustomFieldChoice extends AbstractCustomField
      * If the value had an 'allow_other' = true option, the returned value
      * **is not** the content of the _other field, but the `_other` string.
      */
-    private function guessValue(null|array|string $value)
+    private function guessValue(array|string|null $value)
     {
         if (null === $value) {
             return null;

src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php

@@ -38,7 +38,7 @@ class CustomField
      *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup",
      * inversedBy="customFields")
      */
-    private ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup $customFieldGroup = null;
+    private ?CustomFieldsGroup $customFieldGroup = null;
 
     /**
      * @ORM\Id
@@ -212,7 +212,7 @@ class CustomField
      *
      * @return CustomField
      */
-    public function setCustomFieldsGroup(CustomFieldsGroup $customFieldGroup = null)
+    public function setCustomFieldsGroup(?CustomFieldsGroup $customFieldGroup = null)
     {
         $this->customFieldGroup = $customFieldGroup;
 

src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php

@@ -63,7 +63,7 @@ class Option
      *
      * @ORM\JoinColumn(nullable=true)
      */
-    private ?\Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option $parent = null;
+    private ?Option $parent = null;
 
     /**
      * A json representation of text (multilingual).
@@ -182,7 +182,7 @@ class Option
     /**
      * @return $this
      */
-    public function setParent(Option $parent = null)
+    public function setParent(?Option $parent = null)
     {
         $this->parent = $parent;
         $this->key = $parent->getKey();

src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php

@@ -33,7 +33,7 @@ class CustomFieldsDefaultGroup
      *
      *     sf4 check: option inversedBy="customFields" return inconsistent error mapping !!
      */
-    private ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup $customFieldsGroup = null;
+    private ?CustomFieldsGroup $customFieldsGroup = null;
 
     /**
      * @ORM\Column(type="string", length=255)

src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php

@@ -139,7 +139,7 @@ class CustomFieldsGroup
     /**
      * Get name.
      */
-    public function getName(string $language = null): array|string
+    public function getName(?string $language = null): array|string
     {
         // TODO set this in a service, PLUS twig function
         if (null !== $language) {

src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php

@@ -84,7 +84,7 @@ class CustomFieldProvider implements ContainerAwareInterface
      *
      * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
      */
-    public function setContainer(ContainerInterface $container = null)
+    public function setContainer(?ContainerInterface $container = null)
     {
         if (null === $container) {
             throw new \LogicException('container should not be null');

src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php

@@ -25,7 +25,7 @@ final class CustomFieldsHelperTest extends KernelTestCase
 {
     private ?object $cfHelper = null;
 
-    private \Chill\CustomFieldsBundle\Entity\CustomField $randomCFText;
+    private CustomField $randomCFText;
 
     protected function setUp(): void
     {

src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php

@@ -13,5 +13,5 @@ namespace Chill\DocGeneratorBundle\GeneratorDriver;
 
 interface DriverInterface
 {
-    public function generateFromString(string $template, string $resourceType, array $data, string $templateName = null): string;
+    public function generateFromString(string $template, string $resourceType, array $data, ?string $templateName = null): string;
 }

src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php

@@ -17,7 +17,7 @@ namespace Chill\DocGeneratorBundle\GeneratorDriver\Exception;
  */
 class TemplateException extends \RuntimeException
 {
-    public function __construct(private readonly array $errors, $code = 0, \Throwable $previous = null)
+    public function __construct(private readonly array $errors, $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct('Error while generating document from template', $code, $previous);
     }

src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php

@@ -33,7 +33,7 @@ final class RelatorioDriver implements DriverInterface
         $this->url = $parameterBag->get('chill_doc_generator')['driver']['relatorio']['url'];
     }
 
-    public function generateFromString(string $template, string $resourceType, array $data, string $templateName = null): string
+    public function generateFromString(string $template, string $resourceType, array $data, ?string $templateName = null): string
     {
         $form = new FormDataPart(
             [

src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php

@@ -58,7 +58,7 @@ final class DocGeneratorTemplateRepository implements ObjectRepository
      *
      * @return DocGeneratorTemplate[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -85,7 +85,7 @@ final class DocGeneratorTemplateRepository implements ObjectRepository
             ->getResult();
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?DocGeneratorTemplate
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?DocGeneratorTemplate
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }

src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php

@@ -20,7 +20,7 @@ class NormalizeNullValueHelper
     {
     }
 
-    public function normalize(array $attributes, string $format = 'docgen', ?array $context = [], ClassMetadataInterface $classMetadata = null)
+    public function normalize(array $attributes, string $format = 'docgen', ?array $context = [], ?ClassMetadataInterface $classMetadata = null)
     {
         $data = [];
         $data['isNull'] = true;

src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php

@@ -21,7 +21,7 @@ class BaseContextData
     {
     }
 
-    public function getData(User $user = null): array
+    public function getData(?User $user = null): array
     {
         $data = [];
 

src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php

@@ -46,10 +46,10 @@ class Generator implements GeneratorInterface
         DocGeneratorTemplate $template,
         int $entityId,
         array $contextGenerationDataNormalized,
-        StoredObject $destinationStoredObject = null,
+        ?StoredObject $destinationStoredObject = null,
         bool $isTest = false,
-        File $testFile = null,
-        User $creator = null
+        ?File $testFile = null,
+        ?User $creator = null
     ): ?string {
         if ($destinationStoredObject instanceof StoredObject && StoredObject::STATUS_PENDING !== $destinationStoredObject->getStatus()) {
             $this->logger->info(self::LOG_PREFIX.'Aborting generation of an already generated document');

src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php

@@ -16,7 +16,7 @@ class GeneratorException extends \RuntimeException
     /**
      * @param string[] $errors
      */
-    public function __construct(private readonly array $errors = [], \Throwable $previous = null)
+    public function __construct(private readonly array $errors = [], ?\Throwable $previous = null)
     {
         parent::__construct(
             'Could not generate the document',

src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php

@@ -33,9 +33,9 @@ interface GeneratorInterface
         DocGeneratorTemplate $template,
         int $entityId,
         array $contextGenerationDataNormalized,
-        StoredObject $destinationStoredObject = null,
+        ?StoredObject $destinationStoredObject = null,
         bool $isTest = false,
-        File $testFile = null,
-        User $creator = null
+        ?File $testFile = null,
+        ?User $creator = null
     ): ?string;
 }

src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php

@@ -13,7 +13,7 @@ namespace Chill\DocGeneratorBundle\Service\Generator;
 
 class RelatedEntityNotFoundException extends \RuntimeException
 {
-    public function __construct(string $relatedEntityClass, int $relatedEntityId, \Throwable $previous = null)
+    public function __construct(string $relatedEntityClass, int $relatedEntityId, ?\Throwable $previous = null)
     {
         parent::__construct(
             sprintf('Related entity not found: %s, %s', $relatedEntityClass, $relatedEntityId),

src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php

@@ -56,7 +56,7 @@ final class BaseContextDataTest extends KernelTestCase
     }
 
     private function buildBaseContext(
-        NormalizerInterface $normalizer = null
+        ?NormalizerInterface $normalizer = null
     ): BaseContextData {
         return new BaseContextData(
             $normalizer ?? self::$container->get(NormalizerInterface::class)

src/Bundle/ChillDocStoreBundle/Entity/Document.php

@@ -37,7 +37,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
      *     @ORM\JoinColumn(name="category_id_inside_bundle", referencedColumnName="id_inside_bundle")
      * })
      */
-    private ?\Chill\DocStoreBundle\Entity\DocumentCategory $category = null;
+    private ?DocumentCategory $category = null;
 
     /**
      * @ORM\Column(type="datetime")
@@ -61,12 +61,12 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
      *     message="Upload a document"
      * )
      */
-    private ?\Chill\DocStoreBundle\Entity\StoredObject $object = null;
+    private ?StoredObject $object = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate")
      */
-    private ?\Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate $template = null;
+    private ?DocGeneratorTemplate $template = null;
 
     /**
      * @ORM\Column(type="text")
@@ -138,7 +138,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setObject(StoredObject $object = null)
+    public function setObject(?StoredObject $object = null)
     {
         $this->object = $object;
 

src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php

@@ -43,7 +43,7 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt
      *
      * @var Scope The document's center
      */
-    private ?\Chill\MainBundle\Entity\Scope $scope = null;
+    private ?Scope $scope = null;
 
     public function getCenter()
     {

src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php

@@ -17,10 +17,10 @@ interface GenericDocForAccompanyingPeriodProviderInterface
 {
     public function buildFetchQueryForAccompanyingPeriod(
         AccompanyingPeriod $accompanyingPeriod,
-        \DateTimeImmutable $startDate = null,
-        \DateTimeImmutable $endDate = null,
-        string $content = null,
-        string $origin = null
+        ?\DateTimeImmutable $startDate = null,
+        ?\DateTimeImmutable $endDate = null,
+        ?string $content = null,
+        ?string $origin = null
     ): FetchQueryInterface;
 
     /**

src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForPersonProviderInterface.php

@@ -17,10 +17,10 @@ interface GenericDocForPersonProviderInterface
 {
     public function buildFetchQueryForPerson(
         Person $person,
-        \DateTimeImmutable $startDate = null,
-        \DateTimeImmutable $endDate = null,
-        string $content = null,
-        string $origin = null
+        ?\DateTimeImmutable $startDate = null,
+        ?\DateTimeImmutable $endDate = null,
+        ?string $content = null,
+        ?string $origin = null
     ): FetchQueryInterface;
 
     /**

src/Bundle/ChillDocStoreBundle/GenericDoc/Manager.php

@@ -43,9 +43,9 @@ final readonly class Manager
      */
     public function countDocForAccompanyingPeriod(
         AccompanyingPeriod $accompanyingPeriod,
-        \DateTimeImmutable $startDate = null,
-        \DateTimeImmutable $endDate = null,
-        string $content = null,
+        ?\DateTimeImmutable $startDate = null,
+        ?\DateTimeImmutable $endDate = null,
+        ?string $content = null,
         array $places = []
     ): int {
         ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($accompanyingPeriod, $startDate, $endDate, $content, $places);
@@ -73,9 +73,9 @@ final readonly class Manager
 
     public function countDocForPerson(
         Person $person,
-        \DateTimeImmutable $startDate = null,
-        \DateTimeImmutable $endDate = null,
-        string $content = null,
+        ?\DateTimeImmutable $startDate = null,
+        ?\DateTimeImmutable $endDate = null,
+        ?string $content = null,
         array $places = []
     ): int {
         ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($person, $startDate, $endDate, $content, $places);
@@ -94,9 +94,9 @@ final readonly class Manager
         AccompanyingPeriod $accompanyingPeriod,
         int $offset = 0,
         int $limit = 20,
-        \DateTimeImmutable $startDate = null,
-        \DateTimeImmutable $endDate = null,
-        string $content = null,
+        ?\DateTimeImmutable $startDate = null,
+        ?\DateTimeImmutable $endDate = null,
+        ?string $content = null,
         array $places = []
     ): iterable {
         ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($accompanyingPeriod, $startDate, $endDate, $content, $places);
@@ -137,9 +137,9 @@ final readonly class Manager
         Person $person,
         int $offset = 0,
         int $limit = 20,
-        \DateTimeImmutable $startDate = null,
-        \DateTimeImmutable $endDate = null,
-        string $content = null,
+        ?\DateTimeImmutable $startDate = null,
+        ?\DateTimeImmutable $endDate = null,
+        ?string $content = null,
         array $places = []
     ): iterable {
         ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($person, $startDate, $endDate, $content, $places);
@@ -183,9 +183,9 @@ final readonly class Manager
      */
     private function buildUnionQuery(
         AccompanyingPeriod|Person $linked,
-        \DateTimeImmutable $startDate = null,
-        \DateTimeImmutable $endDate = null,
-        string $content = null,
+        ?\DateTimeImmutable $startDate = null,
+        ?\DateTimeImmutable $endDate = null,
+        ?string $content = null,
         array $places = [],
     ): array {
         $queries = [];

src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php

@@ -34,7 +34,7 @@ final readonly class AccompanyingCourseDocumentGenericDocProvider implements Gen
     ) {
     }
 
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         $classMetadata = $this->entityManager->getClassMetadata(AccompanyingCourseDocument::class);
 
@@ -59,7 +59,7 @@ final readonly class AccompanyingCourseDocumentGenericDocProvider implements Gen
         return $this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $accompanyingPeriod);
     }
 
-    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         $classMetadata = $this->entityManager->getClassMetadata(AccompanyingCourseDocument::class);
 
@@ -108,7 +108,7 @@ final readonly class AccompanyingCourseDocumentGenericDocProvider implements Gen
         return $this->security->isGranted(AccompanyingPeriodVoter::SEE, $person);
     }
 
-    private function addWhereClause(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    private function addWhereClause(FetchQuery $query, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
     {
         $classMetadata = $this->entityManager->getClassMetadata(AccompanyingCourseDocument::class);
 

src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/PersonDocumentGenericDocProvider.php

@@ -32,10 +32,10 @@ final readonly class PersonDocumentGenericDocProvider implements GenericDocForPe
 
     public function buildFetchQueryForPerson(
         Person $person,
-        \DateTimeImmutable $startDate = null,
-        \DateTimeImmutable $endDate = null,
-        string $content = null,
-        string $origin = null
+        ?\DateTimeImmutable $startDate = null,
+        ?\DateTimeImmutable $endDate = null,
+        ?string $content = null,
+        ?string $origin = null
     ): FetchQueryInterface {
         return $this->personDocumentACLAwareRepository->buildFetchQueryForPerson(
             $person,
@@ -50,7 +50,7 @@ final readonly class PersonDocumentGenericDocProvider implements GenericDocForPe
         return $this->security->isGranted(PersonDocumentVoter::SEE, $person);
     }
 
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         return $this->personDocumentACLAwareRepository->buildFetchQueryForAccompanyingPeriod($accompanyingPeriod, $startDate, $endDate, $content);
     }

src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php

@@ -55,7 +55,7 @@ class AccompanyingCourseDocumentRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php

@@ -41,7 +41,7 @@ class DocumentCategoryRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php

@@ -48,14 +48,14 @@ final readonly class PersonDocumentACLAwareRepository implements PersonDocumentA
         return $qb;
     }
 
-    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface
     {
         $query = $this->buildBaseFetchQueryForPerson($person, $startDate, $endDate, $content);
 
         return $this->addFetchQueryByPersonACL($query, $person);
     }
 
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $period, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface
     {
         $personDocMetadata = $this->em->getClassMetadata(PersonDocument::class);
         $participationMetadata = $this->em->getClassMetadata(AccompanyingPeriodParticipation::class);
@@ -114,7 +114,7 @@ final readonly class PersonDocumentACLAwareRepository implements PersonDocumentA
         return $this->addFilterClauses($query, $startDate, $endDate, $content);
     }
 
-    public function buildBaseFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    public function buildBaseFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
     {
         $personDocMetadata = $this->em->getClassMetadata(PersonDocument::class);
 
@@ -134,7 +134,7 @@ final readonly class PersonDocumentACLAwareRepository implements PersonDocumentA
         return $this->addFilterClauses($query, $startDate, $endDate, $content);
     }
 
-    private function addFilterClauses(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    private function addFilterClauses(FetchQuery $query, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
     {
         $personDocMetadata = $this->em->getClassMetadata(PersonDocument::class);
 

src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php

@@ -29,15 +29,15 @@ interface PersonDocumentACLAwareRepositoryInterface
 
     public function buildFetchQueryForPerson(
         Person $person,
-        \DateTimeImmutable $startDate = null,
-        \DateTimeImmutable $endDate = null,
-        string $content = null
+        ?\DateTimeImmutable $startDate = null,
+        ?\DateTimeImmutable $endDate = null,
+        ?string $content = null
     ): FetchQueryInterface;
 
     public function buildFetchQueryForAccompanyingPeriod(
         AccompanyingPeriod $period,
-        \DateTimeImmutable $startDate = null,
-        \DateTimeImmutable $endDate = null,
-        string $content = null
+        ?\DateTimeImmutable $startDate = null,
+        ?\DateTimeImmutable $endDate = null,
+        ?string $content = null
     ): FetchQueryInterface;
 }

src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentRepository.php

@@ -39,7 +39,7 @@ readonly class PersonDocumentRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php

@@ -44,7 +44,7 @@ final class StoredObjectRepository implements ObjectRepository
      *
      * @return array<int, StoredObject>
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php

@@ -136,13 +136,13 @@ final readonly class WopiEditTwigExtensionRuntime implements RuntimeExtensionInt
     }
 
     /**
-     * @param array{small: boolean} $options
+     * @param array{small: bool} $options
      *
      * @throws \Twig\Error\LoaderError
      * @throws \Twig\Error\RuntimeError
      * @throws \Twig\Error\SyntaxError
      */
-    public function renderButtonGroup(Environment $environment, StoredObject $document, string $title = null, bool $canEdit = true, array $options = []): string
+    public function renderButtonGroup(Environment $environment, StoredObject $document, ?string $title = null, bool $canEdit = true, array $options = []): string
     {
         return $environment->render(self::TEMPLATE_BUTTON_GROUP, [
             'document' => $document,
@@ -153,7 +153,7 @@ final readonly class WopiEditTwigExtensionRuntime implements RuntimeExtensionInt
         ]);
     }
 
-    public function renderEditButton(Environment $environment, StoredObject $document, array $options = null): string
+    public function renderEditButton(Environment $environment, StoredObject $document, ?array $options = null): string
     {
         return $environment->render(self::TEMPLATE, [
             'document' => $document,

src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/ManagerTest.php

@@ -174,7 +174,7 @@ class ManagerTest extends KernelTestCase
 
 final readonly class SimpleGenericDocAccompanyingPeriodProvider implements GenericDocForAccompanyingPeriodProviderInterface
 {
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         $query = new FetchQuery(
             'accompanying_course_document_dummy',
@@ -196,7 +196,7 @@ final readonly class SimpleGenericDocAccompanyingPeriodProvider implements Gener
 
 final readonly class SimpleGenericDocPersonProvider implements GenericDocForPersonProviderInterface
 {
-    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         $query = new FetchQuery(
             'dummy_person_doc',

src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProviderTest.php

@@ -40,7 +40,7 @@ class AccompanyingCourseDocumentGenericDocProviderTest extends KernelTestCase
     /**
      * @dataProvider provideSearchArguments
      */
-    public function testWithoutAnyArgument(?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, string $content = null): void
+    public function testWithoutAnyArgument(?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content = null): void
     {
         $period = $this->entityManager->createQuery('SELECT a FROM '.AccompanyingPeriod::class.' a')
             ->setMaxResults(1)

src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php

@@ -53,7 +53,7 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function testBuildFetchQueryForPerson(\DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): void
+    public function testBuildFetchQueryForPerson(?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): void
     {
         $centerManager = $this->prophesize(CenterResolverManagerInterface::class);
         $centerManager->resolveCenters(Argument::type(Person::class))
@@ -92,9 +92,9 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
      */
     public function testBuildFetchQueryForAccompanyingPeriod(
         AccompanyingPeriod $period,
-        \DateTimeImmutable $startDate = null,
-        \DateTimeImmutable $endDate = null,
-        string $content = null
+        ?\DateTimeImmutable $startDate = null,
+        ?\DateTimeImmutable $endDate = null,
+        ?string $content = null
     ): void {
         $centerManager = $this->prophesize(CenterResolverManagerInterface::class);
         $centerManager->resolveCenters(Argument::type(Person::class))

src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php

@@ -90,7 +90,7 @@ final class StoredObjectManagerTest extends TestCase
     /**
      * @dataProvider getDataProvider
      */
-    public function testRead(StoredObject $storedObject, string $encodedContent, string $clearContent, string $exceptionClass = null)
+    public function testRead(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null)
     {
         if (null !== $exceptionClass) {
             $this->expectException($exceptionClass);
@@ -104,7 +104,7 @@ final class StoredObjectManagerTest extends TestCase
     /**
      * @dataProvider getDataProvider
      */
-    public function testWrite(StoredObject $storedObject, string $encodedContent, string $clearContent, string $exceptionClass = null)
+    public function testWrite(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null)
     {
         if (null !== $exceptionClass) {
             $this->expectException($exceptionClass);

src/Bundle/ChillEventBundle/Controller/EventController.php

@@ -17,10 +17,11 @@ use Chill\EventBundle\Form\EventType;
 use Chill\EventBundle\Form\Type\PickEventType;
 use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Form\Type\PickPersonType;
+use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Csv;
@@ -37,53 +38,26 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class EventController.
  */
-class EventController extends AbstractController
+final class EventController extends AbstractController
 {
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
-
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-
-    /**
-     * @var FormFactoryInterface
-     */
-    protected $formFactoryInterface;
-
-    /**
-     * @var PaginatorFactory
-     */
-    protected $paginator;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
     /**
      * EventController constructor.
      */
     public function __construct(
-        EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper,
-        FormFactoryInterface $formFactoryInterface,
-        TranslatorInterface $translator,
-        PaginatorFactory $paginator
+        private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly AuthorizationHelperInterface $authorizationHelper,
+        private readonly FormFactoryInterface $formFactoryInterface,
+        private readonly TranslatorInterface $translator,
+        private readonly PaginatorFactory $paginator,
+        private readonly Security $security,
     ) {
-        $this->eventDispatcher = $eventDispatcher;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->formFactoryInterface = $formFactoryInterface;
-        $this->translator = $translator;
-        $this->paginator = $paginator;
     }
 
     /**
@@ -181,7 +155,7 @@ class EventController extends AbstractController
 
         $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
 
-        $reachablesCircles = $this->authorizationHelper->getReachableCircles(
+        $reachablesCircles = $this->authorizationHelper->getReachableScopes(
             $this->getUser(),
             EventVoter::SEE,
             $person->getCenter()
@@ -233,6 +207,12 @@ class EventController extends AbstractController
      */
     public function newAction(?Center $center, Request $request)
     {
+        $user = $this->security->getUser();
+
+        if (!$user instanceof User) {
+            throw new AccessDeniedHttpException('not a regular user. Maybe an administrator ?');
+        }
+
         if (null === $center) {
             $center_id = $request->query->get('center_id');
             $center = $this->getDoctrine()->getRepository(Center::class)->find($center_id);
@@ -240,6 +220,7 @@ class EventController extends AbstractController
 
         $entity = new Event();
         $entity->setCenter($center);
+        $entity->setLocation($user->getCurrentLocation());
 
         $form = $this->createCreateForm($entity);
         $form->handleRequest($request);
@@ -282,7 +263,7 @@ class EventController extends AbstractController
         }
 
         $form = $this->formFactoryInterface
-            ->createNamedBuilder(null, FormType::class, null, [
+            ->createNamedBuilder('', FormType::class, null, [
                 'csrf_protection' => false,
             ])
             ->setMethod('GET')
@@ -323,7 +304,7 @@ class EventController extends AbstractController
         }
 
         $this->denyAccessUnlessGranted(
-            'CHILL_EVENT_SEE_DETAILS',
+            EventVoter::SEE_DETAILS,
             $event,
             'You are not allowed to see details on this event'
         );
@@ -367,7 +348,7 @@ class EventController extends AbstractController
             $this->addFlash('success', $this->translator
                 ->trans('The event was updated'));
 
-            return $this->redirectToRoute('chill_event__event_edit', ['event_id' => $event_id]);
+            return $this->redirectToRoute('chill_event__event_show', ['event_id' => $event_id]);
         }
 
         return $this->render('@ChillEvent/Event/edit.html.twig', [
@@ -385,7 +366,7 @@ class EventController extends AbstractController
     {
         /** @var \Symfony\Component\Form\FormBuilderInterface $builder */
         $builder = $this
-            ->get('form.factory')
+            ->formFactoryInterface
             ->createNamedBuilder(
                 null,
                 FormType::class,
@@ -430,11 +411,9 @@ class EventController extends AbstractController
      */
     protected function createAddParticipationByPersonForm(Event $event)
     {
-        /** @var \Symfony\Component\Form\FormBuilderInterface $builder */
-        $builder = $this
-            ->get('form.factory')
+        $builder = $this->formFactoryInterface
             ->createNamedBuilder(
-                null,
+                '',
                 FormType::class,
                 null,
                 [
@@ -444,23 +423,17 @@ class EventController extends AbstractController
                 ]
             );
 
-        $builder->add('person_id', PickPersonType::class, [
-            'role' => 'CHILL_EVENT_CREATE',
-            'centers' => $event->getCenter(),
+        $builder->add('person_id', PickPersonDynamicType::class, [
+            'as_id' => true,
+            'multiple' => false,
+            'submit_on_adding_new_entity' => true,
+            'label' => 'Add a participation',
         ]);
 
         $builder->add('event_id', HiddenType::class, [
             'data' => $event->getId(),
         ]);
 
-        $builder->add(
-            'submit',
-            SubmitType::class,
-            [
-                'label' => 'Add a participation',
-            ]
-        );
-
         return $builder->getForm();
     }
 
@@ -469,7 +442,7 @@ class EventController extends AbstractController
      */
     protected function createExportByFormatForm()
     {
-        $builder = $this->createFormBuilder()
+        $builder = $this->createFormBuilder(['format' => 'xlsx'])
             ->add('format', ChoiceType::class, [
                 'choices' => [
                     'xlsx' => 'xlsx',

src/Bundle/ChillEventBundle/Controller/EventListController.php

@@ -0,0 +1,118 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\EventBundle\Controller;
+
+use Chill\EventBundle\Entity\Event;
+use Chill\EventBundle\Entity\EventType;
+use Chill\EventBundle\Repository\EventACLAwareRepositoryInterface;
+use Chill\EventBundle\Repository\EventTypeRepository;
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Twig\Environment;
+
+final readonly class EventListController
+{
+    public function __construct(
+        private Environment $environment,
+        private EventACLAwareRepositoryInterface $eventACLAwareRepository,
+        private EventTypeRepository $eventTypeRepository,
+        private FilterOrderHelperFactory $filterOrderHelperFactory,
+        private FormFactoryInterface $formFactory,
+        private PaginatorFactoryInterface $paginatorFactory,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+        private UrlGeneratorInterface $urlGenerator,
+    ) {
+    }
+
+    /**
+     * @Route("{_locale}/event/event/list", name="chill_event_event_list")
+     */
+    public function __invoke(): Response
+    {
+        $filter = $this->buildFilterOrder();
+        $filterData = [
+            'q' => (string) $filter->getQueryString(),
+            'dates' => $filter->getDateRangeData('dates'),
+            'event_types' => $filter->getEntityChoiceData('event_types'),
+        ];
+        $total = $this->eventACLAwareRepository->countAllViewable($filterData);
+        $pagination = $this->paginatorFactory->create($total);
+        $events = $this->eventACLAwareRepository->findAllViewable($filterData, $pagination->getCurrentPageFirstItemNumber(), $pagination->getItemsPerPage());
+        $eventForms = [];
+        foreach ($events as $event) {
+            $eventForms[$event->getId()] = $this->createAddParticipationByPersonForm($event)->createView();
+        }
+
+        return new Response($this->environment->render(
+            '@ChillEvent/Event/page_list.html.twig',
+            [
+                'events' => $events,
+                'pagination' => $pagination,
+                'eventForms' => $eventForms,
+                'filter' => $filter,
+            ]
+        ));
+    }
+
+    private function buildFilterOrder(): FilterOrderHelper
+    {
+        $types = $this->eventTypeRepository->findAllActive();
+
+        $builder = $this->filterOrderHelperFactory->create(__METHOD__);
+        $builder
+            ->addDateRange('dates', 'event.filter.event_dates')
+            ->addSearchBox(['name'])
+            ->addEntityChoice('event_types', 'event.filter.event_types', EventType::class, $types, [
+                'choice_label' => fn (EventType $e) => $this->translatableStringHelper->localize($e->getName()),
+            ]);
+
+        return $builder->build();
+    }
+
+    private function createAddParticipationByPersonForm(Event $event): FormInterface
+    {
+        $builder = $this->formFactory
+            ->createNamedBuilder(
+                '',
+                FormType::class,
+                null,
+                [
+                    'method' => 'GET',
+                    'action' => $this->urlGenerator->generate('chill_event_participation_new'),
+                    'csrf_protection' => false,
+                ]
+            );
+
+        $builder->add('person_id', PickPersonDynamicType::class, [
+            'as_id' => true,
+            'multiple' => false,
+            'submit_on_adding_new_entity' => true,
+            'label' => 'Add a participation',
+        ]);
+
+        $builder->add('event_id', HiddenType::class, [
+            'data' => $event->getId(),
+        ]);
+
+        return $builder->getForm();
+    }
+}

src/Bundle/ChillEventBundle/Controller/ParticipationController.php

@@ -14,7 +14,10 @@ namespace Chill\EventBundle\Controller;
 use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Entity\Participation;
 use Chill\EventBundle\Form\ParticipationType;
+use Chill\EventBundle\Repository\EventRepository;
 use Chill\EventBundle\Security\Authorization\ParticipationVoter;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\Common\Collections\Collection;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -28,13 +31,17 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 /**
  * Class ParticipationController.
  */
-class ParticipationController extends AbstractController
+final class ParticipationController extends AbstractController
 {
     /**
      * ParticipationController constructor.
      */
-    public function __construct(private readonly LoggerInterface $logger, private readonly TranslatorInterface $translator)
-    {
+    public function __construct(
+        private readonly LoggerInterface $logger,
+        private readonly TranslatorInterface $translator,
+        private readonly EventRepository $eventRepository,
+        private readonly PersonRepository $personRepository,
+    ) {
     }
 
     /**
@@ -230,6 +237,7 @@ class ParticipationController extends AbstractController
         return $this->render('@ChillEvent/Participation/new.html.twig', [
             'form' => $form->createView(),
             'participation' => $participation,
+            'ignored_participations' => [],
         ]);
     }
 
@@ -539,7 +547,7 @@ class ParticipationController extends AbstractController
      * If the request is multiple, the $participation object is cloned.
      * Limitations: the $participation should not be persisted.
      *
-     * @return Participation|Participation[] return one single participation if $multiple == false
+     * @return Participation|list<Participation> return one single participation if $multiple == false
      *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException    if the event/person is not found
      * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedException if the user does not have access to event/person
@@ -548,7 +556,7 @@ class ParticipationController extends AbstractController
         Request $request,
         Participation $participation,
         bool $multiple = false
-    ): array|\Chill\EventBundle\Entity\Participation {
+    ): array|Participation {
         $em = $this->getDoctrine()->getManager();
 
         if ($em->contains($participation)) {
@@ -556,30 +564,25 @@ class ParticipationController extends AbstractController
         }
 
         $event_id = $request->query->getInt('event_id', 0); // sf4 check:
-        // prevent error: `Argument 2 passed to ::getInt() must be of the type int, null given`
 
-        if (null !== $event_id) {
-            $event = $em->getRepository(Event::class)
-                ->find($event_id);
+        $event = $this->eventRepository->find($event_id);
 
-            if (null === $event) {
-                throw $this->createNotFoundException('The event with id '.$event_id.' is not found');
-            }
-
-            $this->denyAccessUnlessGranted(
-                'CHILL_EVENT_SEE',
-                $event,
-                'The user is not allowed to see the event'
-            );
-
-            $participation->setEvent($event);
+        if (null === $event) {
+            throw $this->createNotFoundException('The event with id '.$event_id.' is not found');
         }
 
+        $this->denyAccessUnlessGranted(
+            'CHILL_EVENT_SEE',
+            $event,
+            'The user is not allowed to see the event'
+        );
+
+        $participation->setEvent($event);
+
         // this script should be able to handle multiple, so we translate
         // single person_id in an array
         $persons_ids = $request->query->has('person_id') ?
-            [$request->query->getInt('person_id', 0)]  // sf4 check:
-               // prevent error: `Argument 2 passed to ::getInt() must be of the type int, null given`
+            [$request->query->get('person_id', 0)]
             : explode(',', (string) $request->query->get('persons_ids'));
         $participations = [];
 
@@ -588,15 +591,14 @@ class ParticipationController extends AbstractController
             $participation = \count($persons_ids) > 1 ? clone $participation : $participation;
 
             if (null !== $person_id) {
-                $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)
-                    ->find($person_id);
+                $person = $this->personRepository->find($person_id);
 
                 if (null === $person) {
                     throw $this->createNotFoundException('The person with id '.$person_id.' is not found');
                 }
 
                 $this->denyAccessUnlessGranted(
-                    'CHILL_PERSON_SEE',
+                    PersonVoter::SEE,
                     $person,
                     'The user is not allowed to see the person'
                 );

src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\EventBundle\DependencyInjection;
 
 use Chill\EventBundle\Security\Authorization\EventVoter;
+use Chill\EventBundle\Security\Authorization\ParticipationVoter;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -33,10 +34,8 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/authorization.yaml');
-        $loader->load('services/controller.yaml');
         $loader->load('services/fixtures.yaml');
         $loader->load('services/forms.yaml');
-        $loader->load('services/menu.yaml');
         $loader->load('services/repositories.yaml');
         $loader->load('services/search.yaml');
         $loader->load('services/timeline.yaml');
@@ -61,6 +60,8 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
                 EventVoter::SEE_DETAILS => [EventVoter::SEE],
                 EventVoter::UPDATE => [EventVoter::SEE_DETAILS],
                 EventVoter::CREATE => [EventVoter::SEE_DETAILS],
+                ParticipationVoter::SEE_DETAILS => [ParticipationVoter::SEE],
+                ParticipationVoter::UPDATE => [ParticipationVoter::SEE_DETAILS],
             ],
         ]);
     }

src/Bundle/ChillEventBundle/Entity/Event.php

@@ -11,15 +11,23 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Entity;
 
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Class Event.
@@ -30,17 +38,22 @@ use Doctrine\ORM\Mapping as ORM;
  *
  * @ORM\HasLifecycleCallbacks
  */
-class Event implements HasCenterInterface, HasScopeInterface
+class Event implements HasCenterInterface, HasScopeInterface, TrackCreationInterface, TrackUpdateInterface
 {
+    use TrackCreationTrait;
+    use TrackUpdateTrait;
+
     /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")A
+     *
+     * @Assert\NotNull()
      */
-    private ?\Chill\MainBundle\Entity\Center $center = null;
+    private ?Center $center = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
      */
-    private ?\Chill\MainBundle\Entity\Scope $circle = null;
+    private ?Scope $circle = null;
 
     /**
      * @ORM\Column(type="datetime")
@@ -59,10 +72,12 @@ class Event implements HasCenterInterface, HasScopeInterface
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
-    private ?\Chill\MainBundle\Entity\User $moderator = null;
+    private ?User $moderator = null;
 
     /**
      * @ORM\Column(type="string", length=150)
+     *
+     * @Assert\NotBlank()
      */
     private ?string $name = null;
 
@@ -77,8 +92,36 @@ class Event implements HasCenterInterface, HasScopeInterface
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\EventType")
+     *
+     * @Assert\NotNull()
      */
-    private ?\Chill\EventBundle\Entity\EventType $type = null;
+    private ?EventType $type = null;
+
+    /**
+     * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="comment_")
+     */
+    private CommentEmbeddable $comment;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Location::class)
+     *
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?Location $location = null;
+
+    /**
+     * @var Collection<StoredObject>
+     *
+     * @ORM\ManyToMany(targetEntity=StoredObject::class, cascade={"persist","refresh"})
+     *
+     * @ORM\JoinTable("chill_event_event_documents")
+     */
+    private Collection $documents;
+
+    /**
+     * @ORM\Column(type="decimal", precision=10, scale=4, nullable=true, options={"default": null})
+     */
+    private string $organizationCost = '0.0';
 
     /**
      * Event constructor.
@@ -86,6 +129,8 @@ class Event implements HasCenterInterface, HasScopeInterface
     public function __construct()
     {
         $this->participations = new ArrayCollection();
+        $this->documents = new ArrayCollection();
+        $this->comment = new CommentEmbeddable();
     }
 
     /**
@@ -100,6 +145,22 @@ class Event implements HasCenterInterface, HasScopeInterface
         return $this;
     }
 
+    public function addDocument(StoredObject $storedObject): self
+    {
+        if ($this->documents->contains($storedObject)) {
+            $this->documents[] = $storedObject;
+        }
+
+        return $this;
+    }
+
+    public function removeDocument(StoredObject $storedObject): self
+    {
+        $this->documents->removeElement($storedObject);
+
+        return $this;
+    }
+
     /**
      * @return Center
      */
@@ -136,7 +197,7 @@ class Event implements HasCenterInterface, HasScopeInterface
         return $this->id;
     }
 
-    public function getModerator(): null|User
+    public function getModerator(): User|null
     {
         return $this->moderator;
     }
@@ -259,4 +320,44 @@ class Event implements HasCenterInterface, HasScopeInterface
 
         return $this;
     }
+
+    public function getComment(): CommentEmbeddable
+    {
+        return $this->comment;
+    }
+
+    public function setComment(CommentEmbeddable $comment): void
+    {
+        $this->comment = $comment;
+    }
+
+    public function getLocation(): ?Location
+    {
+        return $this->location;
+    }
+
+    public function setLocation(?Location $location): void
+    {
+        $this->location = $location;
+    }
+
+    public function getDocuments(): Collection
+    {
+        return $this->documents;
+    }
+
+    public function setDocuments(Collection $documents): void
+    {
+        $this->documents = $documents;
+    }
+
+    public function getOrganizationCost(): string
+    {
+        return $this->organizationCost;
+    }
+
+    public function setOrganizationCost(string $organizationCost): void
+    {
+        $this->organizationCost = $organizationCost;
+    }
 }

src/Bundle/ChillEventBundle/Entity/Participation.php

@@ -11,13 +11,17 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Entity;
 
-use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\Scope;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
@@ -26,18 +30,26 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
  * @ORM\Entity(
  * repositoryClass="Chill\EventBundle\Repository\ParticipationRepository")
  *
- * @ORM\Table(name="chill_event_participation")
+ * @ORM\Table(name="chill_event_participation", uniqueConstraints={
+ *
+ *     @ORM\UniqueConstraint(name="chill_event_participation_event_person_unique_idx", columns={"event_id", "person_id"})
+ *     })
  *
  * @ORM\HasLifecycleCallbacks
+ *
+ * @UniqueEntity({"event", "person"}, message="event.validation.person_already_participate_to_event")
  */
-class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterface
+class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterface, TrackUpdateInterface, TrackCreationInterface
 {
+    use TrackCreationTrait;
+    use TrackUpdateTrait;
+
     /**
      * @ORM\ManyToOne(
      *     targetEntity="Chill\EventBundle\Entity\Event",
      * inversedBy="participations")
      */
-    private ?\Chill\EventBundle\Entity\Event $event = null;
+    private ?Event $event = null;
 
     /**
      * @ORM\Id
@@ -48,29 +60,25 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa
      */
     private ?int $id = null;
 
-    /**
-     * @ORM\Column(type="datetime")
-     */
-    private ?\DateTime $lastUpdate = null;
-
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
+     *
+     * @Assert\NotNull()
      */
-    private ?\Chill\PersonBundle\Entity\Person $person = null;
+    private ?Person $person = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\Role")
      */
-    private ?\Chill\EventBundle\Entity\Role $role = null;
+    private ?Role $role = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\Status")
+     *
+     * @Assert\NotNull()
      */
-    private ?\Chill\EventBundle\Entity\Status $status = null;
+    private ?Status $status = null;
 
-    /**
-     * @return Center
-     */
     public function getCenter()
     {
         if (null === $this->getEvent()) {
@@ -83,17 +91,15 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa
     /**
      * Get event.
      */
-    public function getEvent(): null|Event
+    public function getEvent(): Event|null
     {
         return $this->event;
     }
 
     /**
      * Get id.
-     *
-     * @return int
      */
-    public function getId()
+    public function getId(): int
     {
         return $this->id;
     }
@@ -101,11 +107,11 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa
     /**
      * Get lastUpdate.
      *
-     * @return \DateTime
+     * @return \DateTimeInterface|null
      */
     public function getLastUpdate()
     {
-        return $this->lastUpdate;
+        return $this->getUpdatedAt();
     }
 
     /**
@@ -121,7 +127,7 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa
     /**
      * Get role.
      */
-    public function getRole(): null|Role
+    public function getRole(): Role|null
     {
         return $this->role;
     }
@@ -141,7 +147,7 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa
     /**
      * Get status.
      */
-    public function getStatus(): null|Status
+    public function getStatus(): Status|null
     {
         return $this->status;
     }
@@ -233,12 +239,8 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa
      *
      * @return Participation
      */
-    public function setEvent(Event $event = null)
+    public function setEvent(?Event $event = null)
     {
-        if ($this->event !== $event) {
-            $this->update();
-        }
-
         $this->event = $event;
 
         return $this;
@@ -249,12 +251,8 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa
      *
      * @return Participation
      */
-    public function setPerson(Person $person = null)
+    public function setPerson(?Person $person = null)
     {
-        if ($person !== $this->person) {
-            $this->update();
-        }
-
         $this->person = $person;
 
         return $this;
@@ -265,11 +263,8 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa
      *
      * @return Participation
      */
-    public function setRole(Role $role = null)
+    public function setRole(?Role $role = null)
     {
-        if ($role !== $this->role) {
-            $this->update();
-        }
         $this->role = $role;
 
         return $this;
@@ -280,12 +275,8 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa
      *
      * @return Participation
      */
-    public function setStatus(Status $status = null)
+    public function setStatus(?Status $status = null)
     {
-        if ($this->status !== $status) {
-            $this->update();
-        }
-
         $this->status = $status;
 
         return $this;
@@ -295,11 +286,11 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa
      * Set lastUpdate.
      *
      * @return Participation
+     *
+     * @deprecated
      */
     protected function update()
     {
-        $this->lastUpdate = new \DateTime('now');
-
         return $this;
     }
 }

src/Bundle/ChillEventBundle/Entity/Role.php

@@ -50,7 +50,7 @@ class Role
      *     targetEntity="Chill\EventBundle\Entity\EventType",
      * inversedBy="roles")
      */
-    private ?\Chill\EventBundle\Entity\EventType $type = null;
+    private ?EventType $type = null;
 
     /**
      * Get active.
@@ -125,7 +125,7 @@ class Role
      *
      * @return Role
      */
-    public function setType(EventType $type = null)
+    public function setType(?EventType $type = null)
     {
         $this->type = $type;
 

src/Bundle/ChillEventBundle/Entity/Status.php

@@ -50,7 +50,7 @@ class Status
      *     targetEntity="Chill\EventBundle\Entity\EventType",
      * inversedBy="statuses")
      */
-    private ?\Chill\EventBundle\Entity\EventType $type = null;
+    private ?EventType $type = null;
 
     /**
      * Get active.
@@ -125,7 +125,7 @@ class Status
      *
      * @return Status
      */
-    public function setType(EventType $type = null)
+    public function setType(?EventType $type = null)
     {
         $this->type = $type;
 

src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php

@@ -41,7 +41,7 @@ class EventChoiceLoader implements ChoiceLoaderInterface
      */
     public function __construct(
         EntityRepository $eventRepository,
-        array $centers = null
+        ?array $centers = null
     ) {
         $this->eventRepository = $eventRepository;
 

src/Bundle/ChillEventBundle/Form/EventType.php

@@ -11,12 +11,18 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Form;
 
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Form\StoredObjectType;
 use Chill\EventBundle\Form\Type\PickEventTypeType;
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateTimeType;
+use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\PickUserLocationType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Chill\MainBundle\Form\Type\UserPickerType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\MoneyType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -47,6 +53,28 @@ class EventType extends AbstractType
                     'class' => '',
                 ],
                 'required' => false,
+            ])
+            ->add('location', PickUserLocationType::class, [
+                'label' => 'event.fields.location',
+            ])
+            ->add('comment', CommentType::class, [
+                'label' => 'Comment',
+                'required' => false,
+            ])
+            ->add('documents', ChillCollectionType::class, [
+                'entry_type' => StoredObjectType::class,
+                'entry_options' => [
+                    'has_title' => true,
+                ],
+                'allow_add' => true,
+                'allow_delete' => true,
+                'delete_empty' => fn (StoredObject $storedObject): bool => '' === $storedObject->getFilename(),
+                'button_remove_label' => 'event.form.remove_document',
+                'button_add_label' => 'event.form.add_document',
+            ])
+            ->add('organizationCost', MoneyType::class, [
+                'label' => 'event.fields.organizationCost',
+                'help' => 'event.form.organisationCost_help',
             ]);
     }
 

src/Bundle/ChillEventBundle/Form/Type/PickEventType.php

@@ -114,7 +114,7 @@ final class PickEventType extends AbstractType
         } else {
             $centers = $this->authorizationHelper->getReachableCenters(
                 $user,
-                (string) $options['role']->getRole()
+                $options['role']
             );
         }
 

src/Bundle/ChillEventBundle/Menu/SectionMenuBuilder.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\EventBundle\Menu;
+
+use Chill\EventBundle\Security\Authorization\EventVoter;
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final readonly class SectionMenuBuilder implements LocalMenuBuilderInterface
+{
+    public function __construct(
+        private Security $security,
+        private TranslatorInterface $translator,
+    ) {
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if ($this->security->isGranted(EventVoter::SEE)) {
+            $menu->addChild(
+                $this->translator->trans('Events'),
+                [
+                    'route' => 'chill_event_event_list',
+                ]
+            )->setExtras([
+                'order' => 250,
+            ]);
+        }
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['section'];
+    }
+}

src/Bundle/ChillEventBundle/Repository/EventACLAwareRepository.php

@@ -0,0 +1,142 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\EventBundle\Repository;
+
+use Chill\EventBundle\Entity\Event;
+use Chill\EventBundle\Entity\Participation;
+use Chill\EventBundle\Security\Authorization\EventVoter;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class EventACLAwareRepository implements EventACLAwareRepositoryInterface
+{
+    public function __construct(
+        private AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser,
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+    ) {
+    }
+
+    /**
+     * @throws NonUniqueResultException
+     * @throws NoResultException
+     */
+    public function countAllViewable(array $filters): int
+    {
+        if (!$this->security->getUser() instanceof User) {
+            return 0;
+        }
+
+        $qb = $this->buildQueryByAllViewable($filters);
+        $this->addFilters($filters, $qb);
+
+        $qb->select('COUNT(event.id)');
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
+    public function findAllViewable(array $filters, int $offset = 0, int $limit = 50): array
+    {
+        if (!$this->security->getUser() instanceof User) {
+            return [];
+        }
+
+        $qb = $this->buildQueryByAllViewable($filters)->select('event');
+        $this->addFilters($filters, $qb);
+
+        $qb->setFirstResult($offset)->setMaxResults($limit);
+
+        $qb->addOrderBy('event.date', 'DESC');
+
+        return $qb->getQuery()->getResult();
+    }
+
+    private function addFilters(array $filters, QueryBuilder $qb): void
+    {
+        if (($filters['q'] ?? '') !== '') {
+            $qb->andWhere('event.name LIKE :content');
+            $qb->setParameter('content', '%'.$filters['q'].'%');
+        }
+
+        if (array_key_exists('dates', $filters)) {
+            $dates = $filters['dates'];
+            if (null !== ($dates['from'] ?? null)) {
+                $qb->andWhere('event.date >= :date_from');
+                $qb->setParameter('date_from', $dates['from']);
+            }
+            if (null !== ($dates['to'] ?? null)) {
+                $qb->andWhere('event.date <= :date_to');
+                $qb->setParameter('date_to', $dates['to']);
+            }
+        }
+
+        if (0 < count($filters['event_types'] ?? [])) {
+            $qb->andWhere('event.type IN (:event_types)');
+            $qb->setParameter('event_types', $filters['event_types']);
+        }
+    }
+
+    public function buildQueryByAllViewable(array $filters): QueryBuilder
+    {
+        $qb = $this->entityManager->createQueryBuilder();
+        $qb->from(Event::class, 'event');
+
+        $aclConditions = $qb->expr()->orX();
+
+        $i = 0;
+        foreach ($this->authorizationHelperForCurrentUser->getReachableCenters(EventVoter::SEE) as $center) {
+            foreach ($this->authorizationHelperForCurrentUser->getReachableScopes(EventVoter::SEE, $center) as $scopes) {
+                $aclConditions->add(
+                    $qb->expr()->andX(
+                        'event.circle IN (:scopes_'.$i.')',
+                        $qb->expr()->orX(
+                            'event.center = :center_'.$i,
+                            $qb->expr()->exists(
+                                'SELECT 1 FROM '.Participation::class.' participation_'.$i.' JOIN participation_'.$i.'.event event_'.$i.
+                                ' JOIN '.Person\PersonCenterHistory::class.' person_center_history_'.$i.
+                                ' WITH IDENTITY(person_center_history_'.$i.'.person) = IDENTITY(participation_'.$i.'.person) '.
+                                ' AND event_'.$i.'.date <= person_center_history_'.$i.'.startDate AND (person_center_history_'.$i.'.endDate IS NULL OR person_center_history_'.$i.'.endDate > event_'.$i.'.date) '.
+                                ' WHERE participation_'.$i.'.event = event'
+                            )
+                        )
+                    )
+                );
+                $qb->setParameter('scopes_'.$i, $scopes);
+                $qb->setParameter('center_'.$i, $center);
+
+                ++$i;
+            }
+        }
+
+        if (0 === $i) {
+            $aclConditions->add('FALSE = TRUE');
+        }
+
+        $qb
+            ->andWhere(
+                $qb->expr()->orX(
+                    'event.createdBy = :user',
+                    $aclConditions
+                )
+            );
+
+        $qb->setParameter('user', $this->security->getUser());
+
+        return $qb;
+    }
+}

src/Bundle/ChillEventBundle/Repository/EventACLAwareRepositoryInterface.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\EventBundle\Repository;
+
+use Chill\EventBundle\Entity\Event;
+use Chill\EventBundle\Entity\EventType;
+
+interface EventACLAwareRepositoryInterface
+{
+    /**
+     * @param array{q?: string, dates?: array{from?: \DateTimeImmutable|null, to?: \DateTimeImmutable|null}, event_types?: list<EventType>} $filters
+     */
+    public function countAllViewable(array $filters): int;
+
+    /**
+     * @param array{q?: string, dates?: array{from?: \DateTimeImmutable|null, to?: \DateTimeImmutable|null}, event_types?: list<EventType>} $filters
+     *
+     * @return list<Event>
+     */
+    public function findAllViewable(array $filters, int $offset = 0, int $limit = 50): array;
+}

src/Bundle/ChillEventBundle/Repository/EventTypeRepository.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\EventBundle\Repository;
+
+use Chill\EventBundle\Entity\EventType;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ManagerRegistry;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * @extends ServiceEntityRepository<EventType>
+ */
+final class EventTypeRepository extends ServiceEntityRepository
+{
+    public function __construct(
+        ManagerRegistry $registry,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly TranslatorInterface $translator
+    ) {
+        parent::__construct($registry, EventType::class);
+    }
+
+    /**
+     * @return list<EventType>
+     */
+    public function findAllActive(): array
+    {
+        $dql = 'SELECT et FROM '.EventType::class.' et WHERE et.active = TRUE ORDER BY JSON_EXTRACT(et.name, :lang)';
+
+        return $this->entityManager->createQuery($dql)
+            ->setParameter('lang', $this->translator->getLocale())
+            ->getResult();
+    }
+}