fix merge conflicts

src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php

@@ -20,8 +20,8 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_merge;
 

src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php

@@ -27,7 +27,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function array_merge;

src/Bundle/ChillMainBundle/Controller/ExportController.php

@@ -24,7 +24,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function count;
 use function serialize;

src/Bundle/ChillMainBundle/Controller/PasswordController.php

@@ -27,9 +27,9 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class PasswordController.

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -142,7 +142,7 @@ class Address
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
      * @Groups({"write"})
      */
-    private ?PostalCode $postcode;
+    private ?PostalCode $postcode = null;
 
     /**
      * @var string|null
@@ -304,10 +304,8 @@ class Address
 
     /**
      * Get postcode.
-     *
-     * @return PostalCode
      */
-    public function getPostcode()
+    public function getPostcode(): ?PostalCode
     {
         return $this->postcode;
     }

src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php

@@ -18,7 +18,7 @@ use OutOfBoundsException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function array_keys;

src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php

@@ -17,7 +17,7 @@ use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_map;
 use function count;

src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php

@@ -19,7 +19,7 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_map;
 use function array_merge;

src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php

@@ -23,7 +23,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function array_keys;

src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php

@@ -0,0 +1,57 @@
+<?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);
+
+namespace Chill\MainBundle\Form\Type;
+
+use Chill\MainBundle\Entity\Civility;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+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;
+
+class PickCivilityType extends AbstractType
+{
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('label', 'Civility')
+            ->setDefault(
+                'choice_label',
+                function (Civility $civility): string {
+                    return $this->translatableStringHelper->localize($civility->getName());
+                }
+            )
+            ->setDefault(
+                'query_builder',
+                static function (EntityRepository $er): QueryBuilder {
+                    return $er->createQueryBuilder('c')
+                        ->where('c.active = true')
+                        ->orderBy('c.order');
+                },
+            )
+            ->setDefault('placeholder', 'choose civility')
+            ->setDefault('class', Civility::class);
+    }
+
+    public function getParent()
+    {
+        return EntityType::class;
+    }
+}

src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php

@@ -20,7 +20,7 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * A form to pick between PostalCode.

src/Bundle/ChillMainBundle/Notification/Mailer.php

@@ -16,7 +16,7 @@ use Psr\Log\LoggerInterface;
 use Swift_Mailer;
 use Swift_Message;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment;
 
 use function call_user_func;

src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php

@@ -15,7 +15,7 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class SectionMenuBuilder.

src/Bundle/ChillMainBundle/Routing/MenuComposer.php

@@ -15,7 +15,7 @@ use Knp\Menu\FactoryInterface;
 use Knp\Menu\ItemInterface;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function array_merge;

src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php

@@ -16,9 +16,10 @@ use Chill\MainBundle\Security\RoleProvider;
 use Chill\MainBundle\Validation\Constraint\RoleScopeScopePresenceConstraint;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
 use function in_array;
 
 class RoleScopeScopePresence extends ConstraintValidator

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

@@ -19,7 +19,7 @@ services:
     chill.main.export.spreadsheet_formatter:
         class: Chill\MainBundle\Export\Formatter\SpreadSheetFormatter
         arguments:
-            $translatorInterface: '@Symfony\Component\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Contracts\Translation\TranslatorInterface'
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'spreadsheet' }
@@ -27,7 +27,7 @@ services:
     chill.main.export.list_formatter:
         class: Chill\MainBundle\Export\Formatter\CSVListFormatter
         arguments:
-            $translatorInterface: '@Symfony\Component\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Contracts\Translation\TranslatorInterface'
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csvlist' }
@@ -35,7 +35,7 @@ services:
     chill.main.export.list_spreadsheet_formatter:
         class: Chill\MainBundle\Export\Formatter\SpreadsheetListFormatter
         arguments:
-            $translatorInterface: '@Symfony\Component\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Contracts\Translation\TranslatorInterface'
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'spreadlist' }
@@ -43,7 +43,7 @@ services:
     chill.main.export.pivoted_list_formatter:
         class: Chill\MainBundle\Export\Formatter\CSVPivotedListFormatter
         arguments:
-            $translatorInterface: '@Symfony\Component\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Contracts\Translation\TranslatorInterface'
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csv_pivoted_list' }

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

@@ -59,7 +59,7 @@ services:
             - "@chill.main.helper.translatable_string"
             - '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
             - '@Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader'
-            - '@Symfony\Component\Translation\TranslatorInterface'
+            - '@Symfony\Contracts\Translation\TranslatorInterface'
         tags:
             - { name: form.type }
 

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

@@ -15,7 +15,7 @@ services:
     Chill\MainBundle\Routing\MenuBuilder\SectionMenuBuilder:
         arguments:
             $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
         tags:
             - { name: 'chill.menu_builder' }
 

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

@@ -10,7 +10,7 @@ services:
             $mailer: '@swiftmailer.mailer.default'
             # $mailerTransporter: '@swiftmailer.transport'
             $router: '@Symfony\Component\Routing\RouterInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
             $routeParameters: '%chill_main.notifications%'
 
     Chill\MainBundle\Notification\NotificationHandlerManager:

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

@@ -8,7 +8,7 @@ services:
         arguments:
             - '@Symfony\Component\Routing\RouterInterface'
             - '@Knp\Menu\FactoryInterface'
-            - '@Symfony\Component\Translation\TranslatorInterface'
+            - '@Symfony\Contracts\Translation\TranslatorInterface'
     Chill\MainBundle\Routing\MenuComposer: '@chill.main.menu_composer'
 
     chill.main.routes_loader:

src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml

@@ -9,7 +9,7 @@ notification:
     My notifications with counter: >-
         {nb, plural,
             =0 {Mes notifications}
-            one {Une notification}
+            one {# notification}
             few {# notifications}
             other {# notifications}
         }
@@ -41,7 +41,7 @@ workflow:
     My workflows with counter: >-
         {wc, plural,
             =0 {Mes workflows}
-            one {Une workflow}
+            one {# workflow}
             few {# workflows}
             other {# workflows}
         }