Merge branch '111_exports_suite' into testing

src/Bundle/ChillActivityBundle/ChillActivityBundle.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Controller;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Controller;
 
 use Chill\ActivityBundle\Entity\ActivityReasonCategory;

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Controller;
 
 use Chill\ActivityBundle\Entity\ActivityReason;

src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;

src/Bundle/ChillActivityBundle/Controller/AdminController.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityReason;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityReasonCategory;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityType;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\DependencyInjection;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;

src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Entity;
 
 use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;

src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\EntityListener;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Declarations.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export;
 
 /**

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -69,9 +69,9 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         return ['export_avg_activity_duration'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -70,9 +70,9 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return ['export_avg_activity_visit_duration'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -69,9 +69,9 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return ['export_count_activity'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -70,9 +70,9 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         return ['export_sum_activity_duration'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -70,9 +70,9 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return ['export_sum_activity_visit_duration'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Export\LinkedToPerson;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -65,9 +65,9 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return ['export_count_activity'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle()

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Export\LinkedToPerson;
 
 use Chill\ActivityBundle\Entity\ActivityReason;

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Export\LinkedToPerson;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -64,6 +64,8 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         if (self::SUM === $this->action) {
             return 'Sum activities linked to a person duration by various parameters.';
         }
+
+        throw new LogicException('this action is not supported: ' . $this->action);
     }
 
     public function getGroup(): string
@@ -87,9 +89,9 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         return ['export_stat_activity'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle()
@@ -97,6 +99,8 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         if (self::SUM === $this->action) {
             return 'Sum activity linked to a person duration';
         }
+
+        throw new LogicException('This action is not supported: ' . $this->action);
     }
 
     public function getType(): string

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php

@@ -1,23 +1,22 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\Entity\UserRender;
 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;
 
@@ -62,13 +61,8 @@ class ByUserFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_users', EntityType::class, [
-            'class' => User::class,
-            'choice_label' => function (User $u) {
-                return $this->userRender->renderString($u, []);
-            },
+        $builder->add('accepted_users', PickUserDynamicType::class, [
             'multiple' => true,
-            'expanded' => true,
         ]);
     }
 

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -74,15 +74,13 @@ class EmergencyFilter implements FilterInterface
 
     public function describeAction($data, $format = 'string'): array
     {
-        foreach (self::CHOICES as $k => $v) {
-            if ($v === $data['accepted_emergency']) {
-                $choice = $k;
-            }
-        }
-
-        return ['Filtered activity by emergency: only %emergency%', [
-            '%emergency%' => $this->translator->trans($choice),
-        ]];
+        return [
+            'Filtered by emergency: only %emergency%', [
+                '%emergency%' => $this->translator->trans(
+                    $data['accepted_emergency'] ? 'is emergency' : 'is not emergency'
+                ),
+            ],
+        ];
     }
 
     public function getTitle(): string

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php

@@ -1,23 +1,22 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\Select2LocationTypeType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 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;
 
@@ -61,13 +60,9 @@ class LocationTypeFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_locationtype', EntityType::class, [
-            'class' => LocationType::class,
-            'choice_label' => function (LocationType $type) {
-                return $this->translatableStringHelper->localize($type->getTitle());
-            },
+        $builder->add('accepted_locationtype', Select2LocationTypeType::class, [
             'multiple' => true,
-            'expanded' => true,
+            //'label' => false,
         ]);
     }
 

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php

@@ -1,23 +1,22 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class UserFilter implements FilterInterface
@@ -57,13 +56,8 @@ class UserFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_users', EntityType::class, [
-            'class' => User::class,
-            'choice_label' => function (User $u) {
-                return $this->userRender->renderString($u, []);
-            },
+        $builder->add('accepted_users', PickUserDynamicType::class, [
             'multiple' => true,
-            'expanded' => true,
             'label' => 'Creators',
         ]);
     }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;

src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\ActivityType;

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter\PersonFilters;
 
 use Chill\ActivityBundle\Entity\ActivityReason;

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Export\Filter\PersonFilters;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityPresence;

src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;

src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;

src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;

src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityType;

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityReason;

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Form\Type;
 
 use Doctrine\ORM\EntityRepository;

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityType;

src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Menu;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;

src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Menu;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;

src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Notification;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Repository;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;

src/Bundle/ChillActivityBundle/Repository/ActivityReasonCategoryRepository.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\ActivityReasonCategory;

src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\ActivityReason;

src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Repository/ActivityTypeCategoryRepository.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;

src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\ActivityType;

src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\ActivityType;

src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;

src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Security\Authorization;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Service\DocGenerator;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Service\DocGenerator;
 
 use Chill\ActivityBundle\Entity\ActivityPresence;

src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Templating\Entity;
 
 use Chill\ActivityBundle\Entity\ActivityReason;

src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Test;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Controller;
 
 use Chill\ActivityBundle\Entity\ActivityType;

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;

src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Entity;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator;

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator;

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php

@@ -1,14 +1,14 @@
 <?php
 
-/**
+declare(strict_types=1);
+
+/*
  * 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\ActivityBundle\Tests\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Export\Export\LinkedToACP\AvgActivityDuration;