fix cs

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