fix cs

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -46,6 +46,7 @@ use libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use UnexpectedValueException;
 use function count;
 use function in_array;
 
@@ -182,21 +183,23 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's center.
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
+     *
      * @deprecated
      */
     private ?Center $center = null;
 
-    /**
-     * @ORM\OneToMany(targetEntity=PersonCenterHistory::class, mappedBy="person", cascade={"persist"})
-     * @var Collection|PersonCenterHistory[]
-     */
-    private Collection $centerHistory;
-
     /**
      * @ORM\OneToOne(targetEntity=PersonCenterCurrent::class, mappedBy="person")
      */
     private ?PersonCenterCurrent $centerCurrent = null;
 
+    /**
+     * @ORM\OneToMany(targetEntity=PersonCenterHistory::class, mappedBy="person", cascade={"persist"})
+     *
+     * @var Collection|PersonCenterHistory[]
+     */
+    private Collection $centerHistory;
+
     /**
      * Array where customfield's data are stored.
      *
@@ -910,32 +913,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->budgetResources;
     }
 
-    private function getCurrentCenterHistory(): ?PersonCenterHistory
-    {
-        if (0 === $this->centerHistory->count()) {
-            return null;
-        }
-
-        $criteria = Criteria::create();
-        $now = new DateTimeImmutable('now');
-        $criteria->where(Criteria::expr()->lte('startDate', $now))
-            ->andWhere(Criteria::expr()->orX(
-                Criteria::expr()->isNull('endDate'),
-                Criteria::expr()->gt('endDate', $now)
-            ));
-
-        $histories = $this->centerHistory->matching($criteria);
-
-        switch ($histories->count()) {
-            case 0:
-                return null;
-            case 1:
-                return $histories->first();
-            default:
-                throw new \UnexpectedValueException('It should not contains more than one center at a time');
-        }
-    }
-
     public function getCenter(): ?Center
     {
         if (null !== $this->centerCurrent) {
@@ -949,6 +926,24 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $currentCenterHistory->getCenter();
     }
 
+    public function getCenterCurrent(): ?PersonCenterCurrent
+    {
+        if (null !== $this->centerCurrent) {
+            return $this->centerCurrent;
+        }
+
+        if (null === $currentCenterHistory = $this->getCurrentCenterHistory()) {
+            return null;
+        }
+
+        return new PersonCenterCurrent($currentCenterHistory);
+    }
+
+    public function getCenterHistory(): Collection
+    {
+        return $this->centerHistory;
+    }
+
     public function getCFData(): ?array
     {
         if (null === $this->cFData) {
@@ -1562,7 +1557,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Associate the center with the person. The association start on 'now'.
      *
-     * @param Center $center
      * @return $this
      */
     public function setCenter(Center $center): self
@@ -1582,40 +1576,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * @return Collection
-     */
-    public function getCenterHistory(): Collection
-    {
-        return $this->centerHistory;
-    }
-
-    /**
-     * @param Collection $centerHistory
-     * @return Person
-     */
     public function setCenterHistory(Collection $centerHistory): Person
     {
         $this->centerHistory = $centerHistory;
+
         return $this;
     }
 
-    /**
-     * @return PersonCenterCurrent|null
-     */
-    public function getCenterCurrent(): ?PersonCenterCurrent
-    {
-        if (null !== $this->centerCurrent) {
-            return $this->centerCurrent;
-        }
-
-        if (null === $currentCenterHistory = $this->getCurrentCenterHistory()) {
-            return null;
-        }
-
-        return new PersonCenterCurrent($currentCenterHistory);
-    }
-
     /**
      * @return Person
      */
@@ -1818,6 +1785,34 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
+    private function getCurrentCenterHistory(): ?PersonCenterHistory
+    {
+        if (0 === $this->centerHistory->count()) {
+            return null;
+        }
+
+        $criteria = Criteria::create();
+        $now = new DateTimeImmutable('now');
+        $criteria->where(Criteria::expr()->lte('startDate', $now))
+            ->andWhere(Criteria::expr()->orX(
+                Criteria::expr()->isNull('endDate'),
+                Criteria::expr()->gt('endDate', $now)
+            ));
+
+        $histories = $this->centerHistory->matching($criteria);
+
+        switch ($histories->count()) {
+            case 0:
+                return null;
+
+            case 1:
+                return $histories->first();
+
+            default:
+                throw new UnexpectedValueException('It should not contains more than one center at a time');
+        }
+    }
+
     /**
      * This private function scan accompanyingPeriodParticipations Collection,
      * searching for a given AccompanyingPeriod.

src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php

@@ -1,15 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\Person;
 
-use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
-use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeInterface;
+use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -24,6 +28,16 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class PersonCenterCurrent
 {
+    /**
+     * @ORM\ManyToOne(targetEntity=Center::class)
+     */
+    private Center $center;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     */
+    private ?DateTimeImmutable $endDate = null;
+
     /**
      * @ORM\Id
      * @ORM\Column(type="integer")
@@ -35,20 +49,10 @@ class PersonCenterCurrent
      */
     private Person $person;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=Center::class)
-     */
-    private Center $center;
-
     /**
      * @ORM\Column(type="date_immutable", nullable=false)
      */
-    private \DateTimeImmutable $startDate;
-
-    /**
-     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     */
-    private ?\DateTimeImmutable $endDate = null;
+    private DateTimeImmutable $startDate;
 
     /**
      * Populate the properties person, center, start and end date from history.
@@ -56,7 +60,6 @@ class PersonCenterCurrent
      * The creator and updatedby are not filled.
      *
      * @internal Should not be instantied, unless inside Person entity
-     * @param PersonCenterHistory $history
      */
     public function __construct(PersonCenterHistory $history)
     {
@@ -67,46 +70,31 @@ class PersonCenterCurrent
         $this->id = $history->getId();
     }
 
+    public function getCenter(): Center
+    {
+        return $this->center;
+    }
+
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
     /**
-     * The id will be the same as the current @link{PersonCenterHistory::class}
-     *
-     * @return int
+     * The id will be the same as the current @see{PersonCenterHistory::class}.
      */
     public function getId(): int
     {
         return $this->id;
     }
 
-    /**
-     * @return Person
-     */
     public function getPerson(): Person
     {
         return $this->person;
     }
 
-    /**
-     * @return Center
-     */
-    public function getCenter(): Center
-    {
-        return $this->center;
-    }
-
-    /**
-     * @return \DateTimeImmutable
-     */
-    public function getStartDate(): \DateTimeImmutable
+    public function getStartDate(): DateTimeImmutable
     {
         return $this->startDate;
     }
-
-    /**
-     * @return \DateTimeImmutable|null
-     */
-    public function getEndDate(): ?\DateTimeImmutable
-    {
-        return $this->endDate;
-    }
-
 }

src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php

@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
@@ -8,10 +17,11 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Center;
 use Chill\PersonBundle\Entity\Person;
+use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Associate a Person with a Center. The association may change on date intervals
+ * Associate a Person with a Center. The association may change on date intervals.
  *
  * @ORM\Entity
  * @ORM\Table(name="chill_person_person_center_history")
@@ -19,8 +29,19 @@ use Doctrine\ORM\Mapping as ORM;
 class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
+
     use TrackUpdateTrait;
 
+    /**
+     * @ORM\ManyToOne(targetEntity=Center::class)
+     */
+    private ?Center $center = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     */
+    private ?DateTimeImmutable $endDate = null;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -33,71 +54,43 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
      */
     private ?Person $person = null;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=Center::class)
-     */
-    private ?Center $center = null;
-
     /**
      * @ORM\Column(type="date_immutable", nullable=false)
      */
-    private ?\DateTimeImmutable $startDate = null;
+    private ?DateTimeImmutable $startDate = null;
 
-    /**
-     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     */
-    private ?\DateTimeImmutable $endDate = null;
-
-    /**
-     * @param Person|null $person
-     * @param Center|null $center
-     * @param \DateTimeImmutable|null $startDate
-     */
-    public function __construct(?Person $person = null, ?Center $center = null, ?\DateTimeImmutable $startDate = null)
+    public function __construct(?Person $person = null, ?Center $center = null, ?DateTimeImmutable $startDate = null)
     {
         $this->person = $person;
         $this->center = $center;
         $this->startDate = $startDate;
     }
 
-
-    /**
-     * @return int|null
-     */
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    /**
-     * @return Person|null
-     */
-    public function getPerson(): ?Person
-    {
-        return $this->person;
-    }
-
-    /**
-     * @param Person|null $person
-     */
-    public function setPerson(?Person $person): self
-    {
-        $this->person = $person;
-
-        return $this;
-    }
-
-    /**
-     * @return Center|null
-     */
     public function getCenter(): ?Center
     {
         return $this->center;
     }
 
-    /**
-     * @param Center|null $center
-     */
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function getStartDate(): ?DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
     public function setCenter(?Center $center): self
     {
         $this->center = $center;
@@ -105,38 +98,24 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
         return $this;
     }
 
-    /**
-     * @return \DateTimeImmutable|null
-     */
-    public function getStartDate(): ?\DateTimeImmutable
-    {
-        return $this->startDate;
-    }
-
-    /**
-     * @param \DateTimeImmutable|null $startDate
-     */
-    public function setStartDate(?\DateTimeImmutable $startDate): self
-    {
-        $this->startDate = $startDate;
-        return $this;
-    }
-
-    /**
-     * @return \DateTimeImmutable|null
-     */
-    public function getEndDate(): ?\DateTimeImmutable
-    {
-        return $this->endDate;
-    }
-
-    /**
-     * @param \DateTimeImmutable|null $endDate
-     */
-    public function setEndDate(?\DateTimeImmutable $endDate): self
+    public function setEndDate(?DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
         return $this;
     }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
+    public function setStartDate(?DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
 }

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
 {

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 '';
             }
 

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

@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Entity\Address;
@@ -11,12 +20,13 @@ use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
+use DateTimeImmutable;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use UnexpectedValueException;
+use function in_array;
 
 final class GeographicalUnitStatAggregator implements AggregatorInterface
 {
@@ -32,91 +42,11 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function getLabels($key, array $values, $data)
-    {
-        switch ($key) {
-            case 'acp_geog_agg_unitname':
-                return function ($value): string {
-                    if ('_header' === $value) {
-                        return 'acp_geog_agg_unitname';
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $value;
-                };
-            case 'acp_geog_agg_unitrefid':
-                return function ($value): string {
-                    if ('_header' === $value) {
-                        return 'acp_geog_agg_unitrefid';
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $value;
-                };
-            default:
-                throw new \UnexpectedValueException('this value should not happens');
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getQueryKeys($data): array
-    {
-        return ['acp_geog_agg_unitname', 'acp_geog_agg_unitrefid'];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder
-            ->add('date_calc', ChillDateType::class, [
-                'label' => 'Compute geographical location at date',
-                'required' => true,
-                'data' => new \DateTimeImmutable('today'),
-                'input' => 'datetime_immutable',
-            ])
-            ->add('level', EntityType::class, [
-                'label' => 'Geographical layer',
-                'placeholder' => 'Select a geographical layer',
-                'class' => GeographicalUnitLayer::class,
-                'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
-                'choice_label' => function(GeographicalUnitLayer $item) {
-                    return $this->translatableStringHelper->localize($item->getName());
-                },
-            ]);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getTitle(): string
-    {
-        return 'Group by geographical unit';
-    }
-
-    /**
-     * @inheritDoc
-     */
     public function addRole(): ?string
     {
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acp_geog_agg_location_history', $qb->getAllAliases(), true)) {
@@ -181,15 +111,75 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
             ->addSelect('acp_geog_units.unitName AS acp_geog_agg_unitname')
             ->addSelect('acp_geog_units.unitRefId AS acp_geog_agg_unitrefid')
             ->addGroupBy('acp_geog_agg_unitname')
-            ->addGroupBy('acp_geog_agg_unitrefid')
-            ;
+            ->addGroupBy('acp_geog_agg_unitrefid');
     }
 
-    /**
-     * @inheritDoc
-     */
     public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date_calc', ChillDateType::class, [
+                'label' => 'Compute geographical location at date',
+                'required' => true,
+                'data' => new DateTimeImmutable('today'),
+                'input' => 'datetime_immutable',
+            ])
+            ->add('level', EntityType::class, [
+                'label' => 'Geographical layer',
+                'placeholder' => 'Select a geographical layer',
+                'class' => GeographicalUnitLayer::class,
+                'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
+                'choice_label' => function (GeographicalUnitLayer $item) {
+                    return $this->translatableStringHelper->localize($item->getName());
+                },
+            ]);
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        switch ($key) {
+            case 'acp_geog_agg_unitname':
+                return static function ($value): string {
+                    if ('_header' === $value) {
+                        return 'acp_geog_agg_unitname';
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $value;
+                };
+
+            case 'acp_geog_agg_unitrefid':
+                return static function ($value): string {
+                    if ('_header' === $value) {
+                        return 'acp_geog_agg_unitrefid';
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $value;
+                };
+
+            default:
+                throw new UnexpectedValueException('this value should not happens');
+        }
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['acp_geog_agg_unitname', 'acp_geog_agg_unitrefid'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by geographical unit';
+    }
 }

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
 {

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
 {

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
 {

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

@@ -1,25 +1,34 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
+use DateTimeImmutable;
 use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class ReferrerScopeAggregator implements AggregatorInterface
 {
-
     private const SCOPE_KEY = 'acp_agg_refscope_user_history_ref_scope_name';
 
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
     private ScopeRepositoryInterface $scopeRepository;
 
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
     public function __construct(
         ScopeRepositoryInterface $scopeRepository,
         TranslatableStringHelperInterface $translatableStringHelper
@@ -28,9 +37,56 @@ class ReferrerScopeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @inheritDoc
-     */
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $userHistory = 'acp_agg_refscope_user_history';
+        $ref = 'acp_agg_refscope_user_history_ref';
+        $scopeName = self::SCOPE_KEY;
+        $dateCalc = 'acp_agg_refscope_user_history_date_calc';
+
+        $qb
+            ->leftJoin('acp.userHistories', $userHistory)
+            ->leftJoin($userHistory . '.user', $ref)
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull($userHistory),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte($userHistory . '.startDate', ':' . $dateCalc),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull($userHistory . '.endDate'),
+                            $qb->expr()->lt($userHistory . '.endDate', ':' . $dateCalc)
+                        )
+                    )
+                )
+            )
+            ->setParameter($dateCalc, $data['date_calc']);
+
+        // add groups
+        $qb
+            ->addSelect('IDENTITY(' . $ref . '.mainScope) AS ' . $scopeName)
+            ->addGroupBy($scopeName);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('date_calc', ChillDateType::class, [
+            'input' => 'datetime_immutable',
+            'data' => new DateTimeImmutable('now'),
+            'label' => 'export.aggregator.course.by_user_scope.Computation date for referrer',
+            'required' => true,
+        ]);
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value) {
@@ -45,89 +101,20 @@ class ReferrerScopeAggregator implements AggregatorInterface
             $scope = $this->scopeRepository->find($value);
 
             if (null === $scope) {
-                throw new \LogicException('no scope found with this id: ' . $value);
+                throw new LogicException('no scope found with this id: ' . $value);
             }
 
             return $this->translatableStringHelper->localize($scope->getName());
         };
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getQueryKeys($data)
     {
         return [self::SCOPE_KEY];
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('date_calc', ChillDateType::class, [
-            'input' => 'datetime_immutable',
-            'data' => new \DateTimeImmutable('now'),
-            'label' => 'export.aggregator.course.by_user_scope.Computation date for referrer',
-            'required' => true,
-        ]);
-    }
-
-    /**
-     * @inheritDoc
-     */
     public function getTitle()
     {
         return 'export.aggregator.course.by_user_scope.Group course by referrer\'s scope';
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $userHistory = 'acp_agg_refscope_user_history';
-        $ref = 'acp_agg_refscope_user_history_ref';
-        $scopeName = self::SCOPE_KEY;
-        $dateCalc = 'acp_agg_refscope_user_history_date_calc';
-
-        $qb
-            ->leftJoin('acp.userHistories', $userHistory)
-            ->leftJoin($userHistory.'.user', $ref)
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->isNull($userHistory),
-                    $qb->expr()->andX(
-                        $qb->expr()->lte($userHistory.'.startDate', ':'.$dateCalc),
-                        $qb->expr()->orX(
-                            $qb->expr()->isNull($userHistory.'.endDate'),
-                            $qb->expr()->lt($userHistory.'.endDate', ':'.$dateCalc)
-                        )
-                    )
-                )
-            )
-            ->setParameter($dateCalc, $data['date_calc']);
-
-        // add groups
-        $qb
-            ->addSelect('IDENTITY('.$ref.'.mainScope) AS '.$scopeName)
-            ->addGroupBy($scopeName)
-        ;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function applyOn()
-    {
-        return Declarations::ACP_TYPE;
-    }
 }

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
 {

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
 {

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

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';
             }

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;

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

@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Entity\GeographicalUnit;
@@ -9,8 +18,10 @@ use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
+use DateTimeImmutable;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -28,93 +39,11 @@ class GeographicalUnitAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function getLabels($key, array $values, $data)
-    {
-        switch ($key) {
-            case 'geog_unit_name':
-                return function ($value): string {
-                    if ('_header' === $value) {
-                        return 'acp_geog_agg_unitname';
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $value;
-                };
-
-            case 'geog_unit_key':
-                return function ($value): string {
-                    if ('_header' === $value) {
-                        return 'acp_geog_agg_unitrefid';
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $value;
-                };
-
-            default:
-                throw new \LogicException('key not supported');
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getQueryKeys($data)
-    {
-        return ['geog_unit_name', 'geog_unit_key'];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder
-            ->add('date_calc', ChillDateType::class, [
-                'label' => 'Address valid at this date',
-                'required' => true,
-                'data' => new \DateTimeImmutable('today'),
-                'input' => 'datetime_immutable',
-            ])
-            ->add('level', EntityType::class, [
-                'label' => 'Geographical layer',
-                'placeholder' => 'Select a geographical layer',
-                'class' => GeographicalUnitLayer::class,
-                'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
-                'choice_label' => function(GeographicalUnitLayer $item) {
-                    return $this->translatableStringHelper->localize($item->getName());
-                },
-            ]);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getTitle()
-    {
-        return 'Group people by geographical unit based on his address';
-    }
-
-    /**
-     * @inheritDoc
-     */
     public function addRole(): ?string
     {
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb
@@ -144,20 +73,80 @@ class GeographicalUnitAggregator implements AggregatorInterface
             ->addSelect('person_geog_agg_geog_unit.unitName AS geog_unit_name')
             ->addSelect('person_geog_agg_geog_unit.unitRefId AS geog_unit_key')
             ->addGroupBy('geog_unit_name')
-            ->addGroupBy('geog_unit_key')
-            ;
+            ->addGroupBy('geog_unit_key');
     }
 
-    /**
-     * @inheritDoc
-     */
     public function applyOn()
     {
         return Declarations::PERSON_TYPE;
     }
 
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date_calc', ChillDateType::class, [
+                'label' => 'Address valid at this date',
+                'required' => true,
+                'data' => new DateTimeImmutable('today'),
+                'input' => 'datetime_immutable',
+            ])
+            ->add('level', EntityType::class, [
+                'label' => 'Geographical layer',
+                'placeholder' => 'Select a geographical layer',
+                'class' => GeographicalUnitLayer::class,
+                'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
+                'choice_label' => function (GeographicalUnitLayer $item) {
+                    return $this->translatableStringHelper->localize($item->getName());
+                },
+            ]);
+    }
+
     public static function getDefaultAlias(): string
     {
         return 'person_geog_agg';
     }
+
+    public function getLabels($key, array $values, $data)
+    {
+        switch ($key) {
+            case 'geog_unit_name':
+                return static function ($value): string {
+                    if ('_header' === $value) {
+                        return 'acp_geog_agg_unitname';
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $value;
+                };
+
+            case 'geog_unit_key':
+                return static function ($value): string {
+                    if ('_header' === $value) {
+                        return 'acp_geog_agg_unitrefid';
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $value;
+                };
+
+            default:
+                throw new LogicException('key not supported');
+        }
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['geog_unit_name', 'geog_unit_key'];
+    }
+
+    public function getTitle()
+    {
+        return 'Group people by geographical unit based on his address';
+    }
 }

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
 {

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
 {

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
 {

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
 {

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php

@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\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';
+    }
 }

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
 {

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
 {

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
 {

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
 {

src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php

@@ -101,14 +101,13 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
-                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
-            ->setParameter('authorized_centers', $centers)
-            ;
+            ->setParameter('authorized_centers', $centers);
 
         $qb->select('COUNT(DISTINCT acp.id) AS export_result');
 

src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php

@@ -23,6 +23,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
 {
@@ -107,14 +108,13 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
-                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
-            ->setParameter('authorized_centers', $centers)
-        ;
+            ->setParameter('authorized_centers', $centers);
 
         $qb->select('COUNT(DISTINCT workeval.id) AS export_result');
 

src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php

@@ -100,20 +100,18 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
             ->join('acp.participations', 'acppart')
             // little optimization: we remove joins and make a direct join between participations and household members
             ->join(HouseholdMember::class, 'member', Query\Expr\Join::WITH, 'IDENTITY(acppart.person) = IDENTITY(member.person)')
-            ->join('member.household', 'household')
-        ;
+            ->join('member.household', 'household');
 
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
-                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
-            ->setParameter('authorized_centers', $centers)
-        ;
+            ->setParameter('authorized_centers', $centers);
 
         $qb->select('COUNT(DISTINCT household.id) AS export_result');
 

src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php

@@ -18,7 +18,6 @@ use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use LogicException;
@@ -104,10 +103,10 @@ class CountPerson implements ExportInterface, GroupedExportInterface
         $qb->select('COUNT(person.id) AS export_result')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
                 )
             )
-        ->setParameter('authorized_centers', $centers);
+            ->setParameter('authorized_centers', $centers);
 
         return $qb;
     }

src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php

@@ -22,6 +22,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
 {
@@ -105,7 +106,7 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
 
         $qb->andWhere(
             $qb->expr()->exists(
-                'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
             )
         )->setParameter('authorized_centers', $centers);
 

src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php

@@ -102,14 +102,13 @@ class CountSocialWorkActions implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
-                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
-            ->setParameter('authorized_centers', $centers)
-        ;
+            ->setParameter('authorized_centers', $centers);
 
         $qb->select('COUNT(DISTINCT acpw.id) as export_result');
 

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;
 

src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php

@@ -105,14 +105,13 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
-                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
-            ->setParameter('authorized_centers', $centers)
-        ;
+            ->setParameter('authorized_centers', $centers);
 
         $qb
             ->select('AVG(

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;
 

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
 {

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
 {

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

@@ -20,27 +20,23 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Export\Declarations;
-use DateTime;
-use Doctrine\DBAL\Types\Types;
+use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
-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;
 
 /**
- * Filter accompanying period by geographical zone
+ * Filter accompanying period by geographical zone.
  */
 class GeographicalUnitStatFilter implements FilterInterface
 {
+    private EntityManagerInterface $em;
 
     private GeographicalUnitRepositoryInterface $geographicalUnitRepository;
 
     private TranslatableStringHelperInterface $translatableStringHelper;
 
-    private EntityManagerInterface $em;
-
     public function __construct(
         EntityManagerInterface $em,
         GeographicalUnitRepositoryInterface $geographicalUnitRepository,
@@ -61,12 +57,12 @@ class GeographicalUnitStatFilter implements FilterInterface
         $subQueryDql =
             'SELECT
                 1
-            FROM '.AccompanyingPeriod\AccompanyingPeriodLocationHistory::class.' acp_geog_filter_location_history
-            LEFT JOIN '.PersonHouseholdAddress::class.' acp_geog_filter_address_person_location
+            FROM ' . AccompanyingPeriod\AccompanyingPeriodLocationHistory::class . ' acp_geog_filter_location_history
+            LEFT JOIN ' . PersonHouseholdAddress::class . ' acp_geog_filter_address_person_location
                 WITH IDENTITY(acp_geog_filter_location_history.personLocation) = IDENTITY(acp_geog_filter_address_person_location.person)
-            LEFT JOIN '.Address::class.' acp_geog_filter_address
+            LEFT JOIN ' . Address::class . ' acp_geog_filter_address
                 WITH COALESCE(IDENTITY(acp_geog_filter_address_person_location.address), IDENTITY(acp_geog_filter_location_history.addressLocation)) = acp_geog_filter_address.id
-            LEFT JOIN '.GeographicalUnit::class.' acp_geog_filter_units WITH ST_CONTAINS(acp_geog_units.geom, acp_geog_filter_address.point) = TRUE
+            LEFT JOIN ' . GeographicalUnit::class . ' acp_geog_filter_units WITH ST_CONTAINS(acp_geog_units.geom, acp_geog_filter_address.point) = TRUE
             WHERE
                 (acp_geog_filter_location_history.startDate <= :acp_geog_filter_date AND (
                     acp_geog_filter_location_history.endDate IS NULL OR acp_geog_filter_location_history.endDate < :acp_geog_filter_date
@@ -82,8 +78,7 @@ class GeographicalUnitStatFilter implements FilterInterface
         $qb
             ->andWhere($qb->expr()->exists($subQueryDql))
             ->setParameter('acp_geog_filter_date', $data['date_calc'])
-            ->setParameter('acp_geog_filter_units', $data['units'])
-        ;
+            ->setParameter('acp_geog_filter_units', $data['units']);
     }
 
     public function applyOn(): string
@@ -97,7 +92,7 @@ class GeographicalUnitStatFilter implements FilterInterface
             ->add('date_calc', ChillDateType::class, [
                 'label' => 'Compute geographical location at date',
                 'required' => true,
-                'data' => new \DateTimeImmutable('today'),
+                'data' => new DateTimeImmutable('today'),
                 'input' => 'datetime_immutable',
             ])
             ->add('units', EntityType::class, [
@@ -105,7 +100,7 @@ class GeographicalUnitStatFilter implements FilterInterface
                 'placeholder' => 'Select a geographical unit',
                 'class' => GeographicalUnit::class,
                 'choices' => $this->geographicalUnitRepository->findAll(),
-                'choice_label' => function(GeographicalUnit $item) {
+                'choice_label' => function (GeographicalUnit $item) {
                     return $this->translatableStringHelper->localize($item->getLayer()->getName()) . ' > ' . $item->getUnitName();
                 },
                 'attr' => [
@@ -122,12 +117,12 @@ class GeographicalUnitStatFilter implements FilterInterface
             '%units' => implode(
                 ', ',
                 array_map(
-                    function(GeographicalUnit $item) {
+                    function (GeographicalUnit $item) {
                         return $this->translatableStringHelper->localize($item->getLayer()->getName()) . ' > ' . $item->getUnitName();
                     },
                     $data['units']
                 )
-            )
+            ),
         ]];
     }
 

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;
 

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');
                 }

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
 {

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;

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',
         ]);
     }
 

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'),

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php

@@ -1,15 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
-use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\GeographicalUnit;
 use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
 use Chill\MainBundle\Repository\GeographicalUnitRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Export\Declarations;
+use DateTimeImmutable;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -28,81 +36,18 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder
-            ->add('date_calc', ChillDateType::class, [
-                'label' => 'Compute geographical location at date',
-                'required' => true,
-                'data' => new \DateTimeImmutable('today'),
-                'input' => 'datetime_immutable',
-            ])
-            ->add('units', EntityType::class, [
-                'label' => 'Geographical unit',
-                'placeholder' => 'Select a geographical unit',
-                'class' => GeographicalUnit::class,
-                'choices' => $this->geographicalUnitRepository->findAll(),
-                'choice_label' => function(GeographicalUnit $item) {
-                    return $this->translatableStringHelper->localize($item->getLayer()->getName()) . ' > ' . $item->getUnitName();
-                },
-                'attr' => [
-                    'class' => 'select2',
-                ],
-                'multiple' => true,
-            ]);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getTitle(): string
-    {
-        return 'Filter by person\'s geographical unit (based on address)';
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function describeAction($data, $format = 'string')
-    {
-        return [
-            'exports.by_person.Filtered by person\'s geographical unit (based on address) computed at datecalc, only units',
-            [
-                'datecalc' => $data['date_calc']->format('Y-m-d'),
-                'units' => implode(
-                    ', ',
-                        array_map(
-                            function (GeographicalUnit $item) {
-                                return $this->translatableStringHelper->localize($item->getLayer()->getName()) . ' > ' . $item->getUnitName();
-                            },
-                            $data['units']->toArray()
-                        )
-                )
-            ]
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
     public function addRole(): ?string
     {
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $subQuery =
             'SELECT 1
-            FROM '.PersonHouseholdAddress::class.' person_filter_geog_person_household_address
+            FROM ' . PersonHouseholdAddress::class . ' person_filter_geog_person_household_address
             JOIN person_filter_geog_person_household_address.address person_filter_geog_address
-            JOIN '.GeographicalUnit::class.' person_filter_geog_unit
+            JOIN ' . GeographicalUnit::class . ' person_filter_geog_unit
                 WITH ST_CONTAINS(person_filter_geog_unit.geom, person_filter_geog_address.point) = TRUE
             WHERE
                 person_filter_geog_person_household_address.validFrom <= :person_filter_geog_date
@@ -120,15 +65,59 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
                 $qb->expr()->exists($subQuery)
             )
             ->setParameter('person_filter_geog_date', $data['date_calc'])
-            ->setParameter('person_filter_geog_units', $data['units'])
-            ;
+            ->setParameter('person_filter_geog_units', $data['units']);
     }
 
-    /**
-     * @inheritDoc
-     */
     public function applyOn()
     {
         return Declarations::PERSON_TYPE;
     }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date_calc', ChillDateType::class, [
+                'label' => 'Compute geographical location at date',
+                'required' => true,
+                'data' => new DateTimeImmutable('today'),
+                'input' => 'datetime_immutable',
+            ])
+            ->add('units', EntityType::class, [
+                'label' => 'Geographical unit',
+                'placeholder' => 'Select a geographical unit',
+                'class' => GeographicalUnit::class,
+                'choices' => $this->geographicalUnitRepository->findAll(),
+                'choice_label' => function (GeographicalUnit $item) {
+                    return $this->translatableStringHelper->localize($item->getLayer()->getName()) . ' > ' . $item->getUnitName();
+                },
+                'attr' => [
+                    'class' => 'select2',
+                ],
+                'multiple' => true,
+            ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return [
+            'exports.by_person.Filtered by person\'s geographical unit (based on address) computed at datecalc, only units',
+            [
+                'datecalc' => $data['date_calc']->format('Y-m-d'),
+                'units' => implode(
+                    ', ',
+                    array_map(
+                            function (GeographicalUnit $item) {
+                                return $this->translatableStringHelper->localize($item->getLayer()->getName()) . ' > ' . $item->getUnitName();
+                            },
+                            $data['units']->toArray()
+                        )
+                ),
+            ],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by person\'s geographical unit (based on address)';
+    }
 }

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php

@@ -11,18 +11,14 @@ declare(strict_types=1);
 
 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 +73,7 @@ class MaritalStatusFilter implements FilterInterface
                 );
             },
             'multiple' => true,
-            'expanded' => true
+            'expanded' => true,
         ]);
 
         $builder->add('calc_date', ChillDateType::class, [

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
 {

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'),
         ]);
     }
 

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
 {

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
 {

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
 {

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)
+                );
+            }
+        );
+    }
 }

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;

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php

@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Doctrine\Persistence\ObjectRepository;

src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryInterface.php

@@ -1,10 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\Person;
 
 use Doctrine\Persistence\ObjectRepository;
 
 interface PersonCenterHistoryInterface extends ObjectRepository
 {
-
 }

src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php

@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\Person;
 
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;

src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php

@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Repository\CountryRepository;
 use Chill\MainBundle\Search\ParsingException;
 use Chill\MainBundle\Search\SearchApiQuery;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;

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

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +55,7 @@ final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.administrativeLocation', 'acploc')
-                ,
+                ->join('acp.administrativeLocation', 'acploc'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +55,7 @@ final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.closingMotive', 'acpmotive')
-                ,
+                ->join('acp.closingMotive', 'acpmotive'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +54,7 @@ final class ConfidentialAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ,
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +54,7 @@ final class DurationAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ,
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +54,7 @@ final class EmergencyAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ,
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +56,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'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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\GeographicalUnitStatAggregator;
 use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class GeographicalUnitStatAggregatorTest extends AbstractAggregatorTest
 {
     private GeographicalUnitStatAggregator $aggregator;
@@ -50,8 +54,7 @@ final class GeographicalUnitStatAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ,
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +54,7 @@ final class IntensityAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ,
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +55,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.job', 'acpjob')
-                ,
+                ->join('acp.job', 'acpjob'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +55,7 @@ final class OriginAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.origin', 'acporigin')
-                ,
+                ->join('acp.origin', 'acporigin'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +55,7 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.user', 'acpuser')
-                ,
+                ->join('acp.user', 'acpuser'),
         ];
     }
 }

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

@@ -1,19 +1,32 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerScopeAggregator;
+use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 
-class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
 {
     use ProphecyTrait;
 
@@ -37,8 +50,8 @@ class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'date_calc' => new \DateTimeImmutable('now')
-            ]
+                'date_calc' => new DateTimeImmutable('now'),
+            ],
         ];
     }
 
@@ -54,10 +67,7 @@ class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.scopes', 'acpscope')
-            ,
+                ->join('acp.scopes', 'acpscope'),
         ];
     }
-
-
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +55,7 @@ final class RequestorAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.participations', 'acppart')
-                ,
+                ->join('acp.participations', 'acppart'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +55,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.scopes', 'acpscope')
-                ,
+                ->join('acp.scopes', 'acpscope'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +55,7 @@ final class SocialActionAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.works', 'acpw')
-                ,
+                ->join('acp.works', 'acpw'),
         ];
     }
 }

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

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +55,7 @@ final class SocialIssueAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.socialIssues', 'acpsocialissue')
-                ,
+                ->join('acp.socialIssues', 'acpsocialissue'),
         ];
     }
 }

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

@@ -11,11 +11,16 @@ declare(strict_types=1);
 
 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 +41,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 +57,7 @@ final class StepAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ,
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +56,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'),
         ];
     }
 }

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php

@@ -11,11 +11,16 @@ declare(strict_types=1);
 
 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 +41,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 +62,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'),
         ];
     }
 }

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php

@@ -11,11 +11,16 @@ declare(strict_types=1);
 
 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 +41,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 +62,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'),
         ];
     }
 }

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php

@@ -16,6 +16,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 +40,7 @@ final class CountryOfBirthAggregatorTest extends AbstractAggregatorTest
     {
         return [
             ['group_by_level' => 'continent'],
-            ['group_by_level' => 'country',],
+            ['group_by_level' => 'country'],
         ];
     }
 
@@ -52,8 +56,7 @@ final class CountryOfBirthAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(person.id)')
                 ->from(Person::class, 'person')
-                ->leftJoin('person.countryOfBirth', 'countryOfBirth')
-                ,
+                ->leftJoin('person.countryOfBirth', 'countryOfBirth'),
         ];
     }
 }

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php

@@ -15,9 +15,14 @@ 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 +43,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 +61,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'),
         ];
     }
 }

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php

@@ -16,6 +16,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 +55,7 @@ final class MaritalStatusAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(person.id)')
                 ->from(Person::class, 'person')
-                ->join('person.maritalStatus', 'personmarital')
-                ,
+                ->join('person.maritalStatus', 'personmarital'),
         ];
     }
 }

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'),
         ];
     }
 }

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'),
         ];
     }
 }

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +57,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'),
         ];
     }
 }

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +56,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'),
         ];
     }
 }

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'),
         ];
     }
 }

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'),
         ];
     }
 }

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php

@@ -11,11 +11,15 @@ declare(strict_types=1);
 
 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 +56,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'),
         ];
     }
 }

src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php

@@ -15,7 +15,6 @@ use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOnDateFilter;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php

@@ -15,7 +15,6 @@ use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOneDayBetweenDatesFilter;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php

@@ -9,13 +9,12 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;;
+namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AdministrativeLocationFilter;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php

@@ -15,7 +15,6 @@ use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\EvaluationFilter;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php

@@ -15,7 +15,6 @@ use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\GeographicalUnitStatFilter;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php

@@ -15,7 +15,6 @@ use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OpenBetweenDatesFilter;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php

@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilter;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php

@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\RequestorFilter;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php

@@ -15,7 +15,6 @@ use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialActionFilter;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php

@@ -51,7 +51,7 @@ final class EvaluationTypeFilterTest extends AbstractFilterTest
 
         foreach ($array as $r) {
             $data[] = [
-                'accepted_evaluationtype' => $r
+                'accepted_evaluationtype' => $r,
             ];
         }
 

src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php

@@ -13,7 +13,6 @@ 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;
 
@@ -40,8 +39,8 @@ final class MaxDateFilterTest extends AbstractFilterTest
     public function getFormData(): array
     {
         return [
-            ['maxdate' => false ],
-            ['maxdate' => true ]
+            ['maxdate' => false],
+            ['maxdate' => true],
         ];
     }
 

src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php

@@ -15,6 +15,7 @@ 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;
 
 /**
@@ -52,7 +53,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'),
             ];
         }
 
@@ -73,4 +74,4 @@ final class CompositionFilterTest extends AbstractFilterTest
                 ->from(Household::class, 'h'),
         ];
     }
-}
+}

src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilterTest.php

@@ -13,6 +13,7 @@ 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 +44,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 +87,4 @@ final class AccompanyingPeriodClosingFilterTest extends AbstractFilterTest
                 ->join('person.center', 'center'),
         ];
     }
-}
+}