diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
index 6575cf2dc..dbbeb2715 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
@@ -13,7 +13,6 @@ namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
-use DateTime;
 use Doctrine\ORM\QueryBuilder;
 use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -50,14 +49,17 @@ class DateAggregator implements AggregatorInterface
         switch ($data['frequency']) {
             case 'month':
                 $fmt = 'YYYY-MM';
+
                 break;
 
             case 'week':
                 $fmt = 'YYYY-IW';
+
                 break;
 
             case 'year':
                 $fmt = 'YYYY'; $order = 'DESC';
+
                 break; // order DESC does not works !
 
             default:
@@ -98,7 +100,6 @@ class DateAggregator implements AggregatorInterface
 
             switch ($data['frequency']) {
                 case 'month':
-
                 case 'week':
                     //return $this->translator->trans('for week') .' '. $value ;
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
index 931140f57..8c98e1049 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@@ -16,7 +16,6 @@ use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Closure;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use function in_array;
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
index 3bd5ba831..2b1ac57b5 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@@ -61,7 +61,7 @@ class ActivityUserAggregator implements AggregatorInterface
 
     public function getLabels($key, $values, $data): Closure
     {
-    return function ($value) {
+        return function ($value) {
             if ('_header' === $value) {
                 return 'Activity user';
             }
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
index be8caf561..bfd785554 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
@@ -25,8 +25,8 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-use function array_key_exists;
 use function count;
+use function in_array;
 
 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
@@ -67,7 +67,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         $qb->addSelect($elem . ' as ' . $alias);
 
         // make a jointure only if needed
-        if (!in_array( 'actreasons', $qb->getAllAliases(), true)) {
+        if (!in_array('actreasons', $qb->getAllAliases(), true)) {
             $qb->innerJoin('activity.reasons', 'actreasons');
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
index 40f50248d..fa4168d60 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
@@ -21,6 +21,7 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgActivityDuration implements ExportInterface, GroupedExportInterface
@@ -55,7 +56,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period duration' : $value;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
index b547baf8e..e127fc2ff 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
@@ -21,6 +21,7 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
@@ -56,7 +57,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_visit_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period visit duration' : $value;
@@ -89,8 +90,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         $qb
             ->join('activity.accompanyingPeriod', 'acp')
             ->select('AVG(activity.travelTime) as export_avg_activity_visit_duration')
-            ->andWhere($qb->expr()->isNotNull('activity.travelTime'))
-            ;
+            ->andWhere($qb->expr()->isNotNull('activity.travelTime'));
 
         return $qb;
     }
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
index faac97fbb..380388d58 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@@ -23,6 +23,7 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class CountActivity implements ExportInterface, GroupedExportInterface
 {
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
index 3bd9209e2..c4e0c55d2 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
@@ -21,7 +21,9 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class SumActivityDuration implements ExportInterface, GroupedExportInterface
 {
@@ -56,7 +58,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period duration' : $value;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
index 898230aa7..5a525a90c 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
@@ -21,7 +21,9 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
 {
@@ -56,7 +58,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_visit_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period visit duration' : $value;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
index 6a87498f4..9af9c4c2a 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
@@ -21,6 +21,7 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class CountActivity implements ExportInterface, GroupedExportInterface
 {
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
index d17a6af99..0ad56d8f6 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -18,10 +25,10 @@ use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class ActivityTypeFilter implements FilterInterface
 {
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
index 21e9dccec..5338da791 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -17,8 +17,6 @@ use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -79,8 +77,8 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
             'multiple' => true,
             'expanded' => false,
             'attr' => [
-                'class' => 'select2'
-            ]
+                'class' => 'select2',
+            ],
         ]);
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
index 1b6e49127..5634358c7 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -19,14 +19,13 @@ use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-use function array_key_exists;
 use function count;
+use function in_array;
 
 class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
 {
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
index 4f2e0386e..4a1d4bfa7 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
@@ -14,11 +14,8 @@ namespace Chill\ActivityBundle\Form\Type;
 use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TranslatableActivityType extends AbstractType
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
index 38b75894d..fd5d52fce 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
@@ -12,11 +12,8 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\ActivityType;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-use UnexpectedValueException;
 
 final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
 {
@@ -24,15 +21,7 @@ final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
 
     public function __construct(EntityManagerInterface $em)
     {
-        $this->repository =  $em->getRepository(ActivityType::class);
-    }
-
-    /**
-     * @return array|ActivityType[]
-     */
-    public function findAllActive(): array
-    {
-        return $this->findBy(['active' => true]);
+        $this->repository = $em->getRepository(ActivityType::class);
     }
 
     public function find($id): ?ActivityType
@@ -48,6 +37,14 @@ final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
         return $this->repository->findAll();
     }
 
+    /**
+     * @return array|ActivityType[]
+     */
+    public function findAllActive(): array
+    {
+        return $this->findBy(['active' => true]);
+    }
+
     /**
      * @return array|ActivityType[]
      */
@@ -65,6 +62,4 @@ final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
     {
         return ActivityType::class;
     }
-
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
index 533798e5e..2148a02f5 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\ActivityType;
@@ -11,5 +20,4 @@ interface ActivityTypeRepositoryInterface extends ObjectRepository
      * @return array|ActivityType[]
      */
     public function findAllActive(): array;
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
index 597d63884..2e55f862c 100644
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
@@ -49,16 +49,16 @@ class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierar
         return $this->getAttributes();
     }
 
-    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
-    {
-        return $this->helper->voteOnAttribute($attribute, $subject, $token);
-    }
-
     protected function supports($attribute, $subject)
     {
         return $this->helper->supports($attribute, $subject);
     }
 
+    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
+    {
+        return $this->helper->voteOnAttribute($attribute, $subject, $token);
+    }
+
     private function getAttributes()
     {
         return [self::STATS, self::LISTS];
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
index d9b3a8cfb..c37935c21 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -16,6 +23,10 @@ use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialActionAggregat
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class BySocialActionAggregatorTest extends AbstractAggregatorTest
 {
     private BySocialActionAggregator $aggregator;
@@ -52,8 +63,7 @@ final class BySocialActionAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
                 ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.socialActions', 'actsocialaction')
-                ,
+                ->join('activity.socialActions', 'actsocialaction'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
index 87e8462db..36fe6d7c3 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -16,6 +23,10 @@ use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialIssueAggregato
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class BySocialIssueAggregatorTest extends AbstractAggregatorTest
 {
     private BySocialIssueAggregator $aggregator;
@@ -52,8 +63,7 @@ final class BySocialIssueAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
                 ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.socialIssues', 'actsocialissue')
-                ,
+                ->join('activity.socialIssues', 'actsocialissue'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php
index c9a824dc3..dbd5765b1 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -16,6 +23,10 @@ use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByThirdpartyAggregator
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
 {
     private ByThirdpartyAggregator $aggregator;
@@ -52,8 +63,7 @@ final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
                 ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.thirdParties', 'acttparty')
-                ,
+                ->join('activity.thirdParties', 'acttparty'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php
index 00243ce68..3b0eb38f0 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -16,6 +23,10 @@ use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByUserAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class ByUserAggregatorTest extends AbstractAggregatorTest
 {
     private ByUserAggregator $aggregator;
@@ -52,8 +63,7 @@ final class ByUserAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
                 ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.users', 'actusers')
-                ,
+                ->join('activity.users', 'actusers'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php
index c5a1b083c..a3e8f2642 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -16,6 +23,10 @@ use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\DateAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class DateAggregatorTest extends AbstractAggregatorTest
 {
     private DateAggregator $aggregator;
@@ -43,7 +54,7 @@ final class DateAggregatorTest extends AbstractAggregatorTest
             ],
             [
                 'frequency' => 'year',
-            ]
+            ],
         ];
     }
 
@@ -59,8 +70,7 @@ final class DateAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ,
+                ->join('activity.accompanyingPeriod', 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php
index 69be2c900..88ac8a2ac 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -16,6 +23,10 @@ use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\LocationTypeAggregator
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class LocationTypeAggregatorTest extends AbstractAggregatorTest
 {
     private LocationTypeAggregator $aggregator;
@@ -52,8 +63,7 @@ final class LocationTypeAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
                 ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.location', 'actloc')
-                ,
+                ->join('activity.location', 'actloc'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php
index 73943ce7f..0c897be38 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -16,6 +23,10 @@ use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\UserScopeAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class UserScopeAggregatorTest extends AbstractAggregatorTest
 {
     private UserScopeAggregator $aggregator;
@@ -52,8 +63,7 @@ final class UserScopeAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
                 ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.user', 'actuser')
-                ,
+                ->join('activity.user', 'actuser'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
index 6de364ae7..1c312a8bc 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -16,6 +23,10 @@ use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggre
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
 {
     private ActivityReasonAggregator $aggregator;
@@ -40,7 +51,7 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
             ],
             [
                 'level' => 'categories',
-            ]
+            ],
         ];
     }
 
@@ -58,8 +69,7 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
                 ->from(Activity::class, 'activity')
                 ->join('activity.person', 'actperson')
                 ->innerJoin('activity.reasons', 'actreasons')
-                ->join('actreasons.category', 'actreasoncat')
-                ,
+                ->join('actreasons.category', 'actreasoncat'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
index 10f16247e..c9b073310 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -59,7 +66,7 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'accepted_activitytypes' => $a
+                'accepted_activitytypes' => $a,
             ];
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
index 1480e3569..54c12d97f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -57,7 +64,7 @@ final class BySocialActionFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'accepted_socialactions' => $a
+                'accepted_socialactions' => $a,
             ];
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
index 6af3ea97c..4cfa3b428 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -57,7 +64,7 @@ final class BySocialIssueFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'accepted_socialissues' => $a
+                'accepted_socialissues' => $a,
             ];
         }
 
@@ -76,8 +83,7 @@ final class BySocialIssueFilterTest extends AbstractFilterTest
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
-                ->join('activity.socialIssues', 'actsocialissue')
-            ,
+                ->join('activity.socialIssues', 'actsocialissue'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php
index 93810433d..ad8d785c3 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -57,7 +64,7 @@ final class ByUserFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'accepted_users' => $a
+                'accepted_users' => $a,
             ];
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php
index d90523bed..5f12271c0 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -45,8 +52,8 @@ final class EmergencyFilterTest extends AbstractFilterTest
     public function getFormData(): array
     {
         return [
-            ['accepted_emergency' => true ],
-            ['accepted_emergency' => false ],
+            ['accepted_emergency' => true],
+            ['accepted_emergency' => false],
         ];
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php
index dcac884b9..d16f487d7 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -57,7 +64,7 @@ final class LocationTypeFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'accepted_locationtype' => $a
+                'accepted_locationtype' => $a,
             ];
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php
index b40443ee4..6b3942e6a 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -45,8 +52,8 @@ final class SentReceivedFilterTest extends AbstractFilterTest
     public function getFormData(): array
     {
         return [
-            ['accepted_sentreceived' => Activity::SENTRECEIVED_SENT ],
-            ['accepted_sentreceived' => Activity::SENTRECEIVED_RECEIVED ]
+            ['accepted_sentreceived' => Activity::SENTRECEIVED_SENT],
+            ['accepted_sentreceived' => Activity::SENTRECEIVED_RECEIVED],
         ];
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php
index cc1a1b81a..610b0fdce 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -57,7 +64,7 @@ final class UserFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'accepted_users' => $a
+                'accepted_users' => $a,
             ];
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php
index 31ff8ca57..dd3f60264 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -57,7 +64,7 @@ final class UserScopeFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'accepted_userscope' => $a
+                'accepted_userscope' => $a,
             ];
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
index b65d3808d..d280adc92 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,11 +9,19 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Filter\ActivityDateFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
@@ -46,9 +54,9 @@ final class ActivityDateFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => \DateTime::createFromFormat('Y-m-d', '2020-01-01'),
-                'date_to' => \DateTime::createFromFormat('Y-m-d', '2021-01-01'),
-            ]
+                'date_from' => DateTime::createFromFormat('Y-m-d', '2020-01-01'),
+                'date_to' => DateTime::createFromFormat('Y-m-d', '2021-01-01'),
+            ],
         ];
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
index 578b23df7..114c0f730 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
@@ -57,7 +57,7 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'types' => $a
+                'types' => $a,
             ];
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
index e6b14b44c..367f44ea4 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -57,7 +64,7 @@ final class ActivityReasonFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'reasons' => $a
+                'reasons' => $a,
             ];
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
index 5cad68da4..76d47c986 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,12 +9,20 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
@@ -57,9 +65,9 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'date_from' => \DateTime::createFromFormat('Y-m-d', '2021-07-01'),
-                'date_to' => \DateTime::createFromFormat('Y-m-d', '2022-07-01'),
-                'reasons' => $a
+                'date_from' => DateTime::createFromFormat('Y-m-d', '2021-07-01'),
+                'date_to' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
+                'reasons' => $a,
             ];
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php b/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php
index 87a00d0b4..400619990 100644
--- a/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php
+++ b/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Command;
 
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MachineTokenStorage;
diff --git a/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php b/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
index 7d9eec59a..902fe4c38 100644
--- a/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
+++ b/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Command;
 
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\EventsOnUserSubscriptionCreator;
diff --git a/src/Bundle/ChillCalendarBundle/Command/SendShortMessageOnEligibleCalendar.php b/src/Bundle/ChillCalendarBundle/Command/SendShortMessageOnEligibleCalendar.php
index 091436561..6625a7adb 100644
--- a/src/Bundle/ChillCalendarBundle/Command/SendShortMessageOnEligibleCalendar.php
+++ b/src/Bundle/ChillCalendarBundle/Command/SendShortMessageOnEligibleCalendar.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Command;
 
 use Chill\CalendarBundle\Service\ShortMessageNotification\BulkCalendarShortMessageSender;
diff --git a/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php b/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
index 9d79f5654..5891a7be8 100644
--- a/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
+++ b/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Command;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php b/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
index 05ab52718..3016e1660 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php
index cd220972f..9352e42fa 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\OnBehalfOfUserTokenStorage;
diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php
index e07895782..535dda2f5 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Messenger\Message\MSGraphChangeNotificationMessage;
diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php
index 0523bbd19..a95aa1a3f 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
diff --git a/src/Bundle/ChillCalendarBundle/Entity/RemoteCalendarTrait.php b/src/Bundle/ChillCalendarBundle/Entity/RemoteCalendarTrait.php
index 9e162541d..31282fb0b 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/RemoteCalendarTrait.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/RemoteCalendarTrait.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
index 9b0fca7bb..4b888d22f 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Templating\Entity\UserRender;
 use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class AgentAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
index 4ff442018..5daf4231c 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class CancelReasonAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
index 7085874fd..e5acf8f16 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class JobAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
index 9fad152ad..704278b8d 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
@@ -17,7 +17,7 @@ use Chill\MainBundle\Repository\LocationRepository;
 use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use function in_array;
 
 final class LocationAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
index 37b4204ff..e027f5a9e 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class LocationTypeAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
index d19e365b2..54c9584e8 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Export\AggregatorInterface;
 use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 class MonthYearAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
index 2fa0d5c2f..e8d0c7752 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ScopeAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
index fbbbe03b9..f25ccad07 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 class JobFilter implements FilterInterface
 {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
index c2edabcb5..15380c343 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 class ScopeFilter implements FilterInterface
 {
diff --git a/src/Bundle/ChillCalendarBundle/Form/DataTransformer/IdToCalendarRangeDataTransformer.php b/src/Bundle/ChillCalendarBundle/Form/DataTransformer/IdToCalendarRangeDataTransformer.php
index 69bb9eca1..c9643b953 100644
--- a/src/Bundle/ChillCalendarBundle/Form/DataTransformer/IdToCalendarRangeDataTransformer.php
+++ b/src/Bundle/ChillCalendarBundle/Form/DataTransformer/IdToCalendarRangeDataTransformer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Form\DataTransformer;
 
 use Chill\CalendarBundle\Repository\CalendarRangeRepository;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
index cbb765fba..94ba4974c 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Doctrine;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
index 7d85a7537..7628c7af4 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Doctrine;
 
 use Chill\CalendarBundle\Entity\CalendarRange;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php
index 8f8b724a5..4e3ae5891 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Handler;
 
 use Chill\CalendarBundle\Messenger\Message\CalendarRangeRemovedMessage;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php
index 60eb2ae23..79bcd24ee 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Handler;
 
 use Chill\CalendarBundle\Messenger\Message\CalendarRangeMessage;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php
index 81e23e745..f087766ec 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Handler;
 
 use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php
index e0a4c30ee..361fd33c2 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Handler;
 
 use Chill\CalendarBundle\Entity\CalendarRange;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php
index 30888a05b..e1df3ac3d 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Handler;
 
 use Chill\CalendarBundle\Messenger\Message\InviteUpdateMessage;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php
index 744b1a301..9c1e84511 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Handler;
 
 use Chill\CalendarBundle\Messenger\Message\MSGraphChangeNotificationMessage;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php
index 44af1e6a7..ec5977ad3 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Message;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeMessage.php
index b02697147..526826ff8 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeMessage.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Message;
 
 use Chill\CalendarBundle\Entity\CalendarRange;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeRemovedMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeRemovedMessage.php
index e855f91a3..783484592 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeRemovedMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeRemovedMessage.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Message;
 
 use Chill\CalendarBundle\Entity\CalendarRange;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
index 2c3db661b..65831ebe0 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Message;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/InviteUpdateMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/InviteUpdateMessage.php
index ddb5d9028..35f78fc7d 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/InviteUpdateMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/InviteUpdateMessage.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Message;
 
 use Chill\CalendarBundle\Entity\Invite;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/MSGraphChangeNotificationMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/MSGraphChangeNotificationMessage.php
index f5e0f98cb..f1d3b6b04 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/MSGraphChangeNotificationMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/MSGraphChangeNotificationMessage.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Messenger\Message;
 
 class MSGraphChangeNotificationMessage
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/AddressConverter.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/AddressConverter.php
index 3d283ed9d..8b86ba0ec 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/AddressConverter.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/AddressConverter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
index de80aa3fd..c400b6694 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/LocationConverter.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/LocationConverter.php
index bf34ff8bb..396dfd931 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/LocationConverter.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/LocationConverter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\MainBundle\Entity\Location;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSGraphUserRepository.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSGraphUserRepository.php
index d3caea942..c523a1e92 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSGraphUserRepository.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSGraphUserRepository.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php
index 32a4cdf01..cc1692fb7 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineTokenStorage.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineTokenStorage.php
index 31533722e..ac62d44ac 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineTokenStorage.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineTokenStorage.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\MainBundle\Redis\ChillRedis;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
index 402da0b73..504d48ffc 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php
index 9ca988287..9777bf4c0 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
index 580c95888..28f68e0e9 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use LogicException;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
index 15b77a297..ac1de552a 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php
index 18d1e4632..a9227282d 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteToLocalSync;
 
 use Chill\CalendarBundle\Entity\CalendarRange;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php
index db947e039..984e77d87 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteToLocalSync;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
index 8d36a8f8e..c376f9680 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php
index 54440053b..211810abf 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
index c6ae4610d..e3ef89ca4 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Connector;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
index f6631f0cc..f56735de7 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\DependencyInjection;
 
 use Chill\CalendarBundle\Command\AzureGrantAdminConsentAndAcquireToken;
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php
index b96fa0a3b..13c4a1c6a 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\RemoteCalendar\Model;
 
 use DateTimeImmutable;
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php
index 4832d2735..c331a3d3c 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php
index bc62a6a65..a90f6a28c 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
index 54bdcb5fb..6cb091946 100644
--- a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
+++ b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Security\Voter;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Security/Voter/InviteVoter.php b/src/Bundle/ChillCalendarBundle/Security/Voter/InviteVoter.php
index 83caa5f64..36ca66d05 100644
--- a/src/Bundle/ChillCalendarBundle/Security/Voter/InviteVoter.php
+++ b/src/Bundle/ChillCalendarBundle/Security/Voter/InviteVoter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Security\Voter;
 
 use Chill\CalendarBundle\Entity\Invite;
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php
index 06a67c1ce..a35fffce0 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php
index feb3b698b..4e3722ea8 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php
index 0587296a5..5cd4a6168 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use DateInterval;
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
index 2abb3cb00..cd61a8624 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php
index 7117d982b..5ba5acb35 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use DateTimeImmutable;
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/ShortMessageForCalendarBuilderInterface.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/ShortMessageForCalendarBuilderInterface.php
index ffcc8fe5c..65856a437 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/ShortMessageForCalendarBuilderInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/ShortMessageForCalendarBuilderInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php
index 2be0cef24..e805f71aa 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php b/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php
index 348620faf..e37436ad3 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Tests\Entity;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php b/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
index 8adc0599c..3ddc2e836 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Tests\Form;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
index d4fcbf46c..485146939 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Tests\RemoteCalendar\Connector\MSGraph;
 
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\AddressConverter;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php
index 6ff112956..92280f6c1 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Tests\RemoteCalendar\Connector\MSGraph;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php
index f7f658b92..6ccd7a35e 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Tests\RemoteCalendar\Connector\MSGraph;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php
index 3ea81afdc..604b707c0 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Tests\RemoteCalendar\Connector\MSGraph;
 
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\AddressConverter;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php
index fc1262d64..0c190f51d 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Tests\Service\ShortMessageNotification;
 
 use ArrayIterator;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
index ffeefa213..261687515 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Tests\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php
index 7d873c0c1..de2b97963 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Tests\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Service\ShortMessageNotification\DefaultRangeGenerator;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php
index 736bea81d..6d42540cc 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\CalendarBundle\Tests\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220510155609.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220510155609.php
index 30927836e..e023389ca 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220510155609.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220510155609.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220511134619.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220511134619.php
index 1d3ed2784..b82d1b442 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220511134619.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220511134619.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220525080633.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220525080633.php
index fe4c6baf1..344d3a2e6 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220525080633.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220525080633.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220606153851.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220606153851.php
index 1ae43eb41..8b6974670 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220606153851.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220606153851.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220606154119.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220606154119.php
index 990e5bcab..eec87a628 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220606154119.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220606154119.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220608084052.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220608084052.php
index 390e1b743..8fa727533 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220608084052.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220608084052.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220609200857.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220609200857.php
index 8894da5d3..75e3fa61c 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220609200857.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220609200857.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220613202636.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220613202636.php
index 9e9099384..82eda3800 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220613202636.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220613202636.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220629095515.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220629095515.php
index ebc677473..7179bb79a 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220629095515.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220629095515.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
index f3dc04e74..f8de4de36 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
@@ -78,10 +78,10 @@ class PersonDocumentType extends AbstractType
             ]);
 
         if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
-/*            dump($isScopeConcerned);
-            dump($this->parameterBag->get('chill_main')['acl']['form_show_scopes']);
+            /*            dump($isScopeConcerned);
+                        dump($this->parameterBag->get('chill_main')['acl']['form_show_scopes']);
 
-            dump($this->centerResolverDispatcher)*/
+                        dump($this->centerResolverDispatcher)*/
 
             $builder->add('scope', ScopePickerType::class, [
                 'center' => $this->centerResolverDispatcher->resolveCenter($document),
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
index fa9994408..f75840c3a 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
 use Chill\MainBundle\Service\ShortMessage\NullShortMessageSender;
diff --git a/src/Bundle/ChillMainBundle/Export/ExportManager.php b/src/Bundle/ChillMainBundle/Export/ExportManager.php
index 5b490cf5b..aec5998ff 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportManager.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportManager.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Export;
 
 use Chill\MainBundle\Form\Type\Export\ExportType;
 use Chill\MainBundle\Form\Type\Export\PickCenterType;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
diff --git a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
index 9df6d053d..5cc50f185 100644
--- a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Form\DataTransformer;
 
 use Closure;
diff --git a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToLocationDataTransformer.php b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToLocationDataTransformer.php
index f75316956..6dc6c0399 100644
--- a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToLocationDataTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToLocationDataTransformer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Form\DataTransformer;
 
 use Chill\MainBundle\Repository\LocationRepository;
diff --git a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToUserDataTransformer.php b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToUserDataTransformer.php
index 2884480ce..fb99a6871 100644
--- a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToUserDataTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToUserDataTransformer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Form\DataTransformer;
 
 use Chill\MainBundle\Repository\UserRepository;
diff --git a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToUsersDataTransformer.php b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToUsersDataTransformer.php
index 831eb4568..78d4ae0a8 100644
--- a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToUsersDataTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToUsersDataTransformer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Form\DataTransformer;
 
 use Chill\MainBundle\Repository\UserRepository;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index c63661cfd..20db0b535 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -14,9 +14,7 @@ namespace Chill\MainBundle\Form\Type\Export;
 use Chill\MainBundle\Center\GroupingCenterInterface;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Export\ExportManager;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
-use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
@@ -49,9 +47,6 @@ class PickCenterType extends AbstractType
      */
     protected array $groupingCenters = [];
 
-    /**
-     * @var \Symfony\Component\Security\Core\User\UserInterface
-     */
     protected UserInterface $user;
 
     public function __construct(
diff --git a/src/Bundle/ChillMainBundle/Notification/Mailer.php b/src/Bundle/ChillMainBundle/Notification/Mailer.php
index b54e0cded..7fd897d91 100644
--- a/src/Bundle/ChillMainBundle/Notification/Mailer.php
+++ b/src/Bundle/ChillMainBundle/Notification/Mailer.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\User;
 use Psr\Log\LoggerInterface;
-use Swift_Message;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mime\Email;
 use Symfony\Component\Routing\RouterInterface;
diff --git a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
index d4179f799..eaa0a6b1e 100644
--- a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
@@ -14,7 +14,6 @@ namespace Chill\MainBundle\Repository;
 use Chill\MainBundle\Entity\Center;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ObjectRepository;
 
 final class CenterRepository implements CenterRepositoryInterface
 {
diff --git a/src/Bundle/ChillMainBundle/Repository/CenterRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/CenterRepositoryInterface.php
index 27ba64caf..b933a34b7 100644
--- a/src/Bundle/ChillMainBundle/Repository/CenterRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/CenterRepositoryInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Center;
@@ -8,11 +17,11 @@ use Doctrine\Persistence\ObjectRepository;
 interface CenterRepositoryInterface extends ObjectRepository
 {
     /**
-     * Return all active centers
+     * Return all active centers.
      *
      * Note: this is a teaser: active will comes later on center entity
      *
      * @return Center[]
      */
     public function findActive(): array;
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
index 75e8b90b4..7889f9253 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
index 12b30cac7..62ac2b81b 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Security\Authorization;
 
-use Chill\MainBundle\Entity\User;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessage/NullShortMessageSender.php b/src/Bundle/ChillMainBundle/Service/ShortMessage/NullShortMessageSender.php
index 2d5e3e7e2..82dea7bc6 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessage/NullShortMessageSender.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessage/NullShortMessageSender.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Service\ShortMessage;
 
 class NullShortMessageSender implements ShortMessageSenderInterface
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessage.php b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessage.php
index 360dce5be..145e90593 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessage.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessage.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Service\ShortMessage;
 
 use libphonenumber\PhoneNumber;
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageHandler.php b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageHandler.php
index 805f809d9..924335ad9 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageHandler.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Service\ShortMessage;
 
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageSenderInterface.php b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageSenderInterface.php
index fb52aac23..00e003709 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageSenderInterface.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageSenderInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Service\ShortMessage;
 
 interface ShortMessageSenderInterface
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporter.php b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporter.php
index 693a08e5c..6fdc8b05d 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporter.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Service\ShortMessage;
 
 class ShortMessageTransporter implements ShortMessageTransporterInterface
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporterInterface.php b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporterInterface.php
index 42142c7eb..b8832f507 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporterInterface.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporterInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Service\ShortMessage;
 
 interface ShortMessageTransporterInterface
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessageOvh/OvhShortMessageSender.php b/src/Bundle/ChillMainBundle/Service/ShortMessageOvh/OvhShortMessageSender.php
index 7b9df2309..e3273578a 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessageOvh/OvhShortMessageSender.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessageOvh/OvhShortMessageSender.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Service\ShortMessageOvh;
 
 use Chill\MainBundle\Service\ShortMessage\ShortMessage;
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
index 6552361d2..38f80200d 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
@@ -25,6 +25,7 @@ use function is_string;
 /**
  * Helper which creates a set of test for aggregators.
  *
+ * @internal
  */
 abstract class AbstractAggregatorTest extends KernelTestCase
 {
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
index 67076bc1b..88607e7d9 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
@@ -24,6 +24,7 @@ use function is_string;
 /**
  *  Helper to test filters.
  *
+ * @internal
  */
 abstract class AbstractFilterTest extends KernelTestCase
 {
diff --git a/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php b/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
index 1754ffe14..57768bf6e 100644
--- a/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
@@ -19,6 +19,7 @@ namespace Chill\MainBundle\Test;
  *
  * @deprecated use @see{\Prophecy\PhpUnit\ProphecyTrait} instead
  * @codeCoverageIgnore
+ *
  * @deprecated use @class{Prophecy\PhpUnit\ProphecyTrait} instead
  */
 trait ProphecyTrait
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php b/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php
index ffcd538cd..2d2cb8e95 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Form\DataTransformer;
 
 use Chill\MainBundle\Form\DataTransformer\IdToEntityDataTransformer;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220506223243.php b/src/Bundle/ChillMainBundle/migrations/Version20220506223243.php
index c85c4aa35..72d025f2b 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220506223243.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220506223243.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220829132409.php b/src/Bundle/ChillMainBundle/migrations/Version20220829132409.php
index 2012aba27..2734e68f1 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220829132409.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220829132409.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionCRUDController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionCRUDController.php
index 40ecc8736..fd510445c 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionCRUDController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionCRUDController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -23,4 +30,4 @@ class HouseholdCompositionCRUDController extends CRUDController
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 5905990ff..d4b4ba335 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -46,8 +46,6 @@ use function is_array;
 
 final class PersonController extends AbstractController
 {
-    private AuthorizationHelperInterface $authorizationHelper;
-
     /**
      * @var ConfigPersonAltNamesHelper
      */
@@ -73,6 +71,8 @@ final class PersonController extends AbstractController
      */
     protected $translator;
 
+    private AuthorizationHelperInterface $authorizationHelper;
+
     /**
      * @var EntityManagerInterface
      */
@@ -248,7 +248,7 @@ final class PersonController extends AbstractController
                 || count($alternatePersons) === 0
             ) {
                 $this->denyAccessUnlessGranted(PersonVoter::CREATE, $person);
-                
+
                 $this->em->persist($person);
 
                 $this->em->flush();
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
index 2ace4241e..d9fb57e35 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class AdministrativeLocationAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
index 7655df2c4..dfa94e842 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
@@ -13,11 +13,8 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Chill\PersonBundle\Export\Declarations;
-use Chill\PersonBundle\Repository\AccompanyingPeriod\ClosingMotiveRepository;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\ClosingMotiveRepositoryInterface;
-use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -63,7 +60,7 @@ class ClosingMotiveAggregator implements AggregatorInterface
                 return 'Closing motive';
             }
 
-            if (NULL === $value) {
+            if (null === $value) {
                 return '';
             }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
index 18a1b3dea..ef90ee6be 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -11,70 +20,13 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 final class GeographicalUnitStatAggregator implements AggregatorInterface
 {
-    /*
-    private EntityRepository $repository;
-
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->repository = $em->getRepository(...::class);
-    }
-    */
-
-    /**
-     * @inheritDoc
-     */
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Geographical unit';
-            }
-
-            $g = $this->repository->find($value);
-
-            return $g; //...
-        };
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getQueryKeys($data): array
-    {
-        return ['geographicalunitstat_aggregator'];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // TODO: Implement buildForm() method.
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getTitle(): string
-    {
-        return 'Group by geographical unit';
-    }
-
-    /**
-     * @inheritDoc
-     */
     public function addRole(): ?string
     {
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function alterQuery(QueryBuilder $qb, $data)
     {
-
         //$qb->addSelect('... AS geographicalunitstat_aggregator');
 
         $groupby = $qb->getDQLPart('groupBy');
@@ -86,11 +38,44 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
         }
     }
 
-    /**
-     * @inheritDoc
-     */
     public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }
-}
\ No newline at end of file
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+    /*
+    private EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(...::class);
+    }
+     */
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Geographical unit';
+            }
+
+            return $this->repository->find($value);
+              //...
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['geographicalunitstat_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by geographical unit';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php
index b36e88878..d054a4a3f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class JobAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
index 1299a6c45..3c96b6d06 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class OriginAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
index e78da1c12..1498fc3a1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ReferrerAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
index 2f716c92a..9a7c3a83a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
index 7ffbe6511..184be96c3 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ScopeAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
index 584d616de..bf0c9ba26 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
@@ -17,6 +17,7 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class SocialIssueAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
index 498daa20d..1c01b76bd 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
@@ -63,7 +63,7 @@ final class StepAggregator implements AggregatorInterface //, FilterInterface
 
         $qb->add('where', $where);
         $qb->setParameter('ondate', $data['on_date'], Types::DATE_MUTABLE);
-        */
+         */
     }
 
     public function applyOn(): string
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
index a0d9e005f..8024cb08b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
@@ -17,7 +17,6 @@ use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -73,7 +72,7 @@ class ChildrenNumberAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, $data)
     {
-        return function ($value): string {
+        return static function ($value): string {
             if ('_header' === $value) {
                 return 'Number of children';
             }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
index a6d85d0ca..ad7b7030f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
@@ -19,7 +19,6 @@ use Chill\PersonBundle\Repository\Household\HouseholdCompositionTypeRepository;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use function in_array;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
index 018354cea..73e0eedd6 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
@@ -24,6 +24,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 final class HouseholdPositionAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
index 4ebc12ff5..686f907ef 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
@@ -17,6 +17,7 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\MaritalStatusRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class MaritalStatusAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
index 8902b3651..fbdac5d40 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
@@ -17,6 +17,7 @@ use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ActionTypeAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
index 70f092b19..41e0ad086 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
@@ -17,6 +17,7 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class GoalAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
index 48075c38b..e2934247a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -8,14 +17,16 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
 use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class GoalResultAggregator implements AggregatorInterface
 {
-    private ResultRepository $resultRepository;
-
     private GoalRepository $goalRepository;
 
+    private ResultRepository $resultRepository;
+
     private TranslatableStringHelper $translatableStringHelper;
 
     public function __construct(
@@ -28,86 +39,11 @@ class GoalResultAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-
-    /**
-     * @inheritDoc
-     */
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value) use ($key): string {
-            if (null === $value) {
-                return '';
-            }
-
-            switch ($key) {
-                case 'goal_aggregator':
-
-                    if ('_header' === $value) {
-                        return 'Goal Type';
-                    }
-
-                    $g = $this->goalRepository->find($value);
-
-                    return $this->translatableStringHelper->localize(
-                        $g->getTitle()
-                    );
-
-                case 'result_aggregator':
-
-                    if ('_header' === $value) {
-                        return 'Result Type';
-                    }
-
-                    $r = $this->resultRepository->find($value);
-
-                    return $this->translatableStringHelper->localize(
-                        $r->getTitle()
-                    );
-
-                default:
-                    throw new \LogicException();
-            }
-        };
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getQueryKeys($data): array
-    {
-        return [
-            'goal_aggregator',
-            'result_aggregator'
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getTitle(): string
-    {
-        return 'Group social work actions by goal and result';
-    }
-
-    /**
-     * @inheritDoc
-     */
     public function addRole(): ?string
     {
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('goal', $qb->getAllAliases(), true)) {
@@ -123,11 +59,62 @@ class GoalResultAggregator implements AggregatorInterface
         $qb->addGroupBy('goal_aggregator')->addGroupBy('result_aggregator');
     }
 
-    /**
-     * @inheritDoc
-     */
     public function applyOn(): string
     {
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value) use ($key): string {
+            if (null === $value) {
+                return '';
+            }
+
+            switch ($key) {
+                case 'goal_aggregator':
+                    if ('_header' === $value) {
+                        return 'Goal Type';
+                    }
+
+                    $g = $this->goalRepository->find($value);
+
+                    return $this->translatableStringHelper->localize(
+                        $g->getTitle()
+                    );
+
+                case 'result_aggregator':
+                    if ('_header' === $value) {
+                        return 'Result Type';
+                    }
+
+                    $r = $this->resultRepository->find($value);
+
+                    return $this->translatableStringHelper->localize(
+                        $r->getTitle()
+                    );
+
+                default:
+                    throw new LogicException();
+            }
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return [
+            'goal_aggregator',
+            'result_aggregator',
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group social work actions by goal and result';
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
index e5044c55c..ea4184a8e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class JobAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
index eea680221..f8e2e5ca6 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ReferrerAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
index dd45e41ff..ecfa342d6 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
@@ -17,6 +17,7 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ResultAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
index 17f0aeb7e..3ce36476d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ScopeAggregator implements AggregatorInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php b/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
index 2a2fc2e6a..3d7f53f6a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
@@ -21,6 +21,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class CountEvaluation implements ExportInterface, GroupedExportInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
index 3e8b50cf4..2e12fe361 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
@@ -21,6 +21,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class CountHousehold implements ExportInterface, GroupedExportInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php b/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
index 32dc4a83d..dfa145f8b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
@@ -21,6 +21,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExportInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php b/src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php
index a94b1c99c..c44048e9e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php
@@ -23,6 +23,7 @@ use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class CountSocialWorkActions implements ExportInterface, GroupedExportInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
index 818afe309..bde0ec910 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
@@ -24,7 +24,6 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
index 48a4fe99d..7fa92c0ae 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
@@ -14,11 +14,11 @@ namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\Declarations;
+use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use DateTime;
 
 class ActiveOnDateFilter implements FilterInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
index 31f69d094..bf6698f60 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
index 2bbbc061c..0d183cfa4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
@@ -83,8 +83,8 @@ class ConfidentialFilter implements FilterInterface
 
         return [
             'Filtered by confidential: only %confidential%', [
-                '%confidential%' => $this->translator->trans($choice)
-            ]
+                '%confidential%' => $this->translator->trans($choice),
+            ],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php
index 3d7405eab..3accacf2c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Security;
+use function in_array;
 
 class CurrentUserScopeFilter implements FilterInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
index 6d0eb83f8..ec4a5abe7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class EvaluationFilter implements FilterInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
index 2d0112ab5..5b8335c55 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
index 435ff2f77..3295a5b57 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
@@ -20,6 +20,7 @@ use Exception;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 final class RequestorFilter implements FilterInterface
 {
@@ -55,7 +56,6 @@ final class RequestorFilter implements FilterInterface
 
         switch ($data['accepted_choices']) {
             case 'participation':
-
                 if (!in_array('acppart', $qb->getAllAliases(), true)) {
                     $qb->join('acp.participations', 'acppart');
                 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
index fc5f09f7c..d896d6395 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
@@ -21,6 +21,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 class SocialIssueFilter implements FilterInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
index f5275655c..9296717ce 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
@@ -19,7 +19,6 @@ use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
index 7796e1a32..1c6b362d4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
@@ -15,7 +15,8 @@ use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\Declarations;
-use DateTime;
+use DateInterval;
+use DateTimeImmutable;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
@@ -37,8 +38,8 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
         $max = null !== $data['max_age'] ? $data['max_age'] : 3000;
         $calc = $data['date_calc'];
 
-        $minDate = $calc->sub(new \DateInterval('P' . $max . 'Y'));
-        $maxDate = $calc->sub(new \DateInterval('P' . $min . 'Y'));
+        $minDate = $calc->sub(new DateInterval('P' . $max . 'Y'));
+        $maxDate = $calc->sub(new DateInterval('P' . $min . 'Y'));
 
         $clause = $qb->expr()->andX(
             $qb->expr()->gte(
@@ -79,8 +80,8 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
 
         $builder->add('date_calc', ChillDateType::class, [
             'label' => 'Calculate age in relation to this date',
-            'data' => new \DateTimeImmutable('now'),
-            'input' => 'datetime_immutable'
+            'data' => new DateTimeImmutable('now'),
+            'input' => 'datetime_immutable',
         ]);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
index 0c6458f7d..e317d4a04 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
@@ -39,9 +39,9 @@ class DeadOrAliveFilter implements FilterInterface
                 $qb->expr()->andX(
                     $qb->expr()->isNull('person.deathdate'),
                     $qb->expr()->lte(
-                       'person.birthdate',
-                       ':date_calc'
-                   )
+                        'person.birthdate',
+                        ':date_calc'
+                    )
                 ),
                 $qb->expr()->andX(
                     $qb->expr()->isNotNull('person.deathdate'),
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/FamilySituationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/FamilySituationFilter.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
index a7c637bda..c725a9b5b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,20 +9,23 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
-use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
 use Chill\PersonBundle\Entity\MaritalStatus;
 use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\ORM\Query\Expr\Andx;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class MaritalStatusFilter implements FilterInterface
 {
@@ -77,7 +80,7 @@ class MaritalStatusFilter implements FilterInterface
                 );
             },
             'multiple' => true,
-            'expanded' => true
+            'expanded' => true,
         ]);
 
         $builder->add('calc_date', ChillDateType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
index dfede3a56..632ab8d3b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
@@ -22,6 +22,7 @@ use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class ResidentialAddressAtThirdpartyFilter implements FilterInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
index 2eeb89f53..7408f7c2b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
@@ -15,9 +15,11 @@ use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Entity\Person\ResidentialAddress;
 use Chill\PersonBundle\Export\Declarations;
+use DateTime;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
+use function in_array;
 
 class ResidentialAddressAtUserFilter implements FilterInterface
 {
@@ -68,7 +70,7 @@ class ResidentialAddressAtUserFilter implements FilterInterface
     {
         $builder->add('date_calc', ChillDateType::class, [
             'label' => 'Date during which residential address was valid',
-            'data' => new \DateTime('now'),
+            'data' => new DateTime('now'),
         ]);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
index ddd17bfc9..fd8e14c83 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 class JobFilter implements FilterInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
index e8907c986..65d97cbf1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class ReferrerFilter implements FilterInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
index b9a31b667..6d130ce75 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 class ScopeFilter implements FilterInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
index be0f024c8..efc005be0 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
@@ -13,121 +13,38 @@ namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Chill\PersonBundle\Entity\SocialWork\Result;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use function count;
+use function in_array;
 
 class SocialWorkTypeFilter implements FilterInterface
 {
+    private EntityManagerInterface $em;
+
     private SocialActionRender $socialActionRender;
 
     private TranslatableStringHelper $translatableStringHelper;
 
-    private EntityManagerInterface $em;
-
-    public function __construct
-    (
+    public function __construct(
         SocialActionRender $socialActionRender,
         TranslatableStringHelper $translatableStringHelper,
         EntityManagerInterface $em
-    )
-    {
+    ) {
         $this->socialActionRender = $socialActionRender;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->em = $em;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder
-            ->add('actionType', HiddenType::class)
-            ->get('actionType')
-            ->addModelTransformer(
-                $this->iterableToIdTransformer(SocialAction::class)
-            )
-        ;
-        $builder
-            ->add('goal', HiddenType::class)
-            ->get('goal')
-            ->addModelTransformer(
-                $this->iterableToIdTransformer(Goal::class)
-            )
-        ;
-        $builder
-            ->add('result', HiddenType::class)
-            ->get('result')
-            ->addModelTransformer(
-                $this->iterableToIdTransformer(Result::class)
-            )
-        ;
-    }
-
-    private function iterableToIdTransformer(string $entity): CallbackTransformer
-    {
-        return new CallbackTransformer(
-            static function (?iterable $asIterable): string {
-                if (null === $asIterable) { return ''; }
-                $ids = [];
-                foreach ($asIterable as $value) {
-                    $ids[] = $value->getId();
-                }
-                return implode(',', $ids);
-            },
-            function (?string $asString) use ($entity): array {
-                if (null === $asString) { return []; }
-                return array_map(
-                    fn (string $id)
-                    => $this->em
-                        ->getRepository($entity)
-                        ->findOneBy(['id' => (int) $id]),
-                    explode(',', $asString)
-                );
-            }
-        );
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter by type of action, goals and results';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $actionTypes = [];
-        $goals = [];
-        $results = [];
-
-        foreach ($data['actionType'] as $at) {
-            $actionTypes[] = $this->translatableStringHelper->localize(
-                $at->getTitle()
-            );
-        }
-
-        foreach ($data['goal'] as $g) {
-            $goals[] = $this->translatableStringHelper->localize(
-                $g->getTitle()
-            );
-        }
-
-        foreach ($data['result'] as $r) {
-            $results[] = $this->translatableStringHelper->localize(
-                $r->getTitle()
-            );
-        }
-
-        return ['Filtered actions by type, goals and results: %selected%', [
-            '%selected%' => implode(', ', array_merge($actionTypes, $goals, $results))
-        ]];
-    }
-
     public function addRole(): ?string
     {
         return null;
@@ -180,4 +97,90 @@ class SocialWorkTypeFilter implements FilterInterface
     {
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('actionType', HiddenType::class)
+            ->get('actionType')
+            ->addModelTransformer(
+                $this->iterableToIdTransformer(SocialAction::class)
+            );
+        $builder
+            ->add('goal', HiddenType::class)
+            ->get('goal')
+            ->addModelTransformer(
+                $this->iterableToIdTransformer(Goal::class)
+            );
+        $builder
+            ->add('result', HiddenType::class)
+            ->get('result')
+            ->addModelTransformer(
+                $this->iterableToIdTransformer(Result::class)
+            );
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $actionTypes = [];
+        $goals = [];
+        $results = [];
+
+        foreach ($data['actionType'] as $at) {
+            $actionTypes[] = $this->translatableStringHelper->localize(
+                $at->getTitle()
+            );
+        }
+
+        foreach ($data['goal'] as $g) {
+            $goals[] = $this->translatableStringHelper->localize(
+                $g->getTitle()
+            );
+        }
+
+        foreach ($data['result'] as $r) {
+            $results[] = $this->translatableStringHelper->localize(
+                $r->getTitle()
+            );
+        }
+
+        return ['Filtered actions by type, goals and results: %selected%', [
+            '%selected%' => implode(', ', array_merge($actionTypes, $goals, $results)),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by type of action, goals and results';
+    }
+
+    private function iterableToIdTransformer(string $entity): CallbackTransformer
+    {
+        return new CallbackTransformer(
+            static function (?iterable $asIterable): string {
+                if (null === $asIterable) {
+                    return '';
+                }
+                $ids = [];
+
+                foreach ($asIterable as $value) {
+                    $ids[] = $value->getId();
+                }
+
+                return implode(',', $ids);
+            },
+            function (?string $asString) use ($entity): array {
+                if (null === $asString) {
+                    return [];
+                }
+
+                return array_map(
+                    fn (string $id) => $this->em
+                        ->getRepository($entity)
+                        ->findOneBy(['id' => (int) $id]),
+                    explode(',', $asString)
+                );
+            }
+        );
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonsToIdDataTransformer.php b/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonsToIdDataTransformer.php
index b42642a58..d1cb87e02 100644
--- a/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonsToIdDataTransformer.php
+++ b/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonsToIdDataTransformer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Form\DataTransformer;
 
 use Chill\MainBundle\Form\DataTransformer\IdToEntityDataTransformer;
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionTypeType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionTypeType.php
index 6b7181f87..f05216379 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionTypeType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionTypeType.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Form;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
index 142f69969..6422c7e0e 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
@@ -15,7 +15,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
-use UnexpectedValueException;
 
 final class ClosingMotiveRepository implements ClosingMotiveRepositoryInterface
 {
@@ -29,6 +28,32 @@ final class ClosingMotiveRepository implements ClosingMotiveRepositoryInterface
         $this->repository = $entityManager->getRepository(ClosingMotive::class);
     }
 
+    public function find($id): ?ClosingMotive
+    {
+        return $this->repository->find($id);
+    }
+
+    /**
+     * @return array|ClosingMotive[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @return array|ClosingMotive[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?ClosingMotive
+    {
+        return $this->findOneBy($criteria);
+    }
+
     /**
      * @return mixed
      */
@@ -56,32 +81,6 @@ final class ClosingMotiveRepository implements ClosingMotiveRepositoryInterface
             ->getResult();
     }
 
-    public function find($id): ?ClosingMotive
-    {
-        return $this->repository->find($id);
-    }
-
-    /**
-     * @return array|ClosingMotive[]
-     */
-    public function findAll(): array
-    {
-        return $this->repository->findAll();
-    }
-
-    /**
-     * @return array|ClosingMotive[]
-     */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
-    }
-
-    public function findOneBy(array $criteria): ?ClosingMotive
-    {
-        return $this->findOneBy($criteria);
-    }
-
     public function getClassName(): string
     {
         return ClosingMotive::class;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
index fbea29a0b..88c52a5b0 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Doctrine\Persistence\ObjectRepository;
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
index bf2715eb0..ea32326a4 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
@@ -223,6 +223,5 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
         }
 
         return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
-
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
index a988202cf..5d57cadcc 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
@@ -53,16 +53,16 @@ class HouseholdVoter extends Voter implements ProvideRoleHierarchyInterface
             ->build();
     }
 
-    public function getRolesWithHierarchy(): array
-    {
-        return [ 'Person' => $this->getRoles() ];
-    }
-
     public function getRoles(): array
     {
         return [self::STATS];
     }
 
+    public function getRolesWithHierarchy(): array
+    {
+        return ['Person' => $this->getRoles()];
+    }
+
     public function getRolesWithoutScope(): array
     {
         return $this->getRoles();
@@ -72,8 +72,7 @@ class HouseholdVoter extends Voter implements ProvideRoleHierarchyInterface
     {
         return ($subject instanceof Household
             && in_array($attribute, self::ALL, true))
-            || $this->helper->supports($attribute, $subject)
-            ;
+            || $this->helper->supports($attribute, $subject);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
index 82a879b19..c9485ee10 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\AdministrativeLocationAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest
 {
     private AdministrativeLocationAggregator $aggregator;
@@ -51,8 +62,7 @@ final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.administrativeLocation', 'acploc')
-                ,
+                ->join('acp.administrativeLocation', 'acploc'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
index 279b621d4..86a11d4f1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ClosingMotiveAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest
 {
     private ClosingMotiveAggregator $aggregator;
@@ -51,8 +62,7 @@ final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.closingMotive', 'acpmotive')
-                ,
+                ->join('acp.closingMotive', 'acpmotive'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
index ab0e3dae3..2e6876f00 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ConfidentialAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class ConfidentialAggregatorTest extends AbstractAggregatorTest
 {
     private ConfidentialAggregator $aggregator;
@@ -50,8 +61,7 @@ final class ConfidentialAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ,
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
index 056c396e0..703d4115b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\DurationAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class DurationAggregatorTest extends AbstractAggregatorTest
 {
     private DurationAggregator $aggregator;
@@ -50,8 +61,7 @@ final class DurationAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ,
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
index 0b8ff2b12..a1a19edd5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EmergencyAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class EmergencyAggregatorTest extends AbstractAggregatorTest
 {
     private EmergencyAggregator $aggregator;
@@ -50,8 +61,7 @@ final class EmergencyAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ,
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
index 8c67eb649..e87d7e598 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EvaluationAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class EvaluationAggregatorTest extends AbstractAggregatorTest
 {
     private EvaluationAggregator $aggregator;
@@ -52,8 +63,7 @@ final class EvaluationAggregatorTest extends AbstractAggregatorTest
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
                 ->join('acp.works', 'acpw')
-                ->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval')
-                ,
+                ->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
index b3da8ea13..e4c9c89ac 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\IntensityAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class IntensityAggregatorTest extends AbstractAggregatorTest
 {
     private IntensityAggregator $aggregator;
@@ -50,8 +61,7 @@ final class IntensityAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ,
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php
index 8e14ffe4c..183aabf50 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\JobAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class JobAggregatorTest extends AbstractAggregatorTest
 {
     private JobAggregator $aggregator;
@@ -51,8 +62,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.job', 'acpjob')
-                ,
+                ->join('acp.job', 'acpjob'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
index cdd709226..a02ae4e10 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\OriginAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class OriginAggregatorTest extends AbstractAggregatorTest
 {
     private OriginAggregator $aggregator;
@@ -51,8 +62,7 @@ final class OriginAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.origin', 'acporigin')
-                ,
+                ->join('acp.origin', 'acporigin'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
index 789baa228..82125abf4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class ReferrerAggregatorTest extends AbstractAggregatorTest
 {
     private ReferrerAggregator $aggregator;
@@ -51,8 +62,7 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.user', 'acpuser')
-                ,
+                ->join('acp.user', 'acpuser'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
index f888e2535..79a6a3701 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\RequestorAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class RequestorAggregatorTest extends AbstractAggregatorTest
 {
     private RequestorAggregator $aggregator;
@@ -51,8 +62,7 @@ final class RequestorAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.participations', 'acppart')
-                ,
+                ->join('acp.participations', 'acppart'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
index 05fe5e980..14abf70f7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ScopeAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class ScopeAggregatorTest extends AbstractAggregatorTest
 {
     private ScopeAggregator $aggregator;
@@ -51,8 +62,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.scopes', 'acpscope')
-                ,
+                ->join('acp.scopes', 'acpscope'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
index cdf27c1a5..9f17ce23d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialActionAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class SocialActionAggregatorTest extends AbstractAggregatorTest
 {
     private SocialActionAggregator $aggregator;
@@ -51,8 +62,7 @@ final class SocialActionAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.works', 'acpw')
-                ,
+                ->join('acp.works', 'acpw'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
index 912a2b7c6..68451ca6f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialIssueAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class SocialIssueAggregatorTest extends AbstractAggregatorTest
 {
     private SocialIssueAggregator $aggregator;
@@ -51,8 +62,7 @@ final class SocialIssueAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.socialIssues', 'acpsocialissue')
-                ,
+                ->join('acp.socialIssues', 'acpsocialissue'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
index ee11eeee4..bc92529a2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,25 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\StepAggregator;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class StepAggregatorTest extends AbstractAggregatorTest
 {
     private StepAggregator $aggregator;
@@ -36,7 +48,7 @@ final class StepAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'on_date' => \DateTime::createFromFormat('Y-m-d', '2022-01-01'),
+                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-01-01'),
             ],
         ];
     }
@@ -52,8 +64,7 @@ final class StepAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ,
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
index 60b8d838c..16c8d4522 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\EvaluationAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\EvaluationAggregators\EvaluationTypeAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class EvaluationTypeAggregatorTest extends AbstractAggregatorTest
 {
     private EvaluationTypeAggregator $aggregator;
@@ -52,8 +63,7 @@ final class EvaluationTypeAggregatorTest extends AbstractAggregatorTest
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
                 ->join('acp.works', 'acpw')
-                ->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval')
-                ,
+                ->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
index bef052329..d1aeb5861 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,25 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\ChildrenNumberAggregator;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest
 {
     private ChildrenNumberAggregator $aggregator;
@@ -36,7 +48,7 @@ final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'on_date' => \DateTime::createFromFormat('Y-m-d', '2022-07-01')
+                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
             ],
         ];
     }
@@ -57,8 +69,7 @@ final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest
                 ->join('acppart.person', 'partperson')
                 ->join('partperson.householdParticipations', 'member')
                 ->join('member.household', 'household')
-                ->join('household.compositions', 'composition')
-                ,
+                ->join('household.compositions', 'composition'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
index fc808c03d..b247c6995 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,25 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\CompositionAggregator;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class CompositionAggregatorTest extends AbstractAggregatorTest
 {
     private CompositionAggregator $aggregator;
@@ -36,7 +48,7 @@ final class CompositionAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'on_date' => \DateTime::createFromFormat('Y-m-d', '2022-07-01')
+                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
             ],
         ];
     }
@@ -57,8 +69,7 @@ final class CompositionAggregatorTest extends AbstractAggregatorTest
                 ->join('acppart.person', 'partperson')
                 ->join('partperson.householdParticipations', 'member')
                 ->join('member.household', 'household')
-                ->join('household.compositions', 'composition')
-                ,
+                ->join('household.compositions', 'composition'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
index 90596d892..00d102560 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
@@ -16,6 +23,10 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Aggregator\PersonAggregators\CountryOfBirthAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class CountryOfBirthAggregatorTest extends AbstractAggregatorTest
 {
     private CountryOfBirthAggregator $aggregator;
@@ -36,7 +47,7 @@ final class CountryOfBirthAggregatorTest extends AbstractAggregatorTest
     {
         return [
             ['group_by_level' => 'continent'],
-            ['group_by_level' => 'country',],
+            ['group_by_level' => 'country'],
         ];
     }
 
@@ -52,8 +63,7 @@ final class CountryOfBirthAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(person.id)')
                 ->from(Person::class, 'person')
-                ->leftJoin('person.countryOfBirth', 'countryOfBirth')
-                ,
+                ->leftJoin('person.countryOfBirth', 'countryOfBirth'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
index 91a22d05a..a9161af77 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,15 +9,27 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Aggregator\PersonAggregators\HouseholdPositionAggregator;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class HouseholdPositionAggregatorTest extends AbstractAggregatorTest
 {
     private HouseholdPositionAggregator $aggregator;
@@ -38,7 +50,7 @@ final class HouseholdPositionAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'date_position' => \DateTime::createFromFormat('Y-m-d', '2022-07-01')
+                'date_position' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
             ],
         ];
     }
@@ -56,8 +68,7 @@ final class HouseholdPositionAggregatorTest extends AbstractAggregatorTest
                 ->select('count(person.id)')
                 ->from(Person::class, 'person')
                 ->join(HouseholdMember::class, 'householdmember', Expr\Join::WITH, 'householdmember.person = person')
-                ->join('person.center', 'center')
-                ,
+                ->join('person.center', 'center'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
index 25ddb602d..d7415bba9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
@@ -16,6 +23,10 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Aggregator\PersonAggregators\MaritalStatusAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class MaritalStatusAggregatorTest extends AbstractAggregatorTest
 {
     private MaritalStatusAggregator $aggregator;
@@ -51,8 +62,7 @@ final class MaritalStatusAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(person.id)')
                 ->from(Person::class, 'person')
-                ->join('person.maritalStatus', 'personmarital')
-                ,
+                ->join('person.maritalStatus', 'personmarital'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
index 548bc9a96..9363c8064 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
@@ -54,8 +54,7 @@ final class ActionTypeAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acpw.id)')
-                ->from(AccompanyingPeriodWork::class, 'acpw')
-                ,
+                ->from(AccompanyingPeriodWork::class, 'acpw'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
index ef512702e..d22920f27 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
@@ -54,8 +54,7 @@ final class GoalAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acpw.id)')
-                ->from(AccompanyingPeriodWork::class, 'acpw')
-                ,
+                ->from(AccompanyingPeriodWork::class, 'acpw'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
index 37642fa33..1020fd29e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalResultAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class GoalResultAggregatorTest extends AbstractAggregatorTest
 {
     private GoalResultAggregator $aggregator;
@@ -53,8 +64,7 @@ final class GoalResultAggregatorTest extends AbstractAggregatorTest
                 ->from(AccompanyingPeriod::class, 'acp')
                 ->join('acp.works', 'acpw')
                 ->join('acpw.goals', 'goal')
-                ->join('goal.results', 'goalresult')
-                ,
+                ->join('goal.results', 'goalresult'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
index c686e66b6..1a81c49bd 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\JobAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class JobAggregatorTest extends AbstractAggregatorTest
 {
     private JobAggregator $aggregator;
@@ -52,8 +63,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
                 ->join('acp.works', 'acpw')
-                ->join('acpw.referrers', 'acpwuser')
-                ,
+                ->join('acpw.referrers', 'acpwuser'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
index 11beb9950..24ffffd3b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
@@ -54,8 +54,7 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acpw.id)')
-                ->from(AccompanyingPeriodWork::class, 'acpw')
-                ,
+                ->from(AccompanyingPeriodWork::class, 'acpw'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
index 30d05a114..b85a6f2f5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
@@ -54,8 +54,7 @@ final class ResultAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acpw.id)')
-                ->from(AccompanyingPeriodWork::class, 'acpw')
-                ,
+                ->from(AccompanyingPeriodWork::class, 'acpw'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
index 3cece9ed9..ccbc1f784 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,24 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ScopeAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class ScopeAggregatorTest extends AbstractAggregatorTest
 {
     private ScopeAggregator $aggregator;
@@ -52,8 +63,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
                 ->join('acp.works', 'acpw')
-                ->join('acpw.referrers', 'acpwuser')
-                ,
+                ->join('acpw.referrers', 'acpwuser'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
index 8ba2b46c1..259ecef0b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\EvaluationFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
@@ -57,7 +64,7 @@ final class EvaluationTypeFilterTest extends AbstractFilterTest
 
         foreach ($array as $r) {
             $data[] = [
-                'accepted_evaluationtype' => $r
+                'accepted_evaluationtype' => $r,
             ];
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
index 5c9533850..eba57a820 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,11 +9,17 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\EvaluationFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Chill\PersonBundle\Export\Filter\EvaluationFilters\MaxDateFilter;
 use Doctrine\ORM\EntityManagerInterface;
 
@@ -46,8 +52,8 @@ final class MaxDateFilterTest extends AbstractFilterTest
     public function getFormData(): array
     {
         return [
-            ['maxdate' => false ],
-            ['maxdate' => true ]
+            ['maxdate' => false],
+            ['maxdate' => true],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
index 6892c0afc..73c1db3f7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,12 +9,20 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\HouseholdFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
 use Chill\PersonBundle\Export\Filter\HouseholdFilters\CompositionFilter;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
@@ -58,7 +66,7 @@ final class CompositionFilterTest extends AbstractFilterTest
         foreach ($array as $r) {
             $data[] = [
                 'accepted_composition' => $r,
-                'on_date' => \DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
             ];
         }
 
@@ -79,4 +87,4 @@ final class CompositionFilterTest extends AbstractFilterTest
                 ->from(Household::class, 'h'),
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilterTest.php
index bf975c5a1..aa3fc9b69 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,10 +9,18 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Export\Filter\PersonFilters\AccompanyingPeriodClosingFilter;
+use DateTime;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 /**
@@ -43,8 +51,8 @@ final class AccompanyingPeriodClosingFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => \DateTime::createFromFormat('Y-m-d', '2000-01-01'),
-                'date_to' => \DateTime::createFromFormat('Y-m-d', '2010-01-01'),
+                'date_from' => DateTime::createFromFormat('Y-m-d', '2000-01-01'),
+                'date_to' => DateTime::createFromFormat('Y-m-d', '2010-01-01'),
             ],
         ];
     }
@@ -86,4 +94,4 @@ final class AccompanyingPeriodClosingFilterTest extends AbstractFilterTest
                 ->join('person.center', 'center'),
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilterTest.php
index 54ed981ec..93b351d6d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,10 +9,18 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Export\Filter\PersonFilters\AccompanyingPeriodOpeningFilter;
+use DateTime;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 /**
@@ -43,8 +51,8 @@ final class AccompanyingPeriodOpeningFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => \DateTime::createFromFormat('Y-m-d', '2000-01-01'),
-                'date_to' => \DateTime::createFromFormat('Y-m-d', '2010-01-01'),
+                'date_from' => DateTime::createFromFormat('Y-m-d', '2000-01-01'),
+                'date_to' => DateTime::createFromFormat('Y-m-d', '2010-01-01'),
             ],
         ];
     }
@@ -86,4 +94,4 @@ final class AccompanyingPeriodOpeningFilterTest extends AbstractFilterTest
                 ->join('person.center', 'center'),
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
index 30ca43dfd..5d97ad400 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,11 +9,19 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\AgeFilter;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
@@ -48,12 +56,12 @@ final class AgeFilterTest extends AbstractFilterTest
             [
                 'min_age' => '18',
                 'max_age' => '60',
-                'date_calc' => \DateTime::createFromFormat('Y-m-d', '2020-05-01'),
+                'date_calc' => DateTime::createFromFormat('Y-m-d', '2020-05-01'),
             ],
             [   // ça devrait faire boum !
                 'min_age' => '35',
                 'max_age' => '30',
-                'date_calc' => \DateTime::createFromFormat('Y-m-d', '2020-05-01'),
+                'date_calc' => DateTime::createFromFormat('Y-m-d', '2020-05-01'),
             ],
         ];
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
index ea2fa62cb..4c33a27da 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,11 +9,19 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\DeadOrAliveFilter;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
@@ -47,11 +55,11 @@ final class DeadOrAliveFilterTest extends AbstractFilterTest
         return [
             [
                 'person_state' => 'alive',
-                'date_calc' => \DateTime::createFromFormat('Y-m-d', '2021-05-01'),
+                'date_calc' => DateTime::createFromFormat('Y-m-d', '2021-05-01'),
             ],
             [
                 'person_state' => 'deceased',
-                'date_calc' => \DateTime::createFromFormat('Y-m-d', '2021-05-01'),
+                'date_calc' => DateTime::createFromFormat('Y-m-d', '2021-05-01'),
             ],
         ];
     }
@@ -70,4 +78,4 @@ final class DeadOrAliveFilterTest extends AbstractFilterTest
                 ->from(Person::class, 'p'),
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
index cb711af43..eaad1b213 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,11 +9,19 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\DeathdateFilter;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
@@ -46,9 +54,9 @@ final class DeathdateFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => \DateTime::createFromFormat('Y-m-d', '2020-05-01'),
-                'date_to' => \DateTime::createFromFormat('Y-m-d', '2022-05-01'),
-            ]
+                'date_from' => DateTime::createFromFormat('Y-m-d', '2020-05-01'),
+                'date_to' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+            ],
         ];
     }
 
@@ -66,4 +74,4 @@ final class DeathdateFilterTest extends AbstractFilterTest
                 ->from(Person::class, 'p'),
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
index 8ce747f63..ea5b9c7a1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,12 +9,20 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\MaritalStatus;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\MaritalStatusFilter;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
@@ -58,7 +66,7 @@ final class MaritalStatusFilterTest extends AbstractFilterTest
         foreach ($array as $m) {
             $data[] = [
                 'maritalStatus' => $m,
-                'calc_date' => \DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+                'calc_date' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
             ];
         }
 
@@ -80,4 +88,3 @@ final class MaritalStatusFilterTest extends AbstractFilterTest
         ];
     }
 }
-
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
index 4ea2c44cc..463703f4c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Entity\Country;
@@ -53,7 +60,7 @@ final class NationalityFilterTest extends AbstractFilterTest
 
         foreach ($countries as $c) {
             $data[] = [
-                'nationalities' => $c
+                'nationalities' => $c,
             ];
         }
 
@@ -74,5 +81,4 @@ final class NationalityFilterTest extends AbstractFilterTest
                 ->from(Person::class, 'p'),
         ];
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
index 8bd07f75c..c73d246b2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
@@ -16,6 +23,7 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\ResidentialAddress;
 use Chill\PersonBundle\Export\Filter\PersonFilters\ResidentialAddressAtThirdpartyFilter;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr;
 
@@ -60,7 +68,7 @@ final class ResidentialAddressAtThirdpartyFilterTest extends AbstractFilterTest
         foreach ($array as $r) {
             $data[] = [
                 'thirdparty_cat' => $r,
-                'date_calc' => \DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+                'date_calc' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
             ];
         }
 
@@ -82,8 +90,7 @@ final class ResidentialAddressAtThirdpartyFilterTest extends AbstractFilterTest
                 ->join(ResidentialAddress::class, 'resaddr', Expr\Join::WITH, 'resaddr.person = p')
                 ->join('p.center', 'center')
                 ->join('resaddr.hostThirdParty', 'tparty')
-                ->join('tparty.categories', 'tpartycat')
-            ,
+                ->join('tparty.categories', 'tpartycat'),
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
index 6a2cde4b0..09f213c14 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,13 +9,18 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Export\Filter\PersonFilters\ResidentialAddressAtThirdpartyFilter;
 use Chill\PersonBundle\Export\Filter\PersonFilters\ResidentialAddressAtUserFilter;
-use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr;
 
@@ -66,4 +71,4 @@ final class ResidentialAddressAtUserFilterTest extends AbstractFilterTest
                 ->join('p.center', 'center'),
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
index c5cc9c523..6013cfae1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Entity\User;
@@ -53,9 +60,10 @@ final class ReferrerFilterTest extends AbstractFilterTest
 
         foreach ($users as $u) {
             $data[] = [
-                'accepted_agents' => $u
+                'accepted_agents' => $u,
             ];
         }
+
         return $data;
     }
 
@@ -74,4 +82,4 @@ final class ReferrerFilterTest extends AbstractFilterTest
                 ->join('acp.works', 'acpw'),
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php
index 2e3b392ae..7467ea140 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
@@ -56,17 +63,21 @@ final class SocialWorkTypeFilterTest extends AbstractFilterTest
         $results = [];
 
         $social_actions = $action_repository->findAll();
+
         foreach ($social_actions as $action) {
             $actions[] = $action->getId();
             $goals_by_action = $goal_repository->findBySocialActionWithDescendants($action);
+
             foreach ($goals_by_action as $goal) {
                 $goals[] = $goal->getId();
                 $results_by_goal = $result_repository->findByGoal($goal);
+
                 foreach ($results_by_goal as $result) {
                     $results[] = $result->getId();
                 }
             }
             $results_by_action = $result_repository->findBySocialActionWithDescendants($action);
+
             foreach ($results_by_action as $result) {
                 $results[] = $result->getId();
             }
@@ -85,7 +96,7 @@ final class SocialWorkTypeFilterTest extends AbstractFilterTest
                 'actionType' => implode(',', $actions),
                 'goal' => implode(',', $goals),
                 'result' => implode(',', $results),
-            ]
+            ],
         ];
         /// TODO ne fonctionne pas
         var_dump($data);
@@ -108,4 +119,4 @@ final class SocialWorkTypeFilterTest extends AbstractFilterTest
                 ->join('acp.works', 'acpw'),
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
index 27c107f9d..037a82b02 100644
--- a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,11 +9,19 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ReportBundle\Tests\Export\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\ReportBundle\Entity\Report;
 use Chill\ReportBundle\Export\Filter\ReportDateFilter;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
@@ -46,9 +54,9 @@ final class ReportDateFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => \DateTime::createFromFormat('Y-m-d', '2021-07-01'),
-                'date_to' => \DateTime::createFromFormat('Y-m-d', '2022-07-01'),
-            ]
+                'date_from' => DateTime::createFromFormat('Y-m-d', '2021-07-01'),
+                'date_to' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
+            ],
         ];
     }
 
@@ -63,7 +71,7 @@ final class ReportDateFilterTest extends AbstractFilterTest
         return [
             $em->createQueryBuilder()
                 ->select('r.id')
-                ->from(Report::class, 'r')
+                ->from(Report::class, 'r'),
         ];
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/DataTransformer/ThirdPartiesToIdDataTransformer.php b/src/Bundle/ChillThirdPartyBundle/Form/DataTransformer/ThirdPartiesToIdDataTransformer.php
index 8be0cd81c..c08e4ab05 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/DataTransformer/ThirdPartiesToIdDataTransformer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/DataTransformer/ThirdPartiesToIdDataTransformer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ThirdPartyBundle\Form\DataTransformer;
 
 use Chill\MainBundle\Form\DataTransformer\IdToEntityDataTransformer;
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/DataTransformer/ThirdPartyToIdDataTransformer.php b/src/Bundle/ChillThirdPartyBundle/Form/DataTransformer/ThirdPartyToIdDataTransformer.php
index f5539a32c..5736d8ef0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/DataTransformer/ThirdPartyToIdDataTransformer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/DataTransformer/ThirdPartyToIdDataTransformer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Chill is a software for social workers
+ * Chill is a software for social workers.
  *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
@@ -9,6 +9,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ThirdPartyBundle\Form\DataTransformer;
 
 use Chill\MainBundle\Form\DataTransformer\IdToEntityDataTransformer;
diff --git a/tests/app b/tests/app
deleted file mode 160000
index 5b35e7ccd..000000000
--- a/tests/app
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5b35e7ccd0735e5593835e28acbf82386c18e1b6