From 49dd7f94fa0aefb841babb3ecc61c440b37715ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 24 Jun 2024 10:56:02 +0200 Subject: [PATCH] Fix CS and upgrade issues after mergin master branch --- .../Menu/AccompanyingCourseQuickMenuBuilder.php | 4 +--- .../Menu/AccompanyingCourseQuickMenuBuilder.php | 4 +--- .../ChillMainBundle/Serializer/Normalizer/UserNormalizer.php | 4 +--- src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php | 3 +-- .../AccompanyingCourseAggregators/ReferrerAggregator.php | 3 +-- .../AccompanyingCourseAggregators/ReferrerScopeAggregator.php | 3 +-- .../AccompanyingCourseAggregators/UserJobAggregator.php | 3 +-- .../Export/Filter/AccompanyingCourseFilters/UserJobFilter.php | 3 +-- .../Filter/AccompanyingCourseFilters/UserScopeFilter.php | 3 +-- src/Bundle/ChillPersonBundle/Menu/PersonQuickMenuBuilder.php | 4 +--- .../AccompanyingCourseAggregators/ReferrerAggregatorTest.php | 2 +- .../ReferrerScopeAggregatorTest.php | 2 +- .../AccompanyingCourseAggregators/UserJobAggregatorTest.php | 2 +- 13 files changed, 13 insertions(+), 27 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseQuickMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseQuickMenuBuilder.php index 86052c2be..2a3291515 100644 --- a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseQuickMenuBuilder.php +++ b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseQuickMenuBuilder.php @@ -18,9 +18,7 @@ use Symfony\Component\Security\Core\Security; final readonly class AccompanyingCourseQuickMenuBuilder implements LocalMenuBuilderInterface { - public function __construct(private Security $security) - { - } + public function __construct(private Security $security) {} public static function getMenuIds(): array { diff --git a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseQuickMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseQuickMenuBuilder.php index 6b5108d57..cfca6813f 100644 --- a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseQuickMenuBuilder.php +++ b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseQuickMenuBuilder.php @@ -18,9 +18,7 @@ use Symfony\Component\Security\Core\Security; final readonly class AccompanyingCourseQuickMenuBuilder implements LocalMenuBuilderInterface { - public function __construct(private Security $security) - { - } + public function __construct(private Security $security) {} public static function getMenuIds(): array { diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php index e592b453e..c05468f6d 100644 --- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php @@ -41,9 +41,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware 'isAbsent' => false, ]; - public function __construct(private readonly UserRender $userRender, private readonly ClockInterface $clock) - { - } + public function __construct(private readonly UserRender $userRender, private readonly ClockInterface $clock) {} /** * @param mixed|null $format diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php index f8dd55bf2..053e8d611 100644 --- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php +++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php @@ -38,8 +38,7 @@ class UserRender implements ChillEntityRenderInterface private readonly \Twig\Environment $engine, private readonly TranslatorInterface $translator, private readonly ClockInterface $clock, - ) { - } + ) {} /** * @throws LoaderError diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php index 925918e83..8e987a606 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php @@ -32,8 +32,7 @@ final readonly class ReferrerAggregator implements AggregatorInterface, DataTran private UserRepository $userRepository, private UserRender $userRender, private RollingDateConverterInterface $rollingDateConverter - ) { - } + ) {} public function addRole(): ?string { diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php index c183cff70..aec57c10a 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php @@ -32,8 +32,7 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTrans private ScopeRepositoryInterface $scopeRepository, private TranslatableStringHelperInterface $translatableStringHelper, private RollingDateConverterInterface $rollingDateConverter, - ) { - } + ) {} public function addRole(): ?string { diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php index a46fdc5b4..b5d6566e7 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php @@ -32,8 +32,7 @@ final readonly class UserJobAggregator implements AggregatorInterface, DataTrans private UserJobRepository $jobRepository, private TranslatableStringHelper $translatableStringHelper, private RollingDateConverterInterface $rollingDateConverter, - ) { - } + ) {} public function addRole(): ?string { diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php index c958272fc..c328e9b21 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php @@ -35,8 +35,7 @@ final readonly class UserJobFilter implements FilterInterface, DataTransformerIn private TranslatableStringHelper $translatableStringHelper, private UserJobRepositoryInterface $userJobRepository, private RollingDateConverterInterface $rollingDateConverter, - ) { - } + ) {} public function addRole(): ?string { diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php index 5b8ff7526..3489b8cb3 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php @@ -35,8 +35,7 @@ final readonly class UserScopeFilter implements FilterInterface, DataTransformer private ScopeRepositoryInterface $scopeRepository, private TranslatableStringHelper $translatableStringHelper, private RollingDateConverterInterface $rollingDateConverter, - ) { - } + ) {} public function addRole(): ?string { diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonQuickMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonQuickMenuBuilder.php index 5534791e4..f6b857b90 100644 --- a/src/Bundle/ChillPersonBundle/Menu/PersonQuickMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/PersonQuickMenuBuilder.php @@ -18,9 +18,7 @@ use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; final readonly class PersonQuickMenuBuilder implements LocalMenuBuilderInterface { - public function __construct(private AuthorizationCheckerInterface $authorizationChecker) - { - } + public function __construct(private AuthorizationCheckerInterface $authorizationChecker) {} public static function getMenuIds(): array { diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php index 859476562..d89e0ea2a 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php @@ -47,7 +47,7 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest } } - public function provideBeforeData(): iterable + public static function provideBeforeData(): iterable { yield [ ['date_calc' => new RollingDate(RollingDate::T_TODAY)], diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php index 5e7c6015a..738769b7b 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php @@ -74,7 +74,7 @@ final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest } } - public function provideBeforeData(): iterable + public static function provideBeforeData(): iterable { yield [ null, diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php index 9a26276a4..37100110a 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php @@ -47,7 +47,7 @@ final class UserJobAggregatorTest extends AbstractAggregatorTest } } - public function provideBeforeData(): iterable + public static function provideBeforeData(): iterable { yield [ null,