Fix the button text

.changes/unreleased/Fixed-20251218-102405.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix the condition to display concerned persons in calendar list items.
+time: 2025-12-18T10:24:05.885090777+01:00
+custom:
+    Issue: "480"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251218-110722.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Fix ordering of social actions: actions with a closing date in the future should be considered as ''still open''.'
+time: 2025-12-18T11:07:22.699897317+01:00
+custom:
+    Issue: "481"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251230-125728.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix export group by center for persons without a center in CenterAggregator.php
+time: 2025-12-30T12:57:28.773521385+01:00
+custom:
+    Issue: "477"
+    SchemaChange: No schema change

.changes/unreleased/UX-20260106-142813.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Improve the ux of the address field in the person creation form
+time: 2026-01-06T14:28:13.033420033+01:00
+custom:
+    Issue: "487"
+    SchemaChange: No schema change

.changes/v4.12.0.md

@@ -1,16 +0,0 @@
-## v4.12.0 - 2026-01-15
-### Feature
-* ([#473](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/473)) Display version of chill bundles in application footer
-* Increase the delay before removing stale workflow from 90 days to 180 days.
-### Fixed
-* ([#480](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/480)) Fix the condition to display concerned persons in calendar list items.
-* ([#481](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/481)) Fix ordering of social actions: actions with a closing date in the future should be considered as 'still open'.
-* ([#477](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/477)) Fix export group by center for persons without a center in CenterAggregator.php
-* Fix the calculation of budget balance to only take into account resources and charges that are still actual
-* ([#489](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/489)) Fix desactivation date for Goals and results
-* ([#490](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/490)) Prevent sending a notification when the user signs the document himself
-* ([#491](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/491)) Fix: acc periods of which user is the referrer should not be included if when the list is filtered by center and none of the participations are part of the center
-* ([#492](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/492)) fix CommentInput: replace deprecated value binding with model-value
-* ([#493](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/493)) fix issue with stored object permissions associated with workflows (as attachment, or through a related entity)
-
-   BC: the constructor's signature of `\Chill\DocStoreBundle\Security\Authorization\StoredObjectVoter\AbstractStoredObjectVoter` has changed.

.changes/v4.12.1.md

@@ -1,4 +0,0 @@
-## v4.12.1 - 2026-02-01
-### Fixed
-* ([#496](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/496)) Add the option to deal with duplicate address in BAN adress importer
-   

.changes/v4.13.0.md

@@ -1,15 +0,0 @@
-## v4.13.0 - 2026-02-23
-### Feature
-* ([#500](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/500)) ([!964](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/964)) Limit the number of public download of stored object to 30 downloads
-* ([#495](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/495)) ([!967](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/967)) Send email related to notification in both html and txt format, and render quote correctly
-
-### Fixed
-* ([#438](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/438)) Change wrong color of submit button "Désigner comme adresse du parcours"
-* ([#498](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/498)) For giving edit permissions on documents, take into account the workflow creator
-* Fixed mispelling of address in translations: addresse -> adresse
-* ([#499](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/499)) ([!963](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/963)) Fix: some postal code appears in the UI, although they are marked as deleted
-* ([#501](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/501)) ([!966](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/966)) Fix deprecation in the markdown rendering
-* ([#494](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/494)) ([!965](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/965)) Remove unused all-day slot display
-
-### DX
-* ([!960](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/960)) Configure changie to ask for merge request number for a better tracking of changes

.changes/v4.14.0.md

@@ -1,6 +0,0 @@
-## v4.14.0 - 2026-03-09
-### Feature
-* ([#486](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/486)) ([!<no value>](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/<no value>)) Add filter and aggregator based on referrer's main center for exports of accompanying period   
-### Fixed
-* ([#502](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/502)) ([!968](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/968)) Fix import of postal code: mark postal code as deleted if they are not present in the import any more   
-* ([#503](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/503)) ([!969](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/969)) Add a flash message when reassigning accompanying course (reassign list)   

.changes/v4.14.1.md

@@ -1,5 +0,0 @@
-## v4.14.1 - 2026-03-16
-### Security
-* ([#506](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/506)) ([!972](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/972)) Fix permission in list of activities in person context   
-### DX
-* ([#504](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/504)) ([!970](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/970)) Add seeds in DataFixtures and in some tests to avoid random test failures   

.changie.yaml

@@ -7,7 +7,7 @@ versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
 kindFormat: '### {{.Kind}}'
 # Note: it is possible to add a `.custom.Long` text manually into the yaml file produced by `changie new`. This will add a long description.
 changeFormat: >-
-    * {{ if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{ if not (eq .Custom.MR "") }}([!{{ .Custom.MR }}](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/{{ .Custom.MR }})) {{ end }}{{ .Body }}   {{ if and .Custom.SchemaChange (ne .Custom.SchemaChange "No schema change") }}
+    * {{ if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{ .Body }}   {{ if and .Custom.SchemaChange (ne .Custom.SchemaChange "No schema change") }}
 
       **Schema Change**: {{ .Custom.SchemaChange }}
       {{- end -}}
@@ -30,12 +30,6 @@ custom:
         type: int
         minInt: 1
 
-    -   key: MR
-        label: Merge request number (on chill-bundles repository) (optional)
-        optional: true
-        type: int
-        minInt: 1
-
 body:
     # allow multiline messages
     block: true

.junie/guidelines.md

@@ -238,13 +238,13 @@ The tests are run from the project's root (not from the bundle's root).
 
 ```bash
 # Run all tests
-symfony composer exec phpunit
+vendor/bin/phpunit
 
 # Run a specific test file
-symfony composer exec phpunit -- path/to/TestFile.php
+vendor/bin/phpunit path/to/TestFile.php
 
 # Run a specific test method
-symfony composer exec phpunit --filter methodName path/to/TestFile.php
+vendor/bin/phpunit --filter methodName path/to/TestFile.php
 ```
 
 When writing tests, only test specific files. Do not run all tests or the full

CHANGELOG.md

@@ -6,57 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
-## v4.14.1 - 2026-03-16
-### Security
-* ([#506](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/506)) ([!972](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/972)) Fix permission in list of activities in person context   
-### DX
-* ([#504](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/504)) ([!970](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/970)) Add seeds in DataFixtures and in some tests to avoid random test failures   
-
-## v4.14.0 - 2026-03-09
-### Feature
-* ([#486](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/486)) ([!<no value>](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/<no value>)) Add filter and aggregator based on referrer's main center for exports of accompanying period   
-### Fixed
-* ([#502](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/502)) ([!968](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/968)) Fix import of postal code: mark postal code as deleted if they are not present in the import any more   
-* ([#503](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/503)) ([!969](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/969)) Add a flash message when reassigning accompanying course (reassign list)   
-
-## v4.13.0 - 2026-02-23
-### Feature
-* ([#500](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/500)) ([!964](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/964)) Limit the number of public download of stored object to 30 downloads
-* ([#495](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/495)) ([!967](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/967)) Send email related to notification in both html and txt format, and render quote correctly
-
-### Fixed
-* ([#438](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/438)) Change wrong color of submit button "Désigner comme adresse du parcours"
-* ([#498](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/498)) For giving edit permissions on documents, take into account the workflow creator
-* Fixed mispelling of address in translations: addresse -> adresse
-* ([#499](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/499)) ([!963](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/963)) Fix: some postal code appears in the UI, although they are marked as deleted
-* ([#501](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/501)) ([!966](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/966)) Fix deprecation in the markdown rendering
-* ([#494](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/494)) ([!965](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/965)) Remove unused all-day slot display
-
-### DX
-* ([!960](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/960)) Configure changie to ask for merge request number for a better tracking of changes
-
-## v4.12.1 - 2026-02-01
-### Fixed
-* ([#496](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/496)) Add the option to deal with duplicate address in BAN adress importer
-   
-
-## v4.12.0 - 2026-01-15
-### Feature
-* ([#473](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/473)) Display version of chill bundles in application footer
-* Increase the delay before removing stale workflow from 90 days to 180 days.
-### Fixed
-* ([#480](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/480)) Fix the condition to display concerned persons in calendar list items.
-* ([#481](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/481)) Fix ordering of social actions: actions with a closing date in the future should be considered as 'still open'.
-* ([#477](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/477)) Fix export group by center for persons without a center in CenterAggregator.php
-* Fix the calculation of budget balance to only take into account resources and charges that are still actual
-* ([#489](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/489)) Fix desactivation date for Goals and results
-* ([#490](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/490)) Prevent sending a notification when the user signs the document himself
-* ([#491](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/491)) Fix: acc periods of which user is the referrer should not be included if when the list is filtered by center and none of the participations are part of the center
-* ([#492](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/492)) fix CommentInput: replace deprecated value binding with model-value
-* ([#493](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/493)) fix issue with stored object permissions associated with workflows (as attachment, or through a related entity)
-
-   BC: the constructor's signature of `\Chill\DocStoreBundle\Security\Authorization\StoredObjectVoter\AbstractStoredObjectVoter` has changed.
-
 ## v4.11.0 - 2025-12-17
 ### Feature
 * ([#478](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/478)) Add filtering to admin lists: social actions, social issues, goals, results, and evaluations   

composer.json

@@ -21,7 +21,6 @@
         "ext-openssl": "*",
         "ext-redis": "*",
         "ext-zlib": "*",
-        "composer-runtime-api": "*",
         "champs-libres/wopi-bundle": "dev-symfony-v5@dev",
         "champs-libres/wopi-lib": "dev-master@dev",
         "doctrine/data-fixtures": "^1.8",
@@ -83,7 +82,7 @@
         "symfony/templating": "^5.4",
         "symfony/translation": "^5.4",
         "symfony/twig-bundle": "^5.4",
-        "symfony/ux-translator": "2.31.0",
+        "symfony/ux-translator": "^2.22",
         "symfony/validator": "^5.4",
         "symfony/webpack-encore-bundle": "^1.11",
         "symfony/workflow": "^5.4",
@@ -98,7 +97,7 @@
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "fakerphp/faker": "^1.13",
-        "friendsofphp/php-cs-fixer": "3.93.0",
+        "friendsofphp/php-cs-fixer": "3.65.0",
         "jangregor/phpstan-prophecy": "^1.0",
         "nelmio/alice": "^3.8",
         "nikic/php-parser": "^4.15",

config/packages/nelmio_alice.yaml

@@ -8,6 +8,5 @@ when@dev: &dev
             - 'file'
             - 'md5'
             - 'sha1'
-        seed: 1234567890
 
 when@test: *dev

packages/ChillZimbraBundle/.changes/unreleased/Added-20260122-153223.yaml

@@ -1,3 +0,0 @@
-kind: Added
-body: Use admin delegated account for handling authentication
-time: 2026-01-22T15:32:23.932994899+01:00

packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/CreateZimbraComponent.php

@@ -80,19 +80,12 @@ final readonly class CreateZimbraComponent
             $location = $calendar->getCalendar()->getLocation();
             $hasLocation = $calendar->getCalendar()->hasLocation();
             $isPrivate = $calendar->getCalendar()->getAccompanyingPeriod()?->isConfidential() ?? false;
-        } elseif ($calendar instanceof Calendar) {
+        } else {
             $startDate = $calendar->getStartDate();
             $endDate = $calendar->getEndDate();
             $location = $calendar->getLocation();
             $hasLocation = $calendar->hasLocation();
             $isPrivate = $calendar->getAccompanyingPeriod()?->isConfidential() ?? false;
-        } else {
-            // Calendar range case
-            $startDate = $calendar->getStartDate();
-            $endDate = $calendar->getEndDate();
-            $location = $calendar->getLocation();
-            $hasLocation = $calendar->hasLocation();
-            $isPrivate = false;
         }
 
         $comp = new InviteComponent();

packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/SoapClientBuilder.php

@@ -11,84 +11,48 @@ declare(strict_types=1);
 
 namespace Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector;
 
-use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpClient\Psr18Client;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use Zimbra\Admin\AdminApi;
 use Zimbra\Common\Enum\AccountBy;
 use Zimbra\Common\Soap\ClientFactory;
-use Zimbra\Common\Struct\AccountSelector;
 use Zimbra\Common\Struct\Header\AccountInfo;
 use Zimbra\Mail\MailApi;
 
-final class SoapClientBuilder
+final readonly class SoapClientBuilder
 {
-    private readonly string $username;
+    private string $username;
 
-    private readonly string $password;
+    private string $password;
 
-    private readonly string $url;
+    private string $url;
 
-    private readonly string $adminUrl;
-
-    private readonly bool $verifyHost;
-
-    private readonly bool $verifyPeer;
-
-    private readonly bool $adminVerifyHost;
-
-    private readonly bool $adminVerifyPeer;
-
-    /**
-     * Keep the cache of the tokens.
-     *
-     * @var array<string, array{token: string, expirationTime: \DateTimeImmutable}>
-     */
-    private array $tokenCache = [];
-
-    public function __construct(
-        private readonly ParameterBagInterface $parameterBag,
-        private readonly HttpClientInterface $client,
-        private readonly ClockInterface $clock,
-    ) {
+    public function __construct(private ParameterBagInterface $parameterBag, private HttpClientInterface $client)
+    {
         $dsn = $this->parameterBag->get('chill_calendar.remote_calendar_dsn');
         $url = parse_url($dsn);
 
         $this->username = urldecode($url['user']);
         $this->password = urldecode($url['pass']);
         if ('zimbra+http' === $url['scheme']) {
-            $scheme = 'http';
+            $scheme = 'http://';
             $port = $url['port'] ?? 80;
         } elseif ('zimbra+https' === $url['scheme']) {
-            $scheme = 'https';
+            $scheme = 'https://';
             $port = $url['port'] ?? 443;
         } else {
             throw new \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException('Unsupported remote calendar scheme: '.$url['scheme']);
         }
 
-        // get attributes for adminUrl
-        $query = [];
-        parse_str($url['query'] ?? '', $query);
-        $adminPort = $query['adminPort'] ?? '7071';
-        $adminHost = $query['adminHost'] ?? $url['host'];
-        $adminScheme = $query['adminScheme'] ?? $scheme;
-
-        $this->verifyPeer = (bool) ($query['verifyPeer'] ?? true);
-        $this->verifyHost = (bool) ($query['verifyHost'] ?? true);
-        $this->adminVerifyHost = (bool) ($query['adminVerifyHost'] ?? $this->verifyPeer);
-        $this->adminVerifyPeer = (bool) ($query['adminVerifyPeer'] ?? $this->verifyHost);
-
-        $this->url = $scheme.'://'.$url['host'].':'.$port;
-        $this->adminUrl = $adminScheme.'://'.$adminHost.':'.$adminPort;
+        $this->url = $scheme.$url['host'].':'.$port;
     }
 
     private function buildApi(): MailApi
     {
         $baseClient = $this->client->withOptions([
             'base_uri' => $location = $this->url.'/service/soap',
-            'verify_host' => $this->verifyHost,
-            'verify_peer' => $this->verifyPeer,
+            'verify_host' => false,
+            'verify_peer' => false,
         ]);
         $psr18Client = new Psr18Client($baseClient);
         $api = new MailApi();
@@ -98,36 +62,12 @@ final class SoapClientBuilder
         return $api;
     }
 
-    private function buildAdminApi(): AdminApi
-    {
-        $baseClient = $this->client->withOptions([
-            'base_uri' => $location = $this->adminUrl.'/service/admin/soap',
-            'verify_host' => $this->adminVerifyHost,
-            'verify_peer' => $this->adminVerifyPeer,
-        ]);
-        $psr18Client = new Psr18Client($baseClient);
-        $api = new AdminApi();
-        $client = ClientFactory::create($location, $psr18Client);
-        $api->setClient($client);
-
-        return $api;
-    }
-
     public function getApiForAccount(string $accountName): MailApi
     {
-        ['token' => $token, 'expirationTime' => $expirationTime] = $this->tokenCache[$accountName]
-            ?? ['token' => null, 'expirationTime' => null];
+        $api = $this->buildApi();
+        $response = $api->authByAccountName($this->username, $this->password);
 
-        if (null === $token || null === $expirationTime || $expirationTime <= $this->clock->now()) {
-            $adminApi = $this->buildAdminApi();
-            $adminApi->auth($this->username, $this->password);
-
-            $delegateResponse = $adminApi->delegateAuth(new AccountSelector(AccountBy::NAME, $accountName));
-            $token = $delegateResponse->getAuthToken();
-            $expiration = $delegateResponse->getLifetime();
-            $expirationTime = $this->clock->now()->add(new \DateInterval('PT'.$expiration.'S'));
-            $this->tokenCache[$accountName] = ['token' => $token, 'expirationTime' => $expirationTime];
-        }
+        $token = $response->getAuthToken();
 
         $apiBy = $this->buildApi();
         $apiBy->setAuthToken($token);

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php

@@ -33,7 +33,6 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 
     public function __construct(private readonly EntityManagerInterface $em)
     {
-        mt_srand(123456789);
         $this->faker = FakerFactory::create('fr_FR');
     }
 
@@ -49,7 +48,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
             ->findAll();
 
         foreach ($persons as $person) {
-            $activityNbr = mt_rand(0, 3);
+            $activityNbr = random_int(0, 3);
 
             for ($i = 0; $i < $activityNbr; ++$i) {
                 $activity = $this->newRandomActivity($person);
@@ -74,7 +73,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 
         //      ->setAttendee($this->faker->boolean())
 
-        for ($i = 0; mt_rand(0, 4) > $i; ++$i) {
+        for ($i = 0; random_int(0, 4) > $i; ++$i) {
             $reason = $this->getRandomActivityReason();
 
             if (null !== $reason) {

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -69,7 +69,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
     }
 
     /** (non-PHPdoc).
-     * @see PrependExtensionInterface::prepend()
+     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
     public function prependRoutes(ContainerBuilder $container)
     {

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -24,7 +24,6 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInt
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
@@ -341,7 +340,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
         }
 
         foreach ($person->getAccompanyingPeriodParticipations() as $participation) {
-            if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $participation->getAccompanyingPeriod())) {
+            if (!$this->security->isGranted(ActivityVoter::SEE, $participation->getAccompanyingPeriod())) {
                 continue;
             }
 

src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStoredObjectVoter.php

@@ -16,8 +16,7 @@ use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoter\AbstractStoredObjectVoter;
-use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
-use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelperInterface;
+use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
 use Symfony\Component\Security\Core\Security;
 
 class ActivityStoredObjectVoter extends AbstractStoredObjectVoter
@@ -25,10 +24,9 @@ class ActivityStoredObjectVoter extends AbstractStoredObjectVoter
     public function __construct(
         private readonly ActivityRepository $repository,
         Security $security,
-        WorkflowRelatedEntityPermissionHelperInterface $workflowDocumentService,
-        EntityWorkflowAttachmentRepository $attachmentRepository,
+        WorkflowRelatedEntityPermissionHelper $workflowDocumentService,
     ) {
-        parent::__construct($security, $attachmentRepository, $workflowDocumentService);
+        parent::__construct($security, $workflowDocumentService);
     }
 
     protected function getRepository(): AssociatedEntityToStoredObjectInterface

src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php

@@ -21,10 +21,7 @@ use Doctrine\Persistence\ObjectManager;
 
 class LoadAsideActivity extends Fixture implements DependentFixtureInterface
 {
-    public function __construct(private readonly UserRepository $userRepository)
-    {
-        mt_srand(123456789);
-    }
+    public function __construct(private readonly UserRepository $userRepository) {}
 
     public function getDependencies(): array
     {
@@ -50,7 +47,7 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface
                     $this->getReference('aside_activity_category_0', AsideActivityCategory::class)
                 )
                 ->setDate((new \DateTimeImmutable('today'))
-                    ->sub(new \DateInterval('P'.\mt_rand(1, 100).'D')));
+                    ->sub(new \DateInterval('P'.\random_int(1, 100).'D')));
 
             $manager->persist($activity);
         }

src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php

@@ -56,7 +56,7 @@ class ChillBudgetExtension extends Extension implements PrependExtensionInterfac
     }
 
     /** (non-PHPdoc).
-     * @see PrependExtensionInterface::prepend()
+     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
     public function prependRoutes(ContainerBuilder $container)
     {

src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig

@@ -72,20 +72,14 @@
 
 {% macro table_results(actualCharges, actualResources, results) %}
 
-{% set now = date() %}
-
 {% set totalCharges = 0 %}
 {% for c in actualCharges %}
-    {% if c.startDate <= now and (c.endDate is null or c.endDate >= now) %}
-        {% set totalCharges = totalCharges + c.amount %}
-    {% endif %}
+    {% set totalCharges = totalCharges + c.amount %}
 {% endfor %}
 
 {% set totalResources = 0 %}
 {% for r in actualResources %}
-    {% if r.startDate <= now and (r.endDate is null or r.endDate >= now) %}
-        {% set totalResources = totalResources + r.amount %}
-    {% endif %}
+    {% set totalResources = totalResources + r.amount %}
 {% endfor %}
 
 {% set result = (totalResources - totalCharges) %}

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue

@@ -346,7 +346,6 @@ const baseOptions = ref<CalendarOptions>({
         center: "title",
         right: "timeGridWeek,timeGridDay",
     },
-    allDaySlot: false,
 });
 
 const ranges = computed<EventInput[]>(() => {

src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php

@@ -41,7 +41,6 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
 
     public function __construct()
     {
-        mt_srand(123456789);
         $this->fakerFr = \Faker\Factory::create('fr_FR');
         $this->fakerEn = \Faker\Factory::create('en_EN');
         $this->fakerNl = \Faker\Factory::create('nl_NL');
@@ -105,7 +104,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
             $manager->persist($parent);
 
             // Load children
-            $expected_nb_children = mt_rand(10, 50);
+            $expected_nb_children = random_int(10, 50);
 
             for ($i = 0; $i < $expected_nb_children; ++$i) {
                 $companyName = $this->fakerFr->company;
@@ -145,7 +144,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
             $manager->persist($parent);
 
             // Load children
-            $expected_nb_children = mt_rand(10, 50);
+            $expected_nb_children = random_int(10, 50);
 
             for ($i = 0; $i < $expected_nb_children; ++$i) {
                 $manager->persist($this->createChildOption($parent, [

src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php

@@ -52,7 +52,7 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
     }
 
     /** (non-PHPdoc).
-     * @see PrependExtensionInterface::prepend()
+     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
     public function prepend(ContainerBuilder $container)
     {

src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php

@@ -25,7 +25,7 @@ class ChoiceWithOtherType extends AbstractType
     private string $otherValueLabel = 'Other value';
 
     /** (non-PHPdoc).
-     * @see AbstractType::buildForm()
+     * @see \Symfony\Component\Form\AbstractType::buildForm()
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -42,7 +42,7 @@ class ChoiceWithOtherType extends AbstractType
     }
 
     /** (non-PHPdoc).
-     * @see AbstractType::configureOptions()
+     * @see \Symfony\Component\Form\AbstractType::configureOptions()
      */
     public function configureOptions(OptionsResolver $resolver)
     {

src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php

@@ -22,7 +22,7 @@ use Symfony\Component\Form\FormEvents;
 class ChoicesListType extends AbstractType
 {
     /** (non-PHPdoc).
-     * @see AbstractType::buildForm()
+     * @see \Symfony\Component\Form\AbstractType::buildForm()
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {

src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php

@@ -82,7 +82,7 @@ class CustomFieldProvider implements ContainerAwareInterface
     /**
      * (non-PHPdoc).
      *
-     * @see ContainerAwareInterface::setContainer()
+     * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
      */
     public function setContainer(?ContainerInterface $container = null)
     {

src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoter/AbstractStoredObjectVoter.php

@@ -15,10 +15,7 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoterInterface;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
-use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
-use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelperInterface;
+use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Security;
 
@@ -37,8 +34,7 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
 
     public function __construct(
         private readonly Security $security,
-        private readonly EntityWorkflowAttachmentRepository $entityWorkflowAttachmentRepository,
-        private readonly WorkflowRelatedEntityPermissionHelperInterface $workflowDocumentService,
+        private readonly ?WorkflowRelatedEntityPermissionHelper $workflowDocumentService = null,
     ) {}
 
     public function supports(StoredObjectRoleEnum $attribute, StoredObject $subject): bool
@@ -50,6 +46,16 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
 
     public function voteOnAttribute(StoredObjectRoleEnum $attribute, StoredObject $subject, TokenInterface $token): bool
     {
+        // we first try to get the permission from the workflow, as attachement (this is the less intensive query)
+        $workflowPermissionAsAttachment = match ($attribute) {
+            StoredObjectRoleEnum::SEE => $this->workflowDocumentService->isAllowedByWorkflowForReadOperation($subject),
+            StoredObjectRoleEnum::EDIT => $this->workflowDocumentService->isAllowedByWorkflowForWriteOperation($subject),
+        };
+
+        if (WorkflowRelatedEntityPermissionHelper::FORCE_DENIED === $workflowPermissionAsAttachment) {
+            return false;
+        }
+
         // Retrieve the related entity
         $entity = $this->getRepository()->findAssociatedEntityToStoredObject($subject);
 
@@ -59,7 +65,7 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
         $regularPermission = $this->security->isGranted($voterAttribute, $entity);
 
         if (!$this->canBeAssociatedWithWorkflow()) {
-            return $this->voteOnStoredObjectAsAttachementOfAWorkflow($attribute, $regularPermission, $subject);
+            return $regularPermission;
         }
 
         $workflowPermission = match ($attribute) {
@@ -68,41 +74,9 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
         };
 
         return match ($workflowPermission) {
-            WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT => true,
-            WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED => false,
-            WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN => $this->voteOnStoredObjectAsAttachementOfAWorkflow($attribute, $regularPermission, $subject),
+            WorkflowRelatedEntityPermissionHelper::FORCE_GRANT => true,
+            WorkflowRelatedEntityPermissionHelper::FORCE_DENIED => false,
+            WorkflowRelatedEntityPermissionHelper::ABSTAIN => WorkflowRelatedEntityPermissionHelper::FORCE_GRANT === $workflowPermissionAsAttachment || $regularPermission,
         };
     }
-
-    private function voteOnStoredObjectAsAttachementOfAWorkflow(StoredObjectRoleEnum $attribute, bool $regularPermission, StoredObject $storedObject): bool
-    {
-        $attachments = $this->entityWorkflowAttachmentRepository->findByStoredObject($storedObject);
-
-        // we get all the entity workflows where the stored object is attached
-        $entityWorkflows = array_map(static fn (EntityWorkflowAttachment $attachment) => $attachment->getEntityWorkflow(), $attachments);
-
-        // we compute all the permission for each entity workflow
-        $permissions = array_map(fn (EntityWorkflow $entityWorkflow): string => match ($attribute) {
-            StoredObjectRoleEnum::SEE => $this->workflowDocumentService->isAllowedByWorkflowForReadOperation($entityWorkflow),
-            StoredObjectRoleEnum::EDIT => $this->workflowDocumentService->isAllowedByWorkflowForWriteOperation($entityWorkflow),
-        }, $entityWorkflows);
-
-        // now, we reduce the permissions: abstain are ignored. Between DENIED and and GRANT, DENIED takes precedence
-        $computedPermission = WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN;
-        foreach ($permissions as $permission) {
-            if (WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED === $permission) {
-                return false;
-            }
-            if (WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT === $permission) {
-                $computedPermission = WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT;
-            }
-        }
-
-        if (WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN === $computedPermission) {
-            return $regularPermission;
-        }
-
-        // this is the case where WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT is returned
-        return true;
-    }
 }

src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoter/AccompanyingCourseDocumentStoredObjectVoter.php

@@ -16,7 +16,6 @@ use Chill\DocStoreBundle\Repository\AccompanyingCourseDocumentRepository;
 use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
-use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
 use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
 use Symfony\Component\Security\Core\Security;
 
@@ -26,9 +25,8 @@ final class AccompanyingCourseDocumentStoredObjectVoter extends AbstractStoredOb
         private readonly AccompanyingCourseDocumentRepository $repository,
         Security $security,
         WorkflowRelatedEntityPermissionHelper $workflowDocumentService,
-        EntityWorkflowAttachmentRepository $attachmentRepository,
     ) {
-        parent::__construct($security, $attachmentRepository, $workflowDocumentService);
+        parent::__construct($security, $workflowDocumentService);
     }
 
     protected function getRepository(): AssociatedEntityToStoredObjectInterface

src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoter/PersonDocumentStoredObjectVoter.php

@@ -16,7 +16,6 @@ use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Repository\PersonDocumentRepository;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
-use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
 use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
 use Symfony\Component\Security\Core\Security;
 
@@ -26,9 +25,8 @@ class PersonDocumentStoredObjectVoter extends AbstractStoredObjectVoter
         private readonly PersonDocumentRepository $repository,
         Security $security,
         WorkflowRelatedEntityPermissionHelper $workflowDocumentService,
-        EntityWorkflowAttachmentRepository $attachmentRepository,
     ) {
-        parent::__construct($security, $attachmentRepository, $workflowDocumentService);
+        parent::__construct($security, $workflowDocumentService);
     }
 
     protected function getRepository(): AssociatedEntityToStoredObjectInterface

src/Bundle/ChillDocStoreBundle/Tests/Security/Authorization/AbstractStoredObjectVoterTest.php

@@ -16,11 +16,8 @@ use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoter\AbstractStoredObjectVoter;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
-use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
-use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelperInterface;
+use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
 use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Security;
@@ -34,31 +31,21 @@ class AbstractStoredObjectVoterTest extends TestCase
 {
     use ProphecyTrait;
 
-    /**
-     * @param array<int, EntityWorkflowAttachment> $attachments
-     *
-     * @return void
-     */
     private function buildStoredObjectVoter(
         bool $canBeAssociatedWithWorkflow,
         AssociatedEntityToStoredObjectInterface $repository,
         Security $security,
-        ?WorkflowRelatedEntityPermissionHelperInterface $workflowDocumentService = null,
-        array $attachments = [],
+        ?WorkflowRelatedEntityPermissionHelper $workflowDocumentService = null,
     ): AbstractStoredObjectVoter {
-        $attachmentsRepository = $this->prophesize(EntityWorkflowAttachmentRepository::class);
-        $attachmentsRepository->findByStoredObject(Argument::type(StoredObject::class))->willReturn($attachments);
-
         // Anonymous class extending the abstract class
-        return new class ($canBeAssociatedWithWorkflow, $repository, $security, $attachmentsRepository->reveal(), $workflowDocumentService) extends AbstractStoredObjectVoter {
+        return new class ($canBeAssociatedWithWorkflow, $repository, $security, $workflowDocumentService) extends AbstractStoredObjectVoter {
             public function __construct(
                 private readonly bool $canBeAssociatedWithWorkflow,
                 private readonly AssociatedEntityToStoredObjectInterface $repository,
                 Security $security,
-                EntityWorkflowAttachmentRepository $attachmentRepository,
-                WorkflowRelatedEntityPermissionHelperInterface $workflowDocumentService,
+                ?WorkflowRelatedEntityPermissionHelper $workflowDocumentService = null,
             ) {
-                parent::__construct($security, $attachmentRepository, $workflowDocumentService);
+                parent::__construct($security, $workflowDocumentService);
             }
 
             protected function attributeToRole($attribute): string
@@ -85,29 +72,28 @@ class AbstractStoredObjectVoterTest extends TestCase
 
     public function testSupportsOnAttribute(): void
     {
-        $entityWorkflowService = $this->prophesize(WorkflowRelatedEntityPermissionHelperInterface::class);
-
-        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(new \stdClass()), $this->prophesize(Security::class)->reveal(), $entityWorkflowService->reveal());
+        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(new \stdClass()), $this->prophesize(Security::class)->reveal(), null);
 
         self::assertTrue($voter->supports(StoredObjectRoleEnum::SEE, new StoredObject()));
 
-        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(new User()), $this->prophesize(Security::class)->reveal(), $entityWorkflowService->reveal());
+        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(new User()), $this->prophesize(Security::class)->reveal(), null);
 
         self::assertFalse($voter->supports(StoredObjectRoleEnum::SEE, new StoredObject()));
 
-        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(null), $this->prophesize(Security::class)->reveal(), $entityWorkflowService->reveal());
+        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(null), $this->prophesize(Security::class)->reveal(), null);
 
         self::assertFalse($voter->supports(StoredObjectRoleEnum::SEE, new StoredObject()));
     }
 
     /**
-     * @dataProvider dataProviderVoteOnAttributeWithWorkflow
+     * @dataProvider dataProviderVoteOnAttributeWithStoredObjectPermission
      */
-    public function testVoteOnAttributeWithWorkflow(
+    public function testVoteOnAttributeWithStoredObjectPermission(
         StoredObjectRoleEnum $attribute,
         bool $expected,
         bool $isGrantedRegularPermission,
         string $isGrantedWorkflowPermission,
+        string $isGrantedStoredObjectAttachment,
     ): void {
         $storedObject = new StoredObject();
         $repository = new DummyRepository($related = new \stdClass());
@@ -116,28 +102,31 @@ class AbstractStoredObjectVoterTest extends TestCase
         $security = $this->prophesize(Security::class);
         $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
 
-        $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelperInterface::class);
+        $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelper::class);
 
         $security = $this->prophesize(Security::class);
         $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
 
-        $attachementRepository = $this->prophesize(EntityWorkflowAttachmentRepository::class);
-        $attachementRepository->findByStoredObject($storedObject)->willReturn([]);
-
         if (StoredObjectRoleEnum::SEE === $attribute) {
+            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($storedObject)
+                ->shouldBeCalled()
+                ->willReturn($isGrantedStoredObjectAttachment);
             $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($related)
                 ->willReturn($isGrantedWorkflowPermission);
         } elseif (StoredObjectRoleEnum::EDIT === $attribute) {
+            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($storedObject)
+                ->shouldBeCalled()
+                ->willReturn($isGrantedStoredObjectAttachment);
             $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($related)
                 ->willReturn($isGrantedWorkflowPermission);
         } else {
             throw new \LogicException('Invalid attribute for StoredObjectVoter');
         }
 
-        $storedObjectVoter = new class ($repository, $workflowRelatedEntityPermissionHelper->reveal(), $security->reveal(), $attachementRepository->reveal()) extends AbstractStoredObjectVoter {
-            public function __construct(private $repository, $helper, $security, EntityWorkflowAttachmentRepository $attachmentRepository)
+        $storedObjectVoter = new class ($repository, $workflowRelatedEntityPermissionHelper->reveal(), $security->reveal()) extends AbstractStoredObjectVoter {
+            public function __construct(private $repository, $helper, $security)
             {
-                parent::__construct($security, $attachmentRepository, $helper);
+                parent::__construct($security, $helper);
             }
 
             protected function getRepository(): AssociatedEntityToStoredObjectInterface
@@ -166,64 +155,96 @@ class AbstractStoredObjectVoterTest extends TestCase
         self::assertEquals($expected, $actual);
     }
 
-    public static function dataProviderVoteOnAttributeWithWorkflow(): iterable
+    public static function dataProviderVoteOnAttributeWithStoredObjectPermission(): iterable
     {
         foreach (['read' => StoredObjectRoleEnum::SEE, 'write' => StoredObjectRoleEnum::EDIT] as $action => $attribute) {
             yield 'Not related to any workflow nor attachment ('.$action.')' => [
                 $attribute,
                 true,
                 true,
-                WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
             ];
 
             yield 'Not related to any workflow nor attachment (refuse) ('.$action.')' => [
                 $attribute,
                 false,
                 false,
-                WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
             ];
 
             yield 'Is granted by a workflow takes precedence (workflow) ('.$action.')' => [
                 $attribute,
                 false,
                 true,
-                WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
             ];
 
             yield 'Is granted by a workflow takes precedence (stored object) ('.$action.')' => [
                 $attribute,
                 false,
+                true,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+            ];
+
+            yield 'Is granted by a workflow takes precedence (workflow) although grant ('.$action.')' => [
+                $attribute,
                 false,
-                WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
+                true,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
             ];
 
             yield 'Is granted by a workflow takes precedence (stored object) although grant ('.$action.')' => [
                 $attribute,
+                false,
                 true,
-                true,
-                WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
             ];
 
             yield 'Is granted by a workflow takes precedence (initially refused) (workflow) although grant ('.$action.')' => [
                 $attribute,
                 false,
                 false,
-                WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
             ];
 
             yield 'Is granted by a workflow takes precedence (initially refused) (stored object) although grant ('.$action.')' => [
+                $attribute,
+                false,
+                false,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+            ];
+
+            yield 'Force grant inverse the regular permission (workflow) ('.$action.')' => [
                 $attribute,
                 true,
                 false,
-                WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
             ];
+
+            yield 'Force grant inverse the regular permission (so) ('.$action.')' => [
+                $attribute,
+                true,
+                false,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+            ];
+
         }
     }
 
     /**
-     * @dataProvider dataProviderVoteOnAttribute
+     * @dataProvider dataProviderVoteOnAttributeWithoutStoredObjectPermission
      */
-    public function testVoteOnAttribute(
+    public function testVoteOnAttributeWithoutStoredObjectPermission(
         StoredObjectRoleEnum $attribute,
         bool $expected,
         bool $canBeAssociatedWithWorkflow,
@@ -239,7 +260,10 @@ class AbstractStoredObjectVoterTest extends TestCase
         $security = $this->prophesize(Security::class);
         $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
 
-        $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelperInterface::class);
+        $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelper::class);
+
+        $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($storedObject)->willReturn(WorkflowRelatedEntityPermissionHelper::ABSTAIN);
+        $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($storedObject)->willReturn(WorkflowRelatedEntityPermissionHelper::ABSTAIN);
 
         if (null !== $isGrantedWorkflowPermissionRead) {
             $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($related)
@@ -259,155 +283,27 @@ class AbstractStoredObjectVoterTest extends TestCase
         self::assertEquals($expected, $voter->voteOnAttribute($attribute, $storedObject, $token), $message);
     }
 
-    public static function dataProviderVoteOnAttribute(): iterable
+    public static function dataProviderVoteOnAttributeWithoutStoredObjectPermission(): iterable
     {
         // not associated on a workflow
         yield [StoredObjectRoleEnum::SEE, true, false, true, null, null, 'not associated on a workflow, granted by regular access, must not rely on helper'];
         yield [StoredObjectRoleEnum::SEE, false, false, false, null, null, 'not associated on a workflow, denied by regular access, must not rely on helper'];
 
         // associated on a workflow, read operation
-        yield [StoredObjectRoleEnum::SEE, true, true, true, WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT, null, 'associated on a workflow, read by regular, force grant by workflow, ask for read, should be granted'];
-        yield [StoredObjectRoleEnum::SEE, true, true, true, WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN, null, 'associated on a workflow, read by regular, abstain by workflow, ask for read, should be granted'];
-        yield [StoredObjectRoleEnum::SEE, false, true, true, WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED, null, 'associated on a workflow, read by regular, force grant by workflow, ask for read, should be denied'];
-        yield [StoredObjectRoleEnum::SEE, true, true, false, WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT, null, 'associated on a workflow, denied read by regular, force grant by workflow, ask for read, should be granted'];
-        yield [StoredObjectRoleEnum::SEE, false, true, false, WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN, null, 'associated on a workflow, denied read by regular, abstain by workflow, ask for read, should be granted'];
-        yield [StoredObjectRoleEnum::SEE, false, true, false, WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED, null, 'associated on a workflow, denied read by regular, force grant by workflow, ask for read, should be denied'];
+        yield [StoredObjectRoleEnum::SEE, true, true, true, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, null, 'associated on a workflow, read by regular, force grant by workflow, ask for read, should be granted'];
+        yield [StoredObjectRoleEnum::SEE, true, true, true, WorkflowRelatedEntityPermissionHelper::ABSTAIN, null, 'associated on a workflow, read by regular, abstain by workflow, ask for read, should be granted'];
+        yield [StoredObjectRoleEnum::SEE, false, true, true, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, null, 'associated on a workflow, read by regular, force grant by workflow, ask for read, should be denied'];
+        yield [StoredObjectRoleEnum::SEE, true, true, false, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, null, 'associated on a workflow, denied read by regular, force grant by workflow, ask for read, should be granted'];
+        yield [StoredObjectRoleEnum::SEE, false, true, false, WorkflowRelatedEntityPermissionHelper::ABSTAIN, null, 'associated on a workflow, denied read by regular, abstain by workflow, ask for read, should be granted'];
+        yield [StoredObjectRoleEnum::SEE, false, true, false, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, null, 'associated on a workflow, denied read by regular, force grant by workflow, ask for read, should be denied'];
 
         // association on a workflow, write operation
-        yield [StoredObjectRoleEnum::EDIT, true, true, true, null, WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT, 'associated on a workflow, write by regular, force grant by workflow, ask for write, should be granted'];
-        yield [StoredObjectRoleEnum::EDIT, true, true, true, null, WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN, 'associated on a workflow, write by regular, abstain by workflow, ask for write, should be granted'];
-        yield [StoredObjectRoleEnum::EDIT, false, true, true, null, WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED, 'associated on a workflow, write by regular, force grant by workflow, ask for write, should be denied'];
-        yield [StoredObjectRoleEnum::EDIT, true, true, false, null, WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT, 'associated on a workflow, denied write by regular, force grant by workflow, ask for write, should be granted'];
-        yield [StoredObjectRoleEnum::EDIT, false, true, false, null, WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN, 'associated on a workflow, denied write by regular, abstain by workflow, ask for write, should be granted'];
-        yield [StoredObjectRoleEnum::EDIT, false, true, false, null, WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED, 'associated on a workflow, denied write by regular, force grant by workflow, ask for write, should be denied'];
-    }
-
-    /**
-     * @dataProvider dataProviderPrecedenceOfDirectAssociationOverWorkflowAttachments
-     */
-    public function testPrecedenceOfDirectAssociationOverWorkflowAttachments(
-        StoredObjectRoleEnum $attribute,
-        bool $expected,
-        bool $regularPermission,
-        string $directWorkflowPermission,
-        string $attachmentWorkflowPermission,
-        string $message,
-    ): void {
-        $storedObject = new StoredObject();
-        $repository = new DummyRepository($related = new \stdClass());
-        $token = new UsernamePasswordToken(new User(), 'dummy');
-
-        $security = $this->prophesize(Security::class);
-        $security->isGranted('SOME_ROLE', $related)->willReturn($regularPermission);
-
-        $workflowHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelperInterface::class);
-
-        // Direct association permission
-        if (StoredObjectRoleEnum::SEE === $attribute) {
-            $workflowHelper->isAllowedByWorkflowForReadOperation($related)
-                ->willReturn($directWorkflowPermission);
-        } else {
-            $workflowHelper->isAllowedByWorkflowForWriteOperation($related)
-                ->willReturn($directWorkflowPermission);
-        }
-
-        // Attachment permission
-        $entityWorkflow = $this->prophesize(\Chill\MainBundle\Entity\Workflow\EntityWorkflow::class)->reveal();
-        $attachment = $this->prophesize(EntityWorkflowAttachment::class);
-        $attachment->getEntityWorkflow()->willReturn($entityWorkflow);
-
-        if (StoredObjectRoleEnum::SEE === $attribute) {
-            $workflowHelper->isAllowedByWorkflowForReadOperation($entityWorkflow)
-                ->willReturn($attachmentWorkflowPermission);
-        } else {
-            $workflowHelper->isAllowedByWorkflowForWriteOperation($entityWorkflow)
-                ->willReturn($attachmentWorkflowPermission);
-        }
-
-        $voter = $this->buildStoredObjectVoter(
-            true,
-            $repository,
-            $security->reveal(),
-            $workflowHelper->reveal(),
-            [$attachment->reveal()]
-        );
-
-        self::assertEquals($expected, $voter->voteOnAttribute($attribute, $storedObject, $token), $message);
-    }
-
-    public static function dataProviderPrecedenceOfDirectAssociationOverWorkflowAttachments(): iterable
-    {
-        $cases = [
-            [
-                'expected' => true,
-                'regular' => false,
-                'direct' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
-                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
-                'message' => 'Direct FORCE_GRANT should win over attachment FORCE_DENIED',
-            ],
-            [
-                'expected' => false,
-                'regular' => true,
-                'direct' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
-                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
-                'message' => 'Direct FORCE_DENIED should win over attachment FORCE_GRANT',
-            ],
-            [
-                'expected' => true,
-                'regular' => false,
-                'direct' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
-                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
-                'message' => 'Direct FORCE_GRANT should win over attachment ABSTAIN',
-            ],
-            [
-                'expected' => false,
-                'regular' => true,
-                'direct' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
-                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
-                'message' => 'Direct FORCE_DENIED should win over attachment ABSTAIN',
-            ],
-            [
-                'expected' => true,
-                'regular' => false,
-                'direct' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
-                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
-                'message' => 'Direct ABSTAIN should let attachment FORCE_GRANT win',
-            ],
-            [
-                'expected' => false,
-                'regular' => true,
-                'direct' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
-                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
-                'message' => 'Direct ABSTAIN should let attachment FORCE_DENIED win',
-            ],
-            [
-                'expected' => true,
-                'regular' => true,
-                'direct' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
-                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
-                'message' => 'Both ABSTAIN should let regular permission (true) win',
-            ],
-            [
-                'expected' => false,
-                'regular' => false,
-                'direct' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
-                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
-                'message' => 'Both ABSTAIN should let regular permission (false) win',
-            ],
-        ];
-
-        foreach ([StoredObjectRoleEnum::SEE, StoredObjectRoleEnum::EDIT] as $attribute) {
-            foreach ($cases as $case) {
-                yield sprintf('%s - %s', $attribute->name, $case['message']) => [
-                    $attribute,
-                    $case['expected'],
-                    $case['regular'],
-                    $case['direct'],
-                    $case['attachment'],
-                    $case['message'],
-                ];
-            }
-        }
+        yield [StoredObjectRoleEnum::EDIT, true, true, true, null, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, 'associated on a workflow, write by regular, force grant by workflow, ask for write, should be granted'];
+        yield [StoredObjectRoleEnum::EDIT, true, true, true, null, WorkflowRelatedEntityPermissionHelper::ABSTAIN, 'associated on a workflow, write by regular, abstain by workflow, ask for write, should be granted'];
+        yield [StoredObjectRoleEnum::EDIT, false, true, true, null, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, 'associated on a workflow, write by regular, force grant by workflow, ask for write, should be denied'];
+        yield [StoredObjectRoleEnum::EDIT, true, true, false, null, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, 'associated on a workflow, denied write by regular, force grant by workflow, ask for write, should be granted'];
+        yield [StoredObjectRoleEnum::EDIT, false, true, false, null, WorkflowRelatedEntityPermissionHelper::ABSTAIN, 'associated on a workflow, denied write by regular, abstain by workflow, ask for write, should be granted'];
+        yield [StoredObjectRoleEnum::EDIT, false, true, false, null, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, 'associated on a workflow, denied write by regular, force grant by workflow, ask for write, should be denied'];
     }
 }
 

src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php

@@ -34,7 +34,6 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
 
     public function __construct()
     {
-        mt_srand(123456789);
         $this->faker = \Faker\Factory::create('fr_FR');
     }
 
@@ -46,7 +45,7 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
         for ($i = 0; $i < $expectedNumber; ++$i) {
             $event = (new Event())
                 ->setDate($this->faker->dateTimeBetween('-2 years', '+6 months'))
-                ->setName($this->faker->words(mt_rand(2, 4), true))
+                ->setName($this->faker->words(random_int(2, 4), true))
                 ->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)], EventType::class))
                 ->setCenter($center)
                 ->setCircle(
@@ -79,7 +78,7 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
 
             /** @var Person $person */
             foreach ($people as $person) {
-                $nb = mt_rand(0, 3);
+                $nb = random_int(0, 3);
 
                 for ($i = 0; $i < $nb; ++$i) {
                     $event = $events[array_rand($events)];

src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php

@@ -52,7 +52,7 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
     }
 
     /** (non-PHPdoc).
-     * @see PrependExtensionInterface::prepend()
+     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
     public function prepend(ContainerBuilder $container): void
     {

src/Bundle/ChillEventBundle/Security/Authorization/EventStoredObjectVoter.php

@@ -14,7 +14,6 @@ namespace Chill\EventBundle\Security\Authorization;
 use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoter\AbstractStoredObjectVoter;
-use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
 use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
 use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Repository\EventRepository;
@@ -27,9 +26,8 @@ class EventStoredObjectVoter extends AbstractStoredObjectVoter
         private readonly EventRepository $repository,
         Security $security,
         WorkflowRelatedEntityPermissionHelper $workflowDocumentService,
-        EntityWorkflowAttachmentRepository $attachmentRepository,
     ) {
-        parent::__construct($security, $attachmentRepository, $workflowDocumentService);
+        parent::__construct($security, $workflowDocumentService);
     }
 
     protected function getRepository(): AssociatedEntityToStoredObjectInterface

src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANCommand.php

@@ -31,8 +31,7 @@ class LoadAddressesFRFromBANCommand extends Command
     {
         $this->setName('chill:main:address-ref-from-ban')
             ->addArgument('departementNo', InputArgument::REQUIRED | InputArgument::IS_ARRAY, 'a list of departement numbers')
-            ->addOption('send-report-email', 's', InputOption::VALUE_REQUIRED, 'Email address where a list of unimported addresses can be send')
-            ->addOption('allow-remove-double-refid', 'd', InputOption::VALUE_NONE, 'Should the address importer be allowed to remove same refid in the source data, if any');
+            ->addOption('send-report-email', 's', InputOption::VALUE_REQUIRED, 'Email address where a list of unimported addresses can be send');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
@@ -41,7 +40,7 @@ class LoadAddressesFRFromBANCommand extends Command
         foreach ($input->getArgument('departementNo') as $departementNo) {
             $output->writeln('Import addresses for '.$departementNo);
 
-            $this->addressReferenceFromBAN->import($departementNo, $input->hasOption('send-report-email') ? $input->getOption('send-report-email') : null, allowRemoveDoubleRefId: $input->hasOption('allow-remove-double-refid') ? $input->getOption('allow-remove-double-refid') : false);
+            $this->addressReferenceFromBAN->import($departementNo, $input->hasOption('send-report-email') ? $input->getOption('send-report-email') : null);
         }
 
         return Command::SUCCESS;

src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php

@@ -48,7 +48,7 @@ class LoadAndUpdateLanguagesCommand extends Command
     /**
      * (non-PHPdoc).
      *
-     * @see Command::configure()
+     * @see \Symfony\Component\Console\Command\Command::configure()
      */
     protected function configure()
     {
@@ -73,7 +73,7 @@ class LoadAndUpdateLanguagesCommand extends Command
     /**
      * (non-PHPdoc).
      *
-     * @see Command::execute()
+     * @see \Symfony\Component\Console\Command\Command::execute()
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {

src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php

@@ -51,7 +51,7 @@ class LoadCountriesCommand extends Command
     /**
      * (non-PHPdoc).
      *
-     * @see Command::configure()
+     * @see \Symfony\Component\Console\Command\Command::configure()
      */
     protected function configure()
     {
@@ -61,7 +61,7 @@ class LoadCountriesCommand extends Command
     /**
      * (non-PHPdoc).
      *
-     * @see Command::execute()
+     * @see \Symfony\Component\Console\Command\Command::execute()
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {

src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php

@@ -79,7 +79,5 @@ final class PostalCodeAPIController extends ApiController
 
         $qb->andWhere('e.origin = :zero')
             ->setParameter('zero', 0);
-
-        $qb->andWhere('e.deletedAt IS NULL');
     }
 }

src/Bundle/ChillMainBundle/Controller/WorkflowViewSendPublicController.php

@@ -62,15 +62,15 @@ final readonly class WorkflowViewSendPublicController
             );
         }
 
-        if (30 < $workflowSend->getViews()->count()) {
-            $this->chillLogger->info(self::LOG_PREFIX.'30 view reached, not allowed to see it again');
-            throw new AccessDeniedHttpException('30 views reached, not allowed to see it again');
+        if (100 < $workflowSend->getViews()->count()) {
+            $this->chillLogger->info(self::LOG_PREFIX.'100 view reached, not allowed to see it again');
+            throw new AccessDeniedHttpException('100 views reached, not allowed to see it again');
         }
 
         try {
             $metadata = new EntityWorkflowViewMetadataDTO(
                 $workflowSend->getViews()->count(),
-                30 - $workflowSend->getViews()->count(),
+                100 - $workflowSend->getViews()->count(),
             );
             $response = new Response(
                 $this->entityWorkflowManager->renderPublicView($workflowSend, $metadata),

src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php

@@ -31,7 +31,6 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
 
     public function __construct()
     {
-        mt_srand(123456789);
         $this->faker = \Faker\Factory::create('fr_FR');
     }
 
@@ -68,7 +67,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
 
         $ar->setRefId($this->faker->numerify('ref-id-######'));
         $ar->setStreet($this->faker->streetName);
-        $ar->setStreetNumber((string) mt_rand(0, 199));
+        $ar->setStreetNumber((string) random_int(0, 199));
         $ar->setPoint($this->getRandomPoint());
         $ar->setPostcode($this->getReference(
             LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)],
@@ -89,8 +88,8 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
     {
         $lonBrussels = 4.35243;
         $latBrussels = 50.84676;
-        $lon = $lonBrussels + 0.01 * mt_rand(-5, 5);
-        $lat = $latBrussels + 0.01 * mt_rand(-5, 5);
+        $lon = $lonBrussels + 0.01 * random_int(-5, 5);
+        $lat = $latBrussels + 0.01 * random_int(-5, 5);
 
         return Point::fromLonLat($lon, $lat);
     }

src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php

@@ -20,7 +20,7 @@ class SearchableServicesCompilerPass implements CompilerPassInterface
     /**
      * (non-PHPdoc).
      *
-     * @see CompilerPassInterface::process()
+     * @see \Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface::process()
      */
     public function process(ContainerBuilder $container)
     {

src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php

@@ -32,7 +32,7 @@ abstract class AbstractWidgetFactory implements WidgetFactoryInterface
      * Will create the definition by returning the definition from the `services.yml`
      * file (or `services.xml` or `what-you-want.yml`).
      *
-     * @see WidgetFactoryInterface::createDefinition()
+     * @see \Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface::createDefinition()
      */
     public function createDefinition(ContainerBuilder $containerBuilder, $place, $order, array $config)
     {

src/Bundle/ChillMainBundle/Entity/Notification.php

@@ -215,21 +215,17 @@ class Notification implements TrackUpdateInterface
         return $this->addressees;
     }
 
-    /**
-     * @return list<User|UserGroup>
-     */
     public function getAllAddressees(): array
     {
         $allUsers = [];
 
         foreach ($this->getAddressees() as $user) {
-            $allUsers['u_'.$user->getId()] = $user;
+            $allUsers[$user->getId()] = $user;
         }
 
         foreach ($this->getAddresseeUserGroups() as $userGroup) {
-            $allUsers['ug_'.$userGroup->getId()] = $userGroup;
             foreach ($userGroup->getUsers() as $user) {
-                $allUsers['u_'.$user->getId()] = $user;
+                $allUsers[$user->getId()] = $user;
             }
         }
 

src/Bundle/ChillMainBundle/Entity/PostalCode.php

@@ -215,14 +215,4 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
 
         return $this;
     }
-
-    public function isDeleted(): bool
-    {
-        return null !== $this->deletedAt;
-    }
-
-    public function getDeletedAt(): ?\DateTimeImmutable
-    {
-        return $this->deletedAt;
-    }
 }

src/Bundle/ChillMainBundle/Entity/User.php

@@ -658,11 +658,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         return true;
     }
 
-    public function isUserGroup(): bool
-    {
-        return false;
-    }
-
     private function getNotificationFlagData(string $flag): array
     {
         return $this->notificationFlags[$flag] ?? [self::NOTIF_FLAG_IMMEDIATE_EMAIL];

src/Bundle/ChillMainBundle/Entity/UserGroup.php

@@ -256,21 +256,6 @@ class UserGroup
         return true;
     }
 
-    public function isUser(): bool
-    {
-        return false;
-    }
-
-    /**
-     * Return a locale for the userGroup.
-     *
-     * Currently hardcoded, should be replaced by a property.
-     */
-    public function getLocale(): string
-    {
-        return 'fr';
-    }
-
     public function contains(User $user): bool
     {
         return $this->users->contains($user);

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php

@@ -394,10 +394,6 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
     public function isUserInvolved(User $user): bool
     {
-        if ($this->getCreatedBy() === $user) {
-            return true;
-        }
-
         foreach ($this->getSteps() as $step) {
             if ($step->getAllDestUser()->contains($user)) {
                 return true;

src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailHandlers/SendImmediateNotificationEmailHandler.php

@@ -14,8 +14,7 @@ namespace Chill\MainBundle\Notification\Email\NotificationEmailHandlers;
 use Chill\MainBundle\Notification\Email\NotificationEmailMessages\SendImmediateNotificationEmailMessage;
 use Chill\MainBundle\Notification\Email\NotificationMailer;
 use Chill\MainBundle\Repository\NotificationRepository;
-use Chill\MainBundle\Repository\UserGroupRepository;
-use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Repository\UserRepository;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
@@ -25,8 +24,7 @@ readonly class SendImmediateNotificationEmailHandler
 {
     public function __construct(
         private NotificationRepository $notificationRepository,
-        private UserRepositoryInterface $userRepository,
-        private UserGroupRepository $userGroupRepository,
+        private UserRepository $userRepository,
         private NotificationMailer $notificationMailer,
         private LoggerInterface $logger,
     ) {}
@@ -38,13 +36,7 @@ readonly class SendImmediateNotificationEmailHandler
     public function __invoke(SendImmediateNotificationEmailMessage $message): void
     {
         $notification = $this->notificationRepository->find($message->getNotificationId());
-        if (null !== $message->getUserId()) {
-            $addressee = $this->userRepository->find($message->getUserId());
-        } elseif (null !== $message->getUserGroupId()) {
-            $addressee = $this->userGroupRepository->find($message->getUserGroupId());
-        } else {
-            throw new \InvalidArgumentException('Addressee not found: nor an user nor a user group');
-        }
+        $addressee = $this->userRepository->find($message->getAddresseeId());
 
         if (null === $notification) {
             $this->logger->error('[SendImmediateNotificationEmailHandler] Notification not found', [
@@ -56,11 +48,10 @@ readonly class SendImmediateNotificationEmailHandler
 
         if (null === $addressee) {
             $this->logger->error('[SendImmediateNotificationEmailHandler] Addressee not found', [
-                'user_id' => $message->getUserId(),
-                'user_group_id' => $message->getUserGroupId(),
+                'addressee_id' => $message->getAddresseeId(),
             ]);
 
-            throw new \InvalidArgumentException(sprintf('User with ID %s or user group with id %s not found', $message->getUserId(), $message->getUserGroupId()));
+            throw new \InvalidArgumentException(sprintf('User with ID %s not found', $message->getAddresseeId()));
         }
 
         try {
@@ -68,8 +59,7 @@ readonly class SendImmediateNotificationEmailHandler
         } catch (\Exception $e) {
             $this->logger->error('[SendImmediateNotificationEmailHandler] Failed to send email', [
                 'notification_id' => $message->getNotificationId(),
-                'user_id' => $message->getUserId(),
-                'user_group_id' => $message->getUserGroupId(),
+                'addressee_id' => $message->getAddresseeId(),
                 'stacktrace' => $e->getTraceAsString(),
             ]);
             throw $e;

src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailMessages/SendImmediateNotificationEmailMessage.php

@@ -11,45 +11,20 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Notification\Email\NotificationEmailMessages;
 
-use Chill\MainBundle\Entity\Notification;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\UserGroup;
-
 readonly class SendImmediateNotificationEmailMessage
 {
-    private int $notificationId;
-
-    private ?int $userId;
-
-    private ?int $userGroupId;
-
     public function __construct(
-        Notification $notification,
-        UserGroup|User $addressee,
-    ) {
-        $this->notificationId = $notification->getId();
-
-        if ($addressee instanceof User) {
-            $this->userId = $addressee->getId();
-            $this->userGroupId = null;
-        } else {
-            $this->userGroupId = $addressee->getId();
-            $this->userId = null;
-        }
-    }
+        private int $notificationId,
+        private int $addresseeId,
+    ) {}
 
     public function getNotificationId(): int
     {
         return $this->notificationId;
     }
 
-    public function getUserId(): ?int
+    public function getAddresseeId(): int
     {
-        return $this->userId;
-    }
-
-    public function getUserGroupId(): ?int
-    {
-        return $this->userGroupId;
+        return $this->addresseeId;
     }
 }

src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php

@@ -14,7 +14,6 @@ namespace Chill\MainBundle\Notification\Email;
 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\NotificationComment;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\UserGroup;
 use Chill\MainBundle\Notification\Email\NotificationEmailMessages\SendImmediateNotificationEmailMessage;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Psr\Log\LoggerInterface;
@@ -27,13 +26,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 // use Symfony\Component\Translation\LocaleSwitcher;
 
-class NotificationMailer
+readonly class NotificationMailer
 {
     public function __construct(
-        private readonly MailerInterface $mailer,
-        private readonly LoggerInterface $logger,
-        private readonly MessageBusInterface $messageBus,
-        private readonly TranslatorInterface $translator,
+        private MailerInterface $mailer,
+        private LoggerInterface $logger,
+        private MessageBusInterface $messageBus,
+        private TranslatorInterface $translator,
         // private LocaleSwitcher $localeSwitcher,
     ) {}
 
@@ -60,8 +59,7 @@ class NotificationMailer
             $email
                 ->to($dest->getEmail())
                 ->subject('Re: '.$comment->getNotification()->getTitle())
-                ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.txt.twig')
-                ->htmlTemplate('@ChillMain/Notification/email_notification_comment_persist.md.twig')
+                ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.md.twig')
                 ->context([
                     'comment' => $comment,
                     'dest' => $dest,
@@ -85,6 +83,7 @@ class NotificationMailer
     public function postPersistNotification(Notification $notification, PostPersistEventArgs $eventArgs): void
     {
         $this->sendNotificationEmailsToAddressees($notification);
+        $this->sendNotificationEmailsToAddressesEmails($notification);
     }
 
     private function sendNotificationEmailsToAddressees(Notification $notification): void
@@ -101,24 +100,25 @@ class NotificationMailer
             if (null === $addressee->getEmail()) {
                 continue;
             }
+
             $this->processNotificationForAddressee($notification, $addressee);
         }
     }
 
-    private function processNotificationForAddressee(Notification $notification, User|UserGroup $addressee): void
+    private function processNotificationForAddressee(Notification $notification, User $addressee): void
     {
         $notificationType = $notification->getType();
 
-        if ($addressee instanceof UserGroup || $addressee->isNotificationSendImmediately($notificationType)) {
+        if ($addressee->isNotificationSendImmediately($notificationType)) {
             $this->scheduleImmediateEmail($notification, $addressee);
         }
     }
 
-    private function scheduleImmediateEmail(Notification $notification, User|UserGroup $addressee): void
+    private function scheduleImmediateEmail(Notification $notification, User $addressee): void
     {
         $message = new SendImmediateNotificationEmailMessage(
-            $notification,
-            $addressee,
+            $notification->getId(),
+            $addressee->getId()
         );
 
         $this->messageBus->dispatch($message);
@@ -130,17 +130,13 @@ class NotificationMailer
     }
 
     /**
-     * Send an email about a Notification.
-     *
-     * It is called by immediate notification email message handler:
-     *
-     * @see{\Chill\MainBundle\Notification\Email\NotificationEmailHandlers\SendImmediateNotificationEmailHandler}
+     * This method sends the email but is now called by the immediate notification email message handler.
      *
      * @throws TransportExceptionInterface
      */
-    public function sendEmailToAddressee(Notification $notification, User|UserGroup $addressee): void
+    public function sendEmailToAddressee(Notification $notification, User $addressee): void
     {
-        if (null === $addressee->getEmail() || '' === $addressee->getEmail()) {
+        if (null === $addressee->getEmail()) {
             return;
         }
 
@@ -153,8 +149,7 @@ class NotificationMailer
             } else {
                 $email = new TemplatedEmail();
                 $email
-                    ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.txt.twig')
-                    ->htmlTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
+                    ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
                     ->context([
                         'notification' => $notification,
                         'dest' => $addressee,
@@ -191,8 +186,7 @@ class NotificationMailer
         } else {
             $email = new TemplatedEmail();
             $email
-                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.txt.twig')
-                ->htmlTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
+                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
                 ->context([
                     'notification' => $notification,
                     'dest' => $addressee,
@@ -292,4 +286,38 @@ class NotificationMailer
             throw $e;
         }
     }
+
+    private function sendNotificationEmailsToAddressesEmails(Notification $notification): void
+    {
+        foreach ($notification->getAddresseeUserGroups() as $userGroup) {
+
+            if (!$userGroup->hasEmail()) {
+                continue;
+            }
+
+            $emailAddress = $userGroup->getEmail();
+
+            $email = new TemplatedEmail();
+            $email
+                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content_to_email.md.twig')
+                ->context([
+                    'notification' => $notification,
+                    'dest' => $emailAddress,
+                ]);
+
+            $email
+                ->subject($notification->getTitle())
+                ->to($emailAddress);
+
+            try {
+                $this->mailer->send($email);
+            } catch (TransportExceptionInterface $e) {
+                $this->logger->warning('[NotificationMailer] could not send an email notification', [
+                    'to' => $emailAddress,
+                    'error_message' => $e->getMessage(),
+                    'error_trace' => $e->getTraceAsString(),
+                ]);
+            }
+        }
+    }
 }

src/Bundle/ChillMainBundle/Repository/NotificationRepository.php

@@ -23,7 +23,7 @@ use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-class NotificationRepository implements ObjectRepository
+final class NotificationRepository implements ObjectRepository
 {
     private ?Statement $notificationByRelatedEntityAndUserAssociatedStatement = null;
 

src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php

@@ -100,9 +100,7 @@ final readonly class PostalCodeRepository implements PostalCodeRepositoryInterfa
 
         $query
             ->setFromClause('chill_main_postal_code cmpc')
-            ->andWhereClause('cmpc.origin = 0')
-            ->andWhereClause('cmpc.deletedAt IS NULL')
-        ;
+            ->andWhereClause('cmpc.origin = 0');
 
         if (null !== $country) {
             $query->andWhereClause('cmpc.country_id = ?', [$country->getId()]);

src/Bundle/ChillMainBundle/Repository/UserGroupRepository.php

@@ -18,7 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Contracts\Translation\LocaleAwareInterface;
 
-class UserGroupRepository implements UserGroupRepositoryInterface, LocaleAwareInterface
+final class UserGroupRepository implements UserGroupRepositoryInterface, LocaleAwareInterface
 {
     private readonly EntityRepository $repository;
 

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue

@@ -45,10 +45,10 @@
                             :class="getClassButton"
                             type="button"
                             name="button"
-                            :title="trans(getTextButton)"
+                            :title="getTextButton"
                         >
                             <span v-if="displayTextButton">{{
-                                trans(getTextButton)
+                                getTextButton
                             }}</span>
                         </button>
                     </template>
@@ -73,10 +73,10 @@
                         :class="getClassButton"
                         type="button"
                         name="button"
-                        :title="trans(getTextButton)"
+                        :title="getTextButton"
                     >
                         <span v-if="displayTextButton">{{
-                            trans(getTextButton)
+                            getTextButton
                         }}</span>
                     </button>
                 </template>
@@ -97,11 +97,9 @@
                     :class="getClassButton"
                     type="button"
                     name="button"
-                    :title="trans(getTextButton)"
+                    :title="getTextButton"
                 >
-                    <span v-if="displayTextButton">{{
-                        trans(getTextButton)
-                    }}</span>
+                    <span v-if="displayTextButton">{{ getTextButton }}</span>
                 </button>
             </template>
         </action-buttons>
@@ -177,16 +175,18 @@ export default {
         },
         getTextButton() {
             if (
-                typeof this.options.button.text !== "undefined" &&
-                (this.options.button.text.edit !== null ||
-                    this.options.button.text.create !== null)
+                typeof this.options.button !== "undefined" &&
+                typeof this.options.button.text !== "undefined"
             ) {
-                // console.log('this.options.button.text', this.options.button.text)
-                return this.context.edit
-                    ? ACTIVITY_CREATE_ADDRESS
-                    : ACTIVITY_EDIT_ADDRESS;
+                const customText = this.context.edit
+                    ? this.options.button.text.edit
+                    : this.options.button.text.create;
+
+                if (customText !== null) {
+                    return customText;
+                }
             }
-            console.log("defaultz", this.defaultz);
+
             return this.context.edit
                 ? this.defaultz.button.text.edit
                 : this.defaultz.button.text.create;

src/Bundle/ChillMainBundle/Resources/views/Layout/_footer.html.twig

@@ -2,10 +2,6 @@
     <p>
         {{ 'This program is free software: you can redistribute it and/or modify it under the terms of the <strong>GNU Affero General Public License</strong>'|trans|raw }}
         <br/>
-        {% if get_chill_version() %}
-            {{ 'footer.Running chill version %version%'|trans({ '%version%': get_chill_version() }) }}
-        {% endif %}
-        <br/>
         <a name="bottom" class="btn text-white" href="https://gitea.champs-libres.be/Chill-project/manuals/releases" target="_blank">
             {{ 'User manual'|trans }}
         </a>

src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.md.twig

@@ -1,21 +1,20 @@
-{% apply markdown_to_html %}
-{% if dest.isUser %}
 {{ dest.label }},
-{% else %}
-{{ dest.label|localize_translatable_string }},
-{% endif %}
 
 {{ notification.sender.label }} a créé une notification pour vous:
 
-**Titre de la notification**: {{ notification.title }}
-
-{% for line in notification.message|split("\n") %}
+> {{ notification.title }}
+>
+>
+{%- for line in notification.message|split("\n") %}
 > {{ line }}
-{% endfor %}
+{%- if not loop.last %}
+>
+{%- endif %}
+{%- endfor %}
 
-[Vous pouvez visualiser la notification et y répondre ici.]({{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': notification.id }, false)) }})
+Vous pouvez visualiser la notification et y répondre ici:
 
------
+{{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': notification.id }, false)) }}
 
+--
 Le logiciel Chill
-{% endapply %}

src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.txt.twig

@@ -1,18 +0,0 @@
-{% if dest.isUser %}
-{{ dest.label }},
-{% else %}
-{{ dest.label|localize_translatable_string }},
-{% endif %}
-
-{{ notification.sender.label }} a créé une notification pour vous:
-
-Titre de la notification: {{ notification.title }}
-
-{% for line in notification.message|split("\n") %}
-> {{ line|raw }}
-{% endfor %}
-
-Vous pouvez visualiser la notification et y répondre ici: {{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': notification.id }, false)) }}.
-
---
-Le logiciel Chill

src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content_to_email.md.twig

@@ -0,0 +1,20 @@
+{{ dest }},
+
+{{ notification.sender.label }} a créé une notification pour vous:
+
+> {{ notification.title }}
+>
+>
+{%- for line in notification.message|split("\n") %}
+> {{ line }}
+{%- if not loop.last %}
+>
+{%- endif %}
+{%- endfor %}
+
+Vous pouvez cliquer sur ce lien pour obtenir un accès permanent à la notification:
+
+{{ absolute_url(path('chill_main_notification_grant_access_by_access_key', {'_locale': 'fr', 'id': notification.id, 'accessKey': notification.accessKey, 'email': dest})) }}
+
+--
+Le logiciel Chill

src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.md.twig

@@ -1,4 +1,3 @@
-{% apply markdown_to_html %}
 {{ dest.label }},
 
 {{ comment.createdBy.label }} a créé un commentaire sur la notification "{{ comment.notification.title }}".
@@ -7,11 +6,14 @@ Commentaire:
 
 {% for line in comment.content|split("\n") %}
 > {{ line }}
-{% endfor %}
+{%- if not loop.last %}
+>
+{%- endif %}
+{%- endfor %}
 
-[Vous pouvez visualiser la notification et y répondre ici.]({{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': comment.notification.id }, false)) }})
+Vous pouvez visualiser la notification et y répondre ici:
 
-----
+{{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': comment.notification.id }, false)) }}
 
+--
 Le logiciel Chill
-{% endapply %}

src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.txt.twig

@@ -1,14 +0,0 @@
-{{ dest.label }},
-
-{{ comment.createdBy.label }} a créé un commentaire sur la notification "{{ comment.notification.title }}".
-
-Commentaire:
-
-{% for line in comment.content|split("\n") %}
-> {{ line }}
-{%- endfor %}
-
-Vous pouvez visualiser la notification et y répondre ici: {{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': comment.notification.id }, false)) }}
-
---
-Le logiciel Chill

src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php

@@ -33,7 +33,7 @@ final readonly class ScopeResolverDispatcher
     }
 
     /**
-     * @return Scope|iterable<Scope>|null
+     * @return Scope|iterable<Scope>|Scope|null
      */
     public function resolveScope(mixed $entity, ?array $options = []): iterable|Scope|null
     {

src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php

@@ -23,7 +23,7 @@ class AddressReferenceFromBAN
         private readonly AddressToReferenceMatcher $addressToReferenceMatcher,
     ) {}
 
-    public function import(string $departementNo, ?string $sendAddressReportToEmail = null, ?bool $allowRemoveDoubleRefId = false): void
+    public function import(string $departementNo, ?string $sendAddressReportToEmail = null): void
     {
         if (!is_numeric($departementNo)) {
             throw new \UnexpectedValueException('Could not parse this department number');
@@ -96,7 +96,7 @@ class AddressReferenceFromBAN
             );
         }
 
-        $this->baseImporter->finalize(allowRemoveDoubleRefId: $allowRemoveDoubleRefId, sendAddressReportToEmail: $sendAddressReportToEmail);
+        $this->baseImporter->finalize(sendAddressReportToEmail: $sendAddressReportToEmail);
 
         $this->addressToReferenceMatcher->checkAddressesMatchingReferences();
 

src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php

@@ -19,66 +19,31 @@ use Doctrine\DBAL\Statement;
  */
 class PostalCodeBaseImporter
 {
-    private const CREATE_TEMP_TABLE = <<<'SQL'
-        CREATE TEMPORARY TABLE chill_main_postal_code_temp (
-            countrycode VARCHAR(10),
-            label VARCHAR(255),
-            code VARCHAR(100),
-            refpostalcodeid VARCHAR(255),
-            postalcodeSource VARCHAR(255),
-            lon FLOAT,
-            lat FLOAT,
-            srid INT
-        )
-        SQL;
-
-    private const INSERT_TEMP = <<<'SQL'
-        INSERT INTO chill_main_postal_code_temp
-            (countrycode, label, code, refpostalcodeid, postalcodeSource, lon, lat, srid)
-        VALUES
-            {{ values }}
-        SQL;
-
-    private const UPSERT = <<<'SQL'
+    private const QUERY = <<<'SQL'
         WITH g AS (
             SELECT DISTINCT
                 country.id AS country_id,
-                temp.*
-            FROM chill_main_postal_code_temp temp
-            JOIN country ON country.countrycode = temp.countrycode
+                g.*
+            FROM (VALUES
+                      {{ values }}
+                 ) AS g (countrycode, label, code, refpostalcodeid, postalcodeSource, lon, lat, srid)
+            JOIN country ON country.countrycode = g.countrycode
         )
-        INSERT INTO chill_main_postal_code (id, country_id, label, code, origin, refpostalcodeid, postalcodeSource, center, createdAt, updatedAt, deletedAt)
+        INSERT INTO chill_main_postal_code (id, country_id, label, code, origin, refpostalcodeid, postalcodeSource, center, createdAt, updatedAt)
                SELECT
                    nextval('chill_main_postal_code_id_seq'),
                    g.country_id,
-                   g.label,
+                   g.label AS glabel,
                    g.code,
                    0,
                    g.refpostalcodeid,
                    g.postalcodeSource,
-                   CASE WHEN (g.lon != 0.0 AND g.lat != 0.0) THEN ST_Transform(ST_setSrid(ST_point(g.lon, g.lat), g.srid), 4326) ELSE NULL END,
+                   CASE WHEN (g.lon::float != 0.0 AND g.lat::float != 0.0) THEN ST_Transform(ST_setSrid(ST_point(g.lon::float, g.lat::float), g.srid::int), 4326) ELSE NULL END,
                    NOW(),
-                   NOW(),
-                   NULL
+                   NOW()
                FROM g
         ON CONFLICT (code, refpostalcodeid, postalcodeSource) WHERE refpostalcodeid IS NOT NULL DO UPDATE
-            SET label = excluded.label,
-                center = excluded.center,
-                deletedAt = NULL,
-                updatedAt = CASE WHEN NOT st_equals(excluded.center, chill_main_postal_code.center) OR excluded.label != chill_main_postal_code.label OR chill_main_postal_code.deletedAt IS NOT NULL THEN NOW() ELSE chill_main_postal_code.updatedAt END
-        SQL;
-
-    private const DELETE_MISSING = <<<'SQL'
-        UPDATE chill_main_postal_code
-        SET deletedAt = NOW(), updatedAt = NOW()
-        WHERE postalcodeSource = ?
-          AND deletedAt IS NULL
-          AND NOT EXISTS (
-              SELECT 1 FROM chill_main_postal_code_temp temp
-              WHERE temp.code = chill_main_postal_code.code
-                AND temp.refpostalcodeid = chill_main_postal_code.refpostalcodeid
-                AND temp.postalcodeSource = chill_main_postal_code.postalcodeSource
-          )
+            SET label = excluded.label, center = excluded.center, updatedAt = CASE WHEN NOT st_equals(excluded.center, chill_main_postal_code.center) OR excluded.label != chill_main_postal_code.label THEN NOW() ELSE chill_main_postal_code.updatedAt END
         SQL;
 
     private const VALUE = '(?, ?, ?, ?, ?, ?, ?, ?)';
@@ -90,26 +55,11 @@ class PostalCodeBaseImporter
 
     private array $waitingForInsert = [];
 
-    private bool $isInitialized = false;
-
-    private ?string $currentSource = null;
-
     public function __construct(private readonly Connection $defaultConnection) {}
 
     public function finalize(): void
     {
         $this->doInsertPending();
-
-        if ($this->isInitialized && null !== $this->currentSource) {
-            $this->defaultConnection->transactional(function (Connection $connection): void {
-                $connection->executeStatement(self::UPSERT);
-                $connection->executeStatement(self::DELETE_MISSING, [$this->currentSource]);
-            });
-            $this->deleteTemporaryTable();
-        }
-
-        $this->isInitialized = false;
-        $this->currentSource = null;
     }
 
     public function importCode(
@@ -122,14 +72,6 @@ class PostalCodeBaseImporter
         float $centerLon,
         int $centerSRID,
     ): void {
-        if (!$this->isInitialized) {
-            $this->initialize($refPostalCodeSource);
-        }
-
-        if ($this->currentSource !== $refPostalCodeSource) {
-            throw new \LogicException('Cannot store postal codes from different sources during same import. Execute finalize to commit inserts before changing the source');
-        }
-
         $this->waitingForInsert[] = [
             $countryCode,
             $label,
@@ -146,32 +88,10 @@ class PostalCodeBaseImporter
         }
     }
 
-    private function initialize(string $source): void
-    {
-        $this->currentSource = $source;
-        $this->deleteTemporaryTable();
-        $this->createTemporaryTable();
-        $this->isInitialized = true;
-    }
-
-    private function createTemporaryTable(): void
-    {
-        $this->defaultConnection->executeStatement(self::CREATE_TEMP_TABLE);
-    }
-
-    private function deleteTemporaryTable(): void
-    {
-        $this->defaultConnection->executeStatement('DROP TABLE IF EXISTS chill_main_postal_code_temp');
-    }
-
     private function doInsertPending(): void
     {
-        if ([] == $this->waitingForInsert) {
-            return;
-        }
-
         if (!\array_key_exists($forNumber = \count($this->waitingForInsert), $this->cachingStatements)) {
-            $sql = strtr(self::INSERT_TEMP, [
+            $sql = strtr(self::QUERY, [
                 '{{ values }}' => implode(
                     ', ',
                     array_fill(0, $forNumber, self::VALUE)

src/Bundle/ChillMainBundle/Service/VersionProvider.php

@@ -1,45 +0,0 @@
-<?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\MainBundle\Service;
-
-use Composer\InstalledVersions;
-
-readonly class VersionProvider
-{
-    public function __construct(private string $packageName) {}
-
-    public function getVersion(): string
-    {
-        try {
-            $version = InstalledVersions::getPrettyVersion($this->packageName);
-
-            if (null === $version) {
-                return 'unknown';
-            }
-
-            return $version;
-        } catch (\OutOfBoundsException) {
-            return 'unknown';
-        }
-    }
-
-    public function getFormattedVersion(): string
-    {
-        $version = $this->getVersion();
-
-        if ('unknown' === $version) {
-            return 'Version unavailable';
-        }
-
-        return $version;
-    }
-}

src/Bundle/ChillMainBundle/Service/Workflow/CancelStaleWorkflowCronJob.php

@@ -23,7 +23,7 @@ class CancelStaleWorkflowCronJob implements CronJobInterface
 {
     public const KEY = 'remove-stale-workflow';
 
-    public const KEEP_INTERVAL = 'P180D';
+    public const KEEP_INTERVAL = 'P90D';
 
     private const LAST_CANCELED_WORKFLOW = 'last-canceled-workflow-id';
 

src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php

@@ -41,6 +41,6 @@ final class ChillMarkdownRenderExtension extends AbstractExtension
 
     public function renderMarkdownToHtml(?string $var): string
     {
-        return $this->parsedown->text((string) $var);
+        return $this->parsedown->parse((string) $var);
     }
 }

src/Bundle/ChillMainBundle/Templating/VersionRenderExtension.php

@@ -1,35 +0,0 @@
-<?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\MainBundle\Templating;
-
-use Chill\MainBundle\Service\VersionProvider;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFunction;
-
-class VersionRenderExtension extends AbstractExtension
-{
-    public function __construct(
-        private readonly VersionProvider $versionProvider,
-    ) {}
-
-    public function getFunctions(): array
-    {
-        return [
-            new TwigFunction('get_chill_version', $this->getChillVersion(...)),
-        ];
-    }
-
-    public function getChillVersion(): string
-    {
-        return $this->versionProvider->getFormattedVersion();
-    }
-}

src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php

@@ -17,7 +17,6 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Contracts\Translation\TranslatableInterface;
 
 /**
  *  Helper to test filters.
@@ -256,8 +255,8 @@ abstract class AbstractFilterTest extends KernelTestCase
         $description = $this->getFilter()->describeAction($data, $context);
 
         $this->assertTrue(
-            \is_string($description) || \is_array($description) || $description instanceof TranslatableInterface,
-            'test that the description is a string or an array, or a TranslatableInterface'
+            \is_string($description) || \is_array($description),
+            'test that the description is a string or an array'
         );
 
         if (\is_string($description)) {

src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationEmailHandler/SendImmediateNotificationEmailHandlerTest.php

@@ -1,187 +0,0 @@
-<?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\MainBundle\Tests\Notification\Email\NotificationEmailHandler;
-
-use Chill\MainBundle\Entity\Notification;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\UserGroup;
-use Chill\MainBundle\Notification\Email\NotificationEmailHandlers\SendImmediateNotificationEmailHandler;
-use Chill\MainBundle\Notification\Email\NotificationEmailMessages\SendImmediateNotificationEmailMessage;
-use Chill\MainBundle\Notification\Email\NotificationMailer;
-use Chill\MainBundle\Repository\NotificationRepository;
-use Chill\MainBundle\Repository\UserGroupRepository;
-use Chill\MainBundle\Repository\UserRepositoryInterface;
-use PHPUnit\Framework\TestCase;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Psr\Log\NullLogger;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class SendImmediateNotificationEmailHandlerTest extends TestCase
-{
-    use ProphecyTrait;
-
-    private $notificationRepository;
-    private $userRepository;
-    private $userGroupRepository;
-    private $notificationMailer;
-    private SendImmediateNotificationEmailHandler $handler;
-
-    protected function setUp(): void
-    {
-        $this->notificationRepository = $this->prophesize(NotificationRepository::class);
-        $this->userRepository = $this->prophesize(UserRepositoryInterface::class);
-        $this->userGroupRepository = $this->prophesize(UserGroupRepository::class);
-        $this->notificationMailer = $this->prophesize(NotificationMailer::class);
-
-        $this->handler = new SendImmediateNotificationEmailHandler(
-            $this->notificationRepository->reveal(),
-            $this->userRepository->reveal(),
-            $this->userGroupRepository->reveal(),
-            $this->notificationMailer->reveal(),
-            new NullLogger()
-        );
-    }
-
-    public function testInvokeWithUserAddressee(): void
-    {
-        $notificationId = 123;
-        $userId = 456;
-
-        $notification = $this->prophesize(Notification::class);
-        $notification->getId()->willReturn($notificationId);
-        $user = $this->prophesize(User::class);
-        $user->getId()->willReturn($userId);
-
-        $message = new SendImmediateNotificationEmailMessage($notification->reveal(), $user->reveal());
-
-        $this->notificationRepository->find($notificationId)->willReturn($notification->reveal());
-        $this->userRepository->find($userId)->willReturn($user->reveal());
-
-        $this->notificationMailer->sendEmailToAddressee($notification->reveal(), $user->reveal())
-            ->shouldBeCalledOnce();
-
-        ($this->handler)($message);
-    }
-
-    public function testInvokeWithUserGroupAddressee(): void
-    {
-        $notificationId = 123;
-        $userGroupId = 789;
-
-        $notification = $this->prophesize(Notification::class);
-        $notification->getId()->willReturn($notificationId);
-        $userGroup = $this->prophesize(UserGroup::class);
-        $userGroup->getId()->willReturn($userGroupId);
-
-        $message = new SendImmediateNotificationEmailMessage($notification->reveal(), $userGroup->reveal());
-
-        $this->notificationRepository->find($notificationId)->willReturn($notification->reveal());
-        $this->userGroupRepository->find($userGroupId)->willReturn($userGroup->reveal());
-
-        $this->notificationMailer->sendEmailToAddressee($notification->reveal(), $userGroup->reveal())
-            ->shouldBeCalledOnce();
-
-        ($this->handler)($message);
-    }
-
-    public function testInvokeThrowsExceptionWhenNotificationNotFound(): void
-    {
-        $notificationId = 123;
-        $userId = 456;
-
-        $notification = $this->prophesize(Notification::class);
-        $notification->getId()->willReturn($notificationId);
-        $user = $this->prophesize(User::class);
-        $user->getId()->willReturn($userId);
-
-        $message = new SendImmediateNotificationEmailMessage($notification->reveal(), $user->reveal());
-
-        $this->notificationRepository->find($notificationId)->willReturn(null);
-        $this->userRepository->find($userId)->willReturn($user->reveal());
-
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage(sprintf('Notification with ID %s not found', $notificationId));
-
-        ($this->handler)($message);
-    }
-
-    public function testInvokeThrowsExceptionWhenUserNotFound(): void
-    {
-        $notificationId = 123;
-        $userId = 456;
-
-        $notification = $this->prophesize(Notification::class);
-        $notification->getId()->willReturn($notificationId);
-        $user = $this->prophesize(User::class);
-        $user->getId()->willReturn($userId);
-
-        $message = new SendImmediateNotificationEmailMessage($notification->reveal(), $user->reveal());
-
-        $this->notificationRepository->find($notificationId)->willReturn($notification->reveal());
-        $this->userRepository->find($userId)->willReturn(null);
-
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage(sprintf('User with ID %s or user group with id %s not found', $userId, ''));
-
-        ($this->handler)($message);
-    }
-
-    public function testInvokeThrowsExceptionWhenUserGroupNotFound(): void
-    {
-        $notificationId = 123;
-        $userGroupId = 789;
-
-        $notification = $this->prophesize(Notification::class);
-        $notification->getId()->willReturn($notificationId);
-        $userGroup = $this->prophesize(UserGroup::class);
-        $userGroup->getId()->willReturn($userGroupId);
-
-        $message = new SendImmediateNotificationEmailMessage($notification->reveal(), $userGroup->reveal());
-
-        $this->notificationRepository->find($notificationId)->willReturn($notification->reveal());
-        $this->userGroupRepository->find($userGroupId)->willReturn(null);
-
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage(sprintf('User with ID %s or user group with id %s not found', '', $userGroupId));
-
-        ($this->handler)($message);
-    }
-
-    public function testInvokeRethrowsExceptionWhenMailerFails(): void
-    {
-        $notificationId = 123;
-        $userId = 456;
-
-        $notification = $this->prophesize(Notification::class);
-        $notification->getId()->willReturn($notificationId);
-        $user = $this->prophesize(User::class);
-        $user->getId()->willReturn($userId);
-
-        $message = new SendImmediateNotificationEmailMessage($notification->reveal(), $user->reveal());
-
-        $this->notificationRepository->find($notificationId)->willReturn($notification->reveal());
-        $this->userRepository->find($userId)->willReturn($user->reveal());
-
-        $exception = new \Exception('Mailer error');
-        $this->notificationMailer->sendEmailToAddressee($notification->reveal(), $user->reveal())
-            ->willThrow($exception);
-
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Mailer error');
-
-        ($this->handler)($message);
-    }
-}

src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailTwigContentTest.php

@@ -1,71 +0,0 @@
-<?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\MainBundle\Tests\Notification\Email;
-
-use Chill\MainBundle\Entity\Notification;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\UserGroup;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Twig\Environment;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class NotificationMailTwigContentTest extends KernelTestCase
-{
-    private Environment $twig;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-        $this->twig = $this->getContainer()->get('twig');
-    }
-
-    /**
-     * @dataProvider provideContent
-     */
-    public function testContent(string $template, array $args): void
-    {
-        $actual = $this->twig->render($template, $args);
-
-        self::assertIsString($actual);
-    }
-
-    public static function provideContent(): iterable
-    {
-        $notification = new Notification();
-        $notification->setMessage('test message');
-        $notification->setSender(new User());
-
-        $class = new \ReflectionClass($notification);
-        $method = $class->getProperty('id');
-        $method->setValue($notification, 1);
-
-        $txt = '@ChillMain/Notification/email_non_system_notification_content.txt.twig';
-        $md = '@ChillMain/Notification/email_non_system_notification_content.md.twig';
-
-        $user = new User();
-        $user->setLocale('fr');
-        $user->setLabel('test');
-
-        $userGroup = new UserGroup();
-        $userGroup->setLabel(['fr' => 'test user group']);
-
-        foreach ([$md, $txt] as $template) {
-            yield 'test with a user for '.$template => [$template, ['notification' => $notification, 'dest' => $user]];
-            yield 'test with a group for '.$template => [$template, ['notification' => $notification, 'dest' => $userGroup]];
-        }
-
-    }
-}

src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php

@@ -9,12 +9,11 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\MainBundle\Tests\Notification\Email;
+namespace Notification\Email;
 
 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\NotificationComment;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\UserGroup;
 use Chill\MainBundle\Notification\Email\NotificationMailer;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\PostPersistEventArgs;
@@ -65,22 +64,13 @@ class NotificationMailerTest extends TestCase
         // a mail only to user1 and user3 should have been sent
         $mailer->send(Argument::that(function (Email $email) {
             foreach ($email->getTo() as $address) {
-                if ('user1@foo.com' === $address->getAddress()) {
+                if ('user1@foo.com' === $address->getAddress() || 'user3@foo.com' === $address->getAddress()) {
                     return true;
                 }
             }
 
             return false;
-        }))->shouldBeCalledTimes(1);
-        $mailer->send(Argument::that(function (Email $email) {
-            foreach ($email->getTo() as $address) {
-                if ('user3@foo.com' === $address->getAddress()) {
-                    return true;
-                }
-            }
-
-            return false;
-        }))->shouldBeCalledTimes(1);
+        }))->shouldBeCalledTimes(2);
 
         $objectManager = $this->prophesize(EntityManagerInterface::class);
 
@@ -131,83 +121,7 @@ class NotificationMailerTest extends TestCase
      * @throws \ReflectionException
      * @throws Exception
      */
-    public function testPostPersistNotificationToGroup(): void
-    {
-        // Create a real notification entity
-        $notification = new Notification();
-        $notification->setType('test_notification_type');
-
-        // Use reflection to set the ID since it's normally generated by the database
-        $reflectionNotification = new \ReflectionClass(Notification::class);
-        $idProperty = $reflectionNotification->getProperty('id');
-        $idProperty->setValue($notification, 123);
-
-        // Create a real user entity
-        $user = new User();
-        $user->setEmail('user@example.com');
-        $userGroup = new UserGroup();
-        $userGroup->addUser($user);
-        $notification->addAddressee($userGroup);
-
-        // Use reflection to set the ID since it's normally generated by the database
-        $reflectionUser = new \ReflectionClass($user);
-        $idProperty = $reflectionUser->getProperty('id');
-        $idProperty->setValue($user, 456);
-
-        $reflectionUser = new \ReflectionClass($userGroup);
-        $idProperty = $reflectionUser->getProperty('id');
-        $idProperty->setValue($userGroup, 789);
-
-        // Set notification flags for the user
-        $user->setNotificationImmediately('test_notification_type', true);
-
-        $messageBus = $this->prophesize(MessageBusInterface::class);
-        $messageBus->dispatch(Argument::that(fn (SendImmediateNotificationEmailMessage $message) => 123 === $message->getNotificationId() && 456 === $message->getUserId() && null === $message->getUserGroupId()))->willReturn(new Envelope(new \stdClass()))->shouldBeCalled();
-
-        $messageBus->dispatch(Argument::that(fn (SendImmediateNotificationEmailMessage $message) => 123 === $message->getNotificationId() && null === $message->getUserId() && 789 === $message->getUserGroupId()))->willReturn(new Envelope(new \stdClass()))->shouldBeCalled();
-
-        $notificationMailer = $this->buildNotificationMailer(null, $messageBus->reveal());
-
-        $notificationMailer->postPersistNotification($notification, new PostPersistEventArgs($notification, $this->prophesize(EntityManagerInterface::class)->reveal()));
-    }
-
-    /**
-     * @throws \ReflectionException
-     * @throws Exception
-     */
-    public function testPostPersistNotificationWithImmediateEmailPreference(): void
-    {
-        // Create a real notification entity
-        $notification = new Notification();
-        $notification->setType('test_notification_type');
-
-        // Use reflection to set the ID since it's normally generated by the database
-        $reflectionNotification = new \ReflectionClass(Notification::class);
-        $idProperty = $reflectionNotification->getProperty('id');
-        $idProperty->setValue($notification, 123);
-
-        // Create a real user entity
-        $user = new User();
-        $user->setEmail('user@example.com');
-        $notification->addAddressee($user);
-
-        // Use reflection to set the ID since it's normally generated by the database
-        $reflectionUser = new \ReflectionClass(User::class);
-        $idProperty = $reflectionUser->getProperty('id');
-        $idProperty->setValue($user, 456);
-
-        // Set notification flags for the user
-        $user->setNotificationImmediately('test_notification_type', true);
-
-        $messageBus = $this->prophesize(MessageBusInterface::class);
-        $messageBus->dispatch(Argument::that(fn (SendImmediateNotificationEmailMessage $message) => 123 === $message->getNotificationId() && 456 === $message->getUserId() && null === $message->getUserGroupId()))->willReturn(new Envelope(new \stdClass()))->shouldBeCalled();
-
-        $notificationMailer = $this->buildNotificationMailer(null, $messageBus->reveal());
-
-        $notificationMailer->postPersistNotification($notification, new PostPersistEventArgs($notification, $this->prophesize(EntityManagerInterface::class)->reveal()));
-    }
-
-    public function testPostPersistNotificationWithDailyDigestPreference(): void
+    public function testProcessNotificationForAddresseeWithImmediateEmailPreference(): void
     {
         // Create a real notification entity
         $notification = new Notification();
@@ -222,11 +136,6 @@ class NotificationMailerTest extends TestCase
         // Create a real user entity
         $user = new User();
         $user->setEmail('user@example.com');
-        // Set notification flags for the user
-        $user->setNotificationImmediately('test_notification_type', false);
-        $user->setNotificationDailyDigest('test_notification_type', true);
-
-        $notification->addAddressee($user);
 
         // Use reflection to set the ID since it's normally generated by the database
         $reflectionUser = new \ReflectionClass(User::class);
@@ -234,15 +143,23 @@ class NotificationMailerTest extends TestCase
         $idProperty->setAccessible(true);
         $idProperty->setValue($user, 456);
 
-        $messageBus = $this->prophesize(MessageBusInterface::class);
-        $messageBus->dispatch(Argument::that(fn (SendImmediateNotificationEmailMessage $message) => 123 === $message->getNotificationId() && 456 === $message->getUserId() && null === $message->getUserGroupId()))->willReturn(new Envelope(new \stdClass()))->shouldNotBeCalled();
+        // Set notification flags for the user
+        $user->setNotificationImmediately('test_notification_type', true);
 
-        $notificationMailer = $this->buildNotificationMailer(
-            null,
-            $messageBus->reveal()
-        );
+        $messageBus = $this->createMock(MessageBusInterface::class);
+        $messageBus->expects($this->once())
+            ->method('dispatch')
+            ->with($this->callback(fn (SendImmediateNotificationEmailMessage $message) => 123 === $message->getNotificationId()
+                && 456 === $message->getAddresseeId()))
+            ->willReturn(new Envelope(new \stdClass()));
 
-        $notificationMailer->postPersistNotification($notification, new PostPersistEventArgs($notification, $this->prophesize(EntityManagerInterface::class)->reveal()));
+        $mailer = $this->buildNotificationMailer(null, $messageBus);
+
+        // Call the method that processes notifications
+        $reflection = new \ReflectionClass(NotificationMailer::class);
+        $method = $reflection->getMethod('processNotificationForAddressee');
+        $method->setAccessible(true);
+        $method->invoke($mailer, $notification, $user);
     }
 
     public function testSendDailyDigest(): void
@@ -333,108 +250,6 @@ class NotificationMailerTest extends TestCase
         $notificationMailer->sendDailyDigest($user, $notifications);
     }
 
-    public function testSendEmailToAddresseeUser(): void
-    {
-        $user = new User();
-        $user->setEmail('user@example.com');
-        $notification = new Notification();
-        $notification->setSender(new User());
-        $notification->setTitle('Notification 1');
-        $notification->setType('test_notification_type');
-        $notification->addAddressee($user);
-
-        $mailer = $this->prophesize(MailerInterface::class);
-        $mailer->send(Argument::that(function ($arg) {
-            if (!$arg instanceof Email) {
-                return false;
-            }
-
-            if ('Notification 1' !== $arg->getSubject()) {
-                return false;
-            }
-
-            foreach ($arg->getTo() as $address) {
-                if ('user@example.com' === $address->getAddress()) {
-                    return true;
-                }
-            }
-
-            return false;
-        }))->shouldBeCalledOnce();
-
-        $notificationMailer = $this->buildNotificationMailer($mailer->reveal());
-
-        $notificationMailer->sendEmailToAddressee($notification, $user);
-    }
-
-    public function testSendEmailToAddresseeGroup(): void
-    {
-        $userGroup = new UserGroup();
-        $userGroup->setEmail('user@example.com');
-        $notification = new Notification();
-        $notification->setSender(new User());
-        $notification->setTitle('Notification 1');
-        $notification->setType('test_notification_type');
-        $notification->addAddressee($userGroup);
-
-        $mailer = $this->prophesize(MailerInterface::class);
-        $mailer->send(Argument::that(function ($arg) {
-            if (!$arg instanceof Email) {
-                return false;
-            }
-
-            if ('Notification 1' !== $arg->getSubject()) {
-                return false;
-            }
-
-            foreach ($arg->getTo() as $address) {
-                if ('user@example.com' === $address->getAddress()) {
-                    return true;
-                }
-            }
-
-            return false;
-        }))->shouldBeCalledOnce();
-
-        $notificationMailer = $this->buildNotificationMailer($mailer->reveal());
-
-        $notificationMailer->sendEmailToAddressee($notification, $userGroup);
-    }
-
-    public function testSendEmailToAddresseeGroupWithNoAddress(): void
-    {
-        $userGroup = new UserGroup();
-        $notification = new Notification();
-        $notification->setSender(new User());
-        $notification->setTitle('Notification 1');
-        $notification->setType('test_notification_type');
-        $notification->addAddressee($userGroup);
-
-        $mailer = $this->prophesize(MailerInterface::class);
-        $mailer->send(Argument::any())->shouldNotBeCalled();
-
-        $notificationMailer = $this->buildNotificationMailer($mailer->reveal());
-
-        $notificationMailer->sendEmailToAddressee($notification, $userGroup);
-    }
-
-    public function testSendEmailToAddresseeUserWithNoAddress(): void
-    {
-        $user = new User();
-        $notification = new Notification();
-        $notification->setSender(new User());
-        $notification->setTitle('Notification 1');
-        $notification->setType('test_notification_type');
-        $notification->addAddressee($user);
-
-        $mailer = $this->prophesize(MailerInterface::class);
-        $mailer->send(Argument::any())->shouldNotBeCalled();
-
-        $notificationMailer = $this->buildNotificationMailer($mailer->reveal());
-
-        $notificationMailer->sendEmailToAddressee($notification, $user);
-    }
-
     private function buildNotificationMailer(
         ?MailerInterface $mailer = null,
         ?MessageBusInterface $messageBus = null,

src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php

@@ -93,80 +93,4 @@ final class PostalCodeBaseImporterTest extends KernelTestCase
         $this->assertStringStartsWith('tested with adapted pattern', $postalCodes[0]->getName());
         $this->assertEquals($previousId, $postalCodes[0]->getId());
     }
-
-    public function testPostalCodeRemoval(): void
-    {
-        $source = 'removal_test_'.uniqid();
-        $refId1 = 'ref1_'.uniqid();
-        $refId2 = 'ref2_'.uniqid();
-
-        // 1. Import two postal codes
-        $this->importer->importCode('BE', 'Label 1', '1000', $refId1, $source, 50.0, 5.0, 4326);
-        $this->importer->importCode('BE', 'Label 2', '2000', $refId2, $source, 50.0, 5.0, 4326);
-        $this->importer->finalize();
-
-        $pc1 = $this->postalCodeRepository->findOneBy(['refPostalCodeId' => $refId1, 'postalCodeSource' => $source]);
-        $pc2 = $this->postalCodeRepository->findOneBy(['refPostalCodeId' => $refId2, 'postalCodeSource' => $source]);
-
-        $this->assertNotNull($pc1);
-        $this->assertNotNull($pc2);
-
-        // 2. Import only the first one
-        $this->importer->importCode('BE', 'Label 1 updated', '1000', $refId1, $source, 50.0, 5.0, 4326);
-        $this->importer->finalize();
-
-        $this->entityManager->clear();
-
-        $pc1 = $this->postalCodeRepository->findOneBy(['refPostalCodeId' => $refId1, 'postalCodeSource' => $source]);
-        $pc2 = $this->postalCodeRepository->findOneBy(['refPostalCodeId' => $refId2, 'postalCodeSource' => $source]);
-
-        $this->assertNotNull($pc1);
-        $this->assertEquals('Label 1 updated', $pc1->getName());
-
-        $this->assertFalse($pc1->isDeleted(), 'pc1 should NOT be marked as deleted');
-
-        // pc2 should be marked as deleted. Note: findOneBy might still find it if it doesn't filter by deletedAt
-        $this->assertNotNull($pc2);
-
-        $this->assertTrue($pc2->isDeleted(), 'Postal code should be marked as deleted (deletedAt is not null)');
-
-        // 3. Reactivate pc2 by re-importing it
-        $this->importer->importCode('BE', 'Label 2 restored', '2000', $refId2, $source, 50.0, 5.0, 4326);
-        $this->importer->finalize();
-
-        $this->entityManager->clear();
-        $pc2 = $this->postalCodeRepository->findOneBy(['refPostalCodeId' => $refId2, 'postalCodeSource' => $source]);
-        $this->assertFalse($pc2->isDeleted(), 'Postal code should NOT be marked as deleted after restoration');
-        $this->assertEquals('Label 2 restored', $pc2->getName());
-    }
-
-    public function testNoInterferenceBetweenSources(): void
-    {
-        $source1 = 'source1_'.uniqid();
-        $source2 = 'source2_'.uniqid();
-        $refId1 = 'ref1_'.uniqid();
-        $refId2 = 'ref2_'.uniqid();
-
-        // 1. Import from source1
-        $this->importer->importCode('BE', 'Label 1', '1000', $refId1, $source1, 50.0, 5.0, 4326);
-        $this->importer->finalize();
-
-        $pc1 = $this->postalCodeRepository->findOneBy(['refPostalCodeId' => $refId1, 'postalCodeSource' => $source1]);
-        $this->assertNotNull($pc1);
-        $this->assertFalse($pc1->isDeleted());
-
-        // 2. Import from source2
-        $this->importer->importCode('BE', 'Label 2', '2000', $refId2, $source2, 50.0, 5.0, 4326);
-        $this->importer->finalize();
-
-        $this->entityManager->clear();
-
-        $pc1 = $this->postalCodeRepository->findOneBy(['refPostalCodeId' => $refId1, 'postalCodeSource' => $source1]);
-        $pc2 = $this->postalCodeRepository->findOneBy(['refPostalCodeId' => $refId2, 'postalCodeSource' => $source2]);
-
-        $this->assertNotNull($pc1);
-        $this->assertNotNull($pc2);
-        $this->assertFalse($pc1->isDeleted(), 'pc1 from source1 should NOT be deleted after import from source2');
-        $this->assertFalse($pc2->isDeleted(), 'pc2 from source2 should NOT be deleted');
-    }
 }

src/Bundle/ChillMainBundle/Tests/Services/Workflow/CancelStaleWorkflowHandlerTest.php

@@ -42,14 +42,14 @@ class CancelStaleWorkflowHandlerTest extends TestCase
 {
     use ProphecyTrait;
 
-    public function testWorkflowWithOneStepOlderThan180DaysIsCanceled(): void
+    public function testWorkflowWithOneStepOlderThan90DaysIsCanceled(): void
     {
         $clock = new MockClock('2024-01-01');
-        $daysAgos = new \DateTimeImmutable('2023-06-01');
+        $daysAgos = new \DateTimeImmutable('2023-09-01');
 
         $workflow = new EntityWorkflow();
         $workflow->setWorkflowName('dummy_workflow');
-        $workflow->setCreatedAt(new \DateTimeImmutable('2023-06-01'));
+        $workflow->setCreatedAt(new \DateTimeImmutable('2023-09-01'));
         $workflow->setStep('step1', new WorkflowTransitionContextDTO($workflow), 'to_step1', $daysAgos, new User());
 
         $em = $this->prophesize(EntityManagerInterface::class);
@@ -94,7 +94,7 @@ class CancelStaleWorkflowHandlerTest extends TestCase
 
         $workflow = new EntityWorkflow();
         $workflow->setWorkflowName('dummy_workflow');
-        $workflow->setCreatedAt(new \DateTimeImmutable('2023-06-01'));
+        $workflow->setCreatedAt(new \DateTimeImmutable('2023-09-01'));
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->flush()->shouldBeCalled();

src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php

@@ -37,7 +37,7 @@ final class ChillMarkdownRenderExtensionTest extends TestCase
         MD;
 
     private const UNAUTHORIZED_HTML = <<<'HTML'
-        <p>&lt;script&gt;alert("ok");&lt;/script&gt;</p>
+        <p>&lt;script&gt;alert(&quot;ok&quot;);&lt;/script&gt;</p>
         HTML;
 
     private const UNAUTHORIZED_MARKDOWN = <<<'MD'

src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php

@@ -15,9 +15,7 @@ use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserGroup;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflowSignatureStateEnum;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflowStepSignature;
 use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
 use Chill\MainBundle\Workflow\EventSubscriber\NotificationOnTransition;
@@ -89,7 +87,7 @@ final class NotificationOnTransitionTest extends TestCase
             ->willReturn([]);
 
         $registry = $this->prophesize(Registry::class);
-        $registry->get(Argument::type(EntityWorkflow::class), Argument::any())
+        $registry->get(Argument::type(EntityWorkflow::class), Argument::type('string'))
             ->willReturn($workflow);
 
         $security = $this->prophesize(Security::class);
@@ -113,74 +111,4 @@ final class NotificationOnTransitionTest extends TestCase
 
         $notificationOnTransition->onCompletedSendNotification($event);
     }
-
-    public function testOnCompleteDoNotSendNotificationIfStepCreatedByPreviousSignature(): void
-    {
-        $dest = new User();
-        $currentUser = new User();
-        $workflowProphecy = $this->prophesize(WorkflowInterface::class);
-        $workflow = $workflowProphecy->reveal();
-        $entityWorkflow = new EntityWorkflow();
-        $entityWorkflow
-            ->setWorkflowName('workflow_name')
-            ->setRelatedEntityClass(\stdClass::class)
-            ->setRelatedEntityId(1);
-        // force an id to entityWorkflow:
-        $reflection = new \ReflectionClass($entityWorkflow);
-        $id = $reflection->getProperty('id');
-        $id->setValue($entityWorkflow, 1);
-
-        $previousStep = new EntityWorkflowStep();
-        $previousStep->addSignature($signature = new EntityWorkflowStepSignature($previousStep, $dest));
-        $signature->setState(EntityWorkflowSignatureStateEnum::SIGNED);
-
-        $currentStep = new EntityWorkflowStep();
-        $currentStep->addDestUser($dest);
-        $currentStep->setCurrentStep('to_state');
-
-        $entityWorkflow->addStep($previousStep);
-        $entityWorkflow->addStep($currentStep);
-
-        $em = $this->prophesize(EntityManagerInterface::class);
-
-        // we check that NO notification has been persisted for $dest
-        $em->persist(Argument::that(
-            fn ($notificationCandidate) => $notificationCandidate instanceof Notification && $notificationCandidate->getAddressees()->contains($dest)
-        ))->shouldNotBeCalled();
-
-        $engine = $this->prophesize(\Twig\Environment::class);
-        $engine->render(Argument::type('string'), Argument::type('array'))
-            ->willReturn('dummy text');
-
-        $extractor = $this->prophesize(MetadataExtractor::class);
-        $extractor->buildArrayPresentationForPlace(Argument::type(EntityWorkflow::class), Argument::any())
-            ->willReturn([]);
-        $extractor->buildArrayPresentationForWorkflow(Argument::any())
-            ->willReturn([]);
-
-        $registry = $this->prophesize(Registry::class);
-        $registry->get(Argument::type(EntityWorkflow::class), Argument::any())
-            ->willReturn($workflow);
-
-        $security = $this->prophesize(Security::class);
-        $security->getUser()->willReturn(null);
-
-        $entityWorkflowHandler = $this->prophesize(EntityWorkflowHandlerInterface::class);
-        $entityWorkflowHandler->getEntityTitle($entityWorkflow)->willReturn('workflow title');
-        $entityWorkflowManager = $this->prophesize(EntityWorkflowManager::class);
-        $entityWorkflowManager->getHandler($entityWorkflow)->willReturn($entityWorkflowHandler->reveal());
-
-        $notificationOnTransition = new NotificationOnTransition(
-            $em->reveal(),
-            $engine->reveal(),
-            $extractor->reveal(),
-            $security->reveal(),
-            $registry->reveal(),
-            $entityWorkflowManager->reveal(),
-        );
-
-        $event = new Event($entityWorkflow, new Marking(), new Transition('dummy_transition', ['from_state'], ['to_state']), $workflow);
-
-        $notificationOnTransition->onCompletedSendNotification($event);
-    }
 }

src/Bundle/ChillMainBundle/Tests/Workflow/Helper/WorkflowRelatedEntityPermissionHelperTest.php

@@ -11,6 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Tests\Workflow\Helper;
 
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
 use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
@@ -266,7 +269,217 @@ class WorkflowRelatedEntityPermissionHelperTest extends TestCase
         $entityWorkflowManager = $this->prophesize(EntityWorkflowManager::class);
         $entityWorkflowManager->findByRelatedEntity(Argument::type('object'))->willReturn($entityWorkflows);
 
-        return new WorkflowRelatedEntityPermissionHelper($security->reveal(), $entityWorkflowManager->reveal(), $this->buildRegistry(), new MockClock($atDateTime ?? new \DateTimeImmutable()));
+        $repository = $this->prophesize(EntityWorkflowAttachmentRepository::class);
+        $repository->findByStoredObject(Argument::type(StoredObject::class))->willReturn([]);
+
+        return new WorkflowRelatedEntityPermissionHelper($security->reveal(), $entityWorkflowManager->reveal(), $repository->reveal(), $this->buildRegistry(), new MockClock($atDateTime ?? new \DateTimeImmutable()));
+    }
+
+    /**
+     * @dataProvider provideDataAllowedByWorkflowReadOperationByAttachment
+     *
+     * @param list<EntityWorkflow> $entityWorkflows
+     */
+    public function testAllowedByWorkflowReadByAttachment(
+        array $entityWorkflows,
+        User $user,
+        string $expected,
+        ?\DateTimeImmutable $atDate,
+        string $message,
+    ): void {
+        // all entities must have this workflow name, so we are ok to set it here
+        foreach ($entityWorkflows as $entityWorkflow) {
+            $entityWorkflow->setWorkflowName('dummy');
+        }
+        $helper = $this->buildHelperForAttachment($entityWorkflows, $user, $atDate);
+
+        self::assertEquals($expected, $helper->isAllowedByWorkflowForReadOperation(new StoredObject()), $message);
+    }
+
+    public static function provideDataAllowedByWorkflowReadOperationByAttachment(): iterable
+    {
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain because the user is not present as a dest user'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
+            'force grant because the user is a current user'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
+            'force grant because the user was a previous user'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futurePersonSignatures[] = new Person();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'Abstain: there is a signature for person, but the attachment is not concerned'];
+    }
+
+    /**
+     * @dataProvider provideDataAllowedByWorkflowWriteOperationByAttachment
+     *
+     * @param list<EntityWorkflow> $entityWorkflows
+     */
+    public function testAllowedByWorkflowWriteByAttachment(
+        array $entityWorkflows,
+        User $user,
+        string $expected,
+        ?\DateTimeImmutable $atDate,
+        string $message,
+    ): void {
+        // all entities must have this workflow name, so we are ok to set it here
+        foreach ($entityWorkflows as $entityWorkflow) {
+            $entityWorkflow->setWorkflowName('dummy');
+        }
+        $helper = $this->buildHelperForAttachment($entityWorkflows, $user, $atDate);
+
+        self::assertEquals($expected, $helper->isAllowedByWorkflowForWriteOperation(new StoredObject()), $message);
+    }
+
+    public static function provideDataAllowedByWorkflowWriteOperationByAttachment(): iterable
+    {
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain because there is no workflow'];
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain because the user is not present as a dest user (and attachment)'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
+            'force grant because the user is a current user'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
+            'force grant because the user was a previous user'];
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain because the user was not a previous user'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $entityWorkflow->setStep('final_positive', $dto, 'to_final_positive', new \DateTimeImmutable(), new User());
+        $entityWorkflow->getCurrentStep()->setIsFinal(true);
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(),
+            'force denied: user was a previous user, but it is finalized positive'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $entityWorkflow->setStep('final_negative', $dto, 'to_final_negative', new \DateTimeImmutable());
+        $entityWorkflow->getCurrentStep()->setIsFinal(true);
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain: user was a previous user, it is finalized, but finalized negative'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futurePersonSignatures[] = new Person();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $signature = $entityWorkflow->getCurrentStep()->getSignatures()->first();
+        $signature->setState(EntityWorkflowSignatureStateEnum::SIGNED)->setStateDate(new \DateTimeImmutable());
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain: there is a signature, but not on the attachment'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futurePersonSignatures[] = new Person();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain: there is a signature, but the signature is not on the attachment'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futurePersonSignatures[] = new Person();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $signature = $entityWorkflow->getCurrentStep()->getSignatures()->first();
+        $signature->setState(EntityWorkflowSignatureStateEnum::SIGNED)->setStateDate(new \DateTimeImmutable());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $entityWorkflow->setStep('final_negative', $dto, 'to_final_negative', new \DateTimeImmutable(), new User());
+        $entityWorkflow->getCurrentStep()->setIsFinal(true);
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain: there is a signature on a canceled workflow'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('sent_external', $dto, 'to_sent_external', new \DateTimeImmutable(), $user);
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(),
+            'force denied: the workflow is sent to an external user'];
+    }
+
+    /**
+     * @param list<EntityWorkflow> $entityWorkflows
+     */
+    private function buildHelperForAttachment(array $entityWorkflows, User $user, ?\DateTimeImmutable $atDateTime): WorkflowRelatedEntityPermissionHelper
+    {
+        $security = $this->prophesize(Security::class);
+        $security->getUser()->willReturn($user);
+
+        $entityWorkflowManager = $this->prophesize(EntityWorkflowManager::class);
+        $entityWorkflowManager->findByRelatedEntity(Argument::type('object'))->shouldNotBeCalled();
+
+        $repository = $this->prophesize(EntityWorkflowAttachmentRepository::class);
+        $attachments = [];
+        foreach ($entityWorkflows as $entityWorkflow) {
+            $attachments[] = new EntityWorkflowAttachment('dummy', ['id' => 1], $entityWorkflow, new StoredObject());
+        }
+        $repository->findByStoredObject(Argument::type(StoredObject::class))->willReturn($attachments);
+
+        return new WorkflowRelatedEntityPermissionHelper($security->reveal(), $entityWorkflowManager->reveal(), $repository->reveal(), $this->buildRegistry(), new MockClock($atDateTime ?? new \DateTimeImmutable()));
     }
 
     private static function buildRegistry(): Registry

src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php

@@ -103,10 +103,7 @@ class NotificationOnTransition implements EventSubscriberInterface
 
         foreach ($dests as $subscriber) {
             if (
-                // prevent to send a notification to the one who created the step
                 $this->security->getUser() === $subscriber
-                // prevent to send a notification if the user applyied a signature on the previous step
-                || $this->isStepCreatedByPreviousSignature($entityWorkflow, $subscriber)
             ) {
                 continue;
             }
@@ -134,31 +131,4 @@ class NotificationOnTransition implements EventSubscriberInterface
             $this->entityManager->persist($notification);
         }
     }
-
-    /**
-     * Checks if the current step in the workflow was created by a previous signature of the specified user.
-     *
-     * This method retrieves the current step of the workflow and its preceding step. It iterates through
-     * the signatures of the preceding step to verify if the provided user is the signer of any of those
-     * signatures. Returns true if the user matches any signer; otherwise, returns false.
-     *
-     * @param EntityWorkflow $entityWorkflow the workflow entity containing the current step and its details
-     * @param User           $user           the user to check against the signatures of the previous step in the workflow
-     *
-     * @return bool true if the specified user created the step via a previous signature, false otherwise
-     */
-    private function isStepCreatedByPreviousSignature(EntityWorkflow $entityWorkflow, User $user): bool
-    {
-        $step = $entityWorkflow->getCurrentStepChained();
-        $previous = $step->getPrevious();
-
-
-        foreach ($previous->getSignatures() as $signature) {
-            if ($signature->getSigner() === $user) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }

src/Bundle/ChillMainBundle/Workflow/Helper/WorkflowRelatedEntityPermissionHelper.php

@@ -11,9 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Workflow\Helper;
 
+use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowSignatureStateEnum;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
 use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\Security\Core\Security;
@@ -49,28 +52,48 @@ use Symfony\Component\Workflow\Registry;
  *   the workflow denys write operations;
  * - if there is no case above and the user is involved in the workflow (is part of the current step, of a step before), the user is granted;
  */
-final readonly class WorkflowRelatedEntityPermissionHelper implements WorkflowRelatedEntityPermissionHelperInterface
+class WorkflowRelatedEntityPermissionHelper
 {
+    public const FORCE_GRANT = 'FORCE_GRANT';
+    public const FORCE_DENIED = 'FORCE_DENIED';
+    public const ABSTAIN = 'ABSTAIN';
+
     public function __construct(
-        private Security $security,
-        private EntityWorkflowManager $entityWorkflowManager,
-        private Registry $registry,
-        private ClockInterface $clock,
+        private readonly Security $security,
+        private readonly EntityWorkflowManager $entityWorkflowManager,
+        private readonly EntityWorkflowAttachmentRepository $entityWorkflowAttachmentRepository,
+        private readonly Registry $registry,
+        private readonly ClockInterface $clock,
     ) {}
 
     /**
-     * @param object $entity The entity may be an object that is a related entity of a workflow, or an EntityWorkflow itself
+     * @param object $entity The entity may be an
      *
      * @return 'FORCE_GRANT'|'FORCE_DENIED'|'ABSTAIN'
      */
     public function isAllowedByWorkflowForReadOperation(object $entity): string
     {
-        $entityWorkflows = $entity instanceof EntityWorkflow ? [$entity] : $this->entityWorkflowManager->findByRelatedEntity($entity);
+        if ($entity instanceof StoredObject) {
+            $attachments = $this->entityWorkflowAttachmentRepository->findByStoredObject($entity);
+            $entityWorkflows = array_map(static fn (EntityWorkflowAttachment $attachment) => $attachment->getEntityWorkflow(), $attachments);
+            $isAttached = true;
+        } else {
+            $entityWorkflows = $this->entityWorkflowManager->findByRelatedEntity($entity);
+            $isAttached = false;
+        }
+
+        if ([] === $entityWorkflows) {
+            return self::ABSTAIN;
+        }
 
         if ($this->isUserInvolvedInAWorkflow($entityWorkflows)) {
             return self::FORCE_GRANT;
         }
 
+        if ($isAttached) {
+            return self::ABSTAIN;
+        }
+
         // give a view permission if there is a Person signature pending, or in the 12 hours following
         // the signature last state
         foreach ($entityWorkflows as $workflow) {
@@ -94,20 +117,24 @@ final readonly class WorkflowRelatedEntityPermissionHelper implements WorkflowRe
     }
 
     /**
-     * @param object $entity the entity may be an object which is the related entity of a workflow
-     *
      * @return 'FORCE_GRANT'|'FORCE_DENIED'|'ABSTAIN'
      */
     public function isAllowedByWorkflowForWriteOperation(object $entity): string
     {
-        $entityWorkflows = $entity instanceof EntityWorkflow ? [$entity] : $this->entityWorkflowManager->findByRelatedEntity($entity);
+        if ($entity instanceof StoredObject) {
+            $attachments = $this->entityWorkflowAttachmentRepository->findByStoredObject($entity);
+            $entityWorkflows = array_map(static fn (EntityWorkflowAttachment $attachment) => $attachment->getEntityWorkflow(), $attachments);
+            $isAttached = true;
+        } else {
+            $entityWorkflows = $this->entityWorkflowManager->findByRelatedEntity($entity);
+            $isAttached = false;
+        }
 
         if ([] === $entityWorkflows) {
             return self::ABSTAIN;
         }
 
-
-        // if a workflow is finalized positive or isSentExternal, no one is allowed to edit the document anymore
+        // if a workflow is finalized positive, anyone is allowed to edit the document anymore
         foreach ($entityWorkflows as $entityWorkflow) {
             $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
             $marking = $workflow->getMarkingStore()->getMarking($entityWorkflow);
@@ -120,57 +147,28 @@ final readonly class WorkflowRelatedEntityPermissionHelper implements WorkflowRe
                     // the workflow is final, and final positive, or is sentExternal, so we stop here.
                     return self::FORCE_DENIED;
                 }
-            }
-        }
-
-        // if there is a signature on a **running workflow**, no one is allowed edit anymore, except if the workflow is canceled
-        foreach ($entityWorkflows as $entityWorkflow) {
-            // if the workflow is canceled, we ignore it
-            $isFinalNegative = false;
-            if ($entityWorkflow->isFinal()) {
-                $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
-                $marking = $workflow->getMarkingStore()->getMarking($entityWorkflow);
-                foreach ($marking->getPlaces() as $place => $int) {
-                    $placeMetadata = $workflow->getMetadataStore()->getPlaceMetadata($place);
-                    if (isset($placeMetadata['isFinalPositive']) && false === $placeMetadata['isFinalPositive']) {
-                        $isFinalNegative = true;
-                    }
-                }
-            }
-            if ($isFinalNegative) {
-                continue;
-            }
-
-            foreach ($entityWorkflow->getSteps() as $step) {
-                foreach ($step->getSignatures() as $signature) {
-                    if (EntityWorkflowSignatureStateEnum::SIGNED === $signature->getState()) {
-                        return self::FORCE_DENIED;
-                    }
+                if (
+                    // if not finalized positive
+                    $entityWorkflow->isFinal() && !($placeMetadata['isFinalPositive'] ?? false)
+                ) {
+                    return self::ABSTAIN;
                 }
             }
         }
 
-        // if all workflows are finalized negative (= canceled), we should abstain
-        $runningWorkflows = [];
-        foreach ($entityWorkflows as $entityWorkflow) {
-            $isFinalNegative = false;
-            if ($entityWorkflow->isFinal()) {
-                $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
-                $marking = $workflow->getMarkingStore()->getMarking($entityWorkflow);
-                foreach ($marking->getPlaces() as $place => $int) {
-                    $placeMetadata = $workflow->getMetadataStore()->getPlaceMetadata($place);
-                    if (isset($placeMetadata['isFinalPositive']) && false === $placeMetadata['isFinalPositive']) {
-                        $isFinalNegative = true;
+        $runningWorkflows = array_filter($entityWorkflows, fn (EntityWorkflow $ew) => !$ew->isFinal());
+
+        // if there is a signature on a **running workflow**, no one is allowed edit the workflow anymore
+        if (!$isAttached) {
+            foreach ($runningWorkflows as $entityWorkflow) {
+                foreach ($entityWorkflow->getSteps() as $step) {
+                    foreach ($step->getSignatures() as $signature) {
+                        if (EntityWorkflowSignatureStateEnum::SIGNED === $signature->getState()) {
+                            return self::FORCE_DENIED;
+                        }
                     }
                 }
             }
-            if (!$isFinalNegative) {
-                $runningWorkflows[] = $entityWorkflow;
-            }
-        }
-
-        if ([] === $runningWorkflows) {
-            return self::ABSTAIN;
         }
 
         // allow only the users involved
@@ -178,6 +176,10 @@ final readonly class WorkflowRelatedEntityPermissionHelper implements WorkflowRe
             return self::FORCE_GRANT;
         }
 
+        if ($isAttached) {
+            return self::ABSTAIN;
+        }
+
         return self::FORCE_DENIED;
     }
 

src/Bundle/ChillMainBundle/Workflow/Helper/WorkflowRelatedEntityPermissionHelperInterface.php

@@ -1,63 +0,0 @@
-<?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\MainBundle\Workflow\Helper;
-
-/**
- * Helper to give supplementary permissions to a related entity.
- *
- * If a related entity is associated within a workflow, the logic of the workflow can give more permissions, or
- * remove some permissions.
- *
- * The methods of this helper return either:
- *
- * - FORCE_GRANT, which means that a permission can be given, even if it would be denied when the related
- *   entity is not associated with a workflow;
- * - FORCE_DENIED, which means that a permission should be denied, even if it would be granted when the related entity
- *   is not associated with a workflow
- * - ABSTAIN, if there is no workflow logic to add or remove permission
- *
- * For read operations:
- *
- * - if the user is involved in the workflow (is part of the current step, of a step before), the user is granted read
- *   operation;
- * - if there is a pending signature for a person, the workflow grant access to the related entity;
- * - if there a signature applyied in less than 12 hours, the workflow grant access to the related entity. This allow to
- *   show the related entity to the person during this time frame.
- *
- *
- * For write operation:
- *
- * - if the workflow is finalized "positive" (means "not canceled"), the workflow denys write operations;
- * - if there isn't any finalized "positive" workflow, and if there is a signature appliyed for a running workflow (not finalized nor canceled),
- *   the workflow denys write operations;
- * - if there is no case above and the user is involved in the workflow (is part of the current step, of a step before), the user is granted;
- */
-interface WorkflowRelatedEntityPermissionHelperInterface
-{
-    public const FORCE_GRANT = 'FORCE_GRANT';
-    public const FORCE_DENIED = 'FORCE_DENIED';
-    public const ABSTAIN = 'ABSTAIN';
-
-    /**
-     * @param object $entity The entity may be an object that is a related entity of a workflow, or an EntityWorkflow itself
-     *
-     * @return 'FORCE_GRANT'|'FORCE_DENIED'|'ABSTAIN'
-     */
-    public function isAllowedByWorkflowForReadOperation(object $entity): string;
-
-    /**
-     * @param object $entity the entity may be an object which is the related entity of a workflow
-     *
-     * @return 'FORCE_GRANT'|'FORCE_DENIED'|'ABSTAIN'
-     */
-    public function isAllowedByWorkflowForWriteOperation(object $entity): string;
-}

src/Bundle/ChillMainBundle/config/services.yaml

@@ -115,7 +115,3 @@ services:
             $vienEntityInfoProviders: !tagged_iterator chill_main.entity_info_provider
 
     Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommandHandler: ~
-
-    Chill\MainBundle\Service\VersionProvider:
-        arguments:
-            $packageName: 'chill-project/chill-bundles'

src/Bundle/ChillMainBundle/config/services/templating.yaml

@@ -66,7 +66,3 @@ services:
         resource: './../../Templating/Listing'
 
     Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface: '@Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory'
-
-    Chill\MainBundle\Templating\VersionRenderExtension:
-        tags:
-            - { name: twig.extension }

src/Bundle/ChillMainBundle/migrations/Version20260223134919.php

@@ -1,41 +0,0 @@
-<?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\Migrations\Main;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260223134919 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Create a partial index for postal_code search_name_code, to avoid deleted records';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('DROP INDEX public.search_name_code');
-        $this->addSql('CREATE INDEX search_name_code ON public.chill_main_postal_code USING GIN (LOWER(code) gin_trgm_ops, LOWER(label) gin_trgm_ops) WHERE deletedAt IS NULL');
-        $this->addSql('DROP INDEX public.chill_internal_postal_code_canonicalized');
-        $this->addSql('CREATE INDEX chill_internal_postal_code_canonicalized ON chill_main_postal_code USING GIST (canonical gist_trgm_ops) WHERE origin = 0 AND deletedAt IS NULL');
-
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP INDEX public.search_name_code');
-        $this->addSql('CREATE INDEX search_name_code ON chill_main_postal_code USING GIN (LOWER(code) gin_trgm_ops, LOWER(label) gin_trgm_ops)');
-
-        $this->addSql('DROP INDEX public.chill_internal_postal_code_canonicalized');
-        $this->addSql('CREATE INDEX chill_internal_postal_code_canonicalized ON chill_main_postal_code USING GIST (canonical gist_trgm_ops) WHERE origin = 0');
-    }
-}

src/Bundle/ChillMainBundle/translations/messages.fr.yml

@@ -1,7 +1,3 @@
-common:
-    after: Après
-    until: Jusqu'à
-    centers: Territoires
 "This program is free software: you can redistribute it and/or modify it under the terms of the <strong>GNU Affero General Public License</strong>": "Ce programme est un logiciel libre: vous pouvez le redistribuer et/ou le modifier selon les termes de la licence <strong>GNU Affero GPL</strong>"
 User manual: Manuel d'utilisation
 Search: Rechercher
@@ -52,9 +48,6 @@ See: Voir
 Name: Nom
 Label: Nom
 
-footer:
-    Running chill version %version%: "Version de Chill: %version%"
-
 user:
     current_user: Utilisateur courant
     profile:

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -135,15 +135,13 @@ final class PersonController extends AbstractController
                 $this->lastPostDataReset();
 
                 $address = $form->get('address')->getData();
-                $addressForm = (bool) $form->get('addressForm')->getData();
 
-                if (null !== $address && $addressForm) {
+                if (null !== $address) {
                     $household = new Household();
 
                     $member = new HouseholdMember();
                     $member->setPerson($person);
                     $member->setStartDate(new \DateTimeImmutable());
-
                     $household->addMember($member);
                     $household->setForceAddress($address);
 

src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php

@@ -17,6 +17,7 @@ use Chill\MainBundle\Form\Type\PickPostalCodeType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\UserRepository;
+use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
@@ -30,29 +31,18 @@ use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Translation\TranslatableMessage;
 use Symfony\Component\Validator\Constraints\NotIdenticalTo;
 use Symfony\Component\Validator\Constraints\NotNull;
 
 class ReassignAccompanyingPeriodController extends AbstractController
 {
-    public function __construct(
-        private readonly AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository,
-        private readonly UserRepository $userRepository,
-        private readonly AccompanyingPeriodRepository $courseRepository,
-        private readonly \Twig\Environment $engine,
-        private readonly FormFactoryInterface $formFactory,
-        private readonly PaginatorFactory $paginatorFactory,
-        private readonly Security $security,
-        private readonly EntityManagerInterface $entityManager,
-    ) {}
+    public function __construct(private readonly AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository, private readonly UserRepository $userRepository, private readonly AccompanyingPeriodRepository $courseRepository, private readonly \Twig\Environment $engine, private readonly FormFactoryInterface $formFactory, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security, private readonly UserRender $userRender, private readonly EntityManagerInterface $em) {}
 
     #[Route(path: '/{_locale}/person/accompanying-periods/reassign', name: 'chill_course_list_reassign')]
-    public function listAction(Request $request, Session $session): Response
+    public function listAction(Request $request): Response
     {
         if (!$this->security->isGranted(AccompanyingPeriodVoter::REASSIGN_BULK)) {
             throw new AccessDeniedHttpException('no right to reassign bulk');
@@ -106,8 +96,7 @@ class ReassignAccompanyingPeriodController extends AbstractController
                 }
             }
 
-            $this->entityManager->flush();
-            $this->addFlash('success', new TranslatableMessage('period_by_user_list.successfully_re_assigned', ['count' => count($assignPeriodIds)]));
+            $this->em->flush();
 
             // redirect to the first page
             return $this->redirectToRoute('chill_course_list_reassign', $request->query->all());

src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php

@@ -38,7 +38,7 @@ class SocialWorkEvaluationApiController extends AbstractController
             $pagination->getCurrentPageFirstItemNumber(),
             $pagination->getItemsPerPage()
         );
-        $collection = new Collection(array_values($evaluations), $pagination);
+        $collection = new Collection($evaluations, $pagination);
 
         return $this->json($collection, Response::HTTP_OK, [], ['groups' => ['read']]);
     }

src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php

@@ -25,15 +25,14 @@ class SocialWorkGoalApiController extends ApiController
 
     public function listBySocialAction(Request $request, SocialAction $action): Response
     {
-        $totalItems = $this->goalRepository->countBySocialActionWithDescendants($action, true);
-        $paginator = $this->paginator->create($totalItems);
+        $totalItems = $this->goalRepository->countBySocialActionWithDescendants($action);
+        $paginator = $this->getPaginatorFactory()->create($totalItems);
 
         $entities = $this->goalRepository->findBySocialActionWithDescendants(
             $action,
             ['id' => 'ASC'],
             $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber(),
-            onlyActive: true
+            $paginator->getCurrentPageFirstItemNumber()
         );
 
         $model = new Collection($entities, $paginator);

src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php

@@ -25,15 +25,14 @@ class SocialWorkResultApiController extends ApiController
 
     public function listByGoal(Request $request, Goal $goal): Response
     {
-        $totalItems = $this->resultRepository->countByGoal($goal, true);
+        $totalItems = $this->resultRepository->countByGoal($goal);
         $paginator = $this->getPaginatorFactory()->create($totalItems);
 
         $entities = $this->resultRepository->findByGoal(
             $goal,
             ['id' => 'ASC'],
             $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber(),
-            onlyActive: true,
+            $paginator->getCurrentPageFirstItemNumber()
         );
 
         $model = new Collection($entities, $paginator);
@@ -43,15 +42,14 @@ class SocialWorkResultApiController extends ApiController
 
     public function listBySocialAction(Request $request, SocialAction $action): Response
     {
-        $totalItems = $this->resultRepository->countBySocialActionWithDescendants($action, true);
+        $totalItems = $this->resultRepository->countBySocialActionWithDescendants($action);
         $paginator = $this->getPaginatorFactory()->create($totalItems);
 
         $entities = $this->resultRepository->findBySocialActionWithDescendants(
             $action,
             ['id' => 'ASC'],
             $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber(),
-            onlyActive: true
+            $paginator->getCurrentPageFirstItemNumber()
         );
 
         $model = new Collection($entities, $paginator);

src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php

@@ -34,7 +34,7 @@ trait RandomPersonHelperTrait
         return $qb
             ->select('p')
             ->setMaxResults(1)
-            ->setFirstResult(\mt_rand(0, $this->nbOfPersons))
+            ->setFirstResult(\random_int(0, $this->nbOfPersons))
             ->getQuery()
             ->getSingleResult();
     }

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php

@@ -37,9 +37,7 @@ class LoadCustomFields extends AbstractFixture implements OrderedFixtureInterfac
         private readonly EntityManagerInterface $entityManager,
         private readonly CustomFieldChoice $customFieldChoice,
         private readonly CustomFieldText $customFieldText,
-    ) {
-        mt_srand(123456789);
-    }
+    ) {}
 
     // put your code here
     public function getOrder(): int
@@ -80,12 +78,12 @@ class LoadCustomFields extends AbstractFixture implements OrderedFixtureInterfac
         // select a set of people and add data
         foreach ($personIds as $id) {
             // add info on 1 person on 2
-            if (1 === mt_rand(0, 1)) {
+            if (1 === random_int(0, 1)) {
                 /** @var Person $person */
                 $person = $manager->getRepository(Person::class)->find($id);
                 $person->setCFData([
                     'remarques' => $this->createCustomFieldText()
-                        ->serialize($faker->text(mt_rand(150, 250)), $this->cfText),
+                        ->serialize($faker->text(random_int(150, 250)), $this->cfText),
                     'document-d-identite' => $this->createCustomFieldChoice()
                         ->serialize([$choices[array_rand($choices)]], $this->cfChoice),
                 ]);

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php

@@ -36,7 +36,6 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
     public function __construct(private readonly MembersEditorFactory $editorFactory, private readonly EntityManagerInterface $em)
     {
-        mt_srand(123456789);
         $this->loader = new NativeLoader();
     }
 
@@ -73,12 +72,12 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
     private function addAddressToHousehold(Household $household, \DateTimeImmutable $date, ObjectManager $manager)
     {
-        if (\mt_rand(0, 10) > 8) {
+        if (\random_int(0, 10) > 8) {
             //  20% of household without address
             return;
         }
 
-        $nb = \mt_rand(1, 6);
+        $nb = \random_int(1, 6);
 
         $i = 0;
 
@@ -86,15 +85,15 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
             $address = $this->createAddress();
             $address->setValidFrom(\DateTime::createFromImmutable($date));
 
-            if (\mt_rand(0, 20) < 1) {
-                $date = $date->add(new \DateInterval('P'.\mt_rand(8, 52).'W'));
+            if (\random_int(0, 20) < 1) {
+                $date = $date->add(new \DateInterval('P'.\random_int(8, 52).'W'));
                 $address->setValidTo(\DateTime::createFromImmutable($date));
             }
 
             $household->addAddress($address);
             $manager->persist($address);
 
-            $date = $date->add(new \DateInterval('P'.\mt_rand(8, 52).'W'));
+            $date = $date->add(new \DateInterval('P'.\random_int(8, 52).'W'));
             ++$i;
         }
     }
@@ -128,7 +127,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
             $k = 0;
 
             foreach ($this->getRandomPersons(1, 3) as $person) {
-                $date = $startDate->add(new \DateInterval('P'.\mt_rand(1, 200).'W'));
+                $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
                 $position = $this->getReference(LoadHouseholdPosition::ADULT, Position::class);
 
                 $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
@@ -137,7 +136,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
             // load children
             foreach ($this->getRandomPersons(0, 3) as $person) {
-                $date = $startDate->add(new \DateInterval('P'.\mt_rand(1, 200).'W'));
+                $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
                 $position = $this->getReference(LoadHouseholdPosition::CHILD, Position::class);
 
                 $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
@@ -146,7 +145,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
             // load children out
             foreach ($this->getRandomPersons(0, 2) as $person) {
-                $date = $startDate->add(new \DateInterval('P'.\mt_rand(1, 200).'W'));
+                $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
                 $position = $this->getReference(LoadHouseholdPosition::CHILD_OUT, Position::class);
 
                 $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
@@ -170,7 +169,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
     {
         $persons = [];
 
-        $nb = \mt_rand($min, $max);
+        $nb = \random_int($min, $max);
 
         for ($i = 0; $i < $nb; ++$i) {
             $personId = \array_pop($this->personIds)['id'];

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php

@@ -240,7 +240,6 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
         protected UserRepository $userRepository,
         protected GenderRepository $genderRepository,
     ) {
-        mt_srand(123456789);
         $this->faker = Factory::create('fr_FR');
         $this->faker->addProvider($this);
         $this->loader = new NativeLoader($this->faker);
@@ -274,7 +273,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             $this->cacheCountries = $this->countryRepository->findAll();
         }
 
-        if (\mt_rand(0, 100) > $nullPercentage) {
+        if (\random_int(0, 100) > $nullPercentage) {
             return null;
         }
 
@@ -290,7 +289,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             $this->cacheGenders = $this->genderRepository->findByActiveOrdered();
         }
 
-        if (\mt_rand(0, 100) > $nullPercentage) {
+        if (\random_int(0, 100) > $nullPercentage) {
             return null;
         }
 
@@ -308,7 +307,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             $this->cacheMaritalStatuses = $this->maritalStatusRepository->findAll();
         }
 
-        if (\mt_rand(0, 100) > $nullPercentage) {
+        if (\random_int(0, 100) > $nullPercentage) {
             return null;
         }
 
@@ -353,7 +352,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
         $accompanyingPeriod = new AccompanyingPeriod(
             (new \DateTime())
                 ->sub(
-                    new \DateInterval('P'.\mt_rand(0, 180).'D')
+                    new \DateInterval('P'.\random_int(0, 180).'D')
                 )
         );
         $accompanyingPeriod->setCreatedBy($this->getRandomUser())
@@ -361,7 +360,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
         $person->addAccompanyingPeriod($accompanyingPeriod);
         $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue());
 
-        if (\mt_rand(0, 10) > 3) {
+        if (\random_int(0, 10) > 3) {
             // always add social scope:
             $accompanyingPeriod->addScope($this->getReference('scope_social', Scope::class));
             $origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN, AccompanyingPeriod\Origin::class);

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php

@@ -25,10 +25,7 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
 {
     use PersonRandomHelper;
 
-    public function __construct(private readonly EntityManagerInterface $em)
-    {
-        mt_srand(123456789);
-    }
+    public function __construct(private readonly EntityManagerInterface $em) {}
 
     public function getDependencies(): array
     {
@@ -50,8 +47,8 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
                 ->setFromPerson($this->getRandomPerson($this->em))
                 ->setToPerson($this->getRandomPerson($this->em))
                 ->setRelation($this->getReference(LoadRelations::RELATION_KEY.
-                    mt_rand(0, \count(LoadRelations::RELATIONS) - 1), Relation::class))
-                ->setReverse((bool) mt_rand(0, 1))
+                    random_int(0, \count(LoadRelations::RELATIONS) - 1), Relation::class))
+                ->setReverse((bool) random_int(0, 1))
                 ->setCreatedBy($user)
                 ->setUpdatedBy($user)
                 ->setCreatedAt($date)

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerMainCenterAggregator.php

@@ -1,143 +0,0 @@
-<?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
-
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Export\DataTransformerInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
-use Chill\MainBundle\Repository\CenterRepositoryInterface;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-final readonly class ReferrerMainCenterAggregator implements AggregatorInterface, DataTransformerInterface
-{
-    private const P = 'acp_agg_referrer_main_center';
-
-    public function __construct(
-        private CenterRepositoryInterface $centerRepository,
-        private RollingDateConverterInterface $rollingDateConverter,
-    ) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
-    {
-        $p = self::P;
-
-        $qb
-            ->leftJoin('acp.userHistories', "{$p}_uh", Join::WITH, $qb->expr()->andX(
-                $qb->expr()->eq("{$p}_uh.accompanyingPeriod", 'acp.id'),
-                "OVERLAPSI (acp.openingDate, acp.closingDate), ({$p}_uh.startDate, {$p}_uh.endDate) = TRUE",
-                "OVERLAPSI (:{$p}_startDate, :{$p}_endDate), ({$p}_uh.startDate, {$p}_uh.endDate) = TRUE"
-            ))
-            ->leftJoin("{$p}_uh.user", "{$p}_user")
-            ->addSelect("IDENTITY({$p}_user.mainCenter) AS {$p}_select")
-            ->addGroupBy("{$p}_select")
-            ->setParameter("{$p}_startDate", $this->rollingDateConverter->convert($data['start_date']))
-            ->setParameter("{$p}_endDate", $this->rollingDateConverter->convert($data['end_date']));
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACP_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder): void
-    {
-        $builder
-            ->add('start_date', PickRollingDateType::class, [
-                'label' => 'common.after',
-                'required' => true,
-            ])
-            ->add('end_date', PickRollingDateType::class, [
-                'label' => 'common.until',
-                'required' => true,
-            ]);
-    }
-
-    public function getNormalizationVersion(): int
-    {
-        return 1;
-    }
-
-    public function normalizeFormData(array $formData): array
-    {
-        return [
-            'start_date' => $formData['start_date']->normalize(),
-            'end_date' => $formData['end_date']->normalize(),
-        ];
-    }
-
-    public function denormalizeFormData(array $formData, int $fromVersion): array
-    {
-        $default = $this->getFormDefaultData();
-
-        return [
-            'start_date' => array_key_exists('start_date', $formData) ? RollingDate::fromNormalized($formData['start_date']) : $default['start_date'],
-            'end_date' => array_key_exists('end_date', $formData) ? RollingDate::fromNormalized($formData['end_date']) : $default['end_date'],
-        ];
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [
-            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
-            'end_date' => new RollingDate(RollingDate::T_TODAY),
-        ];
-    }
-
-    public function transformData(?array $before): array
-    {
-        $default = $this->getFormDefaultData();
-
-        if (null === $before) {
-            return $default;
-        }
-
-        return [
-            'start_date' => $before['start_date'] ?? $before['date_calc'] ?? $default['start_date'],
-            'end_date' => $before['end_date'] ?? $before['date_calc'] ?? $default['end_date'],
-        ];
-    }
-
-    public function getLabels($key, array $values, $data): callable
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'person.export.period.aggregator.by_referrer_main_center.column_header';
-            }
-
-            if (null === $value || '' === $value) {
-                return '';
-            }
-
-            return (string) $this->centerRepository->find((int) $value)?->getName();
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return [self::P.'_select'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'person.export.period.aggregator.by_referrer_main_center.title';
-    }
-}

src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php

@@ -64,7 +64,7 @@ final readonly class CenterAggregator implements AggregatorInterface
     {
         return function (int|string|null $value) {
             if (null === $value || '' === $value) {
-                return $this->translator->trans('person.export.period.aggregator.by_center.no_center');
+                return $this->translator->trans('person.export.aggregator.by_center.no_center');
             }
 
             if ('_header' === $value) {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerMainCenterFilter.php

@@ -1,155 +0,0 @@
-<?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
-
-use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Export\ExportGenerationContext;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
-use Chill\MainBundle\Repository\CenterRepositoryInterface;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\UserHistory;
-use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Translation\TranslatableMessage;
-use Symfony\Contracts\Translation\TranslatableInterface;
-
-/**
- * Filter accompanying periods by the main center of their referrer (at a given date).
- */
-final readonly class ReferrerMainCenterFilter implements FilterInterface
-{
-    private const UH = 'acp_referrer_main_center_filter_uh';
-    private const DATE_PARAM_SINCE = 'acp_referrer_main_center_filter_date_since';
-    private const DATE_PARAM_UNTIL = 'acp_referrer_main_center_filter_date_until';
-
-    private const CENTER_PARAM = 'acp_referrer_main_center_filter_center';
-
-    public function __construct(
-        private RollingDateConverterInterface $rollingDateConverter,
-        private CenterRepositoryInterface $centerRepository,
-    ) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
-    {
-        $dql = 'SELECT 1 FROM '.UserHistory::class.' '.self::UH.'
-        JOIN '.self::UH.'.user '.self::UH.'_user
-        WHERE acp = '.self::UH.'.accompanyingPeriod
-        AND (
-            '.self::UH.'.startDate < :'.self::DATE_PARAM_UNTIL.'
-            AND (
-                '.self::UH.'.endDate IS NULL OR '.self::UH.'.endDate >= :'.self::DATE_PARAM_SINCE.'
-            )
-        )
-        AND '.self::UH.'_user.mainCenter IN (:'.self::CENTER_PARAM.')';
-
-        $qb->andWhere(
-            $qb->expr()->exists($dql)
-        );
-        $qb
-            ->setParameter(self::DATE_PARAM_SINCE, $this->rollingDateConverter->convert($data['date_calc_since']))
-            ->setParameter(self::DATE_PARAM_UNTIL, $this->rollingDateConverter->convert($data['date_calc_until']))
-            ->setParameter(self::CENTER_PARAM, $data['centers']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACP_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder): void
-    {
-        $builder
-            ->add('centers', EntityType::class, [
-                'class' => Center::class,
-                'choices' => $this->centerRepository->findActive(),
-                'multiple' => true,
-                'expanded' => false,
-                'choice_label' => static fn (Center $c) => $c->getName(),
-                'required' => true,
-                'label' => 'common.centers',
-                'attr' => [
-                    'class' => 'select2',
-                ],
-            ])
-            ->add('date_calc_since', PickRollingDateType::class, [
-                'label' => 'person.export.period.filter.by_referrer_main_center.referrer_since',
-                'required' => true,
-            ])
-            ->add('date_calc_until', PickRollingDateType::class, [
-                'label' => 'person.export.period.filter.by_referrer_main_center.referrer_until',
-                'required' => true,
-            ]);
-    }
-
-    public function getNormalizationVersion(): int
-    {
-        return 1;
-    }
-
-    public function normalizeFormData(array $formData): array
-    {
-        return [
-            'centers' => array_values(array_map(static fn (Center $c) => $c->getId(), $formData['centers'])),
-            'date_calc_since' => $formData['date_calc_since']->normalize(),
-            'date_calc_until' => $formData['date_calc_until']->normalize(),
-        ];
-    }
-
-    public function denormalizeFormData(array $formData, int $fromVersion): array
-    {
-        return [
-            'centers' => array_values(array_filter(array_map(
-                fn (int $id) => $this->centerRepository->find($id),
-                $formData['centers'] ?? []
-            ))),
-            'date_calc_since' => RollingDate::fromNormalized($formData['date_calc_since']),
-            'date_calc_until' => RollingDate::fromNormalized($formData['date_calc_until']),
-        ];
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [
-            'centers' => [],
-            'date_calc_since' => new RollingDate(RollingDate::T_TODAY),
-            'date_calc_until' => new RollingDate(RollingDate::T_TODAY),
-        ];
-    }
-
-    public function describeAction($data, ExportGenerationContext $context): TranslatableInterface
-    {
-        $names = array_map(static fn (Center $c) => $c->getName(), $data['centers']);
-
-        return new TranslatableMessage(
-            'person.export.period.filter.by_referrer_main_center.description',
-            [
-                'centers' => implode(', ', $names),
-                'date_since' => $this->rollingDateConverter->convert($data['date_calc_since']),
-                'date_until' => $this->rollingDateConverter->convert($data['date_calc_until']),
-            ]
-        );
-    }
-
-    public function getTitle(): TranslatableInterface
-    {
-        return new TranslatableMessage('person.export.period.filter.by_referrer_main_center.title');
-    }
-}

src/Bundle/ChillPersonBundle/Export/Helper/FilterListAccompanyingPeriodHelper.php

@@ -44,10 +44,12 @@ final readonly class FilterListAccompanyingPeriodHelper implements FilterListAcc
         };
 
         // add filtering on confidential accompanying period. The confidential is applyed on the current status of
-        // the accompanying period (we do not use the 'calc_date' here)
-        //
-        // IMPORTANT: we must NOT bypass selected centers just because the current user is the referrer.
-        $aclConditionsOrX = $qb->expr()->orX();
+        // the accompanying period (we do not use the 'calc_date' here
+        $aclConditionsOrX = $qb->expr()->orX(
+            // either the current user is the refferer for the course
+            'acp.user = :list_acp_current_user',
+        );
+        $qb->setParameter('list_acp_current_user', $user);
 
         $i = 0;
         foreach ($centers as $center) {
@@ -91,12 +93,6 @@ final readonly class FilterListAccompanyingPeriodHelper implements FilterListAcc
             ++$i;
         }
 
-        // Prevent invalid/empty WHERE when no conditions were added (e.g., no centers available)
-        if (0 === count($aclConditionsOrX->getParts())) {
-            // No allowed conditions => return no rows
-            $qb->andWhere('1 = 0');
-        } else {
-            $qb->andWhere($aclConditionsOrX);
-        }
+        $qb->andWhere($aclConditionsOrX);
     }
 }