csfixer

2025-09-05 22:35:01 +00:00 · 2022-11-14 16:03:04 +01:00
parent 68bfb082fc
commit e767557216
28 changed files with 123 additions and 85 deletions
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
@@ -16,9 +16,9 @@ use Chill\MainBundle\Entity\GeographicalUnit;
 use Chill\MainBundle\Entity\GeographicalUnitLayer;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Export\Declarations;
@@ -33,10 +33,10 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
 {
    private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository;

-    private TranslatableStringHelperInterface $translatableStringHelper;
-
    private RollingDateConverterInterface $rollingDateConverter;

+    private TranslatableStringHelperInterface $translatableStringHelper;
+
    public function __construct(
        GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
        TranslatableStringHelperInterface $translatableStringHelper,
@@ -67,7 +67,8 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
                )
            );

-            $qb->setParameter('acp_geog_aggregator_date',
+            $qb->setParameter(
+                'acp_geog_aggregator_date',
                $this->rollingDateConverter->convert($data['date_calc'])
            );
        }
@@ -88,7 +89,8 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
                )
            );

-            $qb->setParameter('acp_geog_aggregator_date',
+            $qb->setParameter(
+                'acp_geog_aggregator_date',
                $this->rollingDateConverter->convert($data['date_calc'])
            );
        }
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
@@ -13,9 +13,9 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;

 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
@@ -27,12 +27,12 @@ final class ReferrerAggregator implements AggregatorInterface

    private const P = 'acp_ref_agg_date';

+    private RollingDateConverterInterface $rollingDateConverter;
+
    private UserRender $userRender;

    private UserRepository $userRepository;

-    private RollingDateConverterInterface $rollingDateConverter;
-
    public function __construct(
        UserRepository $userRepository,
        UserRender $userRender,
@@ -66,7 +66,8 @@ final class ReferrerAggregator implements AggregatorInterface
                    )
                )
            )
-            ->setParameter(self::P,
+            ->setParameter(
+                self::P,
                $this->rollingDateConverter->convert($data['date_calc'])
            );
    }
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
@@ -13,9 +13,9 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;

 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
@@ -26,12 +26,12 @@ class ReferrerScopeAggregator implements AggregatorInterface
 {
    private const SCOPE_KEY = 'acp_agg_refscope_user_history_ref_scope_name';

+    private RollingDateConverterInterface $rollingDateConverter;
+
    private ScopeRepositoryInterface $scopeRepository;

    private TranslatableStringHelperInterface $translatableStringHelper;

-    private RollingDateConverterInterface $rollingDateConverter;
-
    public function __construct(
        ScopeRepositoryInterface $scopeRepository,
        TranslatableStringHelperInterface $translatableStringHelper,
@@ -69,7 +69,8 @@ class ReferrerScopeAggregator implements AggregatorInterface
                    )
                )
            )
-            ->setParameter($dateCalc,
+            ->setParameter(
+                $dateCalc,
                $this->rollingDateConverter->convert($data['date_calc'])
            );

--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
@@ -24,10 +24,10 @@ use function in_array;

 class ChildrenNumberAggregator implements AggregatorInterface
 {
-    private TranslatorInterface $translator;
-
    private RollingDateConverterInterface $rollingDateConverter;

+    private TranslatorInterface $translator;
+
    public function __construct(
        TranslatorInterface $translator,
        RollingDateConverterInterface $rollingDateConverter
@@ -59,7 +59,8 @@ class ChildrenNumberAggregator implements AggregatorInterface
            ->addSelect('composition_children.numberOfChildren AS childrennumber_aggregator')
            ->addGroupBy('childrennumber_aggregator');

-        $qb->setParameter('ondate_composition_children',
+        $qb->setParameter(
+            'ondate_composition_children',
            $this->rollingDateConverter->convert($data['on_date'])
        );
    }
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
@@ -25,12 +25,12 @@ use function in_array;

 class CompositionAggregator implements AggregatorInterface
 {
+    private RollingDateConverterInterface $rollingDateConverter;
+
    private TranslatableStringHelper $translatableStringHelper;

    private HouseholdCompositionTypeRepository $typeRepository;

-    private RollingDateConverterInterface $rollingDateConverter;
-
    public function __construct(
        HouseholdCompositionTypeRepository $typeRepository,
        TranslatableStringHelper $translatableStringHelper,
@@ -64,7 +64,8 @@ class CompositionAggregator implements AggregatorInterface
            ->addSelect('IDENTITY(composition_type.householdCompositionType) AS composition_aggregator')
            ->addGroupBy('composition_aggregator');

-        $qb->setParameter('ondate_composition_type',
+        $qb->setParameter(
+            'ondate_composition_type',
            $this->rollingDateConverter->convert($data['on_date'])
        );
    }
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php
@@ -29,10 +29,10 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface

    private HouseholdCompositionTypeRepositoryInterface $householdCompositionTypeRepository;

-    private TranslatableStringHelperInterface $translatableStringHelper;
-
    private RollingDateConverterInterface $rollingDateConverter;

+    private TranslatableStringHelperInterface $translatableStringHelper;
+
    public function __construct(
        RollingDateConverterInterface $rollingDateConverter,
        HouseholdCompositionTypeRepositoryInterface $householdCompositionTypeRepository,
@@ -78,7 +78,8 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
                )
            )
            ->addSelect("IDENTITY({$p}_compo.householdCompositionType) AS {$p}_select")
-            ->setParameter("{$p}_date",
+            ->setParameter(
+                "{$p}_date",
                $this->rollingDateConverter->convert($data['date_calc'])
            )
            ->addGroupBy("{$p}_select");
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
@@ -15,9 +15,9 @@ use Chill\MainBundle\Entity\GeographicalUnit;
 use Chill\MainBundle\Entity\GeographicalUnitLayer;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr\Join;
@@ -30,10 +30,10 @@ class GeographicalUnitAggregator implements AggregatorInterface
 {
    private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository;

-    private TranslatableStringHelperInterface $translatableStringHelper;
-
    private RollingDateConverterInterface $rollingDateConverter;

+    private TranslatableStringHelperInterface $translatableStringHelper;
+
    public function __construct(
        GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
        TranslatableStringHelperInterface $translatableStringHelper,
@@ -73,7 +73,8 @@ class GeographicalUnitAggregator implements AggregatorInterface
                    $qb->expr()->in('person_geog_agg_geog_unit.layer', ':person_geog_agg_layers')
                )
            )
-            ->setParameter('person_geog_agg_date',
+            ->setParameter(
+                'person_geog_agg_date',
                $this->rollingDateConverter->convert($data['date_calc'])
            )
            ->setParameter('person_geog_agg_layers', $data['level'])
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
@@ -31,12 +31,12 @@ final class HouseholdPositionAggregator implements AggregatorInterface, ExportEl
 {
    private PositionRepository $positionRepository;

+    private RollingDateConverterInterface $rollingDateConverter;
+
    private TranslatableStringHelper $translatableStringHelper;

    private TranslatorInterface $translator;

-    private RollingDateConverterInterface $rollingDateConverter;
-
    public function __construct(
        TranslatorInterface $translator,
        TranslatableStringHelper $translatableStringHelper,
@@ -72,7 +72,8 @@ final class HouseholdPositionAggregator implements AggregatorInterface, ExportEl
            )
        ));

-        $qb->setParameter('date',
+        $qb->setParameter(
+            'date',
            $this->rollingDateConverter->convert($data['date_position'])
        );