Merge remote-tracking branch 'origin/master' into features/docgen-widget-generate-template

.php_cs.dist.php

@@ -21,52 +21,52 @@ $config
 $rules = $config->getRules();
 
 $riskyRules = [
-    'final_internal_class' => false,
-    'no_useless_sprintf' => false,
-    'dir_constant' => false,
-    'no_alias_functions' => false,
-    'implode_call' => false,
-    'combine_nested_dirname' => false,
-    'pow_to_exponentiation' => false,
-    'comment_to_phpdoc' => false,
-    'no_unset_on_property' => false,
-    'strict_param' => false,
-    'native_constant_invocation' => false,
-    'php_unit_test_annotation' => false,
-    'php_unit_no_expectation_annotation' => false,
-    'declare_strict_types' => false,
-    'function_to_constant' => false,
-    'is_null' => false,
-    'native_function_invocation' => false,
     'ternary_to_elvis_operator' => false,
-    'no_trailing_whitespace_in_string' => false,
-    'no_unreachable_default_argument_value' => false,
-    'php_unit_test_case_static_method_calls' => false,
-    'strict_comparison' => false,
-    'array_push' => false,
-    'ereg_to_preg' => false,
-    'error_suppression' => false,
-    'fopen_flag_order' => false,
-    'fopen_flags' => false,
-    'logical_operators' => false,
-    'modernize_types_casting' => false,
-    'no_homoglyph_names' => false,
-    'no_unneeded_final_method' => false,
-    'non_printable_character' => false,
-    'ordered_traits' => false,
     'php_unit_mock_short_will_return' => false,
     'php_unit_set_up_tear_down_visibility' => false,
-    'set_type_to_cast' => false,
+    'php_unit_construct' => false,
-    'string_line_ending' => false,
+    'php_unit_dedicate_assert' => false,
-    'ordered_interfaces' => false,
     'php_unit_expectation' => false,
     'php_unit_mock' => false,
     'php_unit_namespaced' => false,
-    'random_api_migration' => false,
+    'php_unit_no_expectation_annotation' => false,
-    'static_lambda' => false,
+    'php_unit_test_case_static_method_calls' => false,
-    'php_unit_construct' => false,
+    'php_unit_test_annotation' => false,
-    'psr_autoloading' => false,
+    //    'final_internal_class' => false,
-    'php_unit_dedicate_assert' => false,
+    //    'strict_param' => false,
+    //    'declare_strict_types' => false,
+    //    'strict_comparison' => false,
+    //    'no_unreachable_default_argument_value' => false,
+    //    'ereg_to_preg' => false,
+    //    'ordered_interfaces' => false,
+    //    'error_suppression' => false,
+    //    'non_printable_character' => false,
+    //    'ordered_traits' => false,
+    //    'no_useless_sprintf' => false,
+    //    'dir_constant' => false,
+    //    'no_alias_functions' => false,
+    //    'implode_call' => false,
+    //    'combine_nested_dirname' => false,
+    //    'pow_to_exponentiation' => false,
+    //    'comment_to_phpdoc' => false,
+    //    'no_unset_on_property' => false,
+    //    'native_constant_invocation' => false,
+    //    'function_to_constant' => false,
+    //    'is_null' => false,
+    //    'native_function_invocation' => false,
+    //    'no_trailing_whitespace_in_string' => false,
+    //    'array_push' => false,
+    //    'fopen_flag_order' => false,
+    //    'fopen_flags' => false,
+    //    'logical_operators' => false,
+    //    'modernize_types_casting' => false,
+    //    'no_homoglyph_names' => false,
+    //    'no_unneeded_final_method' => false,
+    //    'random_api_migration' => false,
+    //    'static_lambda' => false,
+    //    'set_type_to_cast' => false,
+    //    'string_line_ending' => false,
+    //    'psr_autoloading' => false,
 ];
 
 $rules = array_merge(

CHANGELOG.md

@@ -11,18 +11,44 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person search] fix bug when using birthdate after and birthdate before
+* [person search] increase pertinence when lastname begins with search pattern
+
+## Test releases
+
+### Test release 2021-11-19 - bis
+
+* [household] do not allow to create two addresses on the same date
+* [activity] handle case when there is no social action associated to social issue
+* [activity] layout for issues / actions
+* [activity][bugfix] in edit mode, the form will now load the social action list
+
+### Test release 2021-11-29
+
+* [person] suggest entities (person | thirdparty) when creating/editing the accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/119)
+* [activity] add custom validation on the Activity class, based on what is required from the ActivityType (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/188)
 * [main] translate multiselect messages when selecting/creating address
 * [main] set the coordinates of the city when creating a new address OR choosing "pas d'adresse complète"
 * Use the user.label in accompanying course banner, instead of username;
 * fix: show validation message when closing accompanying course;
 * [thirdparty] link from modal to thirdparty detail page fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/228)
+* [assets] new asset to style suggestions lists (with add/remove item link) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/258)
+* [accompanyingCourseWorkEdit] improves hyphenation and line breaks for long badges
+* [acompanyingCourse] improve Resume page
+  * complete all needed informations,
+  * actions and activities are clickables,
+  * better placement with js masonry blocks on top of content area,
+  * https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/101
+  * https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/295
+* [activity/calendar] on show page, concerned groups of persons table adapt itself to isVisibles options
 * [activity] remove the "plus" button in activity list
 * [activity] check ACL on activity list in person context
 * [list for accompanying course in person] filter list using ACL
 * [validation] toasts are displayed for errors when modifying accompanying course (generalization required).
+* [period] only the user can enable confidentiality
 * add an endpoint for checking permissions. See https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/232
-
+* [activity] for a new activity: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
-## Test releases
+* [calendar] for a new rdv: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
 
 ### Test release 2021-11-22
 
@@ -52,7 +78,7 @@ and this project adheres to
 * [accompanyingCourse] Ability to close accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/296)
 * [task] Select2 field in task form to allow search for a user (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/167)
 * [list result] show all courses, except ones with period closed
-
+* [accompanyingCourse] improve banner with small carousel to display slide social-issues or slide associated persons (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/69)
 
 ### Test release 2021-11-15
 

CONVENTIONS.md

@@ -98,7 +98,7 @@ Finalement, il importe ici de définir ce qu'est un bloc, ce qu'est une zone d'a
 
 Par exemple pour mettre un style au titre on précise juste h3 dans la cascade bloc.
 
-```sass
+```scss
 div.bloc {
    // un bloc générique, utilisé à plusieurs endroits
    &.bloc-dark {
@@ -381,3 +381,31 @@ A chaque fois qu'un lien est indiqué, vérifier si on ne doit pas utiliser la f
     * utiliser `chill_return_path_or` dans le bouton "Cancel";
     * pour les boutons "enregistrer et voir" et "Enregistrer et fermer" => ?
 
+### Assets pour les listes de suggestion
+
+Créer une liste de suggestions à ajouter (tout l'item est cliquable)
+```html
+<ul class="list-suggest add-items">
+   <li>
+      <span>item</span>
+   </li>
+</ul>
+```
+Créer une liste de suggestions à enlever (avec une croix rouge cliquable, l'ancre a est vide)
+```html
+<ul class="list-suggest remove-items">
+    <li>
+        <span>
+            item
+            <a></a>
+        </span>
+    </li>
+</ul>
+```
+Créer un titre enlevable (avec une croix rouge cliquable, l'ancre a est vide)
+```html
+<div class="item-title">
+    title
+    <a></a>
+</div>
+```

docs/source/_static/code/exports/BirthdateFilter.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Filter;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
@@ -16,7 +18,7 @@ use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-class BirthdateFilter implements FilterInterface, ExportElementValidatedInterface
+class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
     // add specific role for this filter
     public function addRole()

docs/source/_static/code/exports/CountPerson.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
@@ -89,7 +91,7 @@ class CountPerson implements ExportInterface
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         // we gather all center the user choose.
-        $centers = array_map(function ($el) { return $el['center']; }, $acl);
+        $centers = array_map(static function ($el) { return $el['center']; }, $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 

docs/source/development/pagination/example.php

@@ -7,11 +7,13 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MyBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-class ItemController extends Controller
+class example extends Controller
 {
     public function yourAction()
     {

docs/source/development/useful-snippets/controller-secured-for-person.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\HealthBundle\Controller;
 
 use Chill\HealthBundle\Security\Authorization\ConsultationVoter;
@@ -25,7 +27,7 @@ class ConsultationController extends Controller
      */
     public function listAction($id)
     {
-        /* @var $person \Chill\PersonBundle\Entity\Person */
+        /** @var \Chill\PersonBundle\Entity\Person $person */
         $person = $this->get('chill.person.repository.person')
             ->find($id);
 
@@ -35,7 +37,7 @@ class ConsultationController extends Controller
 
         $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
 
-        /* @var $authorizationHelper \Chill\MainBundle\Security\Authorization\AuthorizationHelper */
+        /** @var \Chill\MainBundle\Security\Authorization\AuthorizationHelper $authorizationHelper */
         $authorizationHelper = $this->get('chill.main.security.'
             . 'authorization.helper');
 

docs/source/development/user-interface/widgets/ChillMainConfiguration.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection;
 
    use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
@@ -17,7 +19,7 @@ namespace Chill\MainBundle\DependencyInjection;
    /**
     * Configure the main bundle.
     */
-   class Configuration implements ConfigurationInterface
+   class ChillMainConfiguration implements ConfigurationInterface
    {
        use AddWidgetConfigurationTrait;
 
@@ -27,7 +29,7 @@ namespace Chill\MainBundle\DependencyInjection;
        private $containerBuilder;
 
        public function __construct(
-           array $widgetFactories = [],
+           array $widgetFactories,
            ContainerBuilder $containerBuilder
        ) {
            // we register here widget factories (see below)

docs/source/development/user-interface/widgets/ChillMainExtension.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;

docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;
@@ -16,7 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 /**
  * add configuration for the person_list widget.
  */
-class PersonListWidgetFactory extends AbstractWidgetFactory
+class ChillPersonAddAPersonListWidgetFactory extends AbstractWidgetFactory
 {
     /*
      * append the option to the configuration
@@ -36,8 +38,8 @@ class PersonListWidgetFactory extends AbstractWidgetFactory
             ->end();
     }
 
-    /*
+    /**
-     * return an array with the allowed places where the widget can be rendered
+     * return an array with the allowed places where the widget can be rendered.
      *
      * @return string[]
      */
@@ -59,8 +61,8 @@ class PersonListWidgetFactory extends AbstractWidgetFactory
         return 'chill_person.widget.person_list';
     }
 
-    /*
+    /**
-     * return the widget alias
+     * return the widget alias.
      *
      * @return string
      */

docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Widget;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
@@ -27,7 +29,7 @@ use Twig_Environment;
  *
  * The configuration is defined by `PersonListWidgetFactory`
  */
-class PersonListWidget implements WidgetInterface
+class ChillPersonAddAPersonWidget implements WidgetInterface
 {
     /**
      * the authorization helper.

docs/source/development/user-interface/widgets/ChillPersonExtension.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;

grumphp.yml

@@ -9,6 +9,6 @@ parameters:
     tasks.license.holder: Champs-Libres
     tasks.license.date_from: 2001
 
-    tasks.phpcsfixer.allow_risky: false
+    tasks.phpcsfixer.allow_risky: true
     tasks.phpcsfixer.diff: true
     tasks.phpstan.level: 1

phpstan-critical.neon

@@ -70,11 +70,6 @@ parameters:
             count: 1
             path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
 
-        -
-            message: "#^Undefined variable\\: \\$value$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
-
         -
             message: "#^Undefined variable\\: \\$choiceSlug$#"
             count: 1

phpstan-deprecations.neon

@@ -1,15 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Call to deprecated method getType\\(\\) of class Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\.$#"
-			count: 3
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Call to deprecated method setType\\(\\) of class Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
 		-
 			message:
 				"""

phpstan-types.neon

@@ -1,15 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/Activity.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -20,11 +10,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
-
 		-
 			message: "#^Method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:getDescription\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
@@ -35,11 +20,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -55,36 +35,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 3
@@ -95,36 +45,16 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillBudgetBundle/Form/ResourceType.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Entity/Calendar.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 3
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 4
@@ -190,21 +120,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Participation.php
-
 		-
 			message: "#^Method Chill\\\\EventBundle\\\\Entity\\\\Participation\\:\\:offsetGet\\(\\) should return mixed but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillEventBundle/Entity/Participation.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -225,11 +145,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/StatusType.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
@@ -240,16 +155,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
-
 		-
 			message: "#^Casting to string something that's already string\\.$#"
 			count: 5
@@ -260,11 +165,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -285,16 +185,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
 
-		-
-			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
-
 		-
 			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\ChillImportUsersCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
 			count: 1
@@ -305,11 +195,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -320,11 +205,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
-
 		-
 			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\LoadAndUpdateLanguagesCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
 			count: 1
@@ -360,36 +240,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
-
-		-
-			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 5
-			path: src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
-
-		-
-			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -405,21 +255,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/User.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/User.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 6
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
 		-
 			message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
 			count: 1
@@ -450,11 +290,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 3
@@ -465,51 +300,16 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -530,21 +330,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -570,51 +360,16 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
 
-		-
-			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 6
 			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -625,26 +380,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -665,26 +405,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Household/MembersEditor.php
-
 		-
 			message: "#^Method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\QueryBuilder\\.$#"
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 3
@@ -695,71 +420,26 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
-
 		-
 			message: "#^Method Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\LoadReports\\:\\:getRandomChoice\\(\\) should return array\\<string\\>\\|string but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 4
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
-
 		-
 			message: "#^Method Chill\\\\ReportBundle\\\\Security\\\\Authorization\\\\ReportVoter\\:\\:supports\\(\\) should return bool but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 4
-			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
-
 		-
 			message: "#^Casting to string something that's already string\\.$#"
 			count: 3
@@ -785,31 +465,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
-
 		-
 			message: "#^Method Chill\\\\TaskBundle\\\\Timeline\\\\TaskLifeCycleEventTimelineProvider\\:\\:getTransitionByName\\(\\) should return Symfony\\\\Component\\\\Workflow\\\\Transition but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 4
-			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -820,11 +480,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -835,11 +490,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
 
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1

src/Bundle/ChillActivityBundle/ChillActivityBundle.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -39,6 +39,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Serializer\SerializerInterface;
+use function array_key_exists;
 
 final class ActivityController extends AbstractController
 {
@@ -105,18 +106,19 @@ final class ActivityController extends AbstractController
 
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
-        }
-
         $activity = $this->activityRepository->find($id);
 
         if (!$activity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
+        if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
+            $accompanyingPeriod = $activity->getAccompanyingPeriod();
+        } else {
+            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
+        }
+
         // TODO
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
 
@@ -137,7 +139,7 @@ final class ActivityController extends AbstractController
                             static fn (ActivityReason $ar): int => $ar->getId()
                         )
                         ->toArray(),
-                    'type_id' => $activity->getType()->getId(),
+                    'type_id' => $activity->getActivityType()->getId(),
                     'duration' => $activity->getDurationTime() ? $activity->getDurationTime()->format('U') : null,
                     'date' => $activity->getDate()->format('Y-m-d'),
                     'attendee' => $activity->getAttendee(),
@@ -176,25 +178,25 @@ final class ActivityController extends AbstractController
 
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
-        }
-
         $entity = $this->activityRepository->find($id);
 
         if (null === $entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
+        if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
+            $accompanyingPeriod = $entity->getAccompanyingPeriod();
+        } else {
+            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
+        }
         // TODO
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
 
         $form = $this->createForm(ActivityType::class, $entity, [
             'center' => $entity->getCenter(),
             'role' => new Role('CHILL_ACTIVITY_UPDATE'),
-            'activityType' => $entity->getType(),
+            'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,
         ])->handleRequest($request);
 
@@ -327,7 +329,7 @@ final class ActivityController extends AbstractController
             $entity->setAccompanyingPeriod($accompanyingPeriod);
         }
 
-        $entity->setType($activityType);
+        $entity->setActivityType($activityType);
         $entity->setDate(new DateTime('now'));
 
         if ($request->query->has('activityData')) {
@@ -385,7 +387,7 @@ final class ActivityController extends AbstractController
         $form = $this->createForm(ActivityType::class, $entity, [
             'center' => $entity->getCenter(),
             'role' => new Role('CHILL_ACTIVITY_CREATE'),
-            'activityType' => $entity->getType(),
+            'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,
         ])->handleRequest($request);
 
@@ -408,7 +410,7 @@ final class ActivityController extends AbstractController
 
         $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
 
-        $defaultLocationId = $this->getUser()->getCurrentLocation()->getId();
+        $defaultLocation = $this->getUser()->getCurrentLocation();
 
         return $this->render($view, [
             'person' => $person,
@@ -416,7 +418,7 @@ final class ActivityController extends AbstractController
             'entity' => $entity,
             'form' => $form->createView(),
             'activity_json' => $activity_array,
-            'default_location_id' => $defaultLocationId,
+            'default_location' => $defaultLocation,
         ]);
     }
 

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\ActivityBundle\Entity\ActivityReasonCategory;

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\ActivityBundle\Entity\ActivityReason;

src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -23,6 +25,7 @@ class AdminActivityTypeController extends CRUDController
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
         /** @var \Doctrine\ORM\QueryBuilder $query */
-        return $query->orderBy('e.ordering', 'ASC');
+        return $query->orderBy('e.ordering', 'ASC')
+            ->addOrderBy('e.id', 'ASC');
     }
 }

src/Bundle/ChillActivityBundle/Controller/AdminController.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -48,7 +50,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
             ->findAll();
 
         foreach ($persons as $person) {
-            $activityNbr = rand(0, 3);
+            $activityNbr = mt_rand(0, 3);
 
             for ($i = 0; $i < $activityNbr; ++$i) {
                 $activity = $this->newRandomActivity($person);
@@ -73,7 +75,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 
         //      ->setAttendee($this->faker->boolean())
 
-        for ($i = 0; rand(0, 4) > $i; ++$i) {
+        for ($i = 0; mt_rand(0, 4) > $i; ++$i) {
             $reason = $this->getRandomActivityReason();
 
             if (null !== $reason) {

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\Activity;

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityReason;

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityReasonCategory;

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityType;

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
@@ -17,6 +19,7 @@ use Chill\MainBundle\Entity\RoleScope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
+use function in_array;
 
 /**
  * Add a role CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE for all groups except administrative,
@@ -47,7 +50,7 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
 
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'])) {
+                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
                         }
 

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DependencyInjection;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
@@ -67,7 +69,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         ]);
     }
 
-    /* (non-PHPdoc)
+    /** (non-PHPdoc).
      * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
     public function prependRoutes(ContainerBuilder $container)

src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php

@@ -7,10 +7,13 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use function is_int;
 
 /**
  * This is the class that validates and merges configuration from your app/config files.
@@ -55,7 +58,7 @@ class Configuration implements ConfigurationInterface
             ->info('The number of seconds of this duration. Must be an integer.')
             ->cannotBeEmpty()
             ->validate()
-            ->ifTrue(function ($data) {
+            ->ifTrue(static function ($data) {
                 return !is_int($data);
             })->thenInvalid('The value %s is not a valid integer')
             ->end()

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -7,8 +7,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
+use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\Document;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
@@ -17,6 +20,7 @@ use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
@@ -41,17 +45,14 @@ use Symfony\Component\Serializer\Annotation\SerializedName;
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "activity": Activity::class
  * })
- */
+ * @ActivityValidator\ActivityValidity
-
+ *
-/*
- * TODO : revoir
  * @UserCircleConsistency(
- *      "CHILL_ACTIVITY_SEE_DETAILS",
+ *     "CHILL_ACTIVITY_SEE_DETAILS",
- *      getUserFunction="getUser",
+ *     getUserFunction="getUser",
- *      path="scope")
+ * path="scope")
  */
-
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
-class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
 {
     public const SENTRECEIVED_RECEIVED = 'received';
 
@@ -202,7 +203,9 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     public function addPerson(?Person $person): self
     {
         if (null !== $person) {
-            $this->persons[] = $person;
+            if (!$this->persons->contains($person)) {
+                $this->persons[] = $person;
+            }
         }
 
         return $this;
@@ -236,7 +239,9 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     public function addThirdParty(?ThirdParty $thirdParty): self
     {
         if (null !== $thirdParty) {
-            $this->thirdParties[] = $thirdParty;
+            if (!$this->thirdParties->contains($thirdParty)) {
+                $this->thirdParties[] = $thirdParty;
+            }
         }
 
         return $this;
@@ -245,7 +250,9 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     public function addUser(?User $user): self
     {
         if (null !== $user) {
-            $this->users[] = $user;
+            if (!$this->users->contains($user)) {
+                $this->users[] = $user;
+            }
         }
 
         return $this;
@@ -346,8 +353,9 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         if (null !== $this->accompanyingPeriod) {
             $personsNotAssociated = [];
 
+            // TODO better semantic with:  return $this->persons->filter(...);
             foreach ($this->persons as $person) {
-                if (!in_array($person, $this->getPersonsAssociated())) {
+                if ($this->accompanyingPeriod->getOpenParticipationContainsPerson($person) === null) {
                     $personsNotAssociated[] = $person;
                 }
             }

src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -7,11 +7,14 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use InvalidArgumentException;
 use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Class ActivityType.
@@ -29,11 +32,13 @@ class ActivityType
     public const FIELD_REQUIRED = 2;
 
     /**
+     * @deprecated not in use
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
     private string $accompanyingPeriodLabel = '';
 
     /**
+     * @deprecated not in use
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
      */
     private int $accompanyingPeriodVisible = self::FIELD_INVISIBLE;
@@ -195,16 +200,21 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     * @Assert\EqualTo(propertyPath="socialIssuesVisible", message="This parameter must be equal to social issue parameter")
      */
     private int $socialActionsVisible = self::FIELD_INVISIBLE;
 
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     *
+     * @deprecated not in use
      */
     private string $socialDataLabel = '';
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     *
+     * @deprecated not in use
      */
     private int $socialDataVisible = self::FIELD_INVISIBLE;
 
@@ -260,16 +270,6 @@ class ActivityType
      */
     private int $userVisible = self::FIELD_REQUIRED;
 
-    public function getAccompanyingPeriodLabel(): string
-    {
-        return $this->accompanyingPeriodLabel;
-    }
-
-    public function getAccompanyingPeriodVisible(): int
-    {
-        return $this->accompanyingPeriodVisible;
-    }
-
     /**
      * Get active
      * return true if the type is active.
@@ -446,16 +446,6 @@ class ActivityType
         return $this->socialActionsVisible;
     }
 
-    public function getSocialDataLabel(): string
-    {
-        return $this->socialDataLabel;
-    }
-
-    public function getSocialDataVisible(): int
-    {
-        return $this->socialDataVisible;
-    }
-
     public function getSocialIssuesLabel(): ?string
     {
         return $this->socialIssuesLabel;
@@ -537,20 +527,6 @@ class ActivityType
         return self::FIELD_INVISIBLE !== $this->{$property};
     }
 
-    public function setAccompanyingPeriodLabel(string $accompanyingPeriodLabel): self
-    {
-        $this->accompanyingPeriodLabel = $accompanyingPeriodLabel;
-
-        return $this;
-    }
-
-    public function setAccompanyingPeriodVisible(int $accompanyingPeriodVisible): self
-    {
-        $this->accompanyingPeriodVisible = $accompanyingPeriodVisible;
-
-        return $this;
-    }
-
     /**
      * Set active
      * set to true if the type is active.
@@ -768,20 +744,6 @@ class ActivityType
         return $this;
     }
 
-    public function setSocialDataLabel(string $socialDataLabel): self
-    {
-        $this->socialDataLabel = $socialDataLabel;
-
-        return $this;
-    }
-
-    public function setSocialDataVisible(int $socialDataVisible): self
-    {
-        $this->socialDataVisible = $socialDataVisible;
-
-        return $this;
-    }
-
     public function setSocialIssuesLabel(string $socialIssuesLabel): self
     {
         $this->socialIssuesLabel = $socialIssuesLabel;

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

@@ -25,6 +25,8 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function array_key_exists;
+use function count;
 
 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
@@ -72,7 +74,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
                 array_key_exists('activity', $join)
             && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
             )
-            or (!array_key_exists('activity', $join))
+            || (!array_key_exists('activity', $join))
         ) {
             $qb->add(
                 'join',

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;

src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php

@@ -28,6 +28,8 @@ use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use function array_key_exists;
+use function count;
+use function in_array;
 
 class ListActivity implements ListInterface
 {
@@ -73,7 +75,7 @@ class ListActivity implements ListInterface
             'choices' => array_combine($this->fields, $this->fields),
             'label' => 'Fields to include in export',
             'constraints' => [new Callback([
-                'callback' => function ($selected, ExecutionContextInterface $context) {
+                'callback' => static function ($selected, ExecutionContextInterface $context) {
                     if (count($selected) === 0) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
@@ -187,7 +189,7 @@ class ListActivity implements ListInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(function ($el) { return $el['center']; }, $acl);
+        $centers = array_map(static function ($el) { return $el['center']; }, $acl);
 
         // throw an error if any fields are present
         if (!array_key_exists('fields', $data)) {
@@ -204,7 +206,7 @@ class ListActivity implements ListInterface
             ->setParameter('authorized_centers', $centers);
 
         foreach ($this->fields as $f) {
-            if (in_array($f, $data['fields'])) {
+            if (in_array($f, $data['fields'], true)) {
                 switch ($f) {
                     case 'id':
                         $qb->addSelect('activity.id AS id');

src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php

@@ -89,7 +89,7 @@ class ActivityDateFilter implements FilterInterface
         );
 
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
-            /* @var $filterForm \Symfony\Component\Form\FormInterface */
+            /** @var \Symfony\Component\Form\FormInterface $filterForm */
             $filterForm = $event->getForm()->getParent();
             $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();
 

src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php

@@ -25,8 +25,10 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function array_key_exists;
+use function count;
 
-class ActivityReasonFilter implements FilterInterface, ExportElementValidatedInterface
+class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
 {
     protected ActivityReasonRepository $activityReasonRepository;
 

src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

@@ -24,8 +24,9 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function count;
 
-class ActivityTypeFilter implements FilterInterface, ExportElementValidatedInterface
+class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
 {
     protected ActivityTypeRepository $activityTypeRepository;
 

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

@@ -31,8 +31,9 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function count;
 
-class PersonHavingActivityBetweenDateFilter implements FilterInterface, ExportElementValidatedInterface
+class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInterface, FilterInterface
 {
     protected ActivityReasonRepository $activityReasonRepository;
 
@@ -134,7 +135,7 @@ class PersonHavingActivityBetweenDateFilter implements FilterInterface, ExportEl
         ]);
 
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
-            /* @var FormInterface $filterForm  */
+            /** @var FormInterface $filterForm */
             $filterForm = $event->getForm()->getParent();
             $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();
 

src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityPresence;

src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;

src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -46,6 +48,7 @@ use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use function in_array;
 
 class ActivityType extends AbstractType
 {
@@ -124,7 +127,7 @@ class ActivityType extends AbstractType
             $builder->add('socialIssues', HiddenType::class);
             $builder->get('socialIssues')
                 ->addModelTransformer(new CallbackTransformer(
-                    function (iterable $socialIssuesAsIterable): string {
+                    static function (iterable $socialIssuesAsIterable): string {
                         $socialIssueIds = [];
 
                         foreach ($socialIssuesAsIterable as $value) {
@@ -150,7 +153,7 @@ class ActivityType extends AbstractType
             $builder->add('socialActions', HiddenType::class);
             $builder->get('socialActions')
                 ->addModelTransformer(new CallbackTransformer(
-                    function (iterable $socialActionsAsIterable): string {
+                    static function (iterable $socialActionsAsIterable): string {
                         $socialActionIds = [];
 
                         foreach ($socialActionsAsIterable as $value) {
@@ -202,7 +205,7 @@ class ActivityType extends AbstractType
                 'choice_label' => function (ActivityPresence $activityPresence) {
                     return $this->translatableStringHelper->localize($activityPresence->getName());
                 },
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('a')
                         ->where('a.active = true');
                 },
@@ -228,7 +231,7 @@ class ActivityType extends AbstractType
                     return $this->translatableStringHelper->localize($activityReason->getName());
                 },
                 'attr' => ['class' => 'select2 '],
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('a')
                         ->where('a.active = true');
                 },
@@ -247,7 +250,7 @@ class ActivityType extends AbstractType
             $builder->add('persons', HiddenType::class);
             $builder->get('persons')
                 ->addModelTransformer(new CallbackTransformer(
-                    function (iterable $personsAsIterable): string {
+                    static function (iterable $personsAsIterable): string {
                         $personIds = [];
 
                         foreach ($personsAsIterable as $value) {
@@ -269,7 +272,7 @@ class ActivityType extends AbstractType
             $builder->add('thirdParties', HiddenType::class);
             $builder->get('thirdParties')
                 ->addModelTransformer(new CallbackTransformer(
-                    function (iterable $thirdpartyAsIterable): string {
+                    static function (iterable $thirdpartyAsIterable): string {
                         $thirdpartyIds = [];
 
                         foreach ($thirdpartyAsIterable as $value) {
@@ -302,7 +305,7 @@ class ActivityType extends AbstractType
             $builder->add('users', HiddenType::class);
             $builder->get('users')
                 ->addModelTransformer(new CallbackTransformer(
-                    function (iterable $usersAsIterable): string {
+                    static function (iterable $usersAsIterable): string {
                         $userIds = [];
 
                         foreach ($usersAsIterable as $value) {
@@ -324,7 +327,7 @@ class ActivityType extends AbstractType
             $builder->add('location', HiddenType::class)
                 ->get('location')
                 ->addModelTransformer(new CallbackTransformer(
-                    function (?Location $location): string {
+                    static function (?Location $location): string {
                         if (null === $location) {
                             return '';
                         }
@@ -364,7 +367,7 @@ class ActivityType extends AbstractType
                 ->addModelTransformer($durationTimeTransformer);
 
             $builder->get($fieldName)
-                ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $formEvent) use (
+                ->addEventListener(FormEvents::PRE_SET_DATA, static function (FormEvent $formEvent) use (
                     $timeChoices,
                     $builder,
                     $durationTimeTransformer,
@@ -374,7 +377,7 @@ class ActivityType extends AbstractType
                     // set the timezone to GMT, and fix the difference between current and GMT
                     // the datetimetransformer will then handle timezone as GMT
                     $timezoneUTC = new DateTimeZone('GMT');
-                    /* @var $data \DateTime */
+                    /** @var DateTime $data */
                     $data = $formEvent->getData() === null ?
                         DateTime::createFromFormat('U', 300) :
                         $formEvent->getData();
@@ -384,7 +387,7 @@ class ActivityType extends AbstractType
 
                     // test if the timestamp is in the choices.
                     // If not, recreate the field with the new timestamp
-                    if (!in_array($data->getTimestamp(), $timeChoices)) {
+                    if (!in_array($data->getTimestamp(), $timeChoices, true)) {
                         // the data are not in the possible values. add them
                         $timeChoices[$data->format('H:i')] = $data->getTimestamp();
                         $form = $builder->create($fieldName, ChoiceType::class, array_merge(

src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;

src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;
@@ -56,7 +58,7 @@ class ActivityTypeType extends AbstractType
             'persons', 'user', 'date', 'place', 'persons',
             'thirdParties', 'durationTime', 'travelTime', 'attendee',
             'reasons', 'comment', 'sentReceived', 'documents',
-            'emergency', 'accompanyingPeriod', 'socialData', 'users',
+            'emergency', 'socialIssues', 'socialActions', 'users',
         ];
 
         foreach ($fields as $field) {

src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityType;

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
@@ -55,7 +57,7 @@ class TranslatableActivityReason extends AbstractType
 
                     return null;
                 },
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('r')
                         ->where('r.active = true');
                 },

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form\Type;
 
 use Doctrine\ORM\EntityRepository;
@@ -37,7 +39,7 @@ class TranslatableActivityReasonCategory extends AbstractType
             [
                 'class' => 'ChillActivityBundle:ActivityReasonCategory',
                 'choice_label' => 'name[' . $locale . ']',
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->where('c.active = true');
                 },

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php

@@ -37,7 +37,7 @@ class TranslatableActivityType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        /* @var QueryBuilder $qb */
+        /** @var QueryBuilder $qb */
         $qb = $options['query_builder'];
 
         if (true === $options['active_only']) {

src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Menu;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;

src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php

@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Menu;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
+use function in_array;
 
 final class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
@@ -30,7 +31,7 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        if (in_array($menuId, ['admin_index', 'admin_section'])) {
+        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
             $menu->addChild('Activities', [
                 'route' => 'chill_admin_activity_index',
             ])

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Menu;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
@@ -37,7 +39,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        /* @var $person \Chill\PersonBundle\Entity\Person */
+        /** @var \Chill\PersonBundle\Entity\Person $person */
         $person = $parameters['person'];
 
         if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {

src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Notification;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -26,6 +28,6 @@ final class ActivityNotificationRenderer
 
     public function supports(Notification $notification, array $options = []): bool
     {
-        return $notification->getRelatedEntityClass() == Activity::class;
+        return $notification->getRelatedEntityClass() === Activity::class;
     }
 }

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -22,6 +22,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Security;
+use function count;
 use function in_array;
 
 final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
@@ -159,14 +160,14 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
 
         foreach ($reachableCenters as $center) {
             // we pass if not in centers
-            if (!in_array($center, $args['centers'])) {
+            if (!in_array($center, $args['centers'], true)) {
                 continue;
             }
             // we get all the reachable scopes for this center
             $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
             // we get the ids for those scopes
             $reachablesScopesId = array_map(
-                function (Scope $scope) { return $scope->getId(); },
+                static function (Scope $scope) { return $scope->getId(); },
                 $reachableScopes
             );
 

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue

@@ -1,7 +1,7 @@
 <template>
-   <concerned-groups></concerned-groups>
+   <concerned-groups v-if="hasPerson"></concerned-groups>
-   <social-issues-acc></social-issues-acc>
+   <social-issues-acc v-if="hasSocialIssues"></social-issues-acc>
-   <location></location>
+   <location v-if="hasLocation"></location>
 </template>
 
 <script>
@@ -11,6 +11,7 @@ import Location from './components/Location.vue';
 
 export default {
    name: "App",
+    props: ['hasSocialIssues', 'hasLocation', 'hasPerson'],
    components: {
       ConcernedGroups,
       SocialIssuesAcc,

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/api.js

@@ -1,4 +1,5 @@
 import { getSocialIssues } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api.js';
+import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods';
 
 /*
 *  Load socialActions by socialIssue (id)
@@ -12,33 +13,20 @@ const getSocialActionByIssue = (id) => {
       });
 };
 
-/*
+const getLocations = () => fetchResults('/api/1.0/main/location.json');
-*   Load Locations
+
- */
+const getLocationTypes = () => fetchResults('/api/1.0/main/location-type.json');
-const getLocations = () => {
-    const url = `/api/1.0/main/location.json`;
-    return fetch(url)
-        .then(response => {
-            if (response.ok) { return response.json(); }
-            throw Error('Error with request resource response');
-        });
-};
 
 /*
-*   Load Location Types
+*   Load Location Type by defaultFor
+*   @param {string} entity - can be "person" or "thirdparty"
  */
-const getLocationTypes = () => {
+const getLocationTypeByDefaultFor = (entity) => {
-    const url = `/api/1.0/main/location-type.json`;
+    return getLocationTypes().then(results =>
-    return fetch(url)
+        results.filter(t => t.defaultFor === entity)[0]
-        .then(response => {
+    );
-            if (response.ok) { return response.json(); }
-            throw Error('Error with request resource response');
-        });
 };
 
-/*
-*   Post a Location
- */
 const postLocation = (body) => {
     const url = `/api/1.0/main/location.json`;
     return fetch(url, {
@@ -59,5 +47,6 @@ export {
    getSocialActionByIssue,
    getLocations,
    getLocationTypes,
+   getLocationTypeByDefaultFor,
    postLocation
 };

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue

@@ -1,35 +1,33 @@
 <template>
-   <teleport to="#add-persons" v-if="isComponentVisible">
+    <teleport to="#add-persons" v-if="isComponentVisible">
 
-      <div class="flex-bloc concerned-groups" :class="getContext">
+        <div class="flex-bloc concerned-groups" :class="getContext">
-         <persons-bloc
+            <persons-bloc
-            v-for="bloc in contextPersonsBlocs"
+                v-for="bloc in contextPersonsBlocs"
-            v-bind:key="bloc.key"
+                v-bind:key="bloc.key"
-            v-bind:bloc="bloc"
+                v-bind:bloc="bloc"
-            v-bind:setPersonsInBloc="setPersonsInBloc">
+                v-bind:blocWidth="getBlocWidth"
-         </persons-bloc>
+                v-bind:setPersonsInBloc="setPersonsInBloc">
-      </div>
+            </persons-bloc>
-     <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
+        </div>
-         <ul class="list-unstyled">
+        <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
-          <li v-for="p in suggestedEntities" @click="addSuggestedEntity(p)">
+            <ul class="list-suggest add-items">
-             <span class="badge bg-primary" style="cursor: pointer;">
+                <li v-for="p in suggestedEntities" @click="addSuggestedEntity(p)">
-                 <i class="fa fa-plus fa-fw text-success"></i>
+                    <span>{{ p.text }}</span>
-                 {{ p.text }}
+                </li>
-             </span>
+            </ul>
-          </li>
+        </div>
-        </ul>
-     </div>
 
-      <add-persons
+        <add-persons
-         buttonTitle="activity.add_persons"
+            buttonTitle="activity.add_persons"
-         modalTitle="activity.add_persons"
+            modalTitle="activity.add_persons"
-         v-bind:key="addPersons.key"
+            v-bind:key="addPersons.key"
-         v-bind:options="addPersonsOptions"
+            v-bind:options="addPersonsOptions"
-         @addNewPersons="addNewPersons"
+            @addNewPersons="addNewPersons"
-         ref="addPersons">
+            ref="addPersons">
-      </add-persons>
+        </add-persons>
 
-  </teleport>
+    </teleport>
 </template>
 
 <script>
@@ -122,6 +120,9 @@ export default {
             }
          }
       },
+       getBlocWidth() {
+           return Math.round(100/(this.contextPersonsBlocs.length)) + '%';
+       }
    },
    mounted() {
       this.setPersonsInBloc();

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue

@@ -1,12 +1,8 @@
 <template>
    <li>
-      <span class="badge bg-primary" :title="person.text">
+      <span :title="person.text">
-         <span class="chill_denomination">
+         <span class="chill_denomination">{{ textCutted }}</span>
-            {{ textCutted }}
+         <a @click.prevent="$emit('remove', person)"></a>
-         </span>
-         <a class="fa fa-fw fa-times text-danger text-decoration-none"
-            @click.prevent="$emit('remove', person)">
-         </a>
       </span>
    </li>
 </template>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue

@@ -1,11 +1,11 @@
 <template>
-   <div class="item-bloc">
+   <div class="item-bloc" :style="{ 'flex-basis': blocWidth }">
       <div class="item-row">
          <div class="item-col">
             <h4>{{ $t(bloc.title) }}</h4>
          </div>
          <div class="item-col">
-            <ul class="list-content">
+            <ul class="list-suggest remove-items">
                <person-badge
                   v-for="person in bloc.persons"
                   v-bind:key="person.id"
@@ -25,7 +25,7 @@ export default {
    components: {
       PersonBadge
    },
-   props: ['bloc', 'setPersonsInBloc'],
+   props: ['bloc', 'setPersonsInBloc', 'blocWidth'],
    methods: {
       removePerson(item) {
          console.log('@@ CLICK remove person: item', item);

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue

@@ -2,10 +2,9 @@
     <teleport to="#location">
         <div class="mb-3 row">
             <label class="col-form-label col-sm-4">
-                {{ $t('activity.location') }}
+                {{ $t("activity.location") }}
             </label>
             <div class="col-sm-8">
-
                 <VueMultiselect
                     name="selectLocation"
                     id="selectLocation"
@@ -17,7 +16,10 @@
                     :placeholder="$t('activity.choose_location')"
                     :custom-label="customLabel"
                     :options="locations"
-                    v-model="location">
+                    group-values="locations"
+                    group-label="locationGroup"
+                    v-model="location"
+                >
                 </VueMultiselect>
 
                 <new-location v-bind:locations="locations"></new-location>
@@ -27,49 +29,146 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
+import { mapState, mapGetters } from "vuex";
-import VueMultiselect from 'vue-multiselect';
+import VueMultiselect from "vue-multiselect";
-import NewLocation from './Location/NewLocation.vue';
+import NewLocation from "./Location/NewLocation.vue";
-import { getLocations } from '../api.js';
+import { getLocations, getLocationTypeByDefaultFor } from "../api.js";
 
 export default {
     name: "Location",
     components: {
         NewLocation,
-        VueMultiselect
+        VueMultiselect,
     },
     data() {
         return {
-            locations: []
+            locations: [],
-        }
+        };
     },
     computed: {
-        ...mapState(['activity']),
+        ...mapState(["activity"]),
+        ...mapGetters(["suggestedEntities"]),
         location: {
             get() {
                 return this.activity.location;
             },
             set(value) {
-                this.$store.dispatch('updateLocation', value);
+                this.$store.dispatch("updateLocation", value);
-            }
+            },
-        }
+        },
     },
     mounted() {
-        getLocations().then(response => new Promise(resolve => {
+        getLocations().then(
-            console.log('getLocations', response);
+            (results) => {
-            this.locations = response.results;
+                getLocationTypeByDefaultFor('person').then(
-            if (window.default_location_id) {
+                    (personLocationType) => {
-                let location = this.locations.filter(l => l.id === window.default_location_id);
+                        if (personLocationType) {
-                this.$store.dispatch('updateLocation', location);
+                            const personLocation = this.makeAccompanyingPeriodLocation(personLocationType);
-            }
+                            const concernedPersonsLocation =
-            resolve();
+                                this.makeConcernedPersonsLocation(personLocationType);
-        }))
+                            getLocationTypeByDefaultFor('thirdparty').then(
+                                thirdpartyLocationType => {
+                                    const concernedThirdPartiesLocation =
+                                        this.makeConcernedThirdPartiesLocation(thirdpartyLocationType);
+                                    this.locations = [
+                                        {
+                                            locationGroup: 'Localisation du parcours',
+                                            locations: [personLocation]
+                                        },
+                                        {
+                                            locationGroup: 'Parties concernées',
+                                            locations: [...concernedPersonsLocation, ...concernedThirdPartiesLocation]
+                                        },
+                                        {
+                                            locationGroup: 'Autres localisations',
+                                            locations: results
+                                        }
+                                    ];
+                                }
+                            )
+                        } else {
+                            this.locations = [
+                                {
+                                    locationGroup: 'Localisations',
+                                    locations: response.results
+                                }
+                            ];
+                        }
+                        if (window.default_location_id) {
+                            let location = this.locations.filter(
+                                (l) => l.id === window.default_location_id
+                            );
+                            this.$store.dispatch("updateLocation", location);
+                        }
+                    }
+                )
+            })
     },
     methods: {
+        labelAccompanyingCourseLocation(value) {
+            return `${value.address.text} (${value.locationType.title.fr})`
+        },
         customLabel(value) {
-            return `${value.locationType.title.fr} ${value.name ? value.name : ''}`;
+            return value.locationType
+                ? value.name
+                    ? value.name === '__AccompanyingCourseLocation__'
+                        ? this.labelAccompanyingCourseLocation(value)
+                        : `${value.name} (${value.locationType.title.fr})`
+                    : value.locationType.title.fr
+                : '';
+        },
+        makeConcernedPersonsLocation(locationType) {
+            let locations = [];
+            this.suggestedEntities.forEach(
+                (e) => {
+                    if (e.type === 'person' && e.current_household_address !== null){
+                        locations.push({
+                            type: 'location',
+                            id: -this.suggestedEntities.indexOf(e)*10,
+                            onthefly: true,
+                            name: e.text,
+                            address: {
+                                id: e.current_household_address.address_id,
+                            },
+                            locationType: locationType
+                        });
+                    }
+                }
+            )
+            return locations;
+        },
+        makeConcernedThirdPartiesLocation(locationType) {
+            let locations = [];
+            this.suggestedEntities.forEach(
+                (e) => {
+                    if (e.type === 'thirdparty' && e.address !== null){
+                        locations.push({
+                            type: 'location',
+                            id: -this.suggestedEntities.indexOf(e)*10,
+                            onthefly: true,
+                            name: e.text,
+                            address: { id: e.address.address_id },
+                            locationType: locationType
+                        });
+                    }
+                }
+            )
+            return locations;
+        },
+        makeAccompanyingPeriodLocation(locationType) {
+            const accPeriodLocation = this.activity.accompanyingPeriod.location;
+            return {
+                type: 'location',
+                id: -1,
+                onthefly: true,
+                name: '__AccompanyingCourseLocation__',
+                address: {
+                    id: accPeriodLocation.address_id,
+                    text: `${accPeriodLocation.text} - ${accPeriodLocation.postcode.code} ${accPeriodLocation.postcode.name}`
+                },
+                locationType: locationType
+            }
         }
-    }
+    },
-}
+};
-
 </script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue

@@ -214,11 +214,9 @@ export default {
             return cond;
         },
         getLocationTypesList() {
-            getLocationTypes().then(response => new Promise(resolve => {
+            getLocationTypes().then(results => {
-                console.log('getLocationTypes', response);
+                this.locationTypes = results.filter(t => t.availableForUsers === true);
-                this.locationTypes = response.results.filter(t => t.availableForUsers === true);
+            })
-                resolve();
-            }))
         },
         openModal() {
             this.modal.showModal = true;
@@ -247,7 +245,6 @@ export default {
                 postLocation(body)
                     .then(
                         location => new Promise(resolve => {
-                            console.log('postLocation', location);
                             this.locations.push(location);
                             this.$store.dispatch('updateLocation', location);
                             resolve();

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue

@@ -50,19 +50,26 @@
                <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
             </div>
 
-            <check-social-action
+            <span v-else-if="socialIssuesSelected.length === 0" class="inline-choice chill-no-data-statement mt-3">
-               v-if="socialIssuesSelected.length || socialActionsSelected.length"
-               v-for="action in socialActionsList"
-               v-bind:key="action.id"
-               v-bind:action="action"
-               v-bind:selection="socialActionsSelected"
-               @updateSelected="updateActionsSelected">
-            </check-social-action>
-
-            <span v-else class="inline-choice chill-no-data-statement mt-3">
                {{ $t('activity.select_first_a_social_issue') }}
             </span>
 
+             <template v-else-if="socialActionsList.length > 0">
+                 <check-social-action
+                     v-if="socialIssuesSelected.length || socialActionsSelected.length"
+                     v-for="action in socialActionsList"
+                     v-bind:key="action.id"
+                     v-bind:action="action"
+                     v-bind:selection="socialActionsSelected"
+                     @updateSelected="updateActionsSelected">
+                 </check-social-action>
+             </template>
+
+            <span v-else-if="actionAreLoaded && socialActionsList.length === 0" class="inline-choice chill-no-data-statement mt-3">
+                {{ $t('activity.social_action_list_empty') }}
+            </span>
+
+
          </div>
       </div>
 
@@ -85,7 +92,8 @@ export default {
    data() {
       return {
          issueIsLoading: false,
-         actionIsLoading: false
+         actionIsLoading: false,
+         actionAreLoaded: false,
       }
    },
    computed: {
@@ -109,6 +117,7 @@ export default {
       /* Load others issues in multiselect
       */
       this.issueIsLoading = true;
+      this.actionAreLoaded = false;
       getSocialIssues().then(response => new Promise((resolve, reject) => {
          this.$store.commit('updateIssuesOther', response.results);
 
@@ -141,6 +150,8 @@ export default {
          this.$store.commit('filterList', 'actions');
 
          this.issueIsLoading = false;
+         this.actionAreLoaded = true;
+         this.updateActionsList();
          resolve();
       }));
    },
@@ -173,7 +184,6 @@ export default {
          to get social actions concerned
       */
       updateActionsList() {
-         //console.log('updateActionsList');
          this.resetActionsList();
          this.socialIssuesSelected.forEach(item => {
 
@@ -188,6 +198,7 @@ export default {
                   this.$store.commit('filterList', 'actions');
 
                   this.actionIsLoading = false;
+                  this.actionAreLoaded = true;
                   resolve();
             }));
          }, this);
@@ -196,6 +207,7 @@ export default {
       */
       resetActionsList() {
          this.$store.commit('resetActionsList');
+         this.actionAreLoaded = false;
          this.socialActionsSelected.forEach(item => {
             this.$store.commit('addActionInList', item);
          }, this);

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue

@@ -10,7 +10,7 @@
             v-bind:value="action"
             />
          <label class="form-check-label" v-bind:for="action.id">
-            {{ action.text }}
+            <span class="badge bg-light text-dark">{{ action.text }}</span>
          </label>
 
       </div>
@@ -34,3 +34,15 @@ export default {
    }
 }
 </script>
+
+<style lang="scss" scoped>
+@import 'ChillMainAssets/module/bootstrap/shared';
+@import 'ChillPersonAssets/chill/scss/mixins';
+@import 'ChillMainAssets/chill/scss/chill_variables';
+span.badge {
+    @include badge_social($social-action-color);
+    font-size: 95%;
+    margin-bottom: 5px;
+    margin-right: 1em;
+}
+</style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue

@@ -10,7 +10,7 @@
             v-bind:value="issue"
             />
          <label class="form-check-label" v-bind:for="issue.id">
-            {{ issue.text }}
+            <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
          </label>
 
       </div>
@@ -34,3 +34,15 @@ export default {
    }
 }
 </script>
+
+<style lang="scss" scoped>
+@import 'ChillMainAssets/module/bootstrap/shared';
+@import 'ChillPersonAssets/chill/scss/mixins';
+@import 'ChillMainAssets/chill/scss/chill_variables';
+span.badge {
+    @include badge_social($social-issue-color);
+    font-size: 95%;
+    margin-bottom: 5px;
+    margin-right: 1em;
+}
+</style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js

@@ -9,6 +9,7 @@ const activityMessages = {
          choose_other_social_issue: "Ajouter une autre problématique sociale...",
          social_actions: "Actions d'accompagnement",
          select_first_a_social_issue: "Sélectionnez d'abord une problématique sociale",
+         social_action_list_empty: "Aucune action sociale disponible",
 
          //
          add_persons: "Ajouter des personnes concernées",

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js

@@ -7,8 +7,19 @@ import App from './App.vue';
 
 const i18n = _createI18n(activityMessages);
 
+const hasSocialIssues = document.querySelector('#social-issues-acc') !== null;
+const hasLocation = document.querySelector('#location') !== null;
+const hasPerson = document.querySelector('#add-persons') !== null;
+
 const app = createApp({
-   template: `<app></app>`,
+   template: `<app :hasSocialIssues="hasSocialIssues", :hasLocation="hasLocation", :hasPerson="hasPerson"></app>`,
+    data() {
+       return {
+           hasSocialIssues,
+           hasLocation,
+           hasPerson,
+       };
+    }
 })
 .use(store)
 .use(i18n)

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js

@@ -1,5 +1,6 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
+import { postLocation } from './api';
 
 const debug = process.env.NODE_ENV !== 'production';
 //console.log('window.activity', window.activity);
@@ -27,7 +28,6 @@ const store = createStore({
     },
     getters: {
         suggestedEntities(state) {
-            console.log(state.activity);
             if (typeof state.activity.accompanyingPeriod === "undefined") {
                 return [];
             }
@@ -303,7 +303,33 @@ const store = createStore({
             let hiddenLocation = document.getElementById(
                 "chill_activitybundle_activity_location"
             );
-            hiddenLocation.value = value.id;
+            if (value.onthefly) {
+                const body = {
+                    "type": "location",
+                    "name": value.name === '__AccompanyingCourseLocation__' ? null : value.name,
+                    "locationType": {
+                        "id": value.locationType.id,
+                        "type": "location-type"
+                    }
+                };
+                if (value.address.id) {
+                    Object.assign(body, {
+                        "address": {
+                            "id": value.address.id
+                        },
+                    })
+                }
+                postLocation(body)
+                    .then(
+                        location => hiddenLocation.value = location.id
+                    ).catch(
+                        err => {
+                            console.log(err.message);
+                        }
+                    );
+            } else {
+                hiddenLocation.value = value.id;
+            }
             commit("updateLocation", value);
         },
     },

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Kernel;
 

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 use Composer\Autoload\ClassLoader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 use Symfony\Component\Debug\Debug;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -18,7 +20,7 @@ use Symfony\Component\HttpFoundation\Request;
 // Feel free to remove this, extend it, or make something more sophisticated.
 if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
+    || !(in_array($_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1'], true) || \PHP_SAPI === 'cli-server')
 ) {
     header('HTTP/1.0 403 Forbidden');
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig

@@ -26,23 +26,45 @@
 
         {{ activity.type.name | localize_translatable_string }}
 
-        <ul class="small_in_title">
+        {% if activity.emergency %}
-            {% if activity.location and t.locationVisible %}
+            <span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
-            <li>
+        {% endif %}
-                <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
+
-                <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
+        <ul class="small_in_title mt-3">
-                {{ activity.location.name }}
+
-            </li>
+            {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
+                <li>
+                    <span class="item-key">{{ 'Sent received'|trans ~ ' : ' }}</span>
+                    <b>{{ activity.sentReceived|capitalize|trans }}</b>
+                </li>
             {% endif %}
+
+            {% if activity.location and t.locationVisible %}
+                <li>
+                    <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
+                    <b>
+                        <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
+                        {{ activity.location.name }}
+                    </b>
+                </li>
+            {% endif %}
+
             {% if activity.user and t.userVisible %}
                 <li>
                     <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                    {{ activity.user.usernameCanonical }}
+                    <b>{{ activity.user.usernameCanonical }}</b>
                 </li>
             {% endif %}
+
+            <li class="associated-persons">
+                <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
+                {% for p in activity.personsAssociated %}
+                    <span class="badge-person">{{ p|chill_entity_render_box }}</span>
+                {% endfor %}
+            </li>
         </ul>
 
-        <ul class="list-content">
+        <ul class="list-content my-3">
             {%- if t.reasonsVisible -%}
                 {%- if activity.reasons is not empty -%}
                     <li class="reasons">
@@ -71,11 +93,9 @@
                 {%- endif -%}
             {% endif %}
         </ul>
-
     </span>
 </h2>
 
-{#
 {% if context == 'person' and activity.accompanyingPeriod is not empty %}
     <div class="mt-3">
         <a class="btn btn-sm btn-outline-primary"
@@ -87,4 +107,4 @@
         </a>
     </div>
 {% endif %}
-#}
+

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -3,89 +3,93 @@
     {{ path(pathname, parms) }}
 {% endmacro %}
 
-{% if context == 'person' %}
+{% macro computeWidth(nbBlocks) %}
-    {% set blocs = [
+    {{ 'flex-basis: ' ~ (100 / nbBlocks)|round(1) ~ '%;' }}
-        {   'title': 'Others persons'|trans,
+{% endmacro %}
+
+{% set blocks = [] %}
+{% if entity.activityType.personsVisible %}
+    {% if context == 'person' %}
+        {% set blocks = blocks|merge([{
+            'title': 'Others persons'|trans,
             'items': entity.persons,
             'path' : 'chill_person_view',
             'key'  : 'person_id'
-        },
+        }]) %}
-        {   'title': 'Third parties'|trans,
+    {% else %}
-            'items': entity.thirdParties,
+        {% set blocks = blocks|merge([{
-            'path' : 'chill_crud_3party_3party_view',
+            'title': 'Persons in accompanying course'|trans,
-            'key'  : 'id'
-        },
-        {   'title': 'Users concerned'|trans,
-            'items': entity.users,
-            'key'  : 'id'
-        },
-    ] %}
-{% else %}
-    {% set blocs = [
-        {   'title': 'Persons in accompanying course'|trans,
             'items': entity.personsAssociated,
             'path' : 'chill_person_view',
             'key'  : 'person_id'
-        },
+        },{
-        {   'title': 'Third persons'|trans,
+            'title': 'Third persons'|trans,
             'items': entity.personsNotAssociated,
             'path' : 'chill_person_view',
-            'key'  : 'person_id'
+            'key'  : 'person_id',
-        },
+        }]) %}
-        {   'title': 'Third parties'|trans,
+    {% endif %}
-            'items': entity.thirdParties,
+{% endif %}
-            'path' : 'chill_crud_3party_3party_view',
+{% if entity.activityType.thirdPartiesVisible %}
-            'key'  : 'id'
+    {% set blocks = blocks|merge([{
-        },
+        'title': 'Third parties'|trans,
-        {   'title': 'Users concerned'|trans,
+        'items': entity.thirdParties,
-            'items': entity.users,
+        'path' : 'chill_crud_3party_3party_view',
-            'key'  : 'id'
+        'key'  : 'id',
-        },
+    }]) %}
-    ] %}
+{% endif %}
+{% if entity.activityType.usersVisible %}
+    {% set blocks = blocks|merge([{
+        'title': 'Users concerned'|trans,
+        'items': entity.users,
+        'key'  : 'id',
+    }]) %}
 {% endif %}
 
 {% if (with_display == 'bloc') %}
 <div class="{{ context }} flex-bloc concerned-groups">
-    {% for bloc in blocs %}
+    {% for bloc in blocks %}
-    <div class="item-bloc">
+
-        <div class="item-row">
+        <div class="item-bloc" style="{{ _self.computeWidth(loop.length) }}">
-            <div class="item-col">
+            <div class="item-row">
-                <h4>{{ bloc.title }}</h4>
+                <div class="item-col">
-            </div>
+                    <h4>{{ bloc.title }}</h4>
-            <div class="item-col">
+                </div>
-                <ul class="list-content">
+                <div class="item-col">
-                    {% for item in bloc.items %}
+                    <ul class="list-content">
-                    <li>
+                        {% for item in bloc.items %}
-                        {% if bloc.path is defined %}
+                            <li>
-                        <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
+                                {% if bloc.path is defined %}
-                            <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                                    <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                                {{ item|chill_entity_render_box({
+                                    <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
-                                    'render': 'raw',
+                                        {{ item|chill_entity_render_box({
-                                    'addAltNames': false
+                                            'render': 'raw',
-                                }) }}
+                                            'addAltNames': false
-                            </span>
+                                        }) }}
-                        </a>
+                                    </span>
-                    {% else %}
+                                    </a>
-                        <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                                {% else %}
-                            {{ item|chill_entity_render_box({
+                                    <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
-                                'render': 'raw',
+                                        {{ item|chill_entity_render_box({
-                                'addAltNames': false
+                                            'render': 'raw',
-                            }) }}
+                                            'addAltNames': false
-                        </span>
+                                        }) }}
-                    {% endif %}
+                                    </span>
-                    </li>
+                                {% endif %}
-                    {% endfor %}
+                            </li>
-                </ul>
+                        {% endfor %}
+                    </ul>
+                </div>
             </div>
         </div>
-    </div>
+
     {% endfor %}
 </div>
 {% endif %}
 
 {% if (with_display == 'row') %}
 <div class="concerned-groups">
-    {% for bloc in blocs %}
+    {% for bloc in blocks %}
     <div class="group">
         {% if bloc.items|length > 0 %}
             <h4>{{ bloc.title }}</h4>
@@ -118,7 +122,7 @@
 
 {% if (with_display == 'wrap-list') %}
 <div class="concerned-groups wrap-list">
-    {% for bloc in blocs %}
+    {% for bloc in blocks %}
         <div class="wl-row">
             {% if bloc.items|length > 0 %}
                 <div class="wl-col title">

src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig

@@ -28,7 +28,9 @@
     {{ form_row(edit_form.socialActions) }}
 {% endif %}
 
+{%- if edit_form.socialIssues is defined or edit_form.socialIssues is defined -%}
 <div id="social-issues-acc"></div>
+{% endif %}
 
 {%- if edit_form.reasons is defined -%}
     {{ form_row(edit_form.reasons) }}
@@ -46,9 +48,10 @@
     {%- if edit_form.users is defined -%}
         {{ form_widget(edit_form.users) }}
     {% endif %}
+
+    <div id="add-persons"></div>
 {% endif %}
 
-<div id="add-persons"></div>
 
 <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig

@@ -2,9 +2,11 @@
     {% for activity in activities | slice(0,5) %}
         {% set t = activity.type %}
 
-        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"></a>
+        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
+            class="badge-link" title="{{ 'Show the activity'|trans }}">
 
-        {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
+            {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
+        </a>
 
     {% endfor %}
 </div>

src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig

@@ -29,25 +29,31 @@
     {{ form_row(form.socialActions) }}
 {% endif %}
 
-<div id="social-issues-acc"></div>
+{%- if form.socialIssues is defined or form.socialIssues is defined -%}
+    <div id="social-issues-acc"></div>
+{% endif %}
 
 {%- if form.reasons is defined -%}
     {{ form_row(form.reasons) }}
 {% endif %}
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+{%- if form.persons is defined or form.thirdParties is defined or form.users is defined -%}
 
-{%- if form.persons is defined -%}
+    <h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-    {{ form_widget(form.persons) }}
-{% endif %}
-{%- if form.thirdParties is defined -%}
-    {{ form_widget(form.thirdParties) }}
-{% endif %}
-{%- if form.users is defined -%}
-    {{ form_widget(form.users) }}
-{% endif %}
 
-<div id="add-persons"></div>
+    {%- if form.persons is defined -%}
+        {{ form_widget(form.persons) }}
+    {% endif %}
+    {%- if form.thirdParties is defined -%}
+        {{ form_widget(form.thirdParties) }}
+    {% endif %}
+    {%- if form.users is defined -%}
+        {{ form_widget(form.users) }}
+    {% endif %}
+
+    <div id="add-persons"></div>
+
+{% endif %}
 
 <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig

@@ -22,7 +22,7 @@
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         });
         window.activity = {{ activity_json|json_encode|raw }};
-        window.default_location_id = {{ default_location_id }};
+        {% if default_location is not null %}window.default_location_id = {{ default_location.id }}{% endif %};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig

@@ -27,7 +27,7 @@
       <dt class="inline">{{ 'Social issues'|trans }}</dt>
       <dd>
         {% if entity.socialIssues|length == 0 %}
-          <p class="chill-no-data-statement">{{ 'Any social issues'|trans }}</p>
+          <p class="chill-no-data-statement">{{ 'No social issues associated'|trans }}</p>
         {% else %}
           {% for si in entity.socialIssues %}{{ si|chill_entity_render_box }}{% endfor %}
         {% endif %}
@@ -38,7 +38,7 @@
       <dt class="inline">{{ 'Social actions'|trans }}</dt>
       <dd>
         {% if entity.socialActions|length == 0 %}
-          <p class="chill-no-data-statement">{{ 'Any social actions'|trans }}</p>
+          <p class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</p>
         {% else %}
           {% for sa in entity.socialActions %}{{ sa|chill_entity_render_box }}{% endfor %}
         {% endif %}
@@ -67,8 +67,8 @@
         <dd>
             {% if entity.location is not null %}
                 <p>
-                    <span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
                     {{ entity.location.name }}
+                    <span> ({{ entity.location.locationType.title|localize_translatable_string }})</span>
                 </p>
                 {{ entity.location.address|chill_entity_render_box }}
             {% else %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig

@@ -9,7 +9,7 @@
 {% block content -%}
 <div class="activity-show">
 
-            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
 
 </div>
 {% endblock content %}

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
@@ -63,7 +65,7 @@ class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierar
     protected function supports($attribute, $subject)
     {
         if ($subject instanceof Center
-            && in_array($attribute, $this->getAttributes())) {
+            && in_array($attribute, $this->getAttributes(), true)) {
             return true;
         }
 

src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Templating\Entity;
 
 use Chill\ActivityBundle\Entity\ActivityReason;

src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Test;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php

@@ -7,21 +7,25 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Controller;
 
 use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Security\Core\Role\Role;
+use function count;
+use function in_array;
 
 /**
  * @internal
  * @coversNothing
  */
-class ActivityControllerTest extends WebTestCase
+final class ActivityControllerTest extends WebTestCase
 {
     public function getSecuredPagesAuthenticated()
     {
-        static::bootKernel();
+        self::bootKernel();
 
         $person = $this->getPersonFromFixtures();
         $activities = $this->getActivitiesForPerson($person);
@@ -57,7 +61,7 @@ class ActivityControllerTest extends WebTestCase
      */
     public function getSecuredPagesUnauthenticated()
     {
-        static::bootKernel();
+        self::bootKernel();
         $person = $this->getPersonFromFixtures();
         $activities = $this->getActivitiesForPerson($person);
 
@@ -200,7 +204,7 @@ class ActivityControllerTest extends WebTestCase
      */
     private function createFakeUser()
     {
-        $container = static::$kernel->getContainer();
+        $container = self::$kernel->getContainer();
         $em = $container->get('doctrine.orm.entity_manager');
 
         //get the social PermissionGroup, and remove CHILL_ACTIVITY_*
@@ -242,7 +246,7 @@ class ActivityControllerTest extends WebTestCase
 
     private function getActivitiesForPerson(\Chill\PersonBundle\Entity\Person $person)
     {
-        $em = static::$kernel->getContainer()
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
         $activities = $em->getRepository('ChillActivityBundle:Activity')
@@ -263,7 +267,7 @@ class ActivityControllerTest extends WebTestCase
      */
     private function getAuthenticatedClient($username = 'center a_social')
     {
-        return static::createClient([], [
+        return self::createClient([], [
             'PHP_AUTH_USER' => $username,
             'PHP_AUTH_PW' => 'password',
         ]);
@@ -274,7 +278,7 @@ class ActivityControllerTest extends WebTestCase
      */
     private function getPersonFromFixtures()
     {
-        $em = static::$kernel->getContainer()
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
         $person = $em->getRepository('ChillPersonBundle:Person')
@@ -298,14 +302,14 @@ class ActivityControllerTest extends WebTestCase
      */
     private function getRandomActivityReason(array $excludeIds = [])
     {
-        $reasons = static::$kernel->getContainer()
+        $reasons = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('ChillActivityBundle:ActivityReason')
             ->findAll();
 
         $reason = $reasons[array_rand($reasons)];
 
-        if (in_array($reason->getId(), $excludeIds)) {
+        if (in_array($reason->getId(), $excludeIds, true)) {
             return $this->getRandomActivityReason($excludeIds);
         }
 
@@ -317,7 +321,7 @@ class ActivityControllerTest extends WebTestCase
      */
     private function getRandomActivityType()
     {
-        $types = static::$kernel->getContainer()
+        $types = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('ChillActivityBundle:ActivityType')
             ->findAll();
@@ -333,7 +337,7 @@ class ActivityControllerTest extends WebTestCase
      */
     private function getRandomScope($username, $centerName)
     {
-        $user = static::$kernel->getContainer()
+        $user = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('ChillMainBundle:User')
             ->findOneByUsername($username);
@@ -343,20 +347,20 @@ class ActivityControllerTest extends WebTestCase
                   . 'does not exists in database. Did you add fixtures ?');
         }
 
-        $center = static::$kernel->getContainer()
+        $center = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('ChillMainBundle:Center')
             ->findOneByName($centerName);
 
         // get scope reachable by both role UPDATE and DELETE
-        $reachableScopesUpdate = static::$kernel->getContainer()
+        $reachableScopesUpdate = self::$kernel->getContainer()
             ->get('chill.main.security.authorization.helper')
             ->getReachableScopes(
                 $user,
                 new Role('CHILL_ACTIVITY_UPDATE'),
                 $center
             );
-        $reachableScopesDelete = static::$kernel->getContainer()
+        $reachableScopesDelete = self::$kernel->getContainer()
             ->get('chill.main.security.authorization.helper')
             ->getReachableScopes(
                 $user,
@@ -364,8 +368,8 @@ class ActivityControllerTest extends WebTestCase
                 $center
             );
         $reachableScopesId = array_intersect(
-            array_map(function ($s) { return $s->getId(); }, $reachableScopesDelete),
+            array_map(static function ($s) { return $s->getId(); }, $reachableScopesDelete),
-            array_map(function ($s) { return $s->getId(); }, $reachableScopesUpdate)
+            array_map(static function ($s) { return $s->getId(); }, $reachableScopesUpdate)
         );
 
         if (count($reachableScopesId) === 0) {
@@ -374,7 +378,7 @@ class ActivityControllerTest extends WebTestCase
         }
 
         foreach ($reachableScopesUpdate as $scope) {
-            if (in_array($scope->getId(), $reachableScopesId)) {
+            if (in_array($scope->getId(), $reachableScopesId, true)) {
                 $reachableScopes[] = $scope;
             }
         }

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
@@ -15,7 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * @internal
  * @coversNothing
  */
-class ActivityReasonCategoryControllerTest extends WebTestCase
+final class ActivityReasonCategoryControllerTest extends WebTestCase
 {
     public function testToWrite()
     {

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
@@ -15,7 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * @internal
  * @coversNothing
  */
-class ActivityReasonControllerTest extends WebTestCase
+final class ActivityReasonControllerTest extends WebTestCase
 {
     public function testToWrite()
     {

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
@@ -15,7 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * @internal
  * @coversNothing
  */
-class ActivityTypeControllerTest extends WebTestCase
+final class ActivityTypeControllerTest extends WebTestCase
 {
     public function testToWrite()
     {

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
@@ -17,7 +19,7 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
  * @internal
  * @coversNothing
  */
-class ActivityReasonAggregatorTest extends AbstractAggregatorTest
+final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
 {
     /**
      * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
@@ -26,9 +28,9 @@ class ActivityReasonAggregatorTest extends AbstractAggregatorTest
 
     public function setUp()
     {
-        static::bootKernel();
+        self::bootKernel();
 
-        $container = static::$kernel->getContainer();
+        $container = self::$kernel->getContainer();
 
         $this->aggregator = $container->get('chill.activity.export.reason_aggregator');
 
@@ -57,11 +59,11 @@ class ActivityReasonAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders()
     {
-        if (null === static::$kernel) {
+        if (null === self::$kernel) {
-            static::bootKernel();
+            self::bootKernel();
         }
 
-        $em = static::$kernel->getContainer()
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
         return [

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
@@ -17,7 +19,7 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
  * @internal
  * @coversNothing
  */
-class ActivityTypeAggregatorTest extends AbstractAggregatorTest
+final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
 {
     /**
      * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
@@ -26,9 +28,9 @@ class ActivityTypeAggregatorTest extends AbstractAggregatorTest
 
     public function setUp()
     {
-        static::bootKernel();
+        self::bootKernel();
 
-        $container = static::$kernel->getContainer();
+        $container = self::$kernel->getContainer();
 
         $this->aggregator = $container->get('chill.activity.export.type_aggregator');
 
@@ -56,11 +58,11 @@ class ActivityTypeAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders()
     {
-        if (null === static::$kernel) {
+        if (null === self::$kernel) {
-            static::bootKernel();
+            self::bootKernel();
         }
 
-        $em = static::$kernel->getContainer()
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
         return [

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

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
@@ -17,7 +19,7 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
  * @internal
  * @coversNothing
  */
-class ActivityUserAggregatorTest extends AbstractAggregatorTest
+final class ActivityUserAggregatorTest extends AbstractAggregatorTest
 {
     /**
      * @var \Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator
@@ -26,9 +28,9 @@ class ActivityUserAggregatorTest extends AbstractAggregatorTest
 
     public function setUp()
     {
-        static::bootKernel();
+        self::bootKernel();
 
-        $container = static::$kernel->getContainer();
+        $container = self::$kernel->getContainer();
 
         $this->aggregator = $container->get('chill.activity.export.user_aggregator');
 
@@ -56,11 +58,11 @@ class ActivityUserAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders()
     {
-        if (null === static::$kernel) {
+        if (null === self::$kernel) {
-            static::bootKernel();
+            self::bootKernel();
         }
 
-        $em = static::$kernel->getContainer()
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
         return [

src/Bundle/ChillActivityBundle/Tests/Export/Export/CountActivityTest.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
@@ -15,7 +17,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
  * @internal
  * @coversNothing
  */
-class CountActivityTest extends AbstractExportTest
+final class CountActivityTest extends AbstractExportTest
 {
     /**
      * @var
@@ -24,9 +26,9 @@ class CountActivityTest extends AbstractExportTest
 
     public function setUp()
     {
-        static::bootKernel();
+        self::bootKernel();
 
-        /* @var $container \Symfony\Component\DependencyInjection\ContainerInterface */
+        /** @var \Symfony\Component\DependencyInjection\ContainerInterface $container */
         $container = self::$kernel->getContainer();
 
         $this->export = $container->get('chill.activity.export.count_activity');

src/Bundle/ChillActivityBundle/Tests/Export/Export/ListActivityTest.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
@@ -15,7 +17,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
  * @internal
  * @coversNothing
  */
-class ListActivityTest extends AbstractExportTest
+final class ListActivityTest extends AbstractExportTest
 {
     /**
      * @var \Chill\ActivityBundle\Export\Export\ListActivity
@@ -24,9 +26,9 @@ class ListActivityTest extends AbstractExportTest
 
     public function setUp()
     {
-        static::bootKernel();
+        self::bootKernel();
 
-        /* @var $container \Symfony\Component\DependencyInjection\ContainerInterface */
+        /** @var \Symfony\Component\DependencyInjection\ContainerInterface $container */
         $container = self::$kernel->getContainer();
 
         $this->export = $container->get('chill.activity.export.list_activity');

src/Bundle/ChillActivityBundle/Tests/Export/Export/StatActivityDurationSumTest.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
@@ -17,7 +19,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
  * @internal
  * @coversNothing
  */
-class StatActivityDurationSumTest extends AbstractExportTest
+final class StatActivityDurationSumTest extends AbstractExportTest
 {
     /**
      * @var \Chill\ActivityBundle\Export\Export\StatActivityDuration
@@ -26,9 +28,9 @@ class StatActivityDurationSumTest extends AbstractExportTest
 
     public function setUp()
     {
-        static::bootKernel();
+        self::bootKernel();
 
-        /* @var $container \Symfony\Component\DependencyInjection\ContainerInterface */
+        /** @var \Symfony\Component\DependencyInjection\ContainerInterface $container */
         $container = self::$kernel->getContainer();
 
         $this->export = $container->get('chill.activity.export.sum_activity_duration');

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php

@@ -7,6 +7,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
@@ -16,7 +18,7 @@ use Doctrine\Common\Collections\ArrayCollection;
  * @internal
  * @coversNothing
  */
-class ActivityReasonFilterTest extends AbstractFilterTest
+final class ActivityReasonFilterTest extends AbstractFilterTest
 {
     /**
      * @var \Chill\PersonBundle\Export\Filter\GenderFilter
@@ -25,9 +27,9 @@ class ActivityReasonFilterTest extends AbstractFilterTest
 
     public function setUp()
     {
-        static::bootKernel();
+        self::bootKernel();
 
-        $container = static::$kernel->getContainer();
+        $container = self::$kernel->getContainer();
 
         $this->filter = $container->get('chill.activity.export.reason_filter');
 
@@ -48,11 +50,11 @@ class ActivityReasonFilterTest extends AbstractFilterTest
 
     public function getFormData()
     {
-        if (null === static::$kernel) {
+        if (null === self::$kernel) {
-            static::bootKernel();
+            self::bootKernel();
         }
 
-        $em = static::$kernel->getContainer()
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
         $reasons = $em->createQuery('SELECT reason '
@@ -69,11 +71,11 @@ class ActivityReasonFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders()
     {
-        if (null === static::$kernel) {
+        if (null === self::$kernel) {
-            static::bootKernel();
+            self::bootKernel();
         }
 
-        $em = static::$kernel->getContainer()
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
         return [