Release v3.7.0 with new feature and updated dependencies

Introduce the Symfony Notifier component for SMS messaging, supporting more providers. Fix referrer's scope and job aggregation issue (#348). Update numerous dependencies, including Babel and ESLint, for improved stability and functionality.

.changes/v3.5.2.md

@@ -0,0 +1,3 @@
+## v3.5.2 - 2024-12-19
+### Fixed
+* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range" 

.changes/v3.5.3.md

@@ -0,0 +1,3 @@
+## v3.5.3 - 2025-01-07
+### Fixed
+* Fix the EntityToJsonTransformer to return an empty array if the value is "" 

.changes/v3.6.0.md

@@ -0,0 +1,9 @@
+## v3.6.0 - 2025-01-16
+### Feature
+* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email. 
+* ([#346](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/346)) Create a driver for storing documents on disk (instead of openstack object store)
+ 
+* Add address importer from french Base d'Adresse Nationale (BAN) 
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions 
+### Fixed
+* Export: fix missing alias in activity between certain dates filter. Condition added for alias. 

.changes/v3.7.0.md

@@ -0,0 +1,5 @@
+## v3.7.0 - 2025-01-21
+### Feature
+* Use the Notifier component from Symfony to sens short messages (SMS). This allow to use more provider.    
+### Fixed
+* ([#348](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/348)) [export] Fix aggregation of referrer's scope and job: fix the date range comparison   

.changie.yaml

@@ -7,15 +7,29 @@ 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 }}{{.Body}} {{ if and (.Custom.Long) (not (eq .Custom.Long "")) }}
+    * {{ 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 -}}
+
+    {{ if and (.Custom.Long) (not (eq .Custom.Long "")) }}{{ .Custom.Long }}{{ end }}
 
-      {{ .Custom.Long }}{{ end }}
 custom:
+    - key: SchemaChange
+      label: Is a schema change required?
+      optional: false
+      type: enum
+      enumOptions:
+          - "No schema change"
+          - "Add columns or tables"
+          - "Drop or rename table or columns, or enforce new constraint that must be manually fixed"
+
     -   key: Issue
         label: Issue number (on chill-bundles repository) (optional)
         optional: true
         type: int
         minInt: 1
+
 body:
     # allow multiline messages
     block: true

.env

@@ -88,3 +88,7 @@ REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
 ###< chill-project/chill-bundles ###
+
+###> symfony/ovh-cloud-notifier ###
+# OVHCLOUD_DSN=ovhcloud://APPLICATION_KEY:APPLICATION_SECRET@default?consumer_key=CONSUMER_KEY&service_name=SERVICE_NAME
+###< symfony/ovh-cloud-notifier ###

.gitignore

@@ -51,3 +51,8 @@ phpstan.neon
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###
+
+###> friendsofphp/php-cs-fixer ###
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
+###< friendsofphp/php-cs-fixer ###

.php-cs-fixer.dist.php

@@ -25,7 +25,7 @@ $config = new PhpCsFixer\Config();
 $config
     ->setFinder($finder)
     ->setRiskyAllowed(true)
-    ->setCacheFile('.cache/php-cs-fixer.cache')
+    ->setCacheFile('var/php-cs-fixer.cache')
     ->setUsingCache(true)
     ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
 ;

CHANGELOG.md

@@ -6,6 +6,30 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v3.7.0 - 2025-01-21
+### Feature
+* Use the Notifier component from Symfony to sens short messages (SMS). This allow to use more provider.    
+### Fixed
+* ([#348](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/348)) [export] Fix aggregation of referrer's scope and job: fix the date range comparison   
+
+## v3.6.0 - 2025-01-16
+### Feature
+* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email. 
+* ([#346](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/346)) Create a driver for storing documents on disk (instead of openstack object store)
+ 
+* Add address importer from french Base d'Adresse Nationale (BAN) 
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions 
+### Fixed
+* Export: fix missing alias in activity between certain dates filter. Condition added for alias. 
+
+## v3.5.3 - 2025-01-07
+### Fixed
+* Fix the EntityToJsonTransformer to return an empty array if the value is "" 
+
+## v3.5.2 - 2024-12-19
+### Fixed
+* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range" 
+
 ## v3.5.1 - 2024-12-16
 ### Fixed
 * Filiation: fix the display of the gender label in the graph 

composer.json

@@ -13,8 +13,10 @@
         "ext-json": "*",
         "ext-openssl": "*",
         "ext-redis": "*",
+        "ext-zlib": "*",
         "champs-libres/wopi-bundle": "dev-master@dev",
         "champs-libres/wopi-lib": "dev-master@dev",
+        "doctrine/data-fixtures": "^1.8",
         "doctrine/doctrine-bundle": "^2.1",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.13.0",
@@ -56,7 +58,9 @@
         "symfony/messenger": "^5.4",
         "symfony/mime": "^5.4",
         "symfony/monolog-bundle": "^3.5",
+        "symfony/notifier": "^5.4",
         "symfony/options-resolver": "^5.4",
+        "symfony/ovh-cloud-notifier": "^5.4",
         "symfony/process": "^5.4",
         "symfony/property-access": "^5.4",
         "symfony/property-info": "^5.4",
@@ -85,6 +89,7 @@
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "fakerphp/faker": "^1.13",
+        "friendsofphp/php-cs-fixer": "3.65.0",
         "jangregor/phpstan-prophecy": "^1.0",
         "nelmio/alice": "^3.8",
         "nikic/php-parser": "^4.15",
@@ -157,7 +162,9 @@
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         },
-        "php-cs-fixer": "php-cs-fixer fix --config=./.php-cs-fixer.dist.php --show-progress=none"
+        "php-cs-fixer": "php-cs-fixer fix --config=./.php-cs-fixer.dist.php --show-progress=none",
+        "phpstan":  "phpstan --no-progress",
+        "rector": "rector --no-progress-bar"
     },
     "extra": {
         "symfony": {

config/packages/chill_doc_store.yaml

@@ -1,4 +1,7 @@
 chill_doc_store:
+    use_driver: openstack
+    local_storage:
+        storage_path: '%kernel.project_dir%/var/storage'
     openstack:
         temp_url:
             temp_url_key:         '%env(resolve:ASYNC_UPLOAD_TEMP_URL_KEY)%'       # Required

config/packages/notifier.yaml

@@ -0,0 +1,13 @@
+framework:
+    notifier:
+        texter_transports:
+            #ovhcloud: '%env(OVHCLOUD_DSN)%'
+            #ovhcloud: '%env(SHORT_MESSAGE_DSN)%'
+        channel_policy:
+            # use chat/slack, chat/telegram, sms/twilio or sms/nexmo
+            urgent: ['email']
+            high: ['email']
+            medium: ['email']
+            low: ['email']
+        admin_recipients:
+            - { email: admin@example.com }

docs/source/index.rst

@@ -16,7 +16,7 @@ Welcome to Chill documentation!
 
 Chill is a free software for social workers.
 
-Chill rely on the php framework `Symfony <http://symfony.com>`_. 
+Chill rely on the php framework `Symfony <http://symfony.com>`_.
 
 Contents of this documentation:
 
@@ -42,7 +42,7 @@ Contribute
 User manual
 ===========
 
-An user manual exists in French and currently focuses on describing the main concept of the software. 
+An user manual exists in French and currently focuses on describing the main concept of the software.
 
 `Read (and contribute) to the manual <https://fr.wikibooks.org/wiki/Chill>`_
 
@@ -55,12 +55,11 @@ Available bundles
   * Chill Person, to deal with persons,
   * chill custom fields, to add custom fields to some entities,
   * chill activity: to add activities to people,
-  * chill report: to add report to people, 
+  * chill report: to add report to people,
   * chill event: to gather people into events,
   * chill docs store: to store documents to people, but also entities,
   * chill task: to register task with people,
   * chill third party: to register third parties,
-  * chill family members: to register family members
 
 You will also found the following projects :
 

docs/source/installation/document-storage.rst

@@ -0,0 +1,84 @@
+Document storage
+################
+
+You can store document on two different ways:
+
+- on disk
+- in the cloud, using object storage: currently only `openstack swift <https://docs.openstack.org/api-ref/object-store/index.html>`_ is supported.
+
+Comparison
+==========
+
+Storing documents within the cloud is particularily suitable for "portable" deployments, like in kubernetes, or within container
+without having to manage volumes to store documents. But you'll have to subscribe on a commercial offer.
+
+Storing documents on disk is more easy to configure, but more difficult to manage: if you use container, you will have to
+manager volumes to attach documents on disk. You'll have to do some backup of the directory. If chill is load-balanced (and
+multiple instances of chill are run), you will have to find a way to share the directories in read-write mode for every instance.
+
+On Disk
+=======
+
+Configure Chill like this:
+
+.. code-block:: yaml
+
+   # file config/packages/chill_doc_store.yaml
+   chill_doc_store:
+       use_driver: local_storage
+       local_storage:
+           storage_path: '%kernel.project_dir%/var/storage'
+
+In this configuration, documents will be stored in :code:`var/storage` within your app directory. But this path can be
+elsewhere on the disk. Be aware that the directory must be writable by the user executing the chill app (php-fpm or www-data).
+
+Documents will be stored in subpathes within that directory. The files will be encrypted, the key is stored in the database.
+
+In the cloud, using openstack object store
+##########################################
+
+You must subscribe to a commercial offer for object store.
+
+Chill use some features to allow documents to be stored in the cloud without being uploaded first to the chill server:
+
+- `Form POST Middelware <https://docs.openstack.org/swift/latest/api/form_post_middleware.html>`_;
+- `Temporary URL Middelware <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html>`_.
+
+A secret key must be generated and configured, and CORS must be configured depending on the domain you will use to serve Chill.
+
+At first, create a container and get the base path to the container. For instance, on OVH, if you create a container named "mychill",
+you will be able to retrieve the base path of the container within the OVH interface, like this:
+
+- base_path: :code:`https://storage.gra.cloud.ovh.net/v1/AUTH_123456789/mychill/` => will be variable :code:`ASYNC_UPLOAD_TEMP_URL_BASE_PATH`
+- container: :code:`mychill` => will be variable :code:`ASYNC_UPLOAD_TEMP_URL_CONTAINER`
+
+You can also generate a key, which should have at least 20 characters. This key will go in the variable :code:`ASYNC_UPLOAD_TEMP_URL_KEY`.
+
+.. note::
+
+   See the `documentation of symfony <https://symfony.com/doc/current/configuration.html#config-env-vars>`_ on how to store variables, and how to encrypt them if needed.
+
+Configure the storage like this:
+
+.. code-block:: yaml
+
+   # file config/packages/chill_doc_store.yaml
+   chill_doc_store:
+       use_driver: openstack
+       openstack:
+           temp_url:
+               temp_url_key:         '%env(resolve:ASYNC_UPLOAD_TEMP_URL_KEY)%'       # Required
+               container:            '%env(resolve:ASYNC_UPLOAD_TEMP_URL_CONTAINER)%' # Required
+               temp_url_base_path:   '%env(resolve:ASYNC_UPLOAD_TEMP_URL_BASE_PATH)%' # Required
+
+Chill is able to configure the container in order to store document. Grab an Openstack Token (for instance, using :code:`openstack token issue` or
+the web interface of your openstack provider), and run this command:
+
+.. code-block:: bash
+
+   symfony console async-upload:configure --os_token=OPENSTACK_TOKEN -d https://mychill.mydomain.example
+
+   # or, without symfony-cli
+   bin/console async-upload:configure --os_token=OPENSTACK_TOKEN -d https://mychill.mydomain.example
+
+

docs/source/installation/installation-production.rst

@@ -323,6 +323,7 @@ Going further
    :maxdepth: 2
 
    prod.rst
+   document-storage.rst
    load-addresses.rst
    prod-calendar-sms-sending.rst
    msgraph-configure.rst

package.json

@@ -78,10 +78,9 @@
   "scripts": {
     "dev-server": "encore dev-server",
     "dev": "encore dev",
-    "prettier": "prettier --write \"**/*.{js,ts,vue}\"",
     "watch": "encore dev --watch",
     "build": "encore production --progress",
-    "eslint": "npx eslint-baseline \"**/*.{js,ts,vue}\""
+    "eslint": "npx eslint-baseline --fix \"**/*.{js,ts,vue}\""
   },
   "private": true
 }

rector.php

@@ -20,6 +20,10 @@ return static function (RectorConfig $rectorConfig): void {
         __DIR__ . '/src',
     ]);
 
+    $rectorConfig->skip([
+        \Rector\Php55\Rector\String_\StringClassNameToClassConstantRector::class => __DIR__ . 'src/Bundle/ChillMainBundle/Service/Notifier/LegacyOvhCloudFactory.php'
+    ]);
+
     $rectorConfig->symfonyContainerXml(__DIR__ . '/var/cache/dev/test/App_KernelTestDebugContainer.xml  ');
     $rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
 

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php

@@ -55,6 +55,10 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
             .' AND '
             .'(person_person_having_activity.id = person.id OR person MEMBER OF activity_person_having_activity.persons)');
 
+        if (\in_array('activity', $qb->getAllAliases(), true)) {
+            $sqb->andWhere('activity_person_having_activity.id = activity.id');
+        }
+
         if (isset($data['reasons']) && [] !== $data['reasons']) {
             // add clause activity reason
             $sqb->join('activity_person_having_activity.reasons', 'reasons_person_having_activity');

src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php

@@ -21,9 +21,7 @@ namespace Chill\CalendarBundle\Command;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Service\ShortMessageNotification\ShortMessageForCalendarBuilderInterface;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
-use Chill\MainBundle\Service\ShortMessage\ShortMessageTransporterInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
 use libphonenumber\PhoneNumber;
@@ -36,6 +34,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Notifier\TexterInterface;
 
 class SendTestShortMessageOnCalendarCommand extends Command
 {
@@ -44,9 +43,8 @@ class SendTestShortMessageOnCalendarCommand extends Command
     public function __construct(
         private readonly PersonRepository $personRepository,
         private readonly PhoneNumberUtil $phoneNumberUtil,
-        private readonly PhoneNumberHelperInterface $phoneNumberHelper,
         private readonly ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder,
-        private readonly ShortMessageTransporterInterface $transporter,
+        private readonly TexterInterface $transporter,
         private readonly UserRepositoryInterface $userRepository,
     ) {
         parent::__construct('chill:calendar:test-send-short-message');
@@ -152,10 +150,6 @@ class SendTestShortMessageOnCalendarCommand extends Command
             return $phone;
         });
 
-        $phone = $helper->ask($input, $output, $question);
-
-        $question = new ConfirmationQuestion('really send the message to the phone ?');
-        $reallySend = (bool) $helper->ask($input, $output, $question);
 
         $messages = $this->messageForCalendarBuilder->buildMessageForCalendar($calendar);
 
@@ -165,8 +159,12 @@ class SendTestShortMessageOnCalendarCommand extends Command
 
         foreach ($messages as $key => $message) {
             $output->writeln("The short message for SMS {$key} will be: ");
-            $output->writeln($message->getContent());
-            $message->setPhoneNumber($phone);
+            $output->writeln($message->getSubject());
+            $output->writeln('The destination number will be:');
+            $output->writeln($message->getPhone());
+
+            $question = new ConfirmationQuestion('really send the message to the phone ?');
+            $reallySend = (bool) $helper->ask($input, $output, $question);
 
             if ($reallySend) {
                 $this->transporter->send($message);

src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php

@@ -21,11 +21,17 @@ namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 use Chill\CalendarBundle\Entity\Calendar;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Notifier\TexterInterface;
 
 class BulkCalendarShortMessageSender
 {
-    public function __construct(private readonly CalendarForShortMessageProvider $provider, private readonly EntityManagerInterface $em, private readonly LoggerInterface $logger, private readonly MessageBusInterface $messageBus, private readonly ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder) {}
+    public function __construct(
+        private readonly CalendarForShortMessageProvider $provider,
+        private readonly EntityManagerInterface $em,
+        private readonly LoggerInterface $logger,
+        private readonly TexterInterface $texter,
+        private readonly ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder,
+    ) {}
 
     public function sendBulkMessageToEligibleCalendars()
     {
@@ -36,7 +42,7 @@ class BulkCalendarShortMessageSender
             $smses = $this->messageForCalendarBuilder->buildMessageForCalendar($calendar);
 
             foreach ($smses as $sms) {
-                $this->messageBus->dispatch($sms);
+                $this->texter->send($sms);
                 ++$countSms;
             }
 

src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php

@@ -19,12 +19,26 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
-use Chill\MainBundle\Service\ShortMessage\ShortMessage;
+use libphonenumber\PhoneNumberFormat;
+use libphonenumber\PhoneNumberUtil;
+use Symfony\Component\Notifier\Message\SmsMessage;
 
 class DefaultShortMessageForCalendarBuilder implements ShortMessageForCalendarBuilderInterface
 {
-    public function __construct(private readonly \Twig\Environment $engine) {}
+    private readonly PhoneNumberUtil $phoneUtil;
 
+    public function __construct(private readonly \Twig\Environment $engine)
+    {
+        $this->phoneUtil = PhoneNumberUtil::getInstance();
+    }
+
+    /**
+     * @return list<SmsMessage>
+     *
+     * @throws \Twig\Error\LoaderError
+     * @throws \Twig\Error\RuntimeError
+     * @throws \Twig\Error\SyntaxError
+     */
     public function buildMessageForCalendar(Calendar $calendar): array
     {
         if (true !== $calendar->getSendSMS()) {
@@ -39,16 +53,14 @@ class DefaultShortMessageForCalendarBuilder implements ShortMessageForCalendarBu
             }
 
             if (Calendar::SMS_PENDING === $calendar->getSmsStatus()) {
-                $toUsers[] = new ShortMessage(
+                $toUsers[] = new SmsMessage(
+                    $this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
                     $this->engine->render('@ChillCalendar/CalendarShortMessage/short_message.txt.twig', ['calendar' => $calendar]),
-                    $person->getMobilenumber(),
-                    ShortMessage::PRIORITY_LOW
                 );
             } elseif (Calendar::SMS_CANCEL_PENDING === $calendar->getSmsStatus()) {
-                $toUsers[] = new ShortMessage(
+                $toUsers[] = new SmsMessage(
+                    $this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
                     $this->engine->render('@ChillCalendar/CalendarShortMessage/short_message_canceled.txt.twig', ['calendar' => $calendar]),
-                    $person->getMobilenumber(),
-                    ShortMessage::PRIORITY_LOW
                 );
             }
         }

src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/ShortMessageForCalendarBuilderInterface.php

@@ -19,12 +19,12 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
-use Chill\MainBundle\Service\ShortMessage\ShortMessage;
+use Symfony\Component\Notifier\Message\SmsMessage;
 
 interface ShortMessageForCalendarBuilderInterface
 {
     /**
-     * @return array|ShortMessage[]
+     * @return list<SmsMessage>
      */
     public function buildMessageForCalendar(Calendar $calendar): array;
 }

src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php

@@ -23,17 +23,16 @@ use Chill\CalendarBundle\Service\ShortMessageNotification\BulkCalendarShortMessa
 use Chill\CalendarBundle\Service\ShortMessageNotification\CalendarForShortMessageProvider;
 use Chill\CalendarBundle\Service\ShortMessageNotification\ShortMessageForCalendarBuilderInterface;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Service\ShortMessage\ShortMessage;
 use Chill\MainBundle\Test\PrepareUserTrait;
 use Chill\PersonBundle\DataFixtures\Helper\PersonRandomHelper;
 use Doctrine\ORM\EntityManagerInterface;
-use libphonenumber\PhoneNumberUtil;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Log\NullLogger;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\TexterInterface;
 
 /**
  * @internal
@@ -101,24 +100,23 @@ final class BulkCalendarShortMessageSenderTest extends KernelTestCase
         $messageBuilder->buildMessageForCalendar(Argument::type(Calendar::class))
             ->willReturn(
                 [
-                    new ShortMessage(
+                    new SmsMessage(
+                        '+32470123456',
                         'content',
-                        PhoneNumberUtil::getInstance()->parse('+32470123456', 'BE'),
-                        ShortMessage::PRIORITY_MEDIUM
                     ),
                 ]
             );
 
-        $bus = $this->prophesize(MessageBusInterface::class);
-        $bus->dispatch(Argument::type(ShortMessage::class))
-            ->willReturn(new Envelope(new \stdClass()))
+        $texter = $this->prophesize(TexterInterface::class);
+        $texter->send(Argument::type(SmsMessage::class))
+            ->will(fn ($args): SentMessage => new SentMessage($args[0], 'sms'))
             ->shouldBeCalledTimes(1);
 
         $bulk = new BulkCalendarShortMessageSender(
             $provider->reveal(),
             $em,
             new NullLogger(),
-            $bus->reveal(),
+            $texter->reveal(),
             $messageBuilder->reveal()
         );
 

src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php

@@ -23,7 +23,6 @@ use Chill\CalendarBundle\Service\ShortMessageNotification\DefaultShortMessageFor
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
-use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -90,10 +89,9 @@ final class DefaultShortMessageForCalendarBuilderTest extends TestCase
         $this->assertCount(1, $sms);
         $this->assertEquals(
             '+32470123456',
-            $this->phoneNumberUtil->format($sms[0]->getPhoneNumber(), PhoneNumberFormat::E164)
+            $sms[0]->getPhone()
         );
-        $this->assertEquals('message content', $sms[0]->getContent());
-        $this->assertEquals('low', $sms[0]->getPriority());
+        $this->assertEquals('message content', $sms[0]->getSubject());
 
         // if the calendar is canceled
         $calendar
@@ -105,9 +103,8 @@ final class DefaultShortMessageForCalendarBuilderTest extends TestCase
         $this->assertCount(1, $sms);
         $this->assertEquals(
             '+32470123456',
-            $this->phoneNumberUtil->format($sms[0]->getPhoneNumber(), PhoneNumberFormat::E164)
+            $sms[0]->getRecipientId(),
         );
-        $this->assertEquals('message canceled', $sms[0]->getContent());
-        $this->assertEquals('low', $sms[0]->getPriority());
+        $this->assertEquals('message canceled', $sms[0]->getSubject());
     }
 }

src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php

@@ -298,7 +298,7 @@ class CustomFieldsGroupController extends AbstractController
             ->setCustomFieldsGroup($customFieldsGroup);
 
         $builder = $this->get('form.factory')
-            ->createNamedBuilder(null, FormType::class, $customfield, [
+            ->createNamedBuilder('', FormType::class, $customfield, [
                 'method' => 'GET',
                 'action' => $this->generateUrl('customfield_new'),
                 'csrf_protection' => false,

src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/LocalStorage/StoredObjectManager.php

@@ -0,0 +1,227 @@
+<?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\DocStoreBundle\AsyncUpload\Driver\LocalStorage;
+
+use Base64Url\Base64Url;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Entity\StoredObjectVersion;
+use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
+use Chill\DocStoreBundle\Service\Cryptography\KeyGenerator;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Filesystem\Path;
+
+class StoredObjectManager implements StoredObjectManagerInterface
+{
+    private readonly string $baseDir;
+
+    private readonly Filesystem $filesystem;
+
+    public function __construct(
+        ParameterBagInterface $parameterBag,
+        private readonly KeyGenerator $keyGenerator,
+    ) {
+        $this->baseDir = $parameterBag->get('chill_doc_store')['local_storage']['storage_path'];
+        $this->filesystem = new Filesystem();
+    }
+
+    public function getLastModified(StoredObject|StoredObjectVersion $document): \DateTimeInterface
+    {
+        $version = $document instanceof StoredObject ? $document->getCurrentVersion() : $document;
+
+        if (null === $version) {
+            throw StoredObjectManagerException::storedObjectDoesNotContainsVersion();
+        }
+
+        $path = $this->buildPath($version->getFilename());
+
+        if (false === $ts = filemtime($path)) {
+            throw StoredObjectManagerException::unableToReadDocumentOnDisk($path);
+        }
+
+        return \DateTimeImmutable::createFromFormat('U', (string) $ts);
+    }
+
+    public function getContentLength(StoredObject|StoredObjectVersion $document): int
+    {
+        return strlen($this->read($document));
+    }
+
+    public function exists(StoredObject|StoredObjectVersion $document): bool
+    {
+        $version = $document instanceof StoredObject ? $document->getCurrentVersion() : $document;
+
+        if (null === $version) {
+            return false;
+        }
+
+        return $this->existsContent($version->getFilename());
+    }
+
+    public function read(StoredObject|StoredObjectVersion $document): string
+    {
+        $version = $document instanceof StoredObject ? $document->getCurrentVersion() : $document;
+
+        if (null === $version) {
+            throw StoredObjectManagerException::storedObjectDoesNotContainsVersion();
+        }
+
+        $content = $this->readContent($version->getFilename());
+
+        if (!$this->isVersionEncrypted($version)) {
+            return $content;
+        }
+
+        $clearData = openssl_decrypt(
+            $content,
+            self::ALGORITHM,
+            // TODO: Why using this library and not use base64_decode() ?
+            Base64Url::decode($version->getKeyInfos()['k']),
+            \OPENSSL_RAW_DATA,
+            pack('C*', ...$version->getIv())
+        );
+
+        if (false === $clearData) {
+            throw StoredObjectManagerException::unableToDecrypt(openssl_error_string());
+        }
+
+        return $clearData;
+    }
+
+    public function write(StoredObject $document, string $clearContent, ?string $contentType = null): StoredObjectVersion
+    {
+        $newIv = $document->isEncrypted() ? $document->getIv() : $this->keyGenerator->generateIv();
+        $newKey = $document->isEncrypted() ? $document->getKeyInfos() : $this->keyGenerator->generateKey(self::ALGORITHM);
+        $newType = $contentType ?? $document->getType();
+        $version = $document->registerVersion(
+            $newIv,
+            $newKey,
+            $newType
+        );
+
+        $encryptedContent = $this->isVersionEncrypted($version)
+            ? openssl_encrypt(
+                $clearContent,
+                self::ALGORITHM,
+                // TODO: Why using this library and not use base64_decode() ?
+                Base64Url::decode($version->getKeyInfos()['k']),
+                \OPENSSL_RAW_DATA,
+                pack('C*', ...$version->getIv())
+            )
+            : $clearContent;
+
+        if (false === $encryptedContent) {
+            throw StoredObjectManagerException::unableToEncryptDocument((string) openssl_error_string());
+        }
+
+        $this->writeContent($version->getFilename(), $encryptedContent);
+
+        return $version;
+    }
+
+    public function readContent(string $filename): string
+    {
+        $path = $this->buildPath($filename);
+
+        if (!file_exists($path)) {
+            throw StoredObjectManagerException::unableToFindDocumentOnDisk($path);
+        }
+
+        if (false === $content = file_get_contents($path)) {
+            throw StoredObjectManagerException::unableToReadDocumentOnDisk($path);
+        }
+
+        return $content;
+    }
+
+    public function writeContent(string $filename, string $encryptedContent): void
+    {
+        $fullPath = $this->buildPath($filename);
+        $dir = Path::getDirectory($fullPath);
+
+        if (!$this->filesystem->exists($dir)) {
+            $this->filesystem->mkdir($dir);
+        }
+
+        $result = file_put_contents($fullPath, $encryptedContent);
+
+        if (false === $result) {
+            throw StoredObjectManagerException::unableToStoreDocumentOnDisk();
+        }
+    }
+
+    public function existsContent(string $filename): bool
+    {
+        $path = $this->buildPath($filename);
+
+        return $this->filesystem->exists($path);
+    }
+
+    private function buildPath(string $filename): string
+    {
+        $dirs = [$this->baseDir];
+
+        for ($i = 0; $i < min(strlen($filename), 8); ++$i) {
+            $dirs[] = $filename[$i];
+        }
+
+        $dirs[] = $filename;
+
+        return Path::canonicalize(implode(DIRECTORY_SEPARATOR, $dirs));
+    }
+
+    public function delete(StoredObjectVersion $storedObjectVersion): void
+    {
+        if (!$this->exists($storedObjectVersion)) {
+            return;
+        }
+
+        $path = $this->buildPath($storedObjectVersion->getFilename());
+
+        $this->filesystem->remove($path);
+        $this->removeDirectoriesRecursively(Path::getDirectory($path));
+    }
+
+    private function removeDirectoriesRecursively(string $path): void
+    {
+        if ($path === $this->baseDir) {
+            return;
+        }
+
+        $files = scandir($path);
+
+        // if it does contains only "." and "..", we can remove the directory
+        if (2 === count($files) && in_array('.', $files, true) && in_array('..', $files, true)) {
+            $this->filesystem->remove($path);
+            $this->removeDirectoriesRecursively(Path::getDirectory($path));
+        }
+    }
+
+    /**
+     * @throws StoredObjectManagerException
+     */
+    public function etag(StoredObject|StoredObjectVersion $document): string
+    {
+        return md5($this->read($document));
+    }
+
+    public function clearCache(): void
+    {
+        // there is no cache: nothing to do here !
+    }
+
+    private function isVersionEncrypted(StoredObjectVersion $storedObjectVersion): bool
+    {
+        return $storedObjectVersion->isEncrypted();
+    }
+}

src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/LocalStorage/TempUrlLocalStorageGenerator.php

@@ -0,0 +1,107 @@
+<?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\DocStoreBundle\AsyncUpload\Driver\LocalStorage;
+
+use Chill\DocStoreBundle\AsyncUpload\SignedUrl;
+use Chill\DocStoreBundle\AsyncUpload\SignedUrlPost;
+use Chill\DocStoreBundle\AsyncUpload\TempUrlGeneratorInterface;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
+class TempUrlLocalStorageGenerator implements TempUrlGeneratorInterface
+{
+    private const SIGNATURE_DURATION = 180;
+
+    public function __construct(
+        private readonly string $secret,
+        private readonly ClockInterface $clock,
+        private readonly UrlGeneratorInterface $urlGenerator,
+    ) {}
+
+    public function generate(string $method, string $object_name, ?int $expire_delay = null): SignedUrl
+    {
+        $expiration = $this->clock->now()->getTimestamp() + min($expire_delay ?? self::SIGNATURE_DURATION, self::SIGNATURE_DURATION);
+
+        return new SignedUrl(
+            strtoupper($method),
+            $this->urlGenerator->generate('chill_docstore_stored_object_operate', [
+                'object_name' => $object_name,
+                'exp' => $expiration,
+                'sig' => $this->sign(strtoupper($method), $object_name, $expiration),
+            ], UrlGeneratorInterface::ABSOLUTE_URL),
+            \DateTimeImmutable::createFromFormat('U', (string) $expiration),
+            $object_name,
+        );
+    }
+
+    public function generatePost(?int $expire_delay = null, ?int $submit_delay = null, int $max_file_count = 1, ?string $object_name = null): SignedUrlPost
+    {
+        $submitDelayComputed = min($submit_delay ?? self::SIGNATURE_DURATION, self::SIGNATURE_DURATION);
+        $expireDelayComputed = min($expire_delay ?? self::SIGNATURE_DURATION, self::SIGNATURE_DURATION);
+        $objectNameComputed = $object_name ?? StoredObject::generatePrefix();
+        $expiration = $this->clock->now()->getTimestamp() + $expireDelayComputed + $submitDelayComputed;
+
+        return new SignedUrlPost(
+            $this->urlGenerator->generate(
+                'chill_docstore_storedobject_post',
+                ['prefix' => $objectNameComputed],
+                UrlGeneratorInterface::ABSOLUTE_URL
+            ),
+            \DateTimeImmutable::createFromFormat('U', (string) $expiration),
+            $objectNameComputed,
+            15_000_000,
+            1,
+            $submitDelayComputed,
+            '',
+            $objectNameComputed,
+            $this->sign('POST', $object_name, $expiration),
+        );
+    }
+
+    private function sign(string $method, string $object_name, int $expiration): string
+    {
+        return hash('sha512', sprintf('%s.%s.%s.%d', $method, $this->secret, $object_name, $expiration));
+    }
+
+    public function validateSignaturePost(string $signature, string $prefix, int $expiration, int $maxFileSize, int $maxFileCount): bool
+    {
+        if (15_000_000 !== $maxFileSize || 1 !== $maxFileCount) {
+            return false;
+        }
+
+        return $this->internalValidateSignature($signature, 'POST', $prefix, $expiration);
+    }
+
+    private function internalValidateSignature(string $signature, string $method, string $object_name, int $expiration): bool
+    {
+        if ($expiration < $this->clock->now()->format('U')) {
+            return false;
+        }
+
+        if ('' === $object_name) {
+            return false;
+        }
+
+
+        return $this->sign($method, $object_name, $expiration) === $signature;
+    }
+
+    public function validateSignature(string $signature, string $method, string $objectName, int $expiration): bool
+    {
+        if (!in_array($method, ['GET', 'HEAD'], true)) {
+            return false;
+        }
+
+        return $this->internalValidateSignature($signature, $method, $objectName, $expiration);
+    }
+}

src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/OpenstackObjectStore/ConfigureOpenstackObjectStorageCommand.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\DocStoreBundle\AsyncUpload\Command;
+namespace Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;

src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/OpenstackObjectStore/StoredObjectManager.php

@@ -9,13 +9,14 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\DocStoreBundle\Service;
+namespace Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore;
 
 use Base64Url\Base64Url;
 use Chill\DocStoreBundle\AsyncUpload\TempUrlGeneratorInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Entity\StoredObjectVersion;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
@@ -24,8 +25,6 @@ use Symfony\Contracts\HttpClient\ResponseInterface;
 
 final class StoredObjectManager implements StoredObjectManagerInterface
 {
-    private const ALGORITHM = 'AES-256-CBC';
-
     private array $inMemory = [];
 
     public function __construct(
@@ -361,6 +360,6 @@ final class StoredObjectManager implements StoredObjectManagerInterface
 
     private function isVersionEncrypted(StoredObjectVersion $storedObjectVersion): bool
     {
-        return ([] !== $storedObjectVersion->getKeyInfos()) && ([] !== $storedObjectVersion->getIv());
+        return $storedObjectVersion->isEncrypted();
     }
 }

src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\DocStoreBundle;
 
+use Chill\DocStoreBundle\DependencyInjection\Compiler\StorageConfigurationCompilerPass;
 use Chill\DocStoreBundle\GenericDoc\GenericDocForAccompanyingPeriodProviderInterface;
 use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
 use Chill\DocStoreBundle\GenericDoc\Twig\GenericDocRendererInterface;
@@ -27,5 +28,7 @@ class ChillDocStoreBundle extends Bundle
             ->addTag('chill_doc_store.generic_doc_person_provider');
         $container->registerForAutoconfiguration(GenericDocRendererInterface::class)
             ->addTag('chill_doc_store.generic_doc_renderer');
+
+        $container->addCompilerPass(new StorageConfigurationCompilerPass());
     }
 }

src/Bundle/ChillDocStoreBundle/Controller/StoredObjectContentToLocalStorageController.php

@@ -0,0 +1,120 @@
+<?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\DocStoreBundle\Controller;
+
+use Chill\DocStoreBundle\AsyncUpload\Driver\LocalStorage\StoredObjectManager;
+use Chill\DocStoreBundle\AsyncUpload\Driver\LocalStorage\TempUrlLocalStorageGenerator;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * Controller to deal with local storage operation.
+ */
+final readonly class StoredObjectContentToLocalStorageController
+{
+    public function __construct(
+        private StoredObjectManager $storedObjectManager,
+        private TempUrlLocalStorageGenerator $tempUrlLocalStorageGenerator,
+    ) {}
+
+    #[Route('/public/stored-object/post', name: 'chill_docstore_storedobject_post', methods: ['POST'])]
+    public function postContent(Request $request): Response
+    {
+        $prefix = $request->query->get('prefix', '');
+
+        if ('' === $prefix) {
+            throw new BadRequestHttpException('Prefix parameter is missing');
+        }
+
+        if (0 === $maxFileSize = $request->request->getInt('max_file_size', 0)) {
+            throw new BadRequestHttpException('Max file size is not set or equal to zero');
+        }
+
+        if (1 !== $maxFileCount = $request->request->getInt('max_file_count', 0)) {
+            throw new BadRequestHttpException('Max file count is not set or equal to zero');
+        }
+
+        if (0 === $expiration = $request->request->getInt('expires', 0)) {
+            throw new BadRequestHttpException('Expiration is not set or equal to zero');
+        }
+
+        if ('' === $signature = $request->request->get('signature', '')) {
+            throw new BadRequestHttpException('Signature is not set or is a blank string');
+        }
+
+        if (!$this->tempUrlLocalStorageGenerator->validateSignaturePost($signature, $prefix, $expiration, $maxFileSize, $maxFileCount)) {
+            throw new AccessDeniedHttpException('Invalid signature');
+        }
+
+        $keyFiles = $request->files->keys();
+
+        if ($maxFileCount < count($keyFiles)) {
+            throw new AccessDeniedHttpException('More files than max file count');
+        }
+
+        if (0 === count($keyFiles)) {
+            throw new BadRequestHttpException('Zero files given');
+        }
+
+        foreach ($keyFiles as $keyFile) {
+            /** @var UploadedFile $file */
+            $file = $request->files->get($keyFile);
+
+            if ($maxFileSize < strlen($file->getContent())) {
+                throw new AccessDeniedHttpException('File is too big');
+            }
+
+            if (!str_starts_with((string) $keyFile, $prefix)) {
+                throw new AccessDeniedHttpException('Filename does not start with signed prefix');
+            }
+
+            $this->storedObjectManager->writeContent($keyFile, $file->getContent());
+        }
+
+        return new Response(status: Response::HTTP_NO_CONTENT);
+    }
+
+    #[Route('/public/stored-object/operate', name: 'chill_docstore_stored_object_operate', methods: ['GET', 'HEAD'])]
+    public function contentOperate(Request $request): Response
+    {
+        if ('' === $objectName = $request->query->get('object_name', '')) {
+            throw new BadRequestHttpException('Object name parameter is missing');
+        }
+
+        if (0 === $expiration = $request->query->getInt('exp', 0)) {
+            throw new BadRequestHttpException('Expiration is not set or equal to zero');
+        }
+
+        if ('' === $signature = $request->query->get('sig', '')) {
+            throw new BadRequestHttpException('Signature is not set or is a blank string');
+        }
+
+        if (!$this->tempUrlLocalStorageGenerator->validateSignature($signature, strtoupper($request->getMethod()), $objectName, $expiration)) {
+            throw new AccessDeniedHttpException('Invalid signature');
+        }
+
+        if (!$this->storedObjectManager->existsContent($objectName)) {
+            throw new NotFoundHttpException('Object does not exists on disk');
+        }
+
+        return match ($request->getMethod()) {
+            'GET' => new Response($this->storedObjectManager->readContent($objectName)),
+            'HEAD' => new Response(''),
+            default => throw new BadRequestHttpException('method not supported'),
+        };
+    }
+}

src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php

@@ -53,7 +53,7 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         $this->prependTwig($container);
     }
 
-    protected function prependAuthorization(ContainerBuilder $container)
+    private function prependAuthorization(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('security', [
             'role_hierarchy' => [
@@ -69,7 +69,7 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         ]);
     }
 
-    protected function prependRoute(ContainerBuilder $container)
+    private function prependRoute(ContainerBuilder $container)
     {
         // declare routes for task bundle
         $container->prependExtensionConfig('chill_main', [
@@ -81,7 +81,7 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         ]);
     }
 
-    protected function prependTwig(ContainerBuilder $container)
+    private function prependTwig(ContainerBuilder $container)
     {
         $twigConfig = [
             'form_themes' => ['@ChillDocStore/Form/fields.html.twig'],

src/Bundle/ChillDocStoreBundle/DependencyInjection/Compiler/StorageConfigurationCompilerPass.php

@@ -0,0 +1,86 @@
+<?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\DocStoreBundle\DependencyInjection\Compiler;
+
+use Chill\DocStoreBundle\AsyncUpload\Driver\LocalStorage\TempUrlLocalStorageGenerator;
+use Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore\ConfigureOpenstackObjectStorageCommand;
+use Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore\TempUrlOpenstackGenerator;
+use Chill\DocStoreBundle\AsyncUpload\TempUrlGeneratorInterface;
+use Chill\DocStoreBundle\Controller\StoredObjectContentToLocalStorageController;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class StorageConfigurationCompilerPass implements CompilerPassInterface
+{
+    private const SERVICES_OPENSTACK = [
+        \Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore\StoredObjectManager::class,
+        TempUrlOpenstackGenerator::class,
+        ConfigureOpenstackObjectStorageCommand::class,
+    ];
+
+    private const SERVICES_LOCAL_STORAGE = [
+        \Chill\DocStoreBundle\AsyncUpload\Driver\LocalStorage\StoredObjectManager::class,
+        TempUrlLocalStorageGenerator::class,
+        StoredObjectContentToLocalStorageController::class,
+    ];
+
+    public function process(ContainerBuilder $container)
+    {
+        $config = $container
+            ->getParameterBag()
+            ->resolveValue($container->getParameter('chill_doc_store'));
+
+        if (array_key_exists('local_storage', $config) && !array_key_exists('openstack', $config)) {
+            $driver = 'local_storage';
+            $this->checkUseDriverConfiguration($config['use_driver'] ?? null, $driver);
+        } elseif (!array_key_exists('local_storage', $config) && array_key_exists('openstack', $config)) {
+            $driver = 'openstack';
+            $this->checkUseDriverConfiguration($config['use_driver'] ?? null, $driver);
+        } elseif (array_key_exists('openstack', $config) && array_key_exists('local_storage', $config)) {
+            $driver = $config['use_driver'] ?? null;
+            if (null === $driver) {
+                throw new InvalidConfigurationException('There are multiple drivers configured for chill_doc_store, set the one you want to use with the variable use_driver');
+            }
+        } else {
+            throw new InvalidConfigurationException('No driver defined for storing document. Define one in chill_doc_store configuration');
+        }
+
+        if ('local_storage' === $driver) {
+            foreach (self::SERVICES_OPENSTACK as $service) {
+                $container->removeDefinition($service);
+            }
+
+            $container->setAlias(StoredObjectManagerInterface::class, \Chill\DocStoreBundle\AsyncUpload\Driver\LocalStorage\StoredObjectManager::class);
+            $container->setAlias(TempUrlGeneratorInterface::class, TempUrlLocalStorageGenerator::class);
+        } else {
+            foreach (self::SERVICES_LOCAL_STORAGE as $service) {
+                $container->removeDefinition($service);
+            }
+
+            $container->setAlias(StoredObjectManagerInterface::class, \Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore\StoredObjectManager::class);
+            $container->setAlias(TempUrlGeneratorInterface::class, TempUrlOpenstackGenerator::class);
+        }
+    }
+
+    private function checkUseDriverConfiguration(?string $useDriver, string $driver): void
+    {
+        if (null === $useDriver) {
+            return;
+        }
+
+        if ($useDriver !== $driver) {
+            throw new InvalidConfigurationException(sprintf('The "use_driver" configuration require a driver (%s) which is not configured. Configure this driver in order to use it.', $useDriver));
+        }
+    }
+}

src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php

@@ -30,10 +30,22 @@ class Configuration implements ConfigurationInterface
 
         /* @phpstan-ignore-next-line As there are inconsistencies in return types, but the code works... */
         $rootNode->children()
+            ->enumNode('use_driver')
+            ->values(['local_storage', 'openstack'])
+            ->info('Driver to use. Default to the single one if multiple driver are defined. Configuration will raise an error if there are multiple drivers defined, and if this key is not set')
+            ->end()
+            ->arrayNode('local_storage')
+            ->info('where the stored object should be stored')
+            ->children()
+            ->scalarNode('storage_path')
+            ->info('the folder where the stored object should be stored')
+            ->isRequired()->cannotBeEmpty()
+            ->end() // end of storage_path
+            ->end() // end of children
+            ->end() // end of local_storage
             // openstack node
             ->arrayNode('openstack')
             ->info('parameters to authenticate and generate temp url against the openstack object storage service')
-            ->addDefaultsIfNotSet()
             ->children()
             // openstack.temp_url
             ->arrayNode('temp_url')

src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php

@@ -448,4 +448,12 @@ class StoredObject implements Document, TrackCreationInterface
     {
         return $storedObject->getDeleteAt() < $now && $storedObject->getVersions()->isEmpty();
     }
+
+    /**
+     * Return true if it has a current version, and if the current version is encrypted.
+     */
+    public function isEncrypted(): bool
+    {
+        return $this->hasCurrentVersion() && $this->getCurrentVersion()->isEncrypted();
+    }
 }

src/Bundle/ChillDocStoreBundle/Entity/StoredObjectVersion.php

@@ -226,4 +226,9 @@ class StoredObjectVersion implements TrackCreationInterface
 
         return $this;
     }
+
+    public function isEncrypted(): bool
+    {
+        return ([] !== $this->getKeyInfos()) && ([] !== $this->getIv());
+    }
 }

src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php

@@ -34,4 +34,29 @@ final class StoredObjectManagerException extends \Exception
     {
         return new self('Unable to get content from response.', 500, $exception);
     }
+
+    public static function unableToStoreDocumentOnDisk(?\Throwable $exception = null): self
+    {
+        return new self('Unable to store document on disk.', previous: $exception);
+    }
+
+    public static function unableToFindDocumentOnDisk(string $path): self
+    {
+        return new self('Unable to find document on disk at path "'.$path.'".');
+    }
+
+    public static function unableToReadDocumentOnDisk(string $path): self
+    {
+        return new self('Unable to read document on disk at path "'.$path.'".');
+    }
+
+    public static function unableToEncryptDocument(string $errors): self
+    {
+        return new self('Unable to encrypt document: '.$errors);
+    }
+
+    public static function storedObjectDoesNotContainsVersion(): self
+    {
+        return new self('Stored object does not contains any version');
+    }
 }

src/Bundle/ChillDocStoreBundle/Service/Cryptography/KeyGenerator.php

@@ -0,0 +1,59 @@
+<?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\DocStoreBundle\Service\Cryptography;
+
+use Base64Url\Base64Url;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Random\Randomizer;
+
+class KeyGenerator
+{
+    private readonly Randomizer $randomizer;
+
+    public function __construct()
+    {
+        $this->randomizer = new Randomizer();
+    }
+
+    /**
+     * @return array{alg: string, ext: bool, k: string, key_ops: list<string>, kty: string}
+     */
+    public function generateKey(string $algo = StoredObjectManagerInterface::ALGORITHM): array
+    {
+        if (StoredObjectManagerInterface::ALGORITHM !== $algo) {
+            throw new \LogicException(sprintf("Algorithm '%s' is not supported.", $algo));
+        }
+
+        $key = $this->randomizer->getBytes(32);
+
+        return [
+            'alg' => 'A256CBC',
+            'ext' => true,
+            'k' => Base64Url::encode($key),
+            'key_ops' => ['encrypt', 'decrypt'],
+            'kty' => 'oct',
+        ];
+    }
+
+    /**
+     * @return list<int<0, 255>>
+     */
+    public function generateIv(): array
+    {
+        $iv = [];
+        for ($i = 0; $i < 16; ++$i) {
+            $iv[] = unpack('C', $this->randomizer->getBytes(8))[1];
+        }
+
+        return $iv;
+    }
+}

src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessageHandler.php

@@ -53,7 +53,6 @@ final readonly class PdfSignedMessageHandler implements MessageHandlerInterface
 
         $this->entityManager->wrapInTransaction(function () use ($storedObject, $message, $signature) {
             $this->storedObjectManager->write($storedObject, $message->content);
-
             $this->signatureStepStateChanger->markSignatureAsSigned($signature, $message->signatureZoneIndex);
         });
 

src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php

@@ -18,6 +18,8 @@ use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 
 interface StoredObjectManagerInterface
 {
+    public const ALGORITHM = 'AES-256-CBC';
+
     /**
      * @param StoredObject|StoredObjectVersion $document if a StoredObject is given, the last version will be used
      */

src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/LocalStorage/StoredObjectManagerTest.php

@@ -0,0 +1,160 @@
+<?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\DocStoreBundle\Tests\AsyncUpload\Driver\LocalStorage;
+
+use Chill\DocStoreBundle\AsyncUpload\Driver\LocalStorage\StoredObjectManager;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Entity\StoredObjectVersion;
+use Chill\DocStoreBundle\Service\Cryptography\KeyGenerator;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class StoredObjectManagerTest extends TestCase
+{
+    private const CONTENT = 'abcde';
+
+    public function testWrite(): StoredObjectVersion
+    {
+        $storedObject = new StoredObject();
+
+        $manager = $this->buildStoredObjectManager();
+        $version = $manager->write($storedObject, self::CONTENT);
+
+        self::assertSame($storedObject, $version->getStoredObject());
+
+        return $version;
+    }
+
+    /**
+     * @depends testWrite
+     */
+    public function testRead(StoredObjectVersion $version): StoredObjectVersion
+    {
+        $manager = $this->buildStoredObjectManager();
+        $content = $manager->read($version);
+
+        self::assertEquals(self::CONTENT, $content);
+
+        return $version;
+    }
+
+    /**
+     * @depends testRead
+     */
+    public function testExists(StoredObjectVersion $version): StoredObjectVersion
+    {
+        $manager = $this->buildStoredObjectManager();
+        $notExisting = new StoredObject();
+        $versionNotPersisted = $notExisting->registerVersion();
+
+        self::assertTrue($manager->exists($version));
+        self::assertFalse($manager->exists($versionNotPersisted));
+        self::assertFalse($manager->exists(new StoredObject()));
+
+        return $version;
+    }
+
+    /**
+     * @throws \Chill\DocStoreBundle\Exception\StoredObjectManagerException
+     *
+     * @depends testExists
+     */
+    public function testEtag(StoredObjectVersion $version): StoredObjectVersion
+    {
+        $manager = $this->buildStoredObjectManager();
+        $actual = $manager->etag($version);
+
+        self::assertEquals(md5(self::CONTENT), $actual);
+
+        return $version;
+    }
+
+    /**
+     * @depends testEtag
+     */
+    public function testGetContentLength(StoredObjectVersion $version): StoredObjectVersion
+    {
+        $manager = $this->buildStoredObjectManager();
+
+        $actual = $manager->getContentLength($version);
+
+        self::assertSame(5, $actual);
+
+        return $version;
+    }
+
+    /**
+     * @throws \Chill\DocStoreBundle\Exception\StoredObjectManagerException
+     *
+     * @depends testGetContentLength
+     */
+    public function testGetLastModified(StoredObjectVersion $version): StoredObjectVersion
+    {
+        $manager = $this->buildStoredObjectManager();
+        $actual = $manager->getLastModified($version);
+
+        self::assertInstanceOf(\DateTimeImmutable::class, $actual);
+        self::assertGreaterThan((new \DateTimeImmutable('now'))->getTimestamp() - 10, $actual->getTimestamp());
+
+        return $version;
+    }
+
+    /**
+     * @depends testGetLastModified
+     */
+    public function testDelete(StoredObjectVersion $version): void
+    {
+        $manager = $this->buildStoredObjectManager();
+        $manager->delete($version);
+
+        self::assertFalse($manager->exists($version));
+    }
+
+    public function testDeleteDoesNotRemoveOlderVersion(): void
+    {
+        $storedObject = new StoredObject();
+        $manager = $this->buildStoredObjectManager();
+        $version1 = $manager->write($storedObject, 'version1');
+        $version2 = $manager->write($storedObject, 'version2');
+        $version3 = $manager->write($storedObject, 'version3');
+
+        self::assertTrue($manager->exists($version1));
+        self::assertEquals('version1', $manager->read($version1));
+        self::assertTrue($manager->exists($version2));
+        self::assertEquals('version2', $manager->read($version2));
+        self::assertTrue($manager->exists($version3));
+        self::assertEquals('version3', $manager->read($version3));
+
+        // we delete the intermediate version
+        $manager->delete($version2);
+
+        self::assertFalse($manager->exists($version2));
+        // we check that we are still able to download the other versions
+        self::assertTrue($manager->exists($version1));
+        self::assertEquals('version1', $manager->read($version1));
+        self::assertTrue($manager->exists($version3));
+        self::assertEquals('version3', $manager->read($version3));
+    }
+
+    private function buildStoredObjectManager(): StoredObjectManager
+    {
+        return new StoredObjectManager(
+            new ParameterBag(['chill_doc_store' => ['local_storage' => ['storage_path' => '/tmp/chill-local-storage-test']]]),
+            new KeyGenerator(),
+        );
+    }
+}

src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/LocalStorage/TempUrlLocalStorageGeneratorTest.php

@@ -0,0 +1,238 @@
+<?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\DocStoreBundle\Tests\AsyncUpload\Driver\LocalStorage;
+
+use Chill\DocStoreBundle\AsyncUpload\Driver\LocalStorage\TempUrlLocalStorageGenerator;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class TempUrlLocalStorageGeneratorTest extends TestCase
+{
+    use ProphecyTrait;
+
+    private const SECRET = 'abc';
+
+    public function testGenerate(): void
+    {
+        $urlGenerator = $this->prophesize(UrlGeneratorInterface::class);
+        $urlGenerator->generate('chill_docstore_stored_object_operate', [
+            'object_name' => $object_name = 'testABC',
+            'exp' => $expiration = 1734307200 + 180,
+            'sig' => TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name, $expiration),
+        ], UrlGeneratorInterface::ABSOLUTE_URL)
+            ->shouldBeCalled()
+            ->willReturn($url = 'http://example.com/public/doc-store/stored-object/operate/testABC');
+
+        $generator = $this->buildGenerator($urlGenerator->reveal());
+
+        $signedUrl = $generator->generate('GET', $object_name);
+
+        self::assertEquals($url, $signedUrl->url);
+        self::assertEquals($object_name, $signedUrl->object_name);
+        self::assertEquals($expiration, $signedUrl->expires->getTimestamp());
+        self::assertEquals('GET', $signedUrl->method);
+    }
+
+    public function testGeneratePost(): void
+    {
+        $urlGenerator = $this->prophesize(UrlGeneratorInterface::class);
+        $urlGenerator->generate('chill_docstore_storedobject_post', [
+            'prefix' => 'prefixABC',
+        ], UrlGeneratorInterface::ABSOLUTE_URL)
+            ->shouldBeCalled()
+            ->willReturn($url = 'http://example.com/public/doc-store/stored-object/prefixABC');
+
+        $generator = $this->buildGenerator($urlGenerator->reveal());
+
+        $signedUrl = $generator->generatePost(object_name: 'prefixABC');
+
+        self::assertEquals($url, $signedUrl->url);
+        self::assertEquals('prefixABC', $signedUrl->object_name);
+        self::assertEquals($expiration = 1734307200 + 180 + 180, $signedUrl->expires->getTimestamp());
+        self::assertEquals('POST', $signedUrl->method);
+        self::assertEquals(TempUrlLocalStorageGeneratorTest::expectedSignature('POST', 'prefixABC', $expiration), $signedUrl->signature);
+    }
+
+    private static function expectedSignature(string $method, $objectName, int $expiration): string
+    {
+        return hash('sha512', sprintf('%s.%s.%s.%d', $method, self::SECRET, $objectName, $expiration));
+    }
+
+    /**
+     * @dataProvider generateValidateSignatureData
+     */
+    public function testValidateSignature(string $signature, string $method, string $objectName, int $expiration, \DateTimeImmutable $now, bool $expected, string $message): void
+    {
+        $urlGenerator = $this->buildGenerator(clock: new MockClock($now));
+
+        self::assertEquals($expected, $urlGenerator->validateSignature($signature, $method, $objectName, $expiration), $message);
+    }
+
+    /**
+     * @dataProvider generateValidateSignaturePostData
+     */
+    public function testValidateSignaturePost(string $signature, int $expiration, string $objectName, int $maxFileSize, int $maxFileCount, \DateTimeImmutable $now, bool $expected, string $message): void
+    {
+        $urlGenerator = $this->buildGenerator(clock: new MockClock($now));
+
+        self::assertEquals($expected, $urlGenerator->validateSignaturePost($signature, $objectName, $expiration, $maxFileSize, $maxFileCount), $message);
+    }
+
+    public static function generateValidateSignaturePostData(): iterable
+    {
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('POST', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            $expiration,
+            $object_name,
+            15_000_000,
+            1,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            true,
+            'Valid signature',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('POST', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            $expiration,
+            $object_name,
+            15_000_001,
+            1,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            false,
+            'Wrong max file size',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('POST', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            $expiration,
+            $object_name,
+            15_000_000,
+            2,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            false,
+            'Wrong max file count',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('POST', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            $expiration,
+            $object_name.'AAA',
+            15_000_000,
+            1,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            false,
+            'Invalid object name',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('POST', $object_name = 'testABC', $expiration = 1734307200 + 180).'A',
+            $expiration,
+            $object_name,
+            15_000_000,
+            1,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            false,
+            'Invalid signature',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('POST', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            $expiration,
+            $object_name,
+            15_000_000,
+            1,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration + 1)),
+            false,
+            'Expired signature',
+        ];
+    }
+
+    public static function generateValidateSignatureData(): iterable
+    {
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            'GET',
+            $object_name,
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            true,
+            'Valid signature, not expired',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('HEAD', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            'HEAD',
+            $object_name,
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            true,
+            'Valid signature, not expired',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180).'A',
+            'GET',
+            $object_name,
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            false,
+            'Invalid signature',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            'GET',
+            $object_name,
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration + 1)),
+            false,
+            'Signature expired',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            'GET',
+            $object_name.'____',
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            false,
+            'Invalid object name',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('POST', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            'POST',
+            $object_name,
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            false,
+            'Wrong method',
+        ];
+    }
+
+    private function buildGenerator(?UrlGeneratorInterface $urlGenerator = null, ?ClockInterface $clock = null): TempUrlLocalStorageGenerator
+    {
+        return new TempUrlLocalStorageGenerator(
+            self::SECRET,
+            $clock ?? new MockClock('2024-12-16T00:00:00+00:00'),
+            $urlGenerator ?? $this->prophesize(UrlGeneratorInterface::class)->reveal(),
+        );
+    }
+}

src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/OpenstackObjectStore/ConfigureOpenstackObjectStorageCommandTest.php

@@ -9,9 +9,9 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace AsyncUpload\Command;
+namespace Chill\DocStoreBundle\Tests\AsyncUpload\Driver\OpenstackObjectStore;
 
-use Chill\DocStoreBundle\AsyncUpload\Command\ConfigureOpenstackObjectStorageCommand;
+use Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore\ConfigureOpenstackObjectStorageCommand;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;

src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/OpenstackObjectStore/StoredObjectManagerTest.php

@@ -9,13 +9,13 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\DocStoreBundle\Tests\Service;
+namespace Chill\DocStoreBundle\Tests\AsyncUpload\Driver\OpenstackObjectStore;
 
+use Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore\StoredObjectManager;
 use Chill\DocStoreBundle\AsyncUpload\SignedUrl;
 use Chill\DocStoreBundle\AsyncUpload\TempUrlGeneratorInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
-use Chill\DocStoreBundle\Service\StoredObjectManager;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\Exception\TransportException;
@@ -27,7 +27,7 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
 /**
  * @internal
  *
- * @covers \Chill\DocStoreBundle\Service\StoredObjectManager
+ * @covers \Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore\StoredObjectManager
  */
 final class StoredObjectManagerTest extends TestCase
 {

src/Bundle/ChillDocStoreBundle/Tests/Controller/StoredObjectContentToLocalStorageControllerTest.php

@@ -0,0 +1,338 @@
+<?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\DocStoreBundle\Tests\Controller;
+
+use Chill\DocStoreBundle\AsyncUpload\Driver\LocalStorage\StoredObjectManager;
+use Chill\DocStoreBundle\AsyncUpload\Driver\LocalStorage\TempUrlLocalStorageGenerator;
+use Chill\DocStoreBundle\Controller\StoredObjectContentToLocalStorageController;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class StoredObjectContentToLocalStorageControllerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    /**
+     * @dataProvider generateOperateContentWithExceptionDataProvider
+     */
+    public function testOperateContentWithException(Request $request, string $expectedException, string $expectedExceptionMessage, bool $existContent, string $readContent, bool $signatureValidity): void
+    {
+        $storedObjectManager = $this->prophesize(StoredObjectManager::class);
+        $storedObjectManager->existsContent(Argument::any())->willReturn($existContent);
+        $storedObjectManager->readContent(Argument::any())->willReturn($readContent);
+
+        $tempUrlLocalStorageGenerator = $this->prophesize(TempUrlLocalStorageGenerator::class);
+        $tempUrlLocalStorageGenerator->validateSignature(
+            $request->query->get('sig', ''),
+            $request->getMethod(),
+            $request->query->get('object_name', ''),
+            $request->query->getInt('exp', 0)
+        )
+            ->willReturn($signatureValidity);
+
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($expectedExceptionMessage);
+
+        $controller = new StoredObjectContentToLocalStorageController(
+            $storedObjectManager->reveal(),
+            $tempUrlLocalStorageGenerator->reveal()
+        );
+
+        $controller->contentOperate($request);
+    }
+
+    public function testOperateContentGetHappyScenario(): void
+    {
+        $objectName = 'testABC';
+        $expiration = new \DateTimeImmutable();
+        $storedObjectManager = $this->prophesize(StoredObjectManager::class);
+        $storedObjectManager->existsContent($objectName)->willReturn(true);
+        $storedObjectManager->readContent($objectName)->willReturn('123456789');
+
+        $tempUrlLocalStorageGenerator = $this->prophesize(TempUrlLocalStorageGenerator::class);
+        $tempUrlLocalStorageGenerator->validateSignature('signature', 'GET', $objectName, $expiration->getTimestamp())
+            ->shouldBeCalled()
+            ->willReturn(true);
+
+        $controller = new StoredObjectContentToLocalStorageController(
+            $storedObjectManager->reveal(),
+            $tempUrlLocalStorageGenerator->reveal()
+        );
+
+        $response = $controller->contentOperate(new Request(['object_name' => $objectName, 'sig' => 'signature', 'exp' => $expiration->getTimestamp()]));
+
+        self::assertEquals(200, $response->getStatusCode());
+        self::assertEquals('123456789', $response->getContent());
+    }
+
+    public function testOperateContentHeadHappyScenario(): void
+    {
+        $objectName = 'testABC';
+        $expiration = new \DateTimeImmutable();
+        $storedObjectManager = $this->prophesize(StoredObjectManager::class);
+        $storedObjectManager->existsContent($objectName)->willReturn(true);
+        $storedObjectManager->readContent($objectName)->willReturn('123456789');
+
+        $tempUrlLocalStorageGenerator = $this->prophesize(TempUrlLocalStorageGenerator::class);
+        $tempUrlLocalStorageGenerator->validateSignature('signature', 'HEAD', $objectName, $expiration->getTimestamp())
+            ->shouldBeCalled()
+            ->willReturn(true);
+
+        $controller = new StoredObjectContentToLocalStorageController(
+            $storedObjectManager->reveal(),
+            $tempUrlLocalStorageGenerator->reveal()
+        );
+
+        $request = new Request(['object_name' => $objectName, 'sig' => 'signature', 'exp' => $expiration->getTimestamp()]);
+        $request->setMethod('HEAD');
+        $response = $controller->contentOperate($request);
+
+        self::assertEquals(200, $response->getStatusCode());
+        self::assertEquals('', $response->getContent());
+    }
+
+    public function testPostContentHappyScenario(): void
+    {
+        $expiration = 171899000;
+        $storedObjectManager = $this->prophesize(StoredObjectManager::class);
+        $storedObjectManager->writeContent('filePrefix/abcSUFFIX', Argument::containingString('fake_encrypted_content'))
+            ->shouldBeCalled();
+
+        $tempUrlGenerator = $this->prophesize(TempUrlLocalStorageGenerator::class);
+        $tempUrlGenerator->validateSignaturePost('signature', 'filePrefix/abc', $expiration, 15_000_000, 1)
+            ->shouldBeCalled()
+            ->willReturn(true);
+
+        $controller = new StoredObjectContentToLocalStorageController($storedObjectManager->reveal(), $tempUrlGenerator->reveal());
+
+        $request = new Request(
+            ['prefix' => 'filePrefix/abc'],
+            ['signature' => 'signature', 'expires' => $expiration, 'max_file_size' => 15_000_000, 'max_file_count' => 1],
+            files: [
+                'filePrefix/abcSUFFIX' => new UploadedFile(
+                    __DIR__.'/data/StoredObjectContentToLocalStorageControllerTest/dummy_file',
+                    'Document.odt',
+                    test: true
+                ),
+            ]
+        );
+
+        $response = $controller->postContent($request);
+
+        self::assertEquals(204, $response->getStatusCode());
+    }
+
+    /**
+     * @dataProvider generatePostContentWithExceptionDataProvider
+     */
+    public function testPostContentWithException(Request $request, bool $isSignatureValid, string $expectedException, string $expectedExceptionMessage): void
+    {
+        $storedObjectManager = $this->prophesize(StoredObjectManager::class);
+        $storedObjectManager->writeContent(Argument::any(), Argument::any())->shouldNotBeCalled();
+
+        $tempUrlGenerator = $this->prophesize(TempUrlLocalStorageGenerator::class);
+        $tempUrlGenerator->validateSignaturePost('signature', Argument::any(), Argument::any(), Argument::any(), Argument::any())
+            ->willReturn($isSignatureValid);
+
+        $controller = new StoredObjectContentToLocalStorageController(
+            $storedObjectManager->reveal(),
+            $tempUrlGenerator->reveal()
+        );
+
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($expectedExceptionMessage);
+
+        $controller->postContent($request);
+    }
+
+    public static function generatePostContentWithExceptionDataProvider(): iterable
+    {
+        $query = ['prefix' => 'filePrefix/abc'];
+        $attributes = ['signature' => 'signature', 'expires' => 15088556855, 'max_file_size' => 15_000_000, 'max_file_count' => 1];
+
+        $request = new Request([]);
+        $request->setMethod('POST');
+
+        yield [
+            $request,
+            true,
+            BadRequestHttpException::class,
+            'Prefix parameter is missing',
+        ];
+
+
+        $attrCloned = [...$attributes];
+        unset($attrCloned['max_file_size']);
+        $request = new Request($query, $attrCloned);
+        $request->setMethod('POST');
+
+        yield [
+            $request,
+            true,
+            BadRequestHttpException::class,
+            'Max file size is not set or equal to zero',
+        ];
+
+        $attrCloned = [...$attributes];
+        unset($attrCloned['max_file_count']);
+        $request = new Request($query, $attrCloned);
+        $request->setMethod('POST');
+
+        yield [
+            $request,
+            true,
+            BadRequestHttpException::class,
+            'Max file count is not set or equal to zero',
+        ];
+
+        $attrCloned = [...$attributes];
+        unset($attrCloned['expires']);
+        $request = new Request($query, $attrCloned);
+        $request->setMethod('POST');
+
+        yield [
+            $request,
+            true,
+            BadRequestHttpException::class,
+            'Expiration is not set or equal to zero',
+        ];
+
+        $attrCloned = [...$attributes];
+        unset($attrCloned['signature']);
+        $request = new Request($query, $attrCloned);
+        $request->setMethod('POST');
+
+        yield [
+            $request,
+            true,
+            BadRequestHttpException::class,
+            'Signature is not set or is a blank string',
+        ];
+
+        $request = new Request($query, $attributes);
+        $request->setMethod('POST');
+
+        yield [
+            $request,
+            false,
+            AccessDeniedHttpException::class,
+            'Invalid signature',
+        ];
+
+        $request = new Request($query, $attributes, files: []);
+        $request->setMethod('POST');
+
+        yield [
+            $request,
+            true,
+            BadRequestHttpException::class,
+            'Zero files given',
+        ];
+
+        $request = new Request($query, $attributes, files: [
+            'filePrefix/abcSUFFIX_1' => new UploadedFile(__DIR__.'/data/StoredObjectContentToLocalStorageControllerTest/dummy_file', 'Some content', test: true),
+            'filePrefix/abcSUFFIX_2' => new UploadedFile(__DIR__.'/data/StoredObjectContentToLocalStorageControllerTest/dummy_file', 'Some content2', test: true),
+        ]);
+        $request->setMethod('POST');
+
+        yield [
+            $request,
+            true,
+            AccessDeniedHttpException::class,
+            'More files than max file count',
+        ];
+
+        $request = new Request($query, [...$attributes, 'max_file_size' => 3], files: [
+            'filePrefix/abcSUFFIX_1' => new UploadedFile(__DIR__.'/data/StoredObjectContentToLocalStorageControllerTest/dummy_file', 'Some content', test: true),
+        ]);
+        $request->setMethod('POST');
+
+        yield [
+            $request,
+            true,
+            AccessDeniedHttpException::class,
+            'File is too big',
+        ];
+
+        $request = new Request($query, [...$attributes], files: [
+            'some/other/prefix_SUFFIX' => new UploadedFile(__DIR__.'/data/StoredObjectContentToLocalStorageControllerTest/dummy_file', 'Some content', test: true),
+        ]);
+        $request->setMethod('POST');
+
+        yield [
+            $request,
+            true,
+            AccessDeniedHttpException::class,
+            'Filename does not start with signed prefix',
+        ];
+    }
+
+    public static function generateOperateContentWithExceptionDataProvider(): iterable
+    {
+        yield [
+            new Request(['object_name' => '', 'sig' => '', 'exp' => 0]),
+            BadRequestHttpException::class,
+            'Object name parameter is missing',
+            false,
+            '',
+            false,
+        ];
+
+        yield [
+            new Request(['object_name' => 'testABC', 'sig' => '', 'exp' => 0]),
+            BadRequestHttpException::class,
+            'Expiration is not set or equal to zero',
+            false,
+            '',
+            false,
+        ];
+
+        yield [
+            new Request(['object_name' => 'testABC', 'sig' => '', 'exp' => (new \DateTimeImmutable())->getTimestamp()]),
+            BadRequestHttpException::class,
+            'Signature is not set or is a blank string',
+            false,
+            '',
+            false,
+        ];
+
+        yield [
+            new Request(['object_name' => 'testABC', 'sig' => '1234', 'exp' => (new \DateTimeImmutable())->getTimestamp()]),
+            AccessDeniedHttpException::class,
+            'Invalid signature',
+            false,
+            '',
+            false,
+        ];
+
+
+        yield [
+            new Request(['object_name' => 'testABC', 'sig' => '1234', 'exp' => (new \DateTimeImmutable())->getTimestamp()]),
+            NotFoundHttpException::class,
+            'Object does not exists on disk',
+            false,
+            '',
+            true,
+        ];
+    }
+}

src/Bundle/ChillDocStoreBundle/Tests/Controller/data/StoredObjectContentToLocalStorageControllerTest/dummy_file

@@ -0,0 +1 @@
+fake_encrypted_content

src/Bundle/ChillDocStoreBundle/Tests/Service/Cryptography/KeyGeneratorTest.php

@@ -0,0 +1,47 @@
+<?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\DocStoreBundle\Tests\Service\Cryptography;
+
+use Chill\DocStoreBundle\Service\Cryptography\KeyGenerator;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class KeyGeneratorTest extends TestCase
+{
+    public function testGenerateKey(): void
+    {
+        $keyGenerator = new KeyGenerator();
+
+        $key = $keyGenerator->generateKey();
+
+        self::assertNotEmpty($key['k']);
+        self::assertEquals('A256CBC', $key['alg']);
+    }
+
+    public function testGenerateIv(): void
+    {
+        $keyGenerator = new KeyGenerator();
+
+        $actual = $keyGenerator->generateIv();
+
+        self::assertCount(16, $actual);
+        foreach ($actual as $value) {
+            self::assertIsInt($value);
+            self::assertGreaterThanOrEqual(0, $value);
+            self::assertLessThan(256, $value);
+        }
+    }
+}

src/Bundle/ChillDocStoreBundle/Tests/Service/Signature/Driver/BaseSigner/PdfSignedMessageHandlerTest.php

@@ -25,6 +25,8 @@ use Chill\MainBundle\Workflow\WorkflowTransitionContextDTO;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Log\NullLogger;
 
 /**
@@ -34,6 +36,8 @@ use Psr\Log\NullLogger;
  */
 class PdfSignedMessageHandlerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testThatObjectIsWrittenInStoredObjectManagerHappyScenario(): void
     {
         // a dummy stored object
@@ -91,10 +95,19 @@ class PdfSignedMessageHandlerTest extends TestCase
 
     private function buildEntityManager(bool $willFlush): EntityManagerInterface
     {
-        $em = $this->createMock(EntityManagerInterface::class);
-        $em->expects($willFlush ? $this->once() : $this->never())->method('flush');
-        $em->expects($willFlush ? $this->once() : $this->never())->method('clear');
+        $em = $this->prophesize(EntityManagerInterface::class);
+        $clear = $em->clear();
+        $wrap = $em->wrapInTransaction(Argument::type('callable'))->will(function ($args) {
+            $callable = $args[0];
 
-        return $em;
+            return call_user_func($callable);
+        });
+
+        if ($willFlush) {
+            $clear->shouldBeCalled();
+            $wrap->shouldBeCalled();
+        }
+
+        return $em->reveal();
     }
 }

src/Bundle/ChillDocStoreBundle/config/services.yaml

@@ -8,7 +8,6 @@ services:
         tags:
             - { name: doctrine.repository_service }
 
-
     Chill\DocStoreBundle\Security\Authorization\:
         resource: "./../Security/Authorization"
 
@@ -51,11 +50,9 @@ services:
     Chill\DocStoreBundle\AsyncUpload\Driver\:
         resource: '../AsyncUpload/Driver/'
 
+    Chill\DocStoreBundle\AsyncUpload\Driver\LocalStorage\TempUrlLocalStorageGenerator:
+        arguments:
+            $secret: '%kernel.secret%'
+
     Chill\DocStoreBundle\AsyncUpload\Templating\:
         resource: '../AsyncUpload/Templating/'
-
-    Chill\DocStoreBundle\AsyncUpload\Command\:
-        resource: '../AsyncUpload/Command/'
-
-    Chill\DocStoreBundle\AsyncUpload\TempUrlGeneratorInterface:
-        alias: Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore\TempUrlOpenstackGenerator

src/Bundle/ChillMainBundle/ChillMainBundle.php

@@ -18,7 +18,6 @@ use Chill\MainBundle\DependencyInjection\CompilerPass\ExportsCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\MenuCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\NotificationCounterCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
-use Chill\MainBundle\DependencyInjection\CompilerPass\ShortMessageCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\TimelineCompilerClass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\WidgetsCompilerPass;
 use Chill\MainBundle\DependencyInjection\ConfigConsistencyCompilerPass;
@@ -73,6 +72,5 @@ class ChillMainBundle extends Bundle
         $container->addCompilerPass(new MenuCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new ACLFlagsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new CRUDControllerCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
-        $container->addCompilerPass(new ShortMessageCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
     }
 }

src/Bundle/ChillMainBundle/Command/LoadAddressesBEFromBestAddressCommand.php

@@ -16,6 +16,7 @@ use Chill\MainBundle\Service\Import\PostalCodeBEFromBestAddress;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class LoadAddressesBEFromBestAddressCommand extends Command
@@ -34,14 +35,19 @@ class LoadAddressesBEFromBestAddressCommand extends Command
         $this
             ->setName('chill:main:address-ref-from-best-addresses')
             ->addArgument('lang', InputArgument::REQUIRED, "Language code, for example 'fr'")
-            ->addArgument('list', InputArgument::IS_ARRAY, "The list to add, for example 'full', or 'extract' (dev) or '1xxx' (brussel CP)");
+            ->addArgument('list', InputArgument::IS_ARRAY, "The list to add, for example 'full', or 'extract' (dev) or '1xxx' (brussel CP)")
+            ->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
     {
         $this->postalCodeBEFromBestAddressImporter->import();
 
-        $this->addressImporter->import($input->getArgument('lang'), $input->getArgument('list'));
+        $this->addressImporter->import(
+            $input->getArgument('lang'),
+            $input->getArgument('list'),
+            $input->hasOption('send-report-email') ? $input->getOption('send-report-email') : null
+        );
 
         return Command::SUCCESS;
     }

src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANCommand.php

@@ -0,0 +1,48 @@
+<?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\Command;
+
+use Chill\MainBundle\Service\Import\AddressReferenceFromBAN;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class LoadAddressesFRFromBANCommand extends Command
+{
+    protected static $defaultDescription = 'Import FR addresses from BAN (see https://adresses.data.gouv.fr';
+
+    public function __construct(private readonly AddressReferenceFromBAN $addressReferenceFromBAN)
+    {
+        parent::__construct();
+    }
+
+    protected function configure()
+    {
+        $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');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        dump(__METHOD__);
+        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);
+        }
+
+        return Command::SUCCESS;
+    }
+}

src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php

@@ -15,6 +15,7 @@ use Chill\MainBundle\Service\Import\AddressReferenceFromBano;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class LoadAddressesFRFromBANOCommand extends Command
@@ -29,7 +30,8 @@ class LoadAddressesFRFromBANOCommand extends Command
     protected function configure()
     {
         $this->setName('chill:main:address-ref-from-bano')
-            ->addArgument('departementNo', InputArgument::REQUIRED | InputArgument::IS_ARRAY, 'a list of departement numbers');
+            ->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');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
@@ -37,7 +39,7 @@ class LoadAddressesFRFromBANOCommand extends Command
         foreach ($input->getArgument('departementNo') as $departementNo) {
             $output->writeln('Import addresses for '.$departementNo);
 
-            $this->addressReferenceFromBano->import($departementNo);
+            $this->addressReferenceFromBano->import($departementNo, $input->hasOption('send-report-email') ? $input->getOption('send-report-email') : null);
         }
 
         return Command::SUCCESS;

src/Bundle/ChillMainBundle/Command/LoadAddressesLUFromBDAddressCommand.php

@@ -14,6 +14,7 @@ namespace Chill\MainBundle\Command;
 use Chill\MainBundle\Service\Import\AddressReferenceLU;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class LoadAddressesLUFromBDAddressCommand extends Command
@@ -28,12 +29,16 @@ class LoadAddressesLUFromBDAddressCommand extends Command
 
     protected function configure()
     {
-        $this->setName('chill:main:address-ref-lux');
+        $this
+            ->setName('chill:main:address-ref-lux')
+            ->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
     {
-        $this->addressImporter->import();
+        $this->addressImporter->import(
+            $input->hasOption('send-report-email') ? $input->getOption('send-report-email') : null,
+        );
 
         return Command::SUCCESS;
     }

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -234,6 +234,8 @@ class ChillMainExtension extends Extension implements
 
     public function prepend(ContainerBuilder $container)
     {
+        $this->prependNotifierTexterWithLegacyData($container);
+
         // add installation_name and date_format to globals
         $chillMainConfig = $container->getExtensionConfig($this->getAlias());
         $config = $this->processConfiguration($this
@@ -357,6 +359,44 @@ class ChillMainExtension extends Extension implements
         // Note: the controller are loaded inside compiler pass
     }
 
+    /**
+     * This method prepend framework configuration with legacy configuration from "ovhCloudTransporter".
+     *
+     * It can be safely removed when the option chill_main.short_message.dsn will be removed.
+     */
+    private function prependNotifierTexterWithLegacyData(ContainerBuilder $container): void
+    {
+        $configs = $container->getExtensionConfig('chill_main');
+        $notifierSet = false;
+        foreach (array_reverse($configs) as $config) {
+            if (!array_key_exists('short_messages', $config)) {
+                continue;
+            }
+
+            if (array_key_exists('dsn', $config['short_messages'])) {
+                $container->prependExtensionConfig('framework', [
+                    'notifier' => [
+                        'texter_transports' => [
+                            'ovh_legacy' => $config['short_messages']['dsn'],
+                        ],
+                    ],
+                ]);
+                $notifierSet = true;
+            }
+        }
+        if (!$notifierSet) {
+            $container->prependExtensionConfig('framework', [
+                'notifier' => [
+                    'texter_transports' => [
+                        'dummy' => 'null://null',
+                    ],
+                ],
+            ]);
+        }
+
+
+    }
+
     protected function prependCruds(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('chill_main', [

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

@@ -1,91 +0,0 @@
-<?php
-
-/**
- * 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.
- */
-
-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\DependencyInjection\CompilerPass;
-
-use Chill\MainBundle\Service\ShortMessage\NullShortMessageSender;
-use Chill\MainBundle\Service\ShortMessage\ShortMessageTransporter;
-use Chill\MainBundle\Service\ShortMessageOvh\OvhShortMessageSender;
-use libphonenumber\PhoneNumberUtil;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\DependencyInjection\Reference;
-
-class ShortMessageCompilerPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container)
-    {
-        $config = $container->resolveEnvPlaceholders($container->getParameter('chill_main.short_messages'), true);
-        // weird fix for special characters
-        $config['dsn'] = str_replace(['%%'], ['%'], (string) $config['dsn']);
-        $dsn = parse_url($config['dsn']);
-        parse_str($dsn['query'] ?? '', $dsn['queries']);
-
-        if ('null' === $dsn['scheme'] || false === $config['enabled']) {
-            $defaultTransporter = new Reference(NullShortMessageSender::class);
-        } elseif ('ovh' === $dsn['scheme']) {
-            if (!class_exists('\\'.\Ovh\Api::class)) {
-                throw new RuntimeException('Class \Ovh\Api not found');
-            }
-
-            foreach (['user', 'host', 'pass'] as $component) {
-                if (!\array_key_exists($component, $dsn)) {
-                    throw new RuntimeException(sprintf('The component %s does not exist in dsn. Please provide a dsn like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $component));
-                }
-
-                $container->setParameter('chill_main.short_messages.ovh_config_'.$component, $dsn[$component]);
-            }
-
-            foreach (['consumer_key', 'sender', 'service_name'] as $param) {
-                if (!\array_key_exists($param, $dsn['queries'])) {
-                    throw new RuntimeException(sprintf('The parameter %s does not exist in dsn. Please provide a dsn like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $param));
-                }
-                $container->setParameter('chill_main.short_messages.ovh_config_'.$param, $dsn['queries'][$param]);
-            }
-
-            $ovh = new Definition();
-            $ovh
-                ->setClass('\\'.\Ovh\Api::class)
-                ->setArgument(0, $dsn['user'])
-                ->setArgument(1, $dsn['pass'])
-                ->setArgument(2, $dsn['host'])
-                ->setArgument(3, $dsn['queries']['consumer_key']);
-            $container->setDefinition(\Ovh\Api::class, $ovh);
-
-            $ovhSender = new Definition();
-            $ovhSender
-                ->setClass(OvhShortMessageSender::class)
-                ->setArgument(0, new Reference(\Ovh\Api::class))
-                ->setArgument(1, $dsn['queries']['service_name'])
-                ->setArgument(2, $dsn['queries']['sender'])
-                ->setArgument(3, new Reference(LoggerInterface::class))
-                ->setArgument(4, new Reference(PhoneNumberUtil::class));
-            $container->setDefinition(OvhShortMessageSender::class, $ovhSender);
-
-            $defaultTransporter = new Reference(OvhShortMessageSender::class);
-        } else {
-            throw new RuntimeException(sprintf('Cannot find a sender for this dsn: %s', $config['dsn']));
-        }
-
-        $container->getDefinition(ShortMessageTransporter::class)
-            ->setArgument(0, $defaultTransporter);
-    }
-}

src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php

@@ -123,6 +123,7 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end()
             ->arrayNode('short_messages')
+            ->setDeprecated('chill-project/chill-bundles', '3.7.0', 'Since 3.7.0, Chill use the Notifier component to send message. Configure the notifier instead. In the meantime, the previous available OVH configuration will be append to the notifier component.')
             ->canBeEnabled()
             ->children()
             ->scalarNode('dsn')->cannotBeEmpty()->defaultValue('null://null')

src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php

@@ -230,7 +230,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
 
                 // check the alias does not exists yet
                 if (\array_key_exists($attr[self::WIDGET_SERVICE_TAG_ALIAS], $this->widgetServices)) {
-                    throw new InvalidArgumentException('a service has already be defined with the '.self::WIDGET_SERVICE_TAG_ALIAS.' '.$attr[self::WIDGET_SERVICE_TAG_ALIAS]);
+                    throw new InvalidConfigurationException('a service has already be defined with the '.self::WIDGET_SERVICE_TAG_ALIAS.' '.$attr[self::WIDGET_SERVICE_TAG_ALIAS]);
                 }
 
                 // register the service as available
@@ -259,7 +259,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
 
             // check the alias does not exists yet
             if (\array_key_exists($alias, $this->widgetServices)) {
-                throw new InvalidArgumentException('a service has already be defined with the '.self::WIDGET_SERVICE_TAG_ALIAS.' '.$alias);
+                throw new InvalidConfigurationException('a service has already be defined with the '.self::WIDGET_SERVICE_TAG_ALIAS.' '.$alias);
             }
 
             // register the factory as available

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php

@@ -28,8 +28,8 @@ class EntityToJsonTransformer implements DataTransformerInterface
 
     public function reverseTransform($value)
     {
-        if (false === $this->multiple && '' === $value) {
-            return null;
+        if ('' === $value) {
+            return $this->multiple ? [] : null;
         }
 
         if ($this->multiple && [] === $value) {

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

@@ -22,10 +22,10 @@ class AddressReferenceBEFromBestAddress
 
     public function __construct(private readonly HttpClientInterface $client, private readonly AddressReferenceBaseImporter $baseImporter, private readonly AddressToReferenceMatcher $addressToReferenceMatcher) {}
 
-    public function import(string $lang, array $lists): void
+    public function import(string $lang, array $lists, ?string $sendAddressReportToEmail = null): void
     {
         foreach ($lists as $list) {
-            $this->importList($lang, $list);
+            $this->importList($lang, $list, $sendAddressReportToEmail);
         }
     }
 
@@ -43,7 +43,7 @@ class AddressReferenceBEFromBestAddress
         return array_values($asset)[0]['browser_download_url'];
     }
 
-    private function importList(string $lang, string $list): void
+    private function importList(string $lang, string $list, ?string $sendAddressReportToEmail = null): void
     {
         $downloadUrl = $this->getDownloadUrl($lang, $list);
 
@@ -85,7 +85,7 @@ class AddressReferenceBEFromBestAddress
             );
         }
 
-        $this->baseImporter->finalize();
+        $this->baseImporter->finalize(sendAddressReportToEmail: $sendAddressReportToEmail);
 
         $this->addressToReferenceMatcher->checkAddressesMatchingReferences();
 

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

@@ -13,7 +13,12 @@ namespace Chill\MainBundle\Service\Import;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Statement;
+use League\Csv\Writer;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Filesystem\Path;
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Mime\Email;
 
 /**
  * Import addresses into the database.
@@ -25,15 +30,15 @@ final class AddressReferenceBaseImporter
 {
     private const INSERT = <<<'SQL'
         INSERT INTO reference_address_temp
-            (postcode_id, refid, street, streetnumber, municipalitycode, source, point)
+            (postcode_id, postalcode, refid, street, streetnumber, municipalitycode, source, point)
         SELECT
-            cmpc.id, i.refid, i.street, i.streetnumber, i.refpostalcode, i.source,
+            cmpc.id, i.postalcode, i.refid, i.street, i.streetnumber, i.refpostalcode, i.source,
             CASE WHEN (i.lon::float != 0.0 AND i.lat::float != 0.0) THEN ST_Transform(ST_setSrid(ST_point(i.lon::float, i.lat::float), i.srid::int), 4326) ELSE NULL END
         FROM
             (VALUES
                 {{ values }}
              ) AS i (refid, refpostalcode, postalcode, street, streetnumber, source, lat, lon, srid)
-        JOIN chill_main_postal_code cmpc ON cmpc.refpostalcodeid = i.refpostalcode and cmpc.code = i.postalcode
+        LEFT JOIN chill_main_postal_code cmpc ON cmpc.refpostalcodeid = i.refpostalcode and cmpc.code = i.postalcode
         SQL;
 
     private const LOG_PREFIX = '[AddressReferenceImporter] ';
@@ -51,7 +56,11 @@ final class AddressReferenceBaseImporter
 
     private array $waitingForInsert = [];
 
-    public function __construct(private readonly Connection $defaultConnection, private readonly LoggerInterface $logger) {}
+    public function __construct(
+        private readonly Connection $defaultConnection,
+        private readonly LoggerInterface $logger,
+        private readonly MailerInterface $mailer,
+    ) {}
 
     /**
      * Finalize the import process and make reconciliation with addresses.
@@ -60,11 +69,11 @@ final class AddressReferenceBaseImporter
      *
      * @throws \Exception
      */
-    public function finalize(bool $allowRemoveDoubleRefId = false): void
+    public function finalize(bool $allowRemoveDoubleRefId = false, ?string $sendAddressReportToEmail = null): void
     {
         $this->doInsertPending();
 
-        $this->updateAddressReferenceTable($allowRemoveDoubleRefId);
+        $this->updateAddressReferenceTable($allowRemoveDoubleRefId, $sendAddressReportToEmail);
 
         $this->deleteTemporaryTable();
 
@@ -116,7 +125,8 @@ final class AddressReferenceBaseImporter
     private function createTemporaryTable(): void
     {
         $this->defaultConnection->executeStatement('CREATE TEMPORARY TABLE reference_address_temp (
-            postcode_id INT,
+            postcode_id INT DEFAULT NULL,
+            postalcode TEXT DEFAULT \'\',
             refid VARCHAR(255),
             street VARCHAR(255),
             streetnumber VARCHAR(255),
@@ -185,15 +195,15 @@ final class AddressReferenceBaseImporter
         $this->isInitialized = true;
     }
 
-    private function updateAddressReferenceTable(bool $allowRemoveDoubleRefId): void
+    private function updateAddressReferenceTable(bool $allowRemoveDoubleRefId, ?string $sendAddressReportToEmail = null): void
     {
         $this->defaultConnection->executeStatement(
-            'CREATE INDEX idx_ref_add_temp ON reference_address_temp (refid)'
+            'CREATE INDEX idx_ref_add_temp ON reference_address_temp (refid) WHERE postcode_id IS NOT NULL'
         );
 
         // 0) detect for doublon in current temporary table
         $results = $this->defaultConnection->executeQuery(
-            'SELECT COUNT(*) AS nb_appearance, refid FROM reference_address_temp GROUP BY refid HAVING count(*) > 1'
+            'SELECT COUNT(*) AS nb_appearance, refid FROM reference_address_temp WHERE postcode_id IS NOT NULL GROUP BY refid HAVING count(*) > 1'
         );
 
         $hasDouble = false;
@@ -210,7 +220,7 @@ final class AddressReferenceBaseImporter
                 WITH ordering AS (
                     SELECT gid, rank() over (PARTITION BY refid ORDER BY gid DESC) AS ranking
                     FROM reference_address_temp
-                    WHERE refid IN (SELECT refid FROM reference_address_temp group by refid having count(*) > 1)
+                    WHERE postcode_id IS NOT NULL AND refid IN (SELECT refid FROM reference_address_temp WHERE postcode_id IS NOT NULL group by refid having count(*) > 1)
                     ),
                 keep_last AS (
                     SELECT gid, ranking FROM ordering where ranking > 1
@@ -240,7 +250,7 @@ final class AddressReferenceBaseImporter
                 NOW(),
                 null,
                 NOW()
-            FROM reference_address_temp
+            FROM reference_address_temp WHERE postcode_id IS NOT NULL
             ON CONFLICT (refid, source) DO UPDATE
             SET postcode_id = excluded.postcode_id, refid = excluded.refid, street = excluded.street, streetnumber = excluded.streetnumber, municipalitycode = excluded.municipalitycode, source = excluded.source, point = excluded.point, updatedat = NOW(), deletedAt = NULL
         ");
@@ -251,10 +261,65 @@ final class AddressReferenceBaseImporter
             $affected = $connection->executeStatement('UPDATE chill_main_address_reference
             SET deletedat = NOW()
             WHERE
-                chill_main_address_reference.refid NOT IN (SELECT refid FROM reference_address_temp WHERE source LIKE ?)
+                chill_main_address_reference.refid NOT IN (SELECT refid FROM reference_address_temp WHERE source LIKE ? AND postcode_id IS NOT NULL)
                 AND chill_main_address_reference.source LIKE ?
         ', [$this->currentSource, $this->currentSource]);
             $this->logger->info(self::LOG_PREFIX.'addresses deleted', ['deleted' => $affected]);
         });
+
+
+        // Create a list of addresses without any postal code
+        $results = $this->defaultConnection->executeQuery('SELECT
+            postalcode,
+            refid,
+            street,
+            streetnumber,
+            municipalitycode,
+            source,
+            ST_AsText(point)
+            FROM reference_address_temp
+            WHERE postcode_id IS NULL
+        ');
+        $count = $results->rowCount();
+
+        if ($count > 0) {
+            $this->logger->warning(self::LOG_PREFIX.'There are addresses that could not be associated with a postal code', ['nb' => $count]);
+
+            $filename = sprintf('%s-%s.csv', (new \DateTimeImmutable())->format('Ymd-His'), uniqid());
+            $path = Path::normalize(sprintf('%s%s%s', sys_get_temp_dir(), DIRECTORY_SEPARATOR, $filename));
+            $writer = Writer::createFromPath($path, 'w+');
+            // insert headers
+            $writer->insertOne([
+                'postalcode',
+                'refid',
+                'street',
+                'streetnumber',
+                'municipalitycode',
+                'source',
+                'point',
+            ]);
+
+            $writer->insertAll($results->iterateAssociative());
+            $this->logger->info(sprintf(self::LOG_PREFIX.'The addresses that could not be inserted within the database are registered at path %s', $path));
+
+            if (null !== $sendAddressReportToEmail) {
+                // first, we compress the existing file which can be quite big
+                $attachment = gzopen($attachmentPath = sprintf('%s.gz', $path), 'w9');
+                gzwrite($attachment, file_get_contents($path));
+                gzclose($attachment);
+
+                $email = (new Email())
+                    ->addTo($sendAddressReportToEmail)
+                    ->subject('Addresses that could not be imported')
+                    ->attach(file_get_contents($attachmentPath), sprintf('%s.gz', $path));
+
+                try {
+                    $this->mailer->send($email);
+                } catch (TransportExceptionInterface $e) {
+                    $this->logger->error(self::LOG_PREFIX.'Could not send an email with addresses that could not be registered', ['exception' => $e->getTraceAsString()]);
+                }
+                unlink($attachmentPath);
+            }
+        }
     }
 }

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

@@ -0,0 +1,106 @@
+<?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\Import;
+
+use League\Csv\Reader;
+use League\Csv\Statement;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+class AddressReferenceFromBAN
+{
+    public function __construct(
+        private readonly HttpClientInterface $client,
+        private readonly AddressReferenceBaseImporter $baseImporter,
+        private readonly AddressToReferenceMatcher $addressToReferenceMatcher,
+    ) {}
+
+    public function import(string $departementNo, ?string $sendAddressReportToEmail = null): void
+    {
+        if (!is_numeric($departementNo)) {
+            throw new \UnexpectedValueException('Could not parse this department number');
+        }
+
+        $url = sprintf('https://adresse.data.gouv.fr/data/ban/adresses/latest/csv/adresses-%s.csv.gz', $departementNo);
+
+        $response = $this->client->request('GET', $url);
+
+        if (200 !== $response->getStatusCode()) {
+            throw new \Exception('Could not download CSV: '.$response->getStatusCode());
+        }
+
+        $path = sys_get_temp_dir().'/'.$departementNo.'.csv.gz';
+        $file = fopen($path, 'w');
+
+        if (false === $file) {
+            throw new \Exception('Could not create temporary file');
+        }
+
+        foreach ($this->client->stream($response) as $chunk) {
+            fwrite($file, $chunk->getContent());
+        }
+
+        fclose($file);
+
+        // re-open it to read it
+        $csvDecompressed = gzopen($path, 'r');
+
+        $csv = Reader::createFromStream($csvDecompressed);
+        $csv->setDelimiter(';')->setHeaderOffset(0);
+        $stmt = Statement::create()
+            ->process($csv, [
+                'id',
+                'id_fantoir',
+                'numero',
+                'rep',
+                'nom_voie',
+                'code_postal',
+                'code_insee',
+                'nom_commune',
+                'code_insee_ancienne_commune',
+                'nom_ancienne_commune',
+                'x',
+                'y',
+                'lon',
+                'lat',
+                'type_position',
+                'alias',
+                'nom_ld',
+                'libelle_acheminement',
+                'nom_afnor',
+                'source_position',
+                'source_nom_voie',
+                'certification_commune',
+                'cad_parcelles',
+            ]);
+
+        foreach ($stmt as $record) {
+            $this->baseImporter->importAddress(
+                $record['id'],
+                $record['code_insee'],
+                $record['code_postal'],
+                $record['nom_voie'],
+                $record['numero'].' '.$record['rep'],
+                'BAN.'.$departementNo,
+                (float) $record['lat'],
+                (float) $record['lon'],
+                4326
+            );
+        }
+
+        $this->baseImporter->finalize(sendAddressReportToEmail: $sendAddressReportToEmail);
+
+        $this->addressToReferenceMatcher->checkAddressesMatchingReferences();
+
+        fclose($csvDecompressed);
+        unlink($path);
+    }
+}

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

@@ -19,7 +19,7 @@ class AddressReferenceFromBano
 {
     public function __construct(private readonly HttpClientInterface $client, private readonly AddressReferenceBaseImporter $baseImporter, private readonly AddressToReferenceMatcher $addressToReferenceMatcher) {}
 
-    public function import(string $departementNo): void
+    public function import(string $departementNo, ?string $sendAddressReportToEmail = null): void
     {
         if (!is_numeric($departementNo) || !\is_int((int) $departementNo)) {
             throw new \UnexpectedValueException('Could not parse this department number');
@@ -69,7 +69,7 @@ class AddressReferenceFromBano
             );
         }
 
-        $this->baseImporter->finalize();
+        $this->baseImporter->finalize(sendAddressReportToEmail: $sendAddressReportToEmail);
 
         $this->addressToReferenceMatcher->checkAddressesMatchingReferences();
 

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

@@ -21,7 +21,7 @@ class AddressReferenceLU
 
     public function __construct(private readonly HttpClientInterface $client, private readonly AddressReferenceBaseImporter $addressBaseImporter, private readonly PostalCodeBaseImporter $postalCodeBaseImporter, private readonly AddressToReferenceMatcher $addressToReferenceMatcher) {}
 
-    public function import(): void
+    public function import(?string $sendAddressReportToEmail = null): void
     {
         $downloadUrl = self::RELEASE;
 
@@ -45,14 +45,14 @@ class AddressReferenceLU
 
         $this->process_postal_code($csv);
 
-        $this->process_address($csv);
+        $this->process_address($csv, $sendAddressReportToEmail);
 
         $this->addressToReferenceMatcher->checkAddressesMatchingReferences();
 
         fclose($file);
     }
 
-    private function process_address(Reader $csv): void
+    private function process_address(Reader $csv, ?string $sendAddressReportToEmail = null): void
     {
         $stmt = Statement::create()->process($csv);
         foreach ($stmt as $record) {
@@ -69,7 +69,7 @@ class AddressReferenceLU
             );
         }
 
-        $this->addressBaseImporter->finalize();
+        $this->addressBaseImporter->finalize(sendAddressReportToEmail: $sendAddressReportToEmail);
     }
 
     private function process_postal_code(Reader $csv): void

src/Bundle/ChillMainBundle/Service/Notifier/LegacyOvhCloudFactory.php

@@ -0,0 +1,54 @@
+<?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\Notifier;
+
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+use Symfony\Component\Notifier\Transport\TransportInterface;
+
+/**
+ * This is a legacy ovh cloud provider, to provide the regular OvhCloudTransporter from the previous configuration.
+ *
+ * This is only for transition purpose from the previous ovh dsn, which was existing in chill.
+ */
+class LegacyOvhCloudFactory extends AbstractTransportFactory
+{
+    protected function getSupportedSchemes(): array
+    {
+        return ['ovh'];
+    }
+
+    public function create(Dsn $dsn): TransportInterface
+    {
+        $scheme = $dsn->getScheme();
+
+        if ('ovh' !== $scheme) {
+            throw new UnsupportedSchemeException($dsn, 'ovh', $this->getSupportedSchemes());
+        }
+
+        if (!class_exists($class = '\Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransport')) {
+            throw new \RuntimeException(sprintf('The class %s is missing, please add the dependency with "composer require symfony/ovh-cloud-notifier".', $class));
+        }
+
+        $applicationKey = $this->getUser($dsn);
+        $applicationSecret = $this->getPassword($dsn);
+        $consumerKey = $dsn->getRequiredOption('consumer_key');
+        $serviceName = $dsn->getRequiredOption('service_name');
+        $sender = $dsn->getOption('sender');
+        $host = null;
+        $port = $dsn->getPort();
+
+        return (new $class($applicationKey, $applicationSecret, $consumerKey, $serviceName, $this->client, $this->dispatcher))
+            ->setHost($host)->setPort($port)->setSender($sender);
+    }
+}

src/Bundle/ChillMainBundle/Service/Notifier/SentMessageEventSubscriber.php

@@ -0,0 +1,37 @@
+<?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\Notifier;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Notifier\Event\SentMessageEvent;
+
+final readonly class SentMessageEventSubscriber implements EventSubscriberInterface
+{
+    public function __construct(
+        private LoggerInterface $logger,
+    ) {}
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            SentMessageEvent::class => ['onSentMessage', 0],
+        ];
+    }
+
+    public function onSentMessage(SentMessageEvent $event): void
+    {
+        $message = $event->getMessage();
+
+        $this->logger->warning('[sms] a sms was sent', ['validReceiversI' => $message->getOriginalMessage()->getRecipientId(), 'idsI' => $message->getMessageId()]);
+    }
+}

src/Bundle/ChillMainBundle/Service/ShortMessage/NullShortMessageSender.php

@@ -1,24 +0,0 @@
-<?php
-
-/**
- * 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.
- */
-
-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\ShortMessage;
-
-class NullShortMessageSender implements ShortMessageSenderInterface
-{
-    public function send(ShortMessage $shortMessage): void {}
-}

src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessage.php

@@ -20,6 +20,8 @@ namespace Chill\MainBundle\Service\ShortMessage;
 
 use libphonenumber\PhoneNumber;
 
+trigger_deprecation('chill-project/chill-bundles', '3.7', 'Short Messages are deprecated, use SmsMessage and Notifier component instead');
+
 class ShortMessage
 {
     final public const PRIORITY_LOW = 'low';

src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageHandler.php

@@ -18,17 +18,33 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Service\ShortMessage;
 
+use libphonenumber\PhoneNumberFormat;
+use libphonenumber\PhoneNumberUtil;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\TexterInterface;
 
 /**
  * @AsMessageHandler
  */
 class ShortMessageHandler implements MessageHandlerInterface
 {
-    public function __construct(private readonly ShortMessageTransporterInterface $messageTransporter) {}
+    private readonly PhoneNumberUtil $phoneNumberUtil;
+
+    public function __construct(private readonly TexterInterface $texter)
+    {
+        $this->phoneNumberUtil = PhoneNumberUtil::getInstance();
+    }
 
     public function __invoke(ShortMessage $message): void
     {
-        $this->messageTransporter->send($message);
+        trigger_deprecation('Chill-project/chill-bundles', '3.7.0', 'Send message using Notifier component');
+
+        $this->texter->send(
+            new SmsMessage(
+                $this->phoneNumberUtil->format($message->getPhoneNumber(), PhoneNumberFormat::E164),
+                $message->getContent(),
+            ),
+        );
     }
 }

src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageSenderInterface.php

@@ -1,24 +0,0 @@
-<?php
-
-/**
- * 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.
- */
-
-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\ShortMessage;
-
-interface ShortMessageSenderInterface
-{
-    public function send(ShortMessage $shortMessage): void;
-}

src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporter.php

@@ -1,29 +0,0 @@
-<?php
-
-/**
- * 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.
- */
-
-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\ShortMessage;
-
-class ShortMessageTransporter implements ShortMessageTransporterInterface
-{
-    public function __construct(private readonly ShortMessageSenderInterface $sender) {}
-
-    public function send(ShortMessage $shortMessage): void
-    {
-        $this->sender->send($shortMessage);
-    }
-}

src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporterInterface.php

@@ -1,24 +0,0 @@
-<?php
-
-/**
- * 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.
- */
-
-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\ShortMessage;
-
-interface ShortMessageTransporterInterface
-{
-    public function send(ShortMessage $shortMessage);
-}

src/Bundle/ChillMainBundle/Service/ShortMessageOvh/OvhShortMessageSender.php

@@ -1,65 +0,0 @@
-<?php
-
-/**
- * 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.
- */
-
-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\ShortMessageOvh;
-
-use Chill\MainBundle\Service\ShortMessage\ShortMessage;
-use Chill\MainBundle\Service\ShortMessage\ShortMessageSenderInterface;
-use libphonenumber\PhoneNumberFormat;
-use libphonenumber\PhoneNumberUtil;
-use Ovh\Api;
-use Psr\Log\LoggerInterface;
-
-class OvhShortMessageSender implements ShortMessageSenderInterface
-{
-    public function __construct(
-        private readonly Api $api,
-        // for DI, must remains as first argument
-        private readonly string $serviceName,
-        // for di, must remains as second argument
-        private readonly string $sender,
-        // for DI, must remains as third argument
-        private readonly LoggerInterface $logger,
-        private readonly PhoneNumberUtil $phoneNumberUtil,
-    ) {}
-
-    public function send(ShortMessage $shortMessage): void
-    {
-        $receiver = $this->phoneNumberUtil->format($shortMessage->getPhoneNumber(), PhoneNumberFormat::E164);
-
-        $response = $this->api->post(
-            strtr('/sms/{serviceName}/jobs', ['{serviceName}' => $this->serviceName]),
-            [
-                'message' => $shortMessage->getContent(),
-                'receivers' => [$receiver],
-                'sender' => $this->sender,
-                'noStopClause' => true,
-                'coding' => '7bit',
-                'charset' => 'UTF-8',
-                'priority' => $shortMessage->getPriority(),
-            ]
-        );
-
-        $improved = array_merge([
-            'validReceiversI' => implode(',', $response['validReceivers']),
-            'idsI' => implode(',', $response['ids']),
-        ], $response);
-
-        $this->logger->warning('[sms] a sms was sent', $improved);
-    }
-}

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

@@ -47,6 +47,12 @@ services:
         tags:
             - { name: console.command }
 
+    Chill\MainBundle\Command\LoadAddressesFRFromBANCommand:
+        autoconfigure: true
+        autowire: true
+        tags:
+            - { name: console.command }
+
     Chill\MainBundle\Command\LoadAddressesBEFromBestAddressCommand:
         autoconfigure: true
         autowire: true

src/Bundle/ChillPersonBundle/Controller/EmploymentStatusController.php

@@ -0,0 +1,26 @@
+<?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\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class EmploymentStatusController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.order', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/Controller/SocialWorkExportController.php

@@ -0,0 +1,149 @@
+<?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\Controller;
+
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use League\Csv\CannotInsertRecord;
+use League\Csv\Exception;
+use League\Csv\UnavailableStream;
+use League\Csv\Writer;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class SocialWorkExportController extends AbstractController
+{
+    public function __construct(
+        private readonly SocialIssueRepository $socialIssueRepository,
+        private readonly SocialActionRepository $socialActionRepository,
+        private readonly Security $security,
+        private readonly TranslatorInterface $translator,
+        private readonly SocialIssueRender $socialIssueRender,
+        private readonly SocialActionRender $socialActionRender,
+    ) {}
+
+    /**
+     * @throws UnavailableStream
+     * @throws CannotInsertRecord
+     * @throws Exception
+     */
+    #[Route(path: '/{_locale}/admin/social-work/social-issue/export/list.{_format}', name: 'chill_person_social_issue_export_list', requirements: ['_format' => 'csv'])]
+    public function socialIssueList(Request $request, string $_format = 'csv'): StreamedResponse
+    {
+        if (!$this->security->isGranted('ROLE_ADMIN')) {
+            throw new AccessDeniedHttpException('Only ROLE_ADMIN can export this list');
+        }
+
+        $socialIssues = $this->socialIssueRepository->findAll();
+
+        $socialIssues = array_map(fn ($issue) => [
+            'id' => $issue->getId(),
+            'title' => $this->socialIssueRender->renderString($issue, []),
+            'ordering' => $issue->getOrdering(),
+            'desactivationDate' => $issue->getDesactivationDate(),
+        ], $socialIssues);
+
+        $csv = Writer::createFromPath('php://temp', 'r+');
+        $csv->insertOne(
+            array_map(
+                fn (string $e) => $this->translator->trans($e),
+                [
+                    'Id',
+                    'Title',
+                    'Ordering',
+                    'goal.desactivationDate',
+                ]
+            )
+        );
+
+        $csv->addFormatter(fn (array $row) => null !== ($row['desactivationDate'] ?? null) ? array_merge($row, ['desactivationDate' => $row['desactivationDate']->format('Y-m-d')]) : $row);
+        $csv->insertAll($socialIssues);
+
+        return new StreamedResponse(
+            function () use ($csv) {
+                foreach ($csv->chunk(1024) as $chunk) {
+                    echo $chunk;
+                    flush();
+                }
+            },
+            Response::HTTP_OK,
+            [
+                'Content-Encoding' => 'none',
+                'Content-Type' => 'text/csv; charset=UTF-8',
+                'Content-Disposition' => 'attachment; users.csv',
+            ]
+        );
+    }
+
+    /**
+     * @throws UnavailableStream
+     * @throws CannotInsertRecord
+     * @throws Exception
+     */
+    #[Route(path: '/{_locale}/admin/social-work/social-action/export/list.{_format}', name: 'chill_person_social_action_export_list', requirements: ['_format' => 'csv'])]
+    public function socialActionList(Request $request, string $_format = 'csv'): StreamedResponse
+    {
+        if (!$this->security->isGranted('ROLE_ADMIN')) {
+            throw new AccessDeniedHttpException('Only ROLE_ADMIN can export this list');
+        }
+
+        $socialActions = $this->socialActionRepository->findAll();
+
+        $socialActions = array_map(fn ($action) => [
+            'id' => $action->getId(),
+            'title' => $this->socialActionRender->renderString($action, []),
+            'desactivationDate' => $action->getDesactivationDate(),
+            'socialIssue' => $this->socialIssueRender->renderString($action->getIssue(), []),
+            'ordering' => $action->getOrdering(),
+        ], $socialActions);
+
+        $csv = Writer::createFromPath('php://temp', 'r+');
+        $csv->insertOne(
+            array_map(
+                fn (string $e) => $this->translator->trans($e),
+                [
+                    'Id',
+                    'Title',
+                    'goal.desactivationDate',
+                    'Social issue',
+                    'Ordering',
+                ]
+            )
+        );
+
+        $csv->addFormatter(fn (array $row) => null !== ($row['desactivationDate'] ?? null) ? array_merge($row, ['desactivationDate' => $row['desactivationDate']->format('Y-m-d')]) : $row);
+        $csv->insertAll($socialActions);
+
+        return new StreamedResponse(
+            function () use ($csv) {
+                foreach ($csv->chunk(1024) as $chunk) {
+                    echo $chunk;
+                    flush();
+                }
+            },
+            Response::HTTP_OK,
+            [
+                'Content-Encoding' => 'none',
+                'Content-Type' => 'text/csv; charset=UTF-8',
+                'Content-Disposition' => 'attachment; users.csv',
+            ]
+        );
+    }
+}

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

@@ -0,0 +1,45 @@
+<?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\DataFixtures\ORM;
+
+use Chill\PersonBundle\Entity\EmploymentStatus;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class LoadEmploymentStatus extends Fixture implements FixtureGroupInterface
+{
+    public static function getGroups(): array
+    {
+        return ['employment_status'];
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        $status = [
+            ['name' => ['fr' => 'Salarié·e']],
+            ['name' => ['fr' => 'Indépendant·e']],
+            ['name' => ['fr' => 'Chômeur·euse']],
+            ['name' => ['fr' => 'Bénéficiaire du CPAS']],
+            ['name' => ['fr' => 'Pensionsé·e']],
+        ];
+
+        foreach ($status as $val) {
+            $employmentStatus = (new EmploymentStatus())
+                ->setName($val['name'])
+                ->setActive(true);
+            $manager->persist($employmentStatus);
+        }
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php

@@ -15,10 +15,13 @@ use Chill\MainBundle\DependencyInjection\MissingBundleException;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Chill\PersonBundle\Controller\AccompanyingPeriodCommentApiController;
 use Chill\PersonBundle\Controller\AccompanyingPeriodResourceApiController;
+use Chill\PersonBundle\Controller\EmploymentStatusController;
 use Chill\PersonBundle\Controller\HouseholdCompositionTypeApiController;
 use Chill\PersonBundle\Controller\RelationApiController;
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\EmploymentStatus;
+use Chill\PersonBundle\Form\EmploymentStatusType;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodCommentVoter;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodResourceVoter;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
@@ -192,6 +195,28 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                     ],
                 ],
+                [
+                    'class' => EmploymentStatus::class,
+                    'name' => 'employment_status',
+                    'base_path' => '/admin/employment',
+                    'base_role' => 'ROLE_ADMIN',
+                    'form_class' => EmploymentStatusType::class,
+                    'controller' => EmploymentStatusController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/EmploymentStatus/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/EmploymentStatus/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/EmploymentStatus/edit.html.twig',
+                        ],
+                    ],
+                ],
                 [
                     'class' => \Chill\PersonBundle\Entity\MaritalStatus::class,
                     'name' => 'person_marital-status',

src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php

@@ -85,6 +85,7 @@ class Configuration implements ConfigurationInterface
             ->append($this->addFieldNode('number_of_children'))
             ->append($this->addFieldNode('acceptEmail'))
             ->append($this->addFieldNode('deathdate'))
+            ->append($this->addFieldNode('employment_status', 'hidden'))
             ->arrayNode('alt_names')
             ->defaultValue([])
             ->arrayPrototype()
@@ -141,7 +142,7 @@ class Configuration implements ConfigurationInterface
         return $treeBuilder;
     }
 
-    private function addFieldNode($key)
+    private function addFieldNode(string $key, string $defaultVisibility = 'visible')
     {
         $tree = new TreeBuilder($key, 'enum');
         $node = $tree->getRootNode();
@@ -153,7 +154,7 @@ class Configuration implements ConfigurationInterface
 
         $node
             ->values(['hidden', 'visible'])
-            ->defaultValue('visible')
+            ->defaultValue($defaultVisibility)
             ->info($info)
             ->end();
 

src/Bundle/ChillPersonBundle/Entity/EmploymentStatus.php

@@ -0,0 +1,80 @@
+<?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\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['chill_person_employment_status' => EmploymentStatus::class])]
+#[ORM\Entity]
+#[ORM\Table(name: 'chill_person_employment_status')]
+class EmploymentStatus
+{
+    #[Serializer\Groups(['read', 'docgen:read'])]
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER)]
+    private ?int $id = null;
+
+    #[Serializer\Groups(['read', 'docgen:read'])]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)]
+    #[Serializer\Context(['is-translatable' => true], groups: ['docgen:read'])]
+    private array $name = [];
+
+    #[Serializer\Groups(['read'])]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
+    private bool $active = true;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::FLOAT, name: 'ordering', nullable: true, options: ['default' => '0.0'])]
+    private float $order = 0;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getActive(): ?bool
+    {
+        return $this->active;
+    }
+
+    public function getName(): ?array
+    {
+        return $this->name;
+    }
+
+    public function getOrder(): ?float
+    {
+        return $this->order;
+    }
+
+    public function setActive(bool $active): self
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function setOrder(float $order): self
+    {
+        $this->order = $order;
+
+        return $this;
+    }
+}

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -311,6 +311,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     #[PhonenumberConstraint(type: 'mobile')]
     private ?PhoneNumber $mobilenumber = null;
 
+    /**
+     * The person's professional status.
+     */
+    #[ORM\ManyToOne(targetEntity: EmploymentStatus::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?EmploymentStatus $employmentStatus = null;
+
     /**
      * The person's nationality.
      */
@@ -1033,6 +1040,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->fullnameCanonical;
     }
 
+    public function getEmploymentStatus(): ?EmploymentStatus
+    {
+        return $this->employmentStatus;
+    }
+
     public function getGender(): ?Gender
     {
         return $this->gender;
@@ -1551,6 +1563,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
+    public function setEmploymentStatus(?EmploymentStatus $employmentStatus): self
+    {
+        $this->employmentStatus = $employmentStatus;
+
+        return $this;
+    }
+
     public function setGenderComment(CommentEmbeddable $genderComment): self
     {
         $this->genderComment = $genderComment;

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

@@ -50,18 +50,9 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTrans
                 Join::WITH,
                 $qb->expr()->andX(
                     $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
-                    $qb->expr()->andX(
-                        // check that the user is referrer when the accompanying period is opened
-                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
-                        $qb->expr()->orX(
-                            $qb->expr()->isNull("{$p}_userHistory.endDate"),
-                            $qb->expr()->lt('COALESCE(acp.openingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
-                        )
-                    ),
-                    $qb->expr()->andX(
-                        "{$p}_userHistory.startDate <= :{$p}_endDate",
-                        "COALESCE({$p}_userHistory.endDate, CURRENT_TIMESTAMP()) > :{$p}_startDate"
-                    )
+                    // check that the user is referrer when the accompanying period is opened
+                    "OVERLAPSI (acp.openingDate, acp.closingDate), ({$p}_userHistory.startDate, {$p}_userHistory.endDate) = TRUE",
+                    "OVERLAPSI (:{$p}_startDate, :{$p}_endDate), ({$p}_userHistory.startDate, {$p}_userHistory.endDate) = TRUE"
                 )
             )
             ->leftJoin(
@@ -69,18 +60,9 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTrans
                 "{$p}_scopeHistory",
                 Join::WITH,
                 $qb->expr()->andX(
-                    $qb->expr()->eq("{$p}_scopeHistory.user", "{$p}_userHistory.user"),
-                    $qb->expr()->andX(
-                        $qb->expr()->lte("{$p}_scopeHistory.startDate", "{$p}_userHistory.startDate"),
-                        $qb->expr()->orX(
-                            $qb->expr()->isNull("{$p}_scopeHistory.endDate"),
-                            $qb->expr()->gt("{$p}_scopeHistory.endDate", "{$p}_userHistory.startDate")
-                        )
-                    ),
-                    $qb->expr()->andX(
-                        "{$p}_scopeHistory.startDate <= :{$p}_endDate",
-                        "COALESCE({$p}_scopeHistory.endDate, CURRENT_TIMESTAMP()) > :{$p}_startDate"
-                    )
+                    "{$p}_scopeHistory.user = {$p}_userHistory.user",
+                    "OVERLAPSI ({$p}_scopeHistory.startDate, {$p}_scopeHistory.endDate), ({$p}_userHistory.startDate, {$p}_userHistory.endDate) = TRUE",
+                    "OVERLAPSI (:{$p}_startDate, :{$p}_endDate), ({$p}_userHistory.startDate, {$p}_userHistory.endDate) = TRUE"
                 )
             )
             ->setParameter("{$p}_startDate", $this->rollingDateConverter->convert($data['start_date']))

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

@@ -50,17 +50,9 @@ final readonly class UserJobAggregator implements AggregatorInterface, DataTrans
                 Join::WITH,
                 $qb->expr()->andX(
                     $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
-                    $qb->expr()->andX(
-                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
-                        $qb->expr()->orX(
-                            $qb->expr()->isNull("{$p}_userHistory.endDate"),
-                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
-                        )
-                    ),
-                    $qb->expr()->andX(
-                        "{$p}_userHistory.startDate <= :{$p}_endDate",
-                        "COALESCE({$p}_userHistory.endDate, CURRENT_TIMESTAMP()) > :{$p}_startDate"
-                    )
+                    // check that the user is referrer when the accompanying period is opened
+                    "OVERLAPSI (acp.openingDate, acp.closingDate), ({$p}_userHistory.startDate, {$p}_userHistory.endDate) = TRUE",
+                    "OVERLAPSI (:{$p}_startDate, :{$p}_endDate), ({$p}_userHistory.startDate, {$p}_userHistory.endDate) = TRUE"
                 )
             )
             ->leftJoin(
@@ -68,18 +60,9 @@ final readonly class UserJobAggregator implements AggregatorInterface, DataTrans
                 "{$p}_jobHistory",
                 Join::WITH,
                 $qb->expr()->andX(
-                    $qb->expr()->eq("{$p}_jobHistory.user", "{$p}_userHistory.user"),
-                    $qb->expr()->andX(
-                        $qb->expr()->lte("{$p}_jobHistory.startDate", "{$p}_userHistory.startDate"),
-                        $qb->expr()->orX(
-                            $qb->expr()->isNull("{$p}_jobHistory.endDate"),
-                            $qb->expr()->gt("{$p}_jobHistory.endDate", "{$p}_userHistory.startDate")
-                        )
-                    ),
-                    $qb->expr()->andX(
-                        "{$p}_jobHistory.startDate <= :{$p}_endDate",
-                        "COALESCE({$p}_jobHistory.endDate, CURRENT_TIMESTAMP()) > :{$p}_startDate"
-                    )
+                    "{$p}_jobHistory.user = {$p}_userHistory.user",
+                    "OVERLAPSI ({$p}_jobHistory.startDate, {$p}_jobHistory.endDate), ({$p}_userHistory.startDate, {$p}_userHistory.endDate) = TRUE",
+                    "OVERLAPSI (:{$p}_startDate, :{$p}_endDate), ({$p}_jobHistory.startDate, {$p}_jobHistory.endDate) = TRUE"
                 )
             )
             ->setParameter("{$p}_startDate", $this->rollingDateConverter->convert($data['start_date']))

src/Bundle/ChillPersonBundle/Form/EmploymentStatusType.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\EmploymentStatus;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class EmploymentStatusType extends \Symfony\Component\Form\AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('name', TranslatableStringFormType::class, [
+                'required' => true,
+            ])
+            ->add('active', ChoiceType::class, [
+                'choices' => [
+                    'Active' => true,
+                    'Inactive' => false,
+                ],
+            ])
+            ->add('order', NumberType::class);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => EmploymentStatus::class,
+        ]);
+    }
+}

src/Bundle/ChillPersonBundle/Form/PersonType.php

@@ -26,6 +26,7 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonPhone;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
 use Chill\PersonBundle\Form\Type\PersonPhoneType;
+use Chill\PersonBundle\Form\Type\PickEmploymentStatusType;
 use Chill\PersonBundle\Form\Type\PickGenderType;
 use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
 use Symfony\Component\Form\AbstractType;
@@ -102,6 +103,11 @@ class PersonType extends AbstractType
                 ->add('memo', ChillTextareaType::class, ['required' => false]);
         }
 
+        if ('visible' === $this->config['employment_status']) {
+            $builder
+                ->add('employmentStatus', PickEmploymentStatusType::class, ['required' => false]);
+        }
+
         if ('visible' === $this->config['place_of_birth']) {
             $builder->add('placeOfBirth', TextType::class, [
                 'required' => false,

src/Bundle/ChillPersonBundle/Form/Type/PickEmploymentStatusType.php

@@ -0,0 +1,50 @@
+<?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\Form\Type;
+
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\EmploymentStatus;
+
+class PickEmploymentStatusType extends AbstractType
+{
+    public function __construct(
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+    ) {}
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('label', 'Employment status')
+            ->setDefault(
+                'choice_label',
+                fn (EmploymentStatus $employmentStatus): string => $this->translatableStringHelper->localize($employmentStatus->getName())
+            )
+            ->setDefault(
+                'query_builder',
+                static fn (EntityRepository $er): QueryBuilder => $er->createQueryBuilder('c')
+                    ->where('c.active = true')
+                    ->orderBy('c.order'),
+            )
+            ->setDefault('placeholder', $this->translatableStringHelper->localize(['Select an option…']))
+            ->setDefault('class', EmploymentStatus::class);
+    }
+
+    public function getParent()
+    {
+        return EntityType::class;
+    }
+}

src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
 class AdminPersonMenuBuilder implements LocalMenuBuilderInterface
@@ -22,9 +23,14 @@ class AdminPersonMenuBuilder implements LocalMenuBuilderInterface
      */
     protected $authorizationChecker;
 
-    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
-    {
+    private array $fields_visibility;
+
+    public function __construct(
+        AuthorizationCheckerInterface $authorizationChecker,
+        ParameterBagInterface $parameterBag,
+    ) {
         $this->authorizationChecker = $authorizationChecker;
+        $this->fields_visibility = $parameterBag->get('chill_person.person_fields');
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
@@ -53,6 +59,12 @@ class AdminPersonMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_crud_person_marital-status_index',
         ])->setExtras(['order' => 2030]);
 
+        if ('visible' == $this->fields_visibility['employment_status']) {
+            $menu->addChild('Employment status', [
+                'route' => 'chill_crud_employment_status_index',
+            ])->setExtras(['order' => 2035]);
+        }
+
         $menu->addChild('person_admin.person_resource_kind', [
             'route' => 'chill_crud_person_resource-kind_index',
         ])->setExtras(['order' => 2040]);

src/Bundle/ChillPersonBundle/Resources/views/EmploymentStatus/edit.html.twig

@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillPersonBundle/Resources/views/EmploymentStatus/index.html.twig

@@ -0,0 +1,42 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>id</th>
+            <th>{{ 'name'|trans }}</th>
+            <th>{{ 'active'|trans }}</th>
+            <th>{{ 'ordering'|trans }}</th>
+            <th></th>
+        {% endblock %}
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.name|localize_translatable_string }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.active -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td>{{ entity.order }}</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_employment_status_edit', { 'id': entity.id}) }}" class="btn btn-sm btn-edit btn-mini"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/EmploymentStatus/new.html.twig

@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig

@@ -107,6 +107,9 @@
         {%- if form.spokenLanguages is defined -%}
         {{ form_row(form.spokenLanguages, {'label' : 'Spoken languages'}) }}
         {%- endif -%}
+        {%- if form.employmentStatus is defined -%}
+        {{ form_row(form.employmentStatus, {'label' : 'Employment status'}) }}
+        {%- endif -%}
     </fieldset>
     {%- endif -%}
 

src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig

@@ -170,6 +170,18 @@ This view should receive those arguments:
                     </dd>
                 </dl>
                 {%- endif -%}
+                <dl>
+                    {% if chill_person.fields.employment_status == 'visible' %}
+                    <dt>{{ 'Employment status'|trans }}&nbsp;:</dt>
+                    <dd>
+                    {% if person.employmentStatus is not empty %}
+                        {{ person.employmentStatus.name|localize_translatable_string }}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                    {% endif %}
+                    </dd>
+                    {% endif %}
+                </dl>
                 {%- if chill_person.fields.number_of_children == 'visible' -%}
                 <dl>
                     <dt>{{'Number of children'|trans}}&nbsp;:</dt>
@@ -195,8 +207,8 @@ This view should receive those arguments:
                             <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                         {% endif %}
                     </dd>
-
                     <dt>{{ 'Comment on the marital status'|trans }}&nbsp;:</dt>
+
                     <dd>
                         {% if person.maritalStatusComment.comment is not empty %}
                             <blockquote class="chill-user-quote">

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig

@@ -35,6 +35,9 @@
         {% endblock %}
 
         {% block actions_before %}
+            <li>
+                <a href="{{ path('chill_person_social_action_export_list') }}" class="btn btn-download"></a>
+            </li>
             <li class='cancel'>
                 <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
             </li>

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig

@@ -35,6 +35,9 @@
         {% endblock %}
 
         {% block actions_before %}
+            <li>
+                <a href="{{ path('chill_person_social_issue_export_list') }}" class="btn btn-download"></a>
+            </li>
             <li class='cancel'>
                 <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
             </li>

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php

@@ -73,7 +73,7 @@ final class UserJobAggregatorTest extends AbstractAggregatorTest
     public static function getFormData(): array
     {
         return [
-            ['start_date' => new RollingDate(RollingDate::T_WEEK_CURRENT_START), 'end_date' => new RollingDate(RollingDate::T_TODAY)],
+            ['start_date' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'end_date' => new RollingDate(RollingDate::T_TODAY)],
         ];
     }
 
@@ -86,7 +86,7 @@ final class UserJobAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.job', 'acpjob'),
+                ->leftJoin('acp.job', 'acpjob'),
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp'),

src/Bundle/ChillPersonBundle/config/services/controller.yaml

@@ -71,3 +71,6 @@ services:
     Chill\PersonBundle\Controller\PersonSignatureController:
         tags: [ 'controller.service_arguments' ]
 
+    Chill\PersonBundle\Controller\SocialWorkExportController:
+        tags: [ 'controller.service_arguments' ]
+

src/Bundle/ChillPersonBundle/migrations/Version20241121080214.php

@@ -0,0 +1,43 @@
+<?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\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20241121080214 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add employment status';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE chill_person_employment_status_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_person_employment_status (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, ordering DOUBLE PRECISION DEFAULT \'0.0\', PRIMARY KEY(id))');
+        $this->addSql('ALTER TABLE chill_person_person ADD employmentstatus_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_person ADD CONSTRAINT FK_BF210A14BAE6AEE2 FOREIGN KEY (employmentstatus_id) REFERENCES chill_person_employment_status (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX BF210A14BAE6AEE2 ON chill_person_person (employmentstatus_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_person_employment_status_id_seq CASCADE');
+        $this->addSql('ALTER TABLE chill_person_person DROP CONSTRAINT FK_BF210A14BAE6AEE2');
+        $this->addSql('ALTER TABLE chill_person_person DROP employmentstatus_id');
+        $this->addSql('DROP TABLE chill_person_employment_status');
+    }
+}

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

@@ -1,4 +1,5 @@
 Edit: Modifier
+Select an option…: Choisissez une option…
 'First name': Prénom
 firstname: prénom
 firstName: prénom
@@ -98,7 +99,7 @@ memo: Commentaire
 numberOfChildren: Nombre d'enfants
 contactInfo: Commentaire des contacts
 spokenLanguages: Langues parlées
-
+Employment status: Situation professionelle
 
 
 # dédoublonnage
@@ -653,6 +654,12 @@ crud:
             add_new: Ajouter un nouveau
         title_new: Nouveau motif de clotûre
         title_edit: Modifier le motif de clotûre
+    employment_status:
+        index:
+            title: Situations professionelles
+            add_new: Ajouter une nouvelle
+        title_new: Ajouter une situation professionelle
+        title_edit: Modifier cette situation professionelle
     origin:
         index:
             title: Liste des origines de parcours

src/Bundle/ChillWopiBundle/src/Controller/ConvertController.php

@@ -13,7 +13,6 @@ namespace Chill\WopiBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
-use Chill\DocStoreBundle\Service\StoredObjectManager;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Chill\WopiBundle\Service\WopiConverter;
 use Psr\Log\LoggerInterface;
@@ -26,9 +25,6 @@ class ConvertController
 {
     private const LOG_PREFIX = '[convert] ';
 
-    /**
-     * @param StoredObjectManager $storedObjectManager
-     */
     public function __construct(
         private readonly Security $security,
         private readonly StoredObjectManagerInterface $storedObjectManager,

symfony.lock

@@ -53,6 +53,18 @@
             "migrations/.gitignore"
         ]
     },
+    "friendsofphp/php-cs-fixer": {
+        "version": "3.65",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "3.0",
+            "ref": "be2103eb4a20942e28a6dd87736669b757132435"
+        },
+        "files": [
+            ".php-cs-fixer.dist.php"
+        ]
+    },
     "knplabs/knp-menu-bundle": {
         "version": "v3.4.2"
     },
@@ -284,6 +296,27 @@
             "config/packages/monolog.yaml"
         ]
     },
+    "symfony/notifier": {
+        "version": "5.4",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "5.0",
+            "ref": "178877daf79d2dbd62129dd03612cb1a2cb407cc"
+        },
+        "files": [
+            "config/packages/notifier.yaml"
+        ]
+    },
+    "symfony/ovh-cloud-notifier": {
+        "version": "5.4",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "5.1",
+            "ref": "fe2e382c22d60eae9ad54cb22862b1c15291fdf8"
+        }
+    },
     "symfony/phpunit-bridge": {
         "version": "7.1",
         "recipe": {