Merge branch 'tests/fixes-2022-09-05' into 111_exports_suite

src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php

@@ -1,20 +1,30 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
+use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
 final class AgentAggregator implements AggregatorInterface
 {
-    private UserRepository $userRepository;
-
     private UserRender $userRender;
 
+    private UserRepository $userRepository;
+
     public function __construct(
         UserRepository $userRepository,
         UserRender $userRender
@@ -23,7 +33,7 @@ final class AgentAggregator implements AggregatorInterface
         $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -41,7 +51,6 @@ final class AgentAggregator implements AggregatorInterface
         } else {
             $qb->groupBy('agent_aggregator');
         }
-
     }
 
     public function applyOn(): string
@@ -54,7 +63,7 @@ final class AgentAggregator implements AggregatorInterface
         // no form
     }
 
-    public function getLabels($key, array $values, $data): \Closure
+    public function getLabels($key, array $values, $data): Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -76,4 +85,4 @@ final class AgentAggregator implements AggregatorInterface
     {
         return 'Group appointments by agent';
     }
-}
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php

@@ -1,11 +1,21 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\CalendarBundle\Repository\CancelReasonRepository;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -23,37 +33,7 @@ class CancelReasonAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function getLabels($key, array $values, $data): \Closure
-    {
-        return function($value): string {
-            if ($value === '_header') {
-                return 'Cancel reason';
-            }
-
-            $j = $this->cancelReasonRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $j->getName()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['cancel_reason_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group appointments by cancel reason';
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -78,4 +58,34 @@ class CancelReasonAggregator implements AggregatorInterface
     {
         return Declarations::CALENDAR_TYPE;
     }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Cancel reason';
+            }
+
+            $j = $this->cancelReasonRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['cancel_reason_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by cancel reason';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php

@@ -1,11 +1,21 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserJobRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -23,37 +33,7 @@ final class JobAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function getLabels($key, array $values, $data): \Closure
-    {
-        return function($value): string {
-            if ($value === '_header') {
-                return 'Job';
-            }
-
-            $j = $this->jobRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $j->getLabel()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['job_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group appointments by agent job';
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -77,4 +57,34 @@ final class JobAggregator implements AggregatorInterface
     {
         return Declarations::CALENDAR_TYPE;
     }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Job';
+            }
+
+            $j = $this->jobRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['job_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by agent job';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php

@@ -1,10 +1,20 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\LocationRepository;
+use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
@@ -19,36 +29,7 @@ final class LocationAggregator implements AggregatorInterface
         $this->locationRepository = $locationRepository;
     }
 
-    public function getLabels($key, array $values, $data): \Closure
-    {
-        return function($value): string {
-            if ($value === '_header') {
-                return 'Location';
-            }
-
-            $l = $this->locationRepository->find($value);
-
-            return $l->getName();
-
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['location_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group appointments by location';
-    }
-
-    public function addRole(): ?Role
+    public function addRole(): ?string
     {
         return null;
     }
@@ -72,4 +53,31 @@ final class LocationAggregator implements AggregatorInterface
         return Declarations::CALENDAR_TYPE;
     }
 
-}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Location';
+            }
+
+            $l = $this->locationRepository->find($value);
+
+            return $l->getName();
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['location_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by location';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php

@@ -1,11 +1,21 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\LocationTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -23,37 +33,7 @@ final class LocationTypeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function getLabels($key, array $values, $data): \Closure
-    {
-        return function($value): string {
-            if ($value === '_header') {
-                return 'Location type';
-            }
-
-            $j = $this->locationTypeRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $j->getTitle()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['location_type_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group appointments by location type';
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -78,4 +58,33 @@ final class LocationTypeAggregator implements AggregatorInterface
         return Declarations::CALENDAR_TYPE;
     }
 
-}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Location type';
+            }
+
+            $j = $this->locationTypeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getTitle()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['location_type_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by location type';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
@@ -11,37 +20,7 @@ use Symfony\Component\Security\Core\Role\Role;
 
 class MonthYearAggregator implements AggregatorInterface
 {
-
-    public function getQueryKeys($data): array
-    {
-        return ['month_year_aggregator'];
-    }
-
-    public function getLabels($key, array $values, $data): Closure
-    {
-        return function($value): string {
-            if ($value === '_header') {
-                return 'by month and year';
-            }
-
-            $month = substr($value,0, 2);
-            $year = substr($value, 3, 4);
-
-            return strftime('%B %G', mktime(0, 0, 0, $month, '1', $year));
-        };
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // No form needed
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group appointments by month and year';
-    }
-
-    public function addRole(): ?Role
+    public function addRole(): ?string
     {
         return null;
     }
@@ -63,4 +42,33 @@ class MonthYearAggregator implements AggregatorInterface
     {
         return Declarations::CALENDAR_TYPE;
     }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // No form needed
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return static function ($value): string {
+            if ('_header' === $value) {
+                return 'by month and year';
+            }
+
+            $month = substr($value, 0, 2);
+            $year = substr($value, 3, 4);
+
+            return strftime('%B %G', mktime(0, 0, 0, $month, '1', $year));
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['month_year_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by month and year';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php

@@ -1,11 +1,21 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -23,37 +33,7 @@ final class ScopeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function getLabels($key, array $values, $data): \Closure
-    {
-        return function ($value): string {
-            if ($value === '_header') {
-                return 'Scope';
-            }
-
-            $s = $this->scopeRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $s->getName()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['scope_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group appointments by agent scope';
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -77,4 +57,34 @@ final class ScopeAggregator implements AggregatorInterface
     {
         return Declarations::CALENDAR_TYPE;
     }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Scope';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['scope_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by agent scope';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php

@@ -1,13 +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\CalendarBundle\Export\Export;
 
+use Chill\CalendarBundle\Export\Declarations;
 use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\CalendarBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Closure;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -16,7 +26,6 @@ use Symfony\Component\Security\Core\Role\Role;
 
 class CountAppointments implements ExportInterface, GroupedExportInterface
 {
-
     private CalendarRepository $calendarRepository;
 
     public function __construct(CalendarRepository $calendarRepository)
@@ -39,7 +48,12 @@ class CountAppointments implements ExportInterface, GroupedExportInterface
         return 'Count appointments by various parameters.';
     }
 
-    public function getLabels($key, array $values, $data): \Closure
+    public function getGroup(): string
+    {
+        return 'Exports of calendar';
+    }
+
+    public function getLabels($key, array $values, $data): Closure
     {
         if ('export_result' !== $key) {
             throw new LogicException("the key {$key} is not used by this export");
@@ -89,11 +103,10 @@ class CountAppointments implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-
         // which role should we give here?
-        return new Role(PersonVoter::STATS);
+        return PersonVoter::STATS;
     }
 
     public function supportsModifiers(): array
@@ -102,10 +115,4 @@ class CountAppointments implements ExportInterface, GroupedExportInterface
             Declarations::CALENDAR_TYPE,
         ];
     }
-
-    public function getGroup(): string
-    {
-        return 'Exports of calendar';
-    }
-
-}
+}

src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.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\CalendarBundle\Export\Export;
 
 use Chill\CalendarBundle\Export\Declarations;
@@ -10,12 +19,11 @@ use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 class StatAppointmentAvgDuration implements ExportInterface, GroupedExportInterface
 {
-
     private CalendarRepository $calendarRepository;
 
     public function __construct(
@@ -29,11 +37,6 @@ class StatAppointmentAvgDuration implements ExportInterface, GroupedExportInterf
         // no form needed
     }
 
-    public function getTitle(): string
-    {
-        return 'Average appointment duration';
-    }
-
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -44,10 +47,15 @@ class StatAppointmentAvgDuration implements ExportInterface, GroupedExportInterf
         return 'Get the average of appointment duration according to various filters';
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of calendar';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         $labels = array_combine($values, $values);
@@ -68,6 +76,11 @@ class StatAppointmentAvgDuration implements ExportInterface, GroupedExportInterf
         return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
+    public function getTitle(): string
+    {
+        return 'Average appointment duration';
+    }
+
     public function getType(): string
     {
         return Declarations::CALENDAR_TYPE;
@@ -83,21 +96,15 @@ class StatAppointmentAvgDuration implements ExportInterface, GroupedExportInterf
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(AccompanyingPeriodVoter::STATS);
+        return AccompanyingPeriodVoter::STATS;
     }
 
     public function supportsModifiers(): array
     {
         return [
-            Declarations::CALENDAR_TYPE
+            Declarations::CALENDAR_TYPE,
         ];
     }
-
-    public function getGroup(): string
-    {
-        return 'Exports of calendar';
-    }
-
-}
+}

src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.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\CalendarBundle\Export\Export;
 
 use Chill\CalendarBundle\Export\Declarations;
@@ -10,8 +19,8 @@ use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 class StatAppointmentSumDuration implements ExportInterface, GroupedExportInterface
 {
@@ -28,11 +37,6 @@ class StatAppointmentSumDuration implements ExportInterface, GroupedExportInterf
         // no form needed
     }
 
-    public function getTitle(): string
-    {
-        return 'Sum of appointment durations';
-    }
-
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -43,10 +47,15 @@ class StatAppointmentSumDuration implements ExportInterface, GroupedExportInterf
         return 'Get the sum of appointment durations according to various filters';
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of calendar';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         $labels = array_combine($values, $values);
@@ -67,6 +76,11 @@ class StatAppointmentSumDuration implements ExportInterface, GroupedExportInterf
         return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
+    public function getTitle(): string
+    {
+        return 'Sum of appointment durations';
+    }
+
     public function getType(): string
     {
         return Declarations::CALENDAR_TYPE;
@@ -82,21 +96,15 @@ class StatAppointmentSumDuration implements ExportInterface, GroupedExportInterf
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(AccompanyingPeriodVoter::STATS);
+        return AccompanyingPeriodVoter::STATS;
     }
 
     public function supportsModifiers(): array
     {
         return [
-            Declarations::CALENDAR_TYPE
+            Declarations::CALENDAR_TYPE,
         ];
     }
-
-    public function getGroup(): string
-    {
-        return 'Exports of calendar';
-    }
-
-}
+}

src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.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\CalendarBundle\Export\Filter;
 
 use Chill\CalendarBundle\Export\Declarations;
@@ -20,39 +29,7 @@ class AgentFilter implements FilterInterface
         $this->userRender = $userRender;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_agents', EntityType::class, [
-            'class' => User::class,
-            'choice_label' => function (User $u) {
-                return $this->userRender->renderString($u, []);
-            },
-            'multiple' => true,
-            'expanded' => true
-        ]);
-
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter appointments by agent';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $users = [];
-
-        foreach ($data['accepted_agents'] as $r) {
-            $users[] = $r;
-        }
-
-        return [
-            'Filtered by agent: only %agents%', [
-                '%agents' => implode(", ou ", $users)
-            ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -76,4 +53,35 @@ class AgentFilter implements FilterInterface
     {
         return Declarations::CALENDAR_TYPE;
     }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_agents', EntityType::class, [
+            'class' => User::class,
+            'choice_label' => function (User $u) {
+                return $this->userRender->renderString($u, []);
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $users = [];
+
+        foreach ($data['accepted_agents'] as $r) {
+            $users[] = $r;
+        }
+
+        return [
+            'Filtered by agent: only %agents%', [
+                '%agents' => implode(', ou ', $users),
+            ], ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter appointments by agent';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php

@@ -1,10 +1,20 @@
 <?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\CalendarBundle\Export\Filter;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
+use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
@@ -12,33 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class BetweenDatesFilter implements FilterInterface
 {
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder
-            ->add('date_from', ChillDateType::class, [
-                'data' => new \DateTime(),
-            ])
-            ->add('date_to', ChillDateType::class, [
-                'data' => new \DateTime(),
-            ])
-        ;
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter appointments between certain dates';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        return ['Filtered by appointments between %dateFrom% and %dateTo%', [
-            '%dateFrom%' => $data['date_from']->format('d-m-Y'),
-            '%dateTo%' => $data['date_to']->format('d-m-Y'),
-        ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -48,9 +32,9 @@ class BetweenDatesFilter implements FilterInterface
         $where = $qb->getDQLPart('where');
 
         $clause = $qb->expr()->andX(
-                $qb->expr()->gte('cal.startDate', ':dateFrom'),
-                $qb->expr()->lte('cal.endDate', ':dateTo')
-            );
+            $qb->expr()->gte('cal.startDate', ':dateFrom'),
+            $qb->expr()->lte('cal.endDate', ':dateTo')
+        );
 
         if ($where instanceof Andx) {
             $where->add($clause);
@@ -68,4 +52,28 @@ class BetweenDatesFilter implements FilterInterface
     {
         return Declarations::CALENDAR_TYPE;
     }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date_from', ChillDateType::class, [
+                'data' => new DateTime(),
+            ])
+            ->add('date_to', ChillDateType::class, [
+                'data' => new DateTime(),
+            ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return ['Filtered by appointments between %dateFrom% and %dateTo%', [
+            '%dateFrom%' => $data['date_from']->format('d-m-Y'),
+            '%dateTo%' => $data['date_to']->format('d-m-Y'),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter appointments between certain dates';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php

@@ -23,7 +23,6 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class JobFilter implements FilterInterface
 {
-
     protected TranslatorInterface $translator;
 
     private TranslatableStringHelper $translatableStringHelper;
@@ -36,35 +35,7 @@ class JobFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('job', EntityType::class, [
-            'class' => UserJob::class,
-            'choice_label' => function (UserJob $j) {
-                return $this->translatableStringHelper->localize(
-                    $j->getLabel()
-                );
-            },
-            'multiple' => true,
-            'expanded' => true
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $userJobs = [];
-
-        foreach ($data['job'] as $j) {
-            $userJobs[] = $this->translatableStringHelper->localize(
-                $j->getLabel());
-        }
-
-        return ['Filtered by agent job: only %jobs%', [
-            '%jobs%' => implode(', ou ', $userJobs)
-        ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -91,6 +62,34 @@ class JobFilter implements FilterInterface
         return Declarations::CALENDAR_TYPE;
     }
 
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('job', EntityType::class, [
+            'class' => UserJob::class,
+            'choice_label' => function (UserJob $j) {
+                return $this->translatableStringHelper->localize(
+                    $j->getLabel()
+                );
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $userJobs = [];
+
+        foreach ($data['job'] as $j) {
+            $userJobs[] = $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        }
+
+        return ['Filtered by agent job: only %jobs%', [
+            '%jobs%' => implode(', ou ', $userJobs),
+        ]];
+    }
 
     public function getTitle(): string
     {

src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php

@@ -23,7 +23,6 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ScopeFilter implements FilterInterface
 {
-
     protected TranslatorInterface $translator;
 
     private TranslatableStringHelper $translatableStringHelper;
@@ -36,35 +35,7 @@ class ScopeFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('scope', EntityType::class, [
-            'class' => Scope::class,
-            'choice_label' => function (Scope $s) {
-                return $this->translatableStringHelper->localize(
-                    $s->getName()
-                );
-            },
-            'multiple' => true,
-            'expanded' => true
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        $scopes = [];
-
-        foreach ($data['scope'] as $s) {
-            $scopes[] = $this->translatableStringHelper->localize(
-                $s->getName());
-        }
-
-        return ['Filtered by agent scope: only %scopes%', [
-            '%scopes%' => implode(', ou ', $scopes)
-        ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -91,9 +62,37 @@ class ScopeFilter implements FilterInterface
         return Declarations::CALENDAR_TYPE;
     }
 
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('scope', EntityType::class, [
+            'class' => Scope::class,
+            'choice_label' => function (Scope $s) {
+                return $this->translatableStringHelper->localize(
+                    $s->getName()
+                );
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $scopes = [];
+
+        foreach ($data['scope'] as $s) {
+            $scopes[] = $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        }
+
+        return ['Filtered by agent scope: only %scopes%', [
+            '%scopes%' => implode(', ou ', $scopes),
+        ]];
+    }
 
     public function getTitle()
     {
         return 'Filter appointments by agent scope';
     }
-}
+}