diff --git a/.php_cs.dist.php b/.php_cs.dist.php
index 4ad5af914..59457c082 100644
--- a/.php_cs.dist.php
+++ b/.php_cs.dist.php
@@ -1,15 +1,15 @@
 <?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);
-
-/** @var \drupol\PhpCsFixerConfigsPhp\Config\Php73 $config */
 $config = require __DIR__ . '/tests/app/vendor/drupol/php-conventions/config/php73/php_cs_fixer.config.php';
 
 $config
diff --git a/docs/source/_static/code/exports/BirthdateFilter.php b/docs/source/_static/code/exports/BirthdateFilter.php
index 2c3cd765f..11abb39f9 100644
--- a/docs/source/_static/code/exports/BirthdateFilter.php
+++ b/docs/source/_static/code/exports/BirthdateFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
diff --git a/docs/source/_static/code/exports/CountPerson.php b/docs/source/_static/code/exports/CountPerson.php
index dd95f3c88..49a546755 100644
--- a/docs/source/_static/code/exports/CountPerson.php
+++ b/docs/source/_static/code/exports/CountPerson.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
diff --git a/docs/source/development/pagination/example.php b/docs/source/development/pagination/example.php
index ed91d16a7..301fbb245 100644
--- a/docs/source/development/pagination/example.php
+++ b/docs/source/development/pagination/example.php
@@ -1,14 +1,15 @@
 <?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\MyBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
diff --git a/docs/source/development/useful-snippets/controller-secured-for-person.php b/docs/source/development/useful-snippets/controller-secured-for-person.php
index 325b5da90..ea594a02a 100644
--- a/docs/source/development/useful-snippets/controller-secured-for-person.php
+++ b/docs/source/development/useful-snippets/controller-secured-for-person.php
@@ -1,14 +1,15 @@
 <?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\HealthBundle\Controller;
 
 use Chill\HealthBundle\Security\Authorization\ConsultationVoter;
diff --git a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
index d11225245..9a8859d6b 100644
--- a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
+++ b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
diff --git a/docs/source/development/user-interface/widgets/ChillMainExtension.php b/docs/source/development/user-interface/widgets/ChillMainExtension.php
index e054ebca1..bc7a36485 100644
--- a/docs/source/development/user-interface/widgets/ChillMainExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillMainExtension.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
diff --git a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
index 31121c253..f5d74f4f9 100644
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;
diff --git a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
index 266682e3b..f5d2d823d 100644
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Widget;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
diff --git a/docs/source/development/user-interface/widgets/ChillPersonExtension.php b/docs/source/development/user-interface/widgets/ChillPersonExtension.php
index 66b01792a..ac8ae16f3 100644
--- a/docs/source/development/user-interface/widgets/ChillPersonExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonExtension.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/src/Bundle/ChillActivityBundle/ChillActivityBundle.php b/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
index 21245504f..5c6a7f5d6 100644
--- a/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
+++ b/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index fa6cde7c1..a98667fb8 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
index d367d5803..a73b7b68f 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
index ae213d578..d2fa1f581 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
index 790f59be4..d02582dd1 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
index 48d91aedf..a571cd3ce 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
index f8b19ec9f..6571c84f8 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminController.php b/src/Bundle/ChillActivityBundle/Controller/AdminController.php
index 5a658c165..606d95351 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminController.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
index 72a88a72d..55665a72f 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
index 63eeb965c..b29be51b9 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
index 1904bbcb4..24e3d43cd 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
index e62080aea..f9230174c 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
index c6031b95d..e94fb64ca 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
index 20035b557..525f30f61 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
index f61e15f1c..b33d795e0 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
index 41aa89dcb..5faf88dd0 100644
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
index 4e4e6f3c6..b8e5636ff 100644
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index 828cb68f2..e5aa4d18c 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
index 89f616dc2..e096a2cc2 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
index aed079aca..9d8d5fce9 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
index f6d35b520..2bbd2bd8b 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
index a2b15ee23..89f068501 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php b/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
index 37b85ce61..df5737f71 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
index 88adf9723..5f12d6ee5 100644
--- a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
+++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
index 251f2e9d4..e1d0df160 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
index d7abcfd49..dd4c34493 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
index ebd813af4..9af91573c 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php
index 9eb5c307e..03ff50388 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
index 058b1fc15..4fa217d62 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
index a4c1087db..4d47f2035 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php
index 1b7041d9d..7cca54f83 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
index 04ce2014c..66fca76a5 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
index 86e9e77bb..bbeb91bbb 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
index bf6b3ca02..31db27c21 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Declarations.php b/src/Bundle/ChillActivityBundle/Export/Declarations.php
index 82f01bcb2..98e0d9472 100644
--- a/src/Bundle/ChillActivityBundle/Export/Declarations.php
+++ b/src/Bundle/ChillActivityBundle/Export/Declarations.php
@@ -1,14 +1,15 @@
 <?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;
 
 /**
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
index 326033013..94b0d3423 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
index 6514be3e0..6e13dd032 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
index 92e8cdc27..34d70337a 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
index 692ff5530..0144adf1b 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
index e9be03003..6e6b38b43 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
index fec2b8617..5f9120d9d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
index 78368b0eb..70407d18a 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
index f1228842f..839effa85 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
index b6e26dfdb..0da11175f 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
index 5737220b2..558ddc62c 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
index 1a9fdb519..5eebeb257 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php
index 19ddee3ca..c8f05f321 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
index 63650b452..a7fca79b8 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
index 4ab27f043..bb9d9c63b 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
index 98cb50e89..0c2142b6a 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
index b8d6d1a59..a4d572087 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
index c0cda26a4..6d1471263 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
index 864562cbf..45d2dd3d1 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
index 9bcae2b46..447a4606d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
index 871c5a829..c8ccfbe8e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
index c15411b4e..b606a4638 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php b/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
index 5c467a575..5e8939988 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
index 09cd5ad6e..d9561875d 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php b/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
index 01543d18c..9e2c83348 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 011243d46..315762b4c 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php b/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php
index 510d27913..fc1311686 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
index 4cdcb31f2..5b9e1da02 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php b/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
index 5e0bd4561..e96203905 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php
index 70b7e9b91..5138e884c 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php
index 2b501864f..4ea102a32 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
index fd2784338..7a882e18d 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
index 636d03488..f83056195 100644
--- a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
index 1d887fead..5d64832c9 100644
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
index 56c21051f..032045d3c 100644
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
index f391de1ff..77bd2f868 100644
--- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
index d960a0c21..8c44dbccf 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
index 1fc6d22b1..3e628640e 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityReasonCategoryRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonCategoryRepository.php
index 085846074..aecc90bef 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityReasonCategoryRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonCategoryRepository.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
index 52bc47205..bdbbbacbc 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
index 312d601ad..d38e4e39c 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeCategoryRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeCategoryRepository.php
index 1714d14e3..32ad33bb0 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeCategoryRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeCategoryRepository.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
index 7bd679e8b..e88ff15ae 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
index 6172fe257..d8944855c 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
index 2fc880d2a..09eef4bf5 100644
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
index c95471771..7ee5d2ff6 100644
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index 61bcaad3e..04676e02b 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
index 0a442cec7..552a8ac3d 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php b/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
index 23aae25c8..a0e02cda5 100644
--- a/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
+++ b/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php b/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php
index 91f96dad8..45f959bfb 100644
--- a/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php
+++ b/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
index 43ce85778..da0be2d1a 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
index 0d64d0b65..e59042715 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
index 481098eb0..eb3781370 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
index 7ccf26cf1..7b9aa5c5a 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
index 7a68a36fc..a7a964bb7 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
index 2d28d0967..6d1319993 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
index 36a7c7ceb..015c2a412 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php
index 89c853e55..ccd561f60 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php
index 2ee78b2bf..4f9494ce1 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php
index 8b682487b..cea6e6f27 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php
index 81f7be13b..6b894af1c 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php
index 28f13028f..c60c4de5e 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
index 435d1043e..f69f99b9f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
index ea76a362c..63bebfe2a 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
index 69a82cffc..8635fa2b7 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php
index b175c4f15..38142abb4 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php
@@ -1,14 +1,15 @@
 <?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;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php
index 5d0e11be3..0421f240f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php
@@ -1,14 +1,15 @@
 <?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\AvgActivityVisitDuration;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php
index 78f8556c1..e5d896077 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php
@@ -1,14 +1,15 @@
 <?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\CountActivity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php
index 939ca2a88..9a68d1475 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php
@@ -1,14 +1,15 @@
 <?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\SumActivityDuration;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php
index 7c0f79bc5..1a98f455c 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php
@@ -1,14 +1,15 @@
 <?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\SumActivityVisitDuration;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php
index f94ef3414..e9640c967 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php
@@ -1,14 +1,15 @@
 <?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\LinkedToPerson;
 
 use Chill\ActivityBundle\Export\Export\LinkedToPerson\CountActivity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php
index d39592b5e..7ccaa0248 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php
@@ -1,14 +1,15 @@
 <?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\LinkedToPerson;
 
 use Chill\ActivityBundle\Export\Export\LinkedToPerson\ListActivity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php
index ae9e4f583..cdc73cf6f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php
@@ -1,14 +1,15 @@
 <?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\LinkedToPerson;
 
 use Chill\ActivityBundle\Export\Export\LinkedToPerson\StatActivityDuration;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
index 70918fb54..2a8d958ed 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
index 9beb48082..22026c9e1 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
index f92a143ee..8f311a988 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php
index 6765a918d..4505569b6 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php
index 845bb6490..a3441d832 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php
index 18558b7ee..28750df9e 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php
index a3cc6a941..b88247d18 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php
index 6dca9e18a..3ca795613 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php
index 9a869206e..8c8d593e0 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
index 150ec30f0..44b53803d 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
index 0a7d059a6..c20c44722 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter;
 
 use Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
index 97d63ddc9..0f5dad798 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
index c47b0a0a7..20fff95f0 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter\PersonFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
index c705c5462..611d4bade 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter\PersonFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
index 0e8199352..48d76ce90 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
@@ -1,14 +1,15 @@
 <?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\Filter;
 
 use Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
index 0a6518018..db75dd23f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
@@ -1,14 +1,15 @@
 <?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\Form;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
index 76e8e438c..a05d7230c 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
@@ -1,14 +1,15 @@
 <?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\Form\Type;
 
 use Chill\ActivityBundle\Form\Type\TranslatableActivityReason;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
index 7493bc5f4..2882c1f42 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
@@ -1,14 +1,15 @@
 <?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\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityType;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
index 3ca5aab45..2838f5a97 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
@@ -1,14 +1,15 @@
 <?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\Security\Authorization;
 
 use Chill\ActivityBundle\Test\PrepareActivityTrait;
diff --git a/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
index d069c05f4..8dce1cc2c 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
@@ -1,14 +1,15 @@
 <?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\Timeline;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php b/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
index 74e98e9dc..d242dc654 100644
--- a/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
+++ b/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
@@ -1,14 +1,15 @@
 <?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\Timeline;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php
index e6ed66d4a..d661e8ac4 100644
--- a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php
+++ b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php
@@ -1,14 +1,15 @@
 <?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\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
index b1d0f13e7..420b6bbfa 100644
--- a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
+++ b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
@@ -1,14 +1,15 @@
 <?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\Validator\Constraints;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php b/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
index c84d3af52..025e9bb73 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php b/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
index efcd68c7e..7a2ad20e1 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php b/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
index a4bb82319..e2f746ea9 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php b/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php
index 80afac045..a0350d61e 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20161114085659.php b/src/Bundle/ChillActivityBundle/migrations/Version20161114085659.php
index 73ec11a9e..b9a3c222b 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20161114085659.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20161114085659.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210304154629.php b/src/Bundle/ChillActivityBundle/migrations/Version20210304154629.php
index 427fa5bf2..fb74e4e07 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210304154629.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210304154629.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210311114250.php b/src/Bundle/ChillActivityBundle/migrations/Version20210311114250.php
index 135c6e3ad..4845f8cda 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210311114250.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210311114250.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210401090853.php b/src/Bundle/ChillActivityBundle/migrations/Version20210401090853.php
index cc75b418b..3f3d8c23a 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210401090853.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210401090853.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210408122329.php b/src/Bundle/ChillActivityBundle/migrations/Version20210408122329.php
index 8a32123e1..dc1b07e1a 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210408122329.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210408122329.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210415113216.php b/src/Bundle/ChillActivityBundle/migrations/Version20210415113216.php
index f406d8ad1..6d34989ef 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210415113216.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210415113216.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php b/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
index b24bb9ea7..cc5d089cd 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php b/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
index 577d09c5e..d17622c40 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210506071150.php b/src/Bundle/ChillActivityBundle/migrations/Version20210506071150.php
index 1b60bb219..7153a48b8 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210506071150.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210506071150.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210506090417.php b/src/Bundle/ChillActivityBundle/migrations/Version20210506090417.php
index 15f6a0158..55608a5af 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210506090417.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210506090417.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210506094520.php b/src/Bundle/ChillActivityBundle/migrations/Version20210506094520.php
index e29eb567a..5cdd0434d 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210506094520.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210506094520.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php b/src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php
index 2163a0b65..27be03e35 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210520095626.php b/src/Bundle/ChillActivityBundle/migrations/Version20210520095626.php
index 1d6f42f6e..9856874b5 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210520095626.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210520095626.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210528161250.php b/src/Bundle/ChillActivityBundle/migrations/Version20210528161250.php
index 1bc26298c..ee748c828 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210528161250.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210528161250.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210602103243.php b/src/Bundle/ChillActivityBundle/migrations/Version20210602103243.php
index 3122df777..1889399eb 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210602103243.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210602103243.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20211119173555.php b/src/Bundle/ChillActivityBundle/migrations/Version20211119173555.php
index 66095af3d..744588c8e 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20211119173555.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20211119173555.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20211207152023.php b/src/Bundle/ChillActivityBundle/migrations/Version20211207152023.php
index 034fee71a..bee2a30f4 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20211207152023.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20211207152023.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
index 4a829f18c..075b52c0d 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php b/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
index 2661edf4b..4aab5c65d 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php b/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php
index c87610fae..62134ce8a 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
index ae463d240..9667ea9a7 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
index 43b2d2362..3b12ad922 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
index e5244009e..f1c2aad0c 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Controller;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
index ae84ac472..3b627785e 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\DataFixtures\ORM;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
index 5c897e8ec..0d64a38c0 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\DataFixtures\ORM;
 
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
index f40f18aa9..d4179ded9 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
index 76bcebca5..36f8048b4 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
index 2f4efe580..e5081d987 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
index 73ab536d6..7f8e6a7be 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php
index 314dbe551..d491cc063 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Form;
 
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index 6ade55d07..28934aa8e 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Form;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
index 30b587a7e..94e731011 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Menu;
 
 use Knp\Menu\MenuItem;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
index 700ee58f1..80a6aae96 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
index ceca055e4..a766e5f2d 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
index 791bd0d5b..dbe1d665c 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Repository;
 
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityRepository.php b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityRepository.php
index a318837f7..0fa62df3b 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityRepository.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityRepository.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Repository;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
index 8b49098e4..beee65af4 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Templating\Entity;
 
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
index 1dea9bc0c..3cc2cd81f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
@@ -1,14 +1,15 @@
 <?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\AsideActivityBundle\Tests\Controller;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php
index f02b623d0..63a18e776 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php
@@ -1,14 +1,15 @@
 <?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\Migrations\AsideActivity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php
index d14898422..3c9440a47 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php
@@ -1,14 +1,15 @@
 <?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\Migrations\AsideActivity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php
index 889c7f177..05f655e69 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php
@@ -1,14 +1,15 @@
 <?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\Migrations\AsideActivity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php
index 62fe73244..4c981c87c 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php
@@ -1,14 +1,15 @@
 <?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\Migrations\AsideActivity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php
index d6d4deef4..1a2c37ee1 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php
@@ -1,14 +1,15 @@
 <?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\Migrations\AsideActivity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php
index 67a1db139..fceb2d7eb 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php
@@ -1,14 +1,15 @@
 <?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\Migrations\AsideActivity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php
index cfa5f3ce5..ad7fa5aa0 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php
@@ -1,14 +1,15 @@
 <?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\Migrations\AsideActivity;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
index 88bd5cf23..35c9534a5 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Calculator;
 
 use Chill\BudgetBundle\Entity\AbstractElement;
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
index 21c9e18ca..d7fe8959c 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Calculator;
 
 use Chill\BudgetBundle\Entity\AbstractElement;
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
index c3cc40008..fd7af1d54 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Calculator;
 
 class CalculatorResult
diff --git a/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php b/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php
index ce8214604..289315066 100644
--- a/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php
+++ b/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle;
 
 use Chill\BudgetBundle\DependencyInjection\Compiler\CalculatorCompilerPass;
diff --git a/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php b/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php
index 6443eeaf7..337257004 100644
--- a/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Config;
 
 class ConfigRepository
diff --git a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
index 94cb9255a..8248e51a1 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Controller;
 
 use Chill\BudgetBundle\Entity\AbstractElement;
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
index ec556ffed..feacb0c12 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Controller;
 
 use Chill\BudgetBundle\Entity\Charge;
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
index 0230f53b9..d0da7f820 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Controller;
 
 use Chill\BudgetBundle\Calculator\CalculatorManager;
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
index 3ecd53097..93401e2b3 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Controller;
 
 use Chill\BudgetBundle\Entity\Resource;
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
index cf7e4fad2..453e03335 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\DependencyInjection;
 
 use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
index ec47d5faa..40395ecf9 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
index 710fe43f0..7fcee16d9 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
index 747e6f4b4..53a2942ff 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Entity;
 
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillBudgetBundle/Entity/Charge.php b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
index 4acc6e855..37559ba88 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/Charge.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Entity;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillBudgetBundle/Entity/Resource.php b/src/Bundle/ChillBudgetBundle/Entity/Resource.php
index 6100e90a0..8b4b2cd41 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/Resource.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Resource.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Entity;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
index 85e7e45aa..bacc7c74a 100644
--- a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Form;
 
 use Chill\BudgetBundle\Config\ConfigRepository;
diff --git a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
index 5ad388a39..2cc8a3b6d 100644
--- a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Form;
 
 use Chill\BudgetBundle\Config\ConfigRepository;
diff --git a/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php
index f9f295e17..1abbd0df8 100644
--- a/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php
+++ b/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Menu;
 
 use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
diff --git a/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php
index db2f66d6a..a74581817 100644
--- a/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Menu;
 
 use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
index 62aa9eea6..c9ee54028 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
index 23cc5ca54..7efae4dce 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php b/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
index 18232f246..0e844195e 100644
--- a/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
+++ b/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Security\Authorization;
 
 use Chill\BudgetBundle\Entity\AbstractElement;
diff --git a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
index 243cd4749..8b30ea0f1 100644
--- a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
+++ b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Service\Summary;
 
 use Chill\BudgetBundle\Config\ConfigRepository;
diff --git a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudgetInterface.php b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudgetInterface.php
index 528c4626e..d69f65b11 100644
--- a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudgetInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudgetInterface.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Service\Summary;
 
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillBudgetBundle/Templating/Twig.php b/src/Bundle/ChillBudgetBundle/Templating/Twig.php
index 1f4e4098b..1f398fe49 100644
--- a/src/Bundle/ChillBudgetBundle/Templating/Twig.php
+++ b/src/Bundle/ChillBudgetBundle/Templating/Twig.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Templating;
 
 use Chill\BudgetBundle\Config\ConfigRepository;
diff --git a/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php b/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
index 92784909b..653b5d628 100644
--- a/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
+++ b/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
@@ -1,14 +1,15 @@
 <?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\BudgetBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillBudgetBundle/migrations/Version20180522080432.php b/src/Bundle/ChillBudgetBundle/migrations/Version20180522080432.php
index 001506c0e..9bd54a59c 100644
--- a/src/Bundle/ChillBudgetBundle/migrations/Version20180522080432.php
+++ b/src/Bundle/ChillBudgetBundle/migrations/Version20180522080432.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Budget;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillBudgetBundle/migrations/Version20181219145631.php b/src/Bundle/ChillBudgetBundle/migrations/Version20181219145631.php
index 87ab85f90..6333b9365 100644
--- a/src/Bundle/ChillBudgetBundle/migrations/Version20181219145631.php
+++ b/src/Bundle/ChillBudgetBundle/migrations/Version20181219145631.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Budget;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillBudgetBundle/migrations/Version20220224090319.php b/src/Bundle/ChillBudgetBundle/migrations/Version20220224090319.php
index 9711cbc6d..317a2ead5 100644
--- a/src/Bundle/ChillBudgetBundle/migrations/Version20220224090319.php
+++ b/src/Bundle/ChillBudgetBundle/migrations/Version20220224090319.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Budget;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php b/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php
index 11b985224..ed1edbb09 100644
--- a/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php
+++ b/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
index 9b9195b82..09851df36 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
index 70cf34cd4..10d6f7360 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index ff34aaf45..e4d000301 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
index 018d23426..efcb1199e 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CancelReasonController.php b/src/Bundle/ChillCalendarBundle/Controller/CancelReasonController.php
index 3be2a8f93..0947df0f8 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CancelReasonController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CancelReasonController.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
index e708672a9..b066276bb 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\DataFixtures\ORM;
 
 use Chill\CalendarBundle\Entity\CalendarRange;
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
index fca57288e..b0cc34ab8 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\DataFixtures\ORM;
 
 use Chill\CalendarBundle\Entity\CancelReason;
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
index 77519d773..9eee99417 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\DataFixtures\ORM;
 
 use Chill\CalendarBundle\Entity\Invite;
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
index e33e6c3c3..ab3f375f4 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
index f1e744cb8..f74242add 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index c40bddb44..deb31b58e 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Entity;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
index b29a9db08..0f262a8f0 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Entity;
 
 use Chill\CalendarBundle\Repository\CalendarRangeRepository;
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
index 635508671..7b94c2347 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Entity;
 
 use Chill\CalendarBundle\Repository\CancelReasonRepository;
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Invite.php b/src/Bundle/ChillCalendarBundle/Entity/Invite.php
index 464c5485a..22f437918 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Invite.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Invite.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Entity;
 
 use Chill\CalendarBundle\Repository\InviteRepository;
diff --git a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
index ec902bd64..a3990974a 100644
--- a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
+++ b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Event;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
index d1cdd56b1..ec4ae43aa 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
index 502f8000c..c780d4631 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
index d5471d36e..137e22239 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
index 7746bc7f2..3c3d8bc5d 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
index f48eafd79..00b50bbd8 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
index a74853119..284a79943 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
index 3b8123b65..161dcc499 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Declarations.php b/src/Bundle/ChillCalendarBundle/Export/Declarations.php
index 616d70a1a..c7143a232 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Declarations.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Declarations.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export;
 
 /**
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php b/src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php
index b9da17114..8d8ee9814 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Export;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.php b/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.php
index 491cb38b9..845ca3dbb 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Export;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.php b/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.php
index 286c73be5..5759224dd 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Export;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
index 263b1e160..b7e9a1241 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Filter;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
index c3aafc192..54df3d8a8 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Filter;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
index ed4c2dadd..585e3d502 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Filter;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
index 0093865aa..76393e8bc 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Export\Filter;
 
 use Chill\CalendarBundle\Export\Declarations;
diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
index b1dccb5fd..30203e425 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Form;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php b/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
index be1b4e809..381800263 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Form;
 
 use Chill\CalendarBundle\Entity\CancelReason;
diff --git a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
index 3bf1850a4..ea4f10a8b 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
index 961bab778..55129c9ab 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
index 74512eda5..916548309 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
index 5286c5515..cbd878bb9 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\CalendarRange;
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
index 55fba5f80..a8b0f232b 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\Calendar;
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php
index 47e0bfa44..6ba53c3f9 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\CancelReason;
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
index 53aa8b2a1..f7b275b5b 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\Invite;
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
index 813bb87bd..84bd9adfd 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
@@ -1,14 +1,15 @@
 <?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\CalendarBundle\Tests\Controller;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php
index 20d21f499..5c31c6a0b 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php
index ecafff926..0983e62b1 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php
index f3a7e1928..6c2a672e6 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php
index eb055a27e..8dcbd5673 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20211119173557.php b/src/Bundle/ChillCalendarBundle/migrations/Version20211119173557.php
index 2567557e8..c8ab7707f 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20211119173557.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20211119173557.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
index 39c4cb7c3..6adebf8e1 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220527234046.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220527234046.php
index 9cb68932e..7352d3dc4 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220527234046.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220527234046.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Calendar;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php b/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php
index 65cded145..e4ba3c936 100644
--- a/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php
+++ b/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle;
 
 use Chill\CustomFieldsBundle\DependencyInjection\CustomFieldCompilerPass;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
index 7454ba6cf..a459cb056 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Command;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
index 26a252cf5..0ad1cac75 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
index 7fae79016..4b4da55c9 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Controller;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
index 68d9fb8ec..3cb82836f 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Controller;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php
index d821ff591..a3a3ba1d2 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\CustomFields;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
index 2982b1c83..b800bf85a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\CustomFields;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
index 38a31491d..b811a0817 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\CustomFields;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
index fe0ffb8b9..1615e8428 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\CustomFields;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
index 20b1a9ec7..08d4ca8c0 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\CustomFields;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
index cd42ca751..978082c13 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\CustomFields;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
index 849f851fd..8fc227b43 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\CustomFields;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
index 4b1350499..a0d1e1253 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\CustomFields;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
index 2777a0da5..de0bebc7a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\DataFixtures\ORM;
 
 use Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option;
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
index 9c9ca7872..4fafbaeaa 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
index 453254c4e..20c2858f6 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
index 198028360..551816729 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\DependencyInjection;
 
 use LogicException;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
index 368bf92da..b23e1a5af 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
index fe4f40149..0f1972fdb 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Entity\CustomFieldLongChoice;
 
 use Doctrine\Common\Collections\Collection;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
index 841a71306..108163b97 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
index e5aa5fbbe..3c2cedc21 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php b/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
index 50a4a2c87..38c8e10cd 100644
--- a/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
+++ b/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\EntityRepository\CustomFieldLongChoice;
 
 use Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
index e45cc7837..6bea9eb1e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form;
 
 use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldsGroupToIdTransformer;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
index 5b6622e48..a29dcbeec 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form;
 
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php
index a82fe52d7..910f356db 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\DataTransformer;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
index fc6dfd75f..ed5c9e353 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\DataTransformer;
 
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
index f8095018a..c8f6ac258 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\DataTransformer;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
index 42428c21b..40bbaff6e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php
index 9208720d8..6bee09f19 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\Extension;
 
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextNumberExtension.php b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextNumberExtension.php
index 02a42ae67..32dba2507 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextNumberExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextNumberExtension.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\Extension;
 
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
index 92ef86c4a..7f5553156 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
index 77a479728..88cc60dd9 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\Type;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesType.php
index ed7b52fca..32b682c6d 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesType.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
index e3ef7c694..79c6f22e4 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\Type;
 
 use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php
index 95d5a649f..13e43d235 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
index 35a7cd305..20e8b677a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Form\Type;
 
 use Chill\MainBundle\Templating\TranslatableStringHelper;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
index 71d0d6275..9f72a42f9 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
index 6c90f3951..f7f7bd3de 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Service;
 
 use LogicException;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
index f89854a14..56bf3302c 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Service;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
index 90c31612f..a4575f4b6 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Service;
 
 use Exception;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
index 2bfe41917..d0ca63f6f 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Templating\Twig;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
index a32d2190d..16e425b31 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Templating\Twig;
 
 use Symfony\Component\DependencyInjection\Container;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
index cb8136806..b1371fe50 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Tests\Config;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
index b5e8ab438..39cf2a8bc 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
index 4c3447030..e6b8b3697 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Client;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
index 065b32898..5129eb761 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Tests;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
index d3355b9ce..75dfe43e5 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Tests\CustomFields;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
index fb0079f05..a38743af7 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Tests\CustomFields;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldNumber;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
index c1dca44c0..798f01f74 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Tests\CustomFields;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldText;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
index 1c8b8e143..dffe2873e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
@@ -1,14 +1,15 @@
 <?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\CustomFields\Tests\Form\Extension;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
index 8469b6210..ca94138e6 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
@@ -1,14 +1,15 @@
 <?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\CustomFields\Tests\Form\Extension;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
index 32c6639bc..a8a80e653 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
@@ -1,14 +1,15 @@
 <?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\CustomFieldsBundle\Tests\Routing;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
index b08ca05c0..f9704f96e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
@@ -1,14 +1,15 @@
 <?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\CustomFields\Tests\Service;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
index ab43936eb..2ba6e4e79 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
@@ -1,14 +1,15 @@
 <?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\CustomFields\Tests\Templating\Twig;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
index b950d562e..3837314f1 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
@@ -1,14 +1,15 @@
 <?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\CustomFields\Tests\Templating\Twig;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20141128195430.php b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20141128195430.php
index 5a93f65d9..b263ab5ef 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20141128195430.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20141128195430.php
@@ -1,14 +1,15 @@
 <?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\Migrations\CustomFields;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20150224164531.php b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20150224164531.php
index 41b0dc0e0..ed9e247a4 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20150224164531.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20150224164531.php
@@ -1,14 +1,15 @@
 <?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\Migrations\CustomFields;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
index ba1ce6e1c..c10bc6402 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
@@ -1,14 +1,15 @@
 <?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\Migrations\CustomFields;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php
index 69a6e9032..8e00f2f15 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php
@@ -1,14 +1,15 @@
 <?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\Migrations\CustomFields;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php b/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php
index aa02a6101..3b6b63d4c 100644
--- a/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php
+++ b/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle;
 
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextInterface;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php
index b8f4d0eed..6d1bf0ad1 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Context;
 
 use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php
index 3468d787d..139f68584 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Context;
 
 use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextInterface.php
index df148f6e1..99a54b068 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextInterface.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Context;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
index 3b606ccb5..57ee32ed1 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Context;
 
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
index e207cfb25..c2cc89d54 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Context;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php
index d4bbe856a..3216f6b49 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Context\Exception;
 
 use RuntimeException;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php
index f992e674d..27525c645 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Context\Exception;
 
 use LogicException;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
index 296829455..28250b6f2 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Controller;
 
 use Chill\DocGeneratorBundle\Context\ContextManager;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index 4bbd95e3a..b7001a48b 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Controller;
 
 use Chill\DocGeneratorBundle\Context\ContextManager;
diff --git a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
index 86cedfb3e..eadee4ea4 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\DataFixtures\ORM;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
index b57cbe72b..d2a9d53f8 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php
index 1117a5fc0..c1c9086ac 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
index ee93f74fb..ab4094a4b 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Entity;
 
 use Chill\DocStoreBundle\Entity\StoredObject;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
index ff516d3de..eae5a2333 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Form;
 
 use Chill\DocGeneratorBundle\Context\ContextManager;
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php
index d787523c9..744628f2e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\GeneratorDriver;
 
 interface DriverInterface
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php
index 214c77621..9cf5e2c3a 100644
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\GeneratorDriver\Exception;
 
 use RuntimeException;
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
index 4cadcef1f..ba204fee8 100644
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\GeneratorDriver;
 
 use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
index 5eed2ae9f..a67412a60 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
index a0ab109fb..de9fb6708 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Repository;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php
index b8fca5119..613401271 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Serializer\Encoder;
 
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
index e70171234..de1ec51dc 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Serializer\Helper;
 
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
index cd01a003a..13072d020 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Serializer\Normalizer;
 
 use ArrayObject;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
index 6851c7225..d5789f200 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Serializer\Normalizer;
 
 use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php b/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
index 0e2da164f..771fae3dd 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Service\Context;
 
 use Chill\MainBundle\Entity\Location;
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php
index b11112bad..eeffa79b3 100644
--- a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocGenerator;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php
index c6a7223e4..24d1318db 100644
--- a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocGenerator;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211103111010.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211103111010.php
index 1530fd065..b01e0b02d 100644
--- a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211103111010.php
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211103111010.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocGenerator;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211119173556.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211119173556.php
index 17deb2352..83222f66c 100644
--- a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211119173556.php
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211119173556.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocGenerator;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211201191757.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211201191757.php
index 814974d7b..7df74aeca 100644
--- a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211201191757.php
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211201191757.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocGenerator;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php
index 1e529712f..64e88b44d 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\Tests\Serializer\Encoder;
 
 use Chill\DocGeneratorBundle\Serializer\Encoder\DocGenEncoder;
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
index 178e9b183..b896a931c 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\tests\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php
index feb9afd35..650fbc931 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php
@@ -1,14 +1,15 @@
 <?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\DocGeneratorBundle\tests\Service\Context;
 
 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
diff --git a/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php b/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php
index c5536d0f1..bfb8bb310 100644
--- a/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php
+++ b/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
index 784fed6c9..b563653c6 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
index 41991b1bb..3dec53376 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
index 4daa9fe28..be9d4b1b4 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\ChillDocStoreBundle;
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
index 062ac3e4a..ceb2b6760 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\PersonDocument;
diff --git a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
index cab5895a9..055dab691 100644
--- a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
+++ b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\DataFixtures\ORM;
 
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
diff --git a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php
index 3369994bd..4f0ccd88e 100644
--- a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php
+++ b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\DataFixtures\ORM;
 
 use Chill\DocStoreBundle\Entity\DocumentCategory;
diff --git a/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php b/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
index 957624702..f1a835ec4 100644
--- a/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
+++ b/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\DependencyInjection;
 
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
diff --git a/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php
index a0761c074..2bd664b90 100644
--- a/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php b/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
index 4f90b06fc..dba906e35 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Entity;
 
 use Chill\MainBundle\Entity\HasScopesInterface;
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/Document.php b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
index 0fd329ff8..41d0f914e 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/Document.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Entity;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
index 69af75f42..6991230a9 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
index b6cf5376f..f64e3133b 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Entity;
 
 use Chill\MainBundle\Entity\HasCenterInterface;
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index f852e9f14..d5c23123f 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Entity;
 
 use ChampsLibres\AsyncUploaderBundle\Model\AsyncFileInterface;
diff --git a/src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php b/src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php
index dfbd533d9..ed0f9edd9 100644
--- a/src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\EntityRepository;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
diff --git a/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php b/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php
index b5d0bf679..e35614680 100644
--- a/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php
+++ b/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Exception;
 
 use Exception;
diff --git a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
index c9f9365a4..91d21599c 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Form;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
diff --git a/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php b/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
index 62c63fe1f..efff114f1 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Form;
 
 use Chill\DocStoreBundle\Entity\DocumentCategory;
diff --git a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
index f7abd93dd..8dc1c2bf7 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Form;
 
 use Chill\DocStoreBundle\Entity\Document;
diff --git a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
index aaf1e80da..c46bfef6b 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Form;
 
 use ChampsLibres\AsyncUploaderBundle\Form\Type\AsyncUploaderType;
diff --git a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
index cdae0136b..341b6f919 100644
--- a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
index d579dc162..1b859551e 100644
--- a/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Menu;
 
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
diff --git a/src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php b/src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php
index 7c9054010..6c95d1bf4 100644
--- a/src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php
+++ b/src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Object;
 
 use ChampsLibres\AsyncUploaderBundle\Form\AsyncFileTransformer\AsyncFileTransformerInterface;
diff --git a/src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php b/src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php
index c0e4f7509..c3fba836b 100644
--- a/src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php
+++ b/src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Object;
 
 use ChampsLibres\AsyncUploaderBundle\Persistence\PersistenceCheckerInterface;
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
index 57c898b68..abb64dc41 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Repository;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
index e91cdad9a..1c92218bd 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Repository;
 
 use Chill\DocStoreBundle\Entity\DocumentCategory;
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
index 2fee85a8f..47ee333b8 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Repository;
 
 use Chill\DocStoreBundle\Entity\PersonDocument;
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php
index 85b0288c0..96af869fe 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
index 118998a9c..60566f73b 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Repository;
 
 use Chill\DocStoreBundle\Entity\StoredObject;
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
index e37a8deab..da363df51 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Security\Authorization;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
index dbaa474a3..c74d37b10 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Security\Authorization;
 
 use Chill\DocStoreBundle\Entity\PersonDocument;
diff --git a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php
index 1c32b3d03..ad54cbe8d 100644
--- a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php
+++ b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Serializer\Normalizer;
 
 use Chill\DocStoreBundle\Entity\StoredObject;
diff --git a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php
index 0f867e0de..3998d19c2 100644
--- a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php
+++ b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Service;
 
 use Base64Url\Base64Url;
diff --git a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php
index ad40b571c..f6fd87057 100644
--- a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Service;
 
 use Chill\DocStoreBundle\Entity\StoredObject;
diff --git a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtension.php b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtension.php
index dcf1ea507..fdb44777e 100644
--- a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtension.php
+++ b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtension.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Templating;
 
 use Twig\Extension\AbstractExtension;
diff --git a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
index a99a7d351..9bb9597b6 100644
--- a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
+++ b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Templating;
 
 use ChampsLibres\WopiLib\Contract\Service\Discovery\DiscoveryInterface;
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php
index 589515a05..0423db0f7 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Tests;
 
 use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index 02cdf6fb3..de2a4cc63 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
@@ -1,14 +1,15 @@
 <?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\DocStoreBundle\Workflow;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
index 30e008d1f..2c62acdbb 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocStore;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
index 5a3034280..5fd3435d0 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocStore;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20210903091534.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20210903091534.php
index caf412f2d..53e25ca9b 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20210903091534.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20210903091534.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocStore;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20210903123835.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20210903123835.php
index d24474bde..d64f486f3 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20210903123835.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20210903123835.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocStore;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php
index cbafadc02..2a122147e 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocStore;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20211119173558.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20211119173558.php
index 7d0b5e3e2..786cb9320 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20211119173558.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20211119173558.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocStore;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20220131093117.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20220131093117.php
index fea869730..9ccebcfcd 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20220131093117.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20220131093117.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocStore;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20220525141646.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20220525141646.php
index 71f251db7..ea750f974 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20220525141646.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20220525141646.php
@@ -1,14 +1,15 @@
 <?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\Migrations\DocStore;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillEventBundle/ChillEventBundle.php b/src/Bundle/ChillEventBundle/ChillEventBundle.php
index 66438716e..f4324b7a9 100644
--- a/src/Bundle/ChillEventBundle/ChillEventBundle.php
+++ b/src/Bundle/ChillEventBundle/ChillEventBundle.php
@@ -1,14 +1,15 @@
 <?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\EventBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillEventBundle/Controller/AdminController.php b/src/Bundle/ChillEventBundle/Controller/AdminController.php
index 81918436e..607589bec 100644
--- a/src/Bundle/ChillEventBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillEventBundle/Controller/AdminController.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillEventBundle/Controller/EventController.php b/src/Bundle/ChillEventBundle/Controller/EventController.php
index 5d00387c8..831f7091b 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventController.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Controller;
 
 use Chill\EventBundle\Entity\Event;
diff --git a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
index 5db922dea..3c8576e36 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Controller;
 
 use Chill\EventBundle\Entity\EventType;
diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
index da1569d3c..0cd6b4fd6 100644
--- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Controller;
 
 use ArrayIterator;
diff --git a/src/Bundle/ChillEventBundle/Controller/RoleController.php b/src/Bundle/ChillEventBundle/Controller/RoleController.php
index 8bf8affbd..d0ae54647 100644
--- a/src/Bundle/ChillEventBundle/Controller/RoleController.php
+++ b/src/Bundle/ChillEventBundle/Controller/RoleController.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Controller;
 
 use Chill\EventBundle\Entity\Role;
diff --git a/src/Bundle/ChillEventBundle/Controller/StatusController.php b/src/Bundle/ChillEventBundle/Controller/StatusController.php
index 40f92cba4..d9841071f 100644
--- a/src/Bundle/ChillEventBundle/Controller/StatusController.php
+++ b/src/Bundle/ChillEventBundle/Controller/StatusController.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Controller;
 
 use Chill\EventBundle\Entity\Status;
diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php
index c106d777c..263de397b 100644
--- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php
+++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\DataFixtures\ORM;
 
 use Chill\EventBundle\Entity\EventType;
diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
index 925a61495..b8755b7ad 100644
--- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
+++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\DataFixtures\ORM;
 
 use Chill\EventBundle\Entity\Event;
diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
index 8bd1a3513..639c2b8a3 100644
--- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
+++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
diff --git a/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php b/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
index a793469b6..044747e07 100644
--- a/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
+++ b/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\DependencyInjection;
 
 use Chill\EventBundle\Security\Authorization\EventVoter;
diff --git a/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php
index 181ae43db..38c4d0324 100644
--- a/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillEventBundle/Entity/Event.php b/src/Bundle/ChillEventBundle/Entity/Event.php
index 3c90967f5..ec18d7077 100644
--- a/src/Bundle/ChillEventBundle/Entity/Event.php
+++ b/src/Bundle/ChillEventBundle/Entity/Event.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Entity;
 
 use ArrayIterator;
diff --git a/src/Bundle/ChillEventBundle/Entity/EventType.php b/src/Bundle/ChillEventBundle/Entity/EventType.php
index 2a2c932d9..12e0f1dd7 100644
--- a/src/Bundle/ChillEventBundle/Entity/EventType.php
+++ b/src/Bundle/ChillEventBundle/Entity/EventType.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillEventBundle/Entity/Participation.php b/src/Bundle/ChillEventBundle/Entity/Participation.php
index d52618bcd..f2497fd33 100644
--- a/src/Bundle/ChillEventBundle/Entity/Participation.php
+++ b/src/Bundle/ChillEventBundle/Entity/Participation.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Entity;
 
 use ArrayAccess;
diff --git a/src/Bundle/ChillEventBundle/Entity/Role.php b/src/Bundle/ChillEventBundle/Entity/Role.php
index 999116700..719d22626 100644
--- a/src/Bundle/ChillEventBundle/Entity/Role.php
+++ b/src/Bundle/ChillEventBundle/Entity/Role.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillEventBundle/Entity/Status.php b/src/Bundle/ChillEventBundle/Entity/Status.php
index f7d936671..f23a1df84 100644
--- a/src/Bundle/ChillEventBundle/Entity/Status.php
+++ b/src/Bundle/ChillEventBundle/Entity/Status.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
index faac75668..d60e0510d 100644
--- a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+++ b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Form\ChoiceLoader;
 
 use Chill\EventBundle\Entity\Event;
diff --git a/src/Bundle/ChillEventBundle/Form/EventType.php b/src/Bundle/ChillEventBundle/Form/EventType.php
index 6fe0535b3..d61b339ce 100644
--- a/src/Bundle/ChillEventBundle/Form/EventType.php
+++ b/src/Bundle/ChillEventBundle/Form/EventType.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Form;
 
 use Chill\EventBundle\Form\Type\PickEventTypeType;
diff --git a/src/Bundle/ChillEventBundle/Form/EventTypeType.php b/src/Bundle/ChillEventBundle/Form/EventTypeType.php
index dee3fea25..56ba174fb 100644
--- a/src/Bundle/ChillEventBundle/Form/EventTypeType.php
+++ b/src/Bundle/ChillEventBundle/Form/EventTypeType.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
diff --git a/src/Bundle/ChillEventBundle/Form/ParticipationType.php b/src/Bundle/ChillEventBundle/Form/ParticipationType.php
index 70efcb7b9..ce5c5d816 100644
--- a/src/Bundle/ChillEventBundle/Form/ParticipationType.php
+++ b/src/Bundle/ChillEventBundle/Form/ParticipationType.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Form;
 
 use Chill\EventBundle\Entity\EventType;
diff --git a/src/Bundle/ChillEventBundle/Form/RoleType.php b/src/Bundle/ChillEventBundle/Form/RoleType.php
index da91637d8..c2c1166a9 100644
--- a/src/Bundle/ChillEventBundle/Form/RoleType.php
+++ b/src/Bundle/ChillEventBundle/Form/RoleType.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Form;
 
 use Chill\EventBundle\Entity\EventType;
diff --git a/src/Bundle/ChillEventBundle/Form/StatusType.php b/src/Bundle/ChillEventBundle/Form/StatusType.php
index cea82049a..595790ef0 100644
--- a/src/Bundle/ChillEventBundle/Form/StatusType.php
+++ b/src/Bundle/ChillEventBundle/Form/StatusType.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Form;
 
 use Chill\EventBundle\Form\Type\PickEventTypeType;
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php b/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
index 68500e55e..6457379bd 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Form\Type;
 
 use Chill\EventBundle\Entity\Event;
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php b/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
index bad43a349..9cc156c2c 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Form\Type;
 
 use Chill\EventBundle\Entity\EventType;
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php b/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
index 928fd4180..798178886 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Form\Type;
 
 use Chill\EventBundle\Entity\EventType;
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php b/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
index a85f4e4c3..94d400f5c 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Form\Type;
 
 use Chill\EventBundle\Entity\EventType;
diff --git a/src/Bundle/ChillEventBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillEventBundle/Menu/AdminMenuBuilder.php
index 63307a99d..12cee8632 100644
--- a/src/Bundle/ChillEventBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillEventBundle/Menu/AdminMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
index e16466b33..84f2a05bb 100644
--- a/src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Menu;
 
 use Chill\EventBundle\Security\Authorization\EventVoter;
diff --git a/src/Bundle/ChillEventBundle/Repository/EventRepository.php b/src/Bundle/ChillEventBundle/Repository/EventRepository.php
index 352021120..d41a896ce 100644
--- a/src/Bundle/ChillEventBundle/Repository/EventRepository.php
+++ b/src/Bundle/ChillEventBundle/Repository/EventRepository.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
diff --git a/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php b/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
index 673d63df8..e7de4a346 100644
--- a/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
+++ b/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
diff --git a/src/Bundle/ChillEventBundle/Search/EventSearch.php b/src/Bundle/ChillEventBundle/Search/EventSearch.php
index 9b2052305..1113a2fa1 100644
--- a/src/Bundle/ChillEventBundle/Search/EventSearch.php
+++ b/src/Bundle/ChillEventBundle/Search/EventSearch.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Search;
 
 use Chill\EventBundle\Entity\Event;
diff --git a/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php b/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
index 9d7c88500..af49a5e24 100644
--- a/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
+++ b/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Security\Authorization;
 
 use Chill\EventBundle\Entity\Event;
diff --git a/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php b/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
index 8d7a76c62..2a7ef0581 100644
--- a/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
+++ b/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Security\Authorization;
 
 use Chill\EventBundle\Entity\Participation;
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
index 21c5c89d9..13685acaa 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
index e2a8170d4..11f92cfbc 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
index d81c6f9c8..26316418b 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
index d720f7e7a..28cc4fa45 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
index 28bbab8e3..d08b37c6b 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
index f8565b5e8..fce633d0a 100644
--- a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Tests\Search;
 
 use Chill\EventBundle\Entity\Event;
diff --git a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
index 132a74144..c60e81580 100644
--- a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
+++ b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
@@ -1,14 +1,15 @@
 <?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\EventBundle\Timeline;
 
 use Chill\EventBundle\Entity\Event;
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php b/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
index 241003abf..13c80fa46 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Event;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php b/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
index b0b676362..7876ae32f 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Event;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php b/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php
index 35b586907..a018390e1 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Event;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php b/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
index 7c6d0abc8..555e930d5 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Event;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php b/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php
index 1f4c78842..4b1e17b2e 100644
--- a/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php
+++ b/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Config/ConfigRepository.php b/src/Bundle/ChillFamilyMembersBundle/Config/ConfigRepository.php
index c62a8b84b..73adbc53e 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Config/ConfigRepository.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Config/ConfigRepository.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\Config;
 
 use function count;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php b/src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
index 6627e7334..336d5f761 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\Controller;
 
 use Chill\FamilyMembersBundle\Entity\FamilyMember;
diff --git a/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/ChillAMLIFamilyMembersExtension.php b/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/ChillAMLIFamilyMembersExtension.php
index bd843edae..52cf5b27e 100644
--- a/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/ChillAMLIFamilyMembersExtension.php
+++ b/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/ChillAMLIFamilyMembersExtension.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\DependencyInjection;
 
 use Chill\FamilyMembersBundle\Security\Voter\FamilyMemberVoter;
diff --git a/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/Configuration.php
index 1ee8be8c3..4227dd321 100644
--- a/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php b/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
index 5a9b52e5e..7a8fce146 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\Entity;
 
 use Chill\MainBundle\Entity\HasCenterInterface;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php b/src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php
index e8e873c63..59fe4e402 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php b/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
index 5474c8f86..1e76999db 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\Form;
 
 use Chill\FamilyMembersBundle\Config\ConfigRepository;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMembersType.php b/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMembersType.php
index 48572c1c0..89a6854a8 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMembersType.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMembersType.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillCollectionType;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
index f7c0436c7..cbab60a53 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\Menu;
 
 use Chill\FamilyMembersBundle\Security\Voter\FamilyMemberVoter;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php b/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php
index db3e2c727..51b69ece1 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\Repository;
 
 use Chill\FamilyMembersBundle\Entity\FamilyMember;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php b/src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php
index 47cf5df6a..b7fcde018 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php
@@ -1,14 +1,15 @@
 <?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 Application\Migrations;
 
 use Doctrine\DBAL\Migrations\AbstractMigration;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php b/src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
index c53a4aead..06077c4ec 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\Security\Voter;
 
 use Chill\FamilyMembersBundle\Entity\FamilyMember;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Templating/Twig.php b/src/Bundle/ChillFamilyMembersBundle/Templating/Twig.php
index 5580684f3..33402ecca 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Templating/Twig.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Templating/Twig.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\Templating;
 
 use Chill\FamilyMembersBundle\Config\ConfigRepository;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Tests/Controller/FamilyMemberControllerTest.php b/src/Bundle/ChillFamilyMembersBundle/Tests/Controller/FamilyMemberControllerTest.php
index 3acd42300..a2a454436 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Tests/Controller/FamilyMemberControllerTest.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Tests/Controller/FamilyMemberControllerTest.php
@@ -1,14 +1,15 @@
 <?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\FamilyMembersBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php b/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
index 86ed8a4fa..36e471857 100644
--- a/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\CRUD\CompilerPass;
 
 use Symfony\Component\DependencyInjection\Alias;
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
index 436ee41d3..098ada660 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\CRUD\Controller;
 
 use Chill\MainBundle\CRUD\Resolver\Resolver;
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
index 9bf43b37e..51bd75767 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\CRUD\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorInterface;
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index edca07b41..d393be77d 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\CRUD\Controller;
 
 use Chill\MainBundle\CRUD\Form\CRUDDeleteEntityForm;
diff --git a/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php b/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php
index 00cb7bfc4..492671c2a 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\CRUD\Form;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php b/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
index d11c5fb98..90e23e95c 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\CRUD\Resolver;
 
 use Doctrine\ORM\EntityManagerInterface;
diff --git a/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php b/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
index 322218202..185aeef6f 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\CRUD\Routing;
 
 use RuntimeException;
diff --git a/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php b/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
index 8704a79ca..39f6864ea 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\CRUD\Templating;
 
 use Chill\MainBundle\CRUD\Resolver\Resolver;
diff --git a/src/Bundle/ChillMainBundle/Center/GroupingCenterInterface.php b/src/Bundle/ChillMainBundle/Center/GroupingCenterInterface.php
index 4fb6071cd..ec88266ec 100644
--- a/src/Bundle/ChillMainBundle/Center/GroupingCenterInterface.php
+++ b/src/Bundle/ChillMainBundle/Center/GroupingCenterInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Center;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index 32e075b7f..5d5b4e875 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -1,14 +1,15 @@
 <?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\MainBundle;
 
 use Chill\MainBundle\CRUD\CompilerPass\CRUDControllerCompilerPass;
diff --git a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
index 383fd501d..394280c4a 100644
--- a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Command;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
index c119907b4..32439e33e 100644
--- a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Command;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressesBEFromBestAddressCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressesBEFromBestAddressCommand.php
index abd4e294a..e5375a2a3 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAddressesBEFromBestAddressCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAddressesBEFromBestAddressCommand.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Command;
 
 use Chill\MainBundle\Service\Import\AddressReferenceBEFromBestAddress;
diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php
index 96e7023fb..80fb10f1b 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Command;
 
 use Chill\MainBundle\Service\Import\AddressReferenceFromBano;
diff --git a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
index a32fd5d97..cb284af2b 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Command;
 
 use Chill\MainBundle\Entity\Language;
diff --git a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
index 47bd93491..4922b1f22 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Command;
 
 use Chill\MainBundle\Entity\Country;
diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php
index 1c7f9cbc5..a8e6bb27c 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Command;
 
 use Chill\MainBundle\Service\Import\PostalCodeFRFromOpenData;
diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index bc4616b7b..c0cad76ad 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Command;
 
 use Chill\MainBundle\Doctrine\Model\Point;
diff --git a/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php b/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
index 07e514e6d..d19d1beba 100644
--- a/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Command;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Controller/AddressApiController.php b/src/Bundle/ChillMainBundle/Controller/AddressApiController.php
index db87874e2..8673739f7 100644
--- a/src/Bundle/ChillMainBundle/Controller/AddressApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AddressApiController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
index 1ac7a87fe..eec55985d 100644
--- a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillMainBundle/Controller/AdminController.php b/src/Bundle/ChillMainBundle/Controller/AdminController.php
index 56eac11e4..2368f6fbd 100644
--- a/src/Bundle/ChillMainBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AdminController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillMainBundle/Controller/CenterController.php b/src/Bundle/ChillMainBundle/Controller/CenterController.php
index 005fa4a01..fded473a4 100644
--- a/src/Bundle/ChillMainBundle/Controller/CenterController.php
+++ b/src/Bundle/ChillMainBundle/Controller/CenterController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Controller/CivilityApiController.php b/src/Bundle/ChillMainBundle/Controller/CivilityApiController.php
index 3db55ae0e..7c8e331e9 100644
--- a/src/Bundle/ChillMainBundle/Controller/CivilityApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/CivilityApiController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillMainBundle/Controller/CivilityController.php b/src/Bundle/ChillMainBundle/Controller/CivilityController.php
index afda9cc64..0eb3cecae 100644
--- a/src/Bundle/ChillMainBundle/Controller/CivilityController.php
+++ b/src/Bundle/ChillMainBundle/Controller/CivilityController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillMainBundle/Controller/CountryController.php b/src/Bundle/ChillMainBundle/Controller/CountryController.php
index fe56f3c13..aad0adea2 100644
--- a/src/Bundle/ChillMainBundle/Controller/CountryController.php
+++ b/src/Bundle/ChillMainBundle/Controller/CountryController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillMainBundle/Controller/DefaultController.php b/src/Bundle/ChillMainBundle/Controller/DefaultController.php
index 2c8102a39..a5c8ae982 100644
--- a/src/Bundle/ChillMainBundle/Controller/DefaultController.php
+++ b/src/Bundle/ChillMainBundle/Controller/DefaultController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillMainBundle/Controller/ExportController.php b/src/Bundle/ChillMainBundle/Controller/ExportController.php
index 3d861fdfa..afcb32b26 100644
--- a/src/Bundle/ChillMainBundle/Controller/ExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ExportController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Export\ExportManager;
diff --git a/src/Bundle/ChillMainBundle/Controller/LanguageController.php b/src/Bundle/ChillMainBundle/Controller/LanguageController.php
index 4612a3728..cee238978 100644
--- a/src/Bundle/ChillMainBundle/Controller/LanguageController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LanguageController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
index 2cf5caaf9..5b451e870 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationController.php b/src/Bundle/ChillMainBundle/Controller/LocationController.php
index 97deac9c5..f34ee3aaf 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php
index ce1b5e825..ad0eb77b1 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php b/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php
index 542282260..8b5651d58 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillMainBundle/Controller/LoginController.php b/src/Bundle/ChillMainBundle/Controller/LoginController.php
index d853d75af..5079e6b94 100644
--- a/src/Bundle/ChillMainBundle/Controller/LoginController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LoginController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillMainBundle/Controller/MenuController.php b/src/Bundle/ChillMainBundle/Controller/MenuController.php
index 81a80f485..52b1b9eaf 100644
--- a/src/Bundle/ChillMainBundle/Controller/MenuController.php
+++ b/src/Bundle/ChillMainBundle/Controller/MenuController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php b/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
index c43015efd..9b5ee7d3d 100644
--- a/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
index c6ecdd873..565cd4916 100644
--- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Controller/PasswordController.php b/src/Bundle/ChillMainBundle/Controller/PasswordController.php
index 4d6a13545..6df422498 100644
--- a/src/Bundle/ChillMainBundle/Controller/PasswordController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PasswordController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php b/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php
index 5293ddc70..f352c5b60 100644
--- a/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
index 216ef1f5c..79bd61d6a 100644
--- a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\PermissionsGroup;
diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
index ffad0caeb..0b183b01b 100644
--- a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
index f38e0004b..56fbafa12 100644
--- a/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\PostalCode;
diff --git a/src/Bundle/ChillMainBundle/Controller/ScopeController.php b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
index 5dc85d201..cc80548b2 100644
--- a/src/Bundle/ChillMainBundle/Controller/ScopeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillMainBundle/Controller/SearchController.php b/src/Bundle/ChillMainBundle/Controller/SearchController.php
index 496538665..6ed295657 100644
--- a/src/Bundle/ChillMainBundle/Controller/SearchController.php
+++ b/src/Bundle/ChillMainBundle/Controller/SearchController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
diff --git a/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php b/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
index 5d50f246c..0ba6ff141 100644
--- a/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
+++ b/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
diff --git a/src/Bundle/ChillMainBundle/Controller/UIController.php b/src/Bundle/ChillMainBundle/Controller/UIController.php
index 97be4ca3c..2549a0da4 100644
--- a/src/Bundle/ChillMainBundle/Controller/UIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UIController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Templating\UI\CountNotificationUser;
diff --git a/src/Bundle/ChillMainBundle/Controller/UserApiController.php b/src/Bundle/ChillMainBundle/Controller/UserApiController.php
index 6acd0c4dd..da726255d 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserApiController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index b6ded6653..3ed9472bb 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillMainBundle/Controller/UserJobApiController.php b/src/Bundle/ChillMainBundle/Controller/UserJobApiController.php
index 50b97809a..304f40f91 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserJobApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserJobApiController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillMainBundle/Controller/UserJobController.php b/src/Bundle/ChillMainBundle/Controller/UserJobController.php
index 0c1fd4b3d..ef2ea4abb 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserJobController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserJobController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
index afb85658b..50c9a2943 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index a4e2ff8bf..aab8e3d7b 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
index bbeab94b3..d4546e925 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
index a4afefa2b..b08995cdb 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Doctrine\Model\Point;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php
index e4cd7d565..0820b2378 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
index 07cf976eb..1ad843384 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\Civility;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
index 88750b340..2b8f7048b 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Command\LoadCountriesCommand;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
index ad04709ab..ce215f92a 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\GroupCenter;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
index 0b6e6a833..8e57b340f 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\Language;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
index 3e24d034c..810d35299 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\LocationType;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
index dc7773765..cfd290029 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\PermissionsGroup;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
index 3da6e86da..83a739184 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Doctrine\Model\Point;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
index 9db21414d..2180a6612 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\RoleScope;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
index d3a66d887..502734f3e 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
index 6a518bada..cc844f930 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 30bda0ab6..dcbeebf82 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\Controller\AddressApiController;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
index b8b3b4d85..86a9fc896 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\CompilerPass;
 
 use Chill\MainBundle\Form\PermissionsGroupType;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
index 64b5704bc..56303bc0f 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\CompilerPass;
 
 use LogicException;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php
index 9b5d0903c..21ffb0140 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\CompilerPass;
 
 use LogicException;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
index 7a63412d5..32dc6c233 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\CompilerPass;
 
 use Chill\MainBundle\Routing\MenuComposer;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
index 36435400c..5f295c6e1 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\CompilerPass;
 
 use Chill\MainBundle\Templating\UI\CountNotificationUser;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
index e5504a532..3a8906416 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\CompilerPass;
 
 use LogicException;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
index 8b9b83fb6..551c57478 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\CompilerPass;
 
 use LogicException;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/WidgetsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/WidgetsCompilerPass.php
index f079571a1..9062b478f 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/WidgetsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/WidgetsCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\CompilerPass;
 
 use Chill\MainBundle\DependencyInjection\Widget\AbstractWidgetsCompilerPass;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
index 15943b775..e840f25fa 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection;
 
 use LogicException;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
index a9b3ffec0..c56eb7f8d 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php b/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
index 54961699a..6febdfd7e 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection;
 
 use Exception;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
index fa9fd2d30..6a16890a8 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection;
 
 use LogicException;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
index 0b055b682..01e2b58d6 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
index 2b2d0f001..c5bbd853c 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\AbstractWidgetsCompilerPass as WidgetsCompilerPass;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
index 242b46e9c..1f1db416b 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\Widget\Factory;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
index 8ab19a270..a1d9daeba 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\Widget\Factory;
 
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php
index 92279ea70..9f2f70d14 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\DependencyInjection\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
index 7d8809582..e595bedd8 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\DateDiffFunction;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
index d57cc866d..f256a1451 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
index a678f8c27..ceb501f79 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php
index 680d5c6f4..d218bbe59 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
index 6295cf366..dc61b3789 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
index 52b39e97f..2c8d63aa9 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
index d7f46ab54..331c7b397 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
index 810084e56..af186ca6c 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
index d6a3c1238..d766261b4 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
index fead5a37d..b1420810c 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\Lexer;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php
index 51ff5a9dd..673282022 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
index 799b208bb..ba2560a63 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
index ad355544f..d915360d0 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\Event;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php b/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
index aafa852f6..f11886a67 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\Migrations;
 
 use Doctrine\Migrations\Version\Comparator;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
index 31983d969..23c6384e3 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\Model;
 
 use Exception;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php b/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
index 5186e8168..3bf9215e1 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\Model;
 
 use Exception;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
index f4862c35a..b3a917ee7 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php
index cb01870bc..92d53f822 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
index d85dc5809..2c5a5c53a 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php
index fbe967cca..b577b975a 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
index 140f06b65..59a5a16a3 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\ORM\Hydration;
 
 use Doctrine\ORM\Internal\Hydration\ObjectHydrator;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php b/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
index 8f8d63aef..f9f112928 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\Type;
 
 use DateInterval;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
index 1d44b2358..bcafc65cf 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Doctrine\Type;
 
 use Chill\MainBundle\Doctrine\Model\Point;
diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index d3eee0b2a..9abad30c5 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\Point;
diff --git a/src/Bundle/ChillMainBundle/Entity/AddressReference.php b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
index 5a6b176c2..436be8acf 100644
--- a/src/Bundle/ChillMainBundle/Entity/AddressReference.php
+++ b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\Point;
diff --git a/src/Bundle/ChillMainBundle/Entity/Center.php b/src/Bundle/ChillMainBundle/Entity/Center.php
index 5b25ee119..8c04820f3 100644
--- a/src/Bundle/ChillMainBundle/Entity/Center.php
+++ b/src/Bundle/ChillMainBundle/Entity/Center.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillMainBundle/Entity/Civility.php b/src/Bundle/ChillMainBundle/Entity/Civility.php
index e5d15a751..6ca204c26 100644
--- a/src/Bundle/ChillMainBundle/Entity/Civility.php
+++ b/src/Bundle/ChillMainBundle/Entity/Civility.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillMainBundle/Entity/Country.php b/src/Bundle/ChillMainBundle/Entity/Country.php
index f1fc18557..5e330a3a2 100644
--- a/src/Bundle/ChillMainBundle/Entity/Country.php
+++ b/src/Bundle/ChillMainBundle/Entity/Country.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
index a29ad8f29..f9a126d48 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity\Embeddable;
 
 use DateTime;
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index 00e0f29d7..3d1e1eae6 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity\Embeddable;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
index bd49fe892..02b33d95d 100644
--- a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
+++ b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php b/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php
index 961a0e79a..d0de86669 100644
--- a/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php
+++ b/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillMainBundle/Entity/GroupCenter.php b/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
index ccf000b9d..cc9d7bce2 100644
--- a/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
+++ b/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillMainBundle/Entity/HasCenterInterface.php b/src/Bundle/ChillMainBundle/Entity/HasCenterInterface.php
index 5ffe6dc87..ce397d058 100644
--- a/src/Bundle/ChillMainBundle/Entity/HasCenterInterface.php
+++ b/src/Bundle/ChillMainBundle/Entity/HasCenterInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php b/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php
index ae22cd6c6..e7aec4029 100644
--- a/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php
+++ b/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 interface HasCentersInterface
diff --git a/src/Bundle/ChillMainBundle/Entity/HasScopeInterface.php b/src/Bundle/ChillMainBundle/Entity/HasScopeInterface.php
index 44d4b4834..567a28653 100644
--- a/src/Bundle/ChillMainBundle/Entity/HasScopeInterface.php
+++ b/src/Bundle/ChillMainBundle/Entity/HasScopeInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php b/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php
index 1beea38f5..8abdf9d7a 100644
--- a/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php
+++ b/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 interface HasScopesInterface
diff --git a/src/Bundle/ChillMainBundle/Entity/Language.php b/src/Bundle/ChillMainBundle/Entity/Language.php
index b4929b662..bf94e5e3b 100644
--- a/src/Bundle/ChillMainBundle/Entity/Language.php
+++ b/src/Bundle/ChillMainBundle/Entity/Language.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillMainBundle/Entity/Location.php b/src/Bundle/ChillMainBundle/Entity/Location.php
index c1421586f..fb157329f 100644
--- a/src/Bundle/ChillMainBundle/Entity/Location.php
+++ b/src/Bundle/ChillMainBundle/Entity/Location.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillMainBundle/Entity/LocationType.php b/src/Bundle/ChillMainBundle/Entity/LocationType.php
index 2fd4dbfea..eff32c35e 100644
--- a/src/Bundle/ChillMainBundle/Entity/LocationType.php
+++ b/src/Bundle/ChillMainBundle/Entity/LocationType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Chill\MainBundle\Repository\LocationTypeRepository;
diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php
index 8dad39d12..3af2857e0 100644
--- a/src/Bundle/ChillMainBundle/Entity/Notification.php
+++ b/src/Bundle/ChillMainBundle/Entity/Notification.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
diff --git a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
index 5275010e6..8d826f51b 100644
--- a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
+++ b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
index f066178dc..a6cf11742 100644
--- a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
+++ b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillMainBundle/Entity/PostalCode.php b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
index 769f6dfd7..dbf3c0dc6 100644
--- a/src/Bundle/ChillMainBundle/Entity/PostalCode.php
+++ b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\Point;
diff --git a/src/Bundle/ChillMainBundle/Entity/RoleScope.php b/src/Bundle/ChillMainBundle/Entity/RoleScope.php
index a9a65799d..18e67c2bc 100644
--- a/src/Bundle/ChillMainBundle/Entity/RoleScope.php
+++ b/src/Bundle/ChillMainBundle/Entity/RoleScope.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillMainBundle/Entity/Scope.php b/src/Bundle/ChillMainBundle/Entity/Scope.php
index 72ac0ad01..eaf274cb8 100644
--- a/src/Bundle/ChillMainBundle/Entity/Scope.php
+++ b/src/Bundle/ChillMainBundle/Entity/Scope.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 80848e2cf..ddb840020 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillMainBundle/Entity/UserJob.php b/src/Bundle/ChillMainBundle/Entity/UserJob.php
index 99db5d4f1..fbd55cf9b 100644
--- a/src/Bundle/ChillMainBundle/Entity/UserJob.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserJob.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index bb0fc0e93..b7ff56aba 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity\Workflow;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
index 9f4e7f096..dbe47ab02 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity\Workflow;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
index 2207b224a..ddae67365 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Entity\Workflow;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php b/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
index 244d3ba14..ef540a357 100644
--- a/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 use Closure;
diff --git a/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php b/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
index 734939b7c..cf44c3866 100644
--- a/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 use Symfony\Component\Security\Core\Role\Role;
diff --git a/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php b/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
index 0e4457764..a6a5434c6 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php b/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php
index c2e13d25e..2482a4503 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
diff --git a/src/Bundle/ChillMainBundle/Export/ExportElementsProviderInterface.php b/src/Bundle/ChillMainBundle/Export/ExportElementsProviderInterface.php
index b43d2d267..dfe0e4446 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportElementsProviderInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportElementsProviderInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Export/ExportInterface.php b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
index 6319fbac9..1bcaf6b1d 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 use Closure;
diff --git a/src/Bundle/ChillMainBundle/Export/ExportManager.php b/src/Bundle/ChillMainBundle/Export/ExportManager.php
index 37aa39695..de300bcb5 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportManager.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportManager.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 use Chill\MainBundle\Form\Type\Export\ExportType;
diff --git a/src/Bundle/ChillMainBundle/Export/FilterInterface.php b/src/Bundle/ChillMainBundle/Export/FilterInterface.php
index 0b27f1cf1..4feef38a4 100644
--- a/src/Bundle/ChillMainBundle/Export/FilterInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/FilterInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
index 7e5b71268..d420d3de4 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
index 610b3145a..d4cc71e0a 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
index d523b5b33..24064723e 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
index ab9b2d660..1f2f92283 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
index 4380cd877..949eb8fe0 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
diff --git a/src/Bundle/ChillMainBundle/Export/FormatterInterface.php b/src/Bundle/ChillMainBundle/Export/FormatterInterface.php
index 2e4e569fc..2b0f0e869 100644
--- a/src/Bundle/ChillMainBundle/Export/FormatterInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/FormatterInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/Bundle/ChillMainBundle/Export/GroupedExportInterface.php b/src/Bundle/ChillMainBundle/Export/GroupedExportInterface.php
index 6a0e7722a..11f622287 100644
--- a/src/Bundle/ChillMainBundle/Export/GroupedExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/GroupedExportInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Export/ListInterface.php b/src/Bundle/ChillMainBundle/Export/ListInterface.php
index 496415e3b..ee966a01e 100644
--- a/src/Bundle/ChillMainBundle/Export/ListInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ListInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Export/ModifierInterface.php b/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
index ac8e3e692..996871968 100644
--- a/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Export;
 
 use Doctrine\ORM\QueryBuilder;
diff --git a/src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php b/src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php
index e1d94728e..c3cee9550 100644
--- a/src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php
+++ b/src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Search\SearchProvider;
diff --git a/src/Bundle/ChillMainBundle/Form/CenterType.php b/src/Bundle/ChillMainBundle/Form/CenterType.php
index 494df50e9..f3b4cf13e 100644
--- a/src/Bundle/ChillMainBundle/Form/CenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/CenterType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
index ed0426b8b..5479bead4 100644
--- a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+++ b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\ChoiceLoader;
 
 use Chill\MainBundle\Entity\PostalCode;
diff --git a/src/Bundle/ChillMainBundle/Form/CivilityType.php b/src/Bundle/ChillMainBundle/Form/CivilityType.php
index 96469b216..3a2a177ec 100644
--- a/src/Bundle/ChillMainBundle/Form/CivilityType.php
+++ b/src/Bundle/ChillMainBundle/Form/CivilityType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Civility;
diff --git a/src/Bundle/ChillMainBundle/Form/CountryType.php b/src/Bundle/ChillMainBundle/Form/CountryType.php
index a1792b0b6..195f6c07b 100644
--- a/src/Bundle/ChillMainBundle/Form/CountryType.php
+++ b/src/Bundle/ChillMainBundle/Form/CountryType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Country;
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
index 73a61c998..a2e6f90b2 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\DataMapper;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
index 2c03c59f1..365accd38 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\DataMapper;
 
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
index 7284b9b3a..54b7631a3 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\DataMapper;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillMainBundle/Form/EntityWorkflowCommentType.php b/src/Bundle/ChillMainBundle/Form/EntityWorkflowCommentType.php
index c32e09dfd..e2dca33e3 100644
--- a/src/Bundle/ChillMainBundle/Form/EntityWorkflowCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/EntityWorkflowCommentType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillTextareaType;
diff --git a/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php b/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
index 776a8d80c..d59628a6c 100644
--- a/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
+++ b/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Event;
 
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/Bundle/ChillMainBundle/Form/LanguageType.php b/src/Bundle/ChillMainBundle/Form/LanguageType.php
index 0c4f036de..6758ee17f 100644
--- a/src/Bundle/ChillMainBundle/Form/LanguageType.php
+++ b/src/Bundle/ChillMainBundle/Form/LanguageType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Language;
diff --git a/src/Bundle/ChillMainBundle/Form/LocationFormType.php b/src/Bundle/ChillMainBundle/Form/LocationFormType.php
index c027e8086..308513a92 100644
--- a/src/Bundle/ChillMainBundle/Form/LocationFormType.php
+++ b/src/Bundle/ChillMainBundle/Form/LocationFormType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Entity\LocationType as EntityLocationType;
diff --git a/src/Bundle/ChillMainBundle/Form/LocationTypeType.php b/src/Bundle/ChillMainBundle/Form/LocationTypeType.php
index 2ecaa56c8..fa918c8c7 100644
--- a/src/Bundle/ChillMainBundle/Form/LocationTypeType.php
+++ b/src/Bundle/ChillMainBundle/Form/LocationTypeType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Entity\LocationType;
diff --git a/src/Bundle/ChillMainBundle/Form/NotificationCommentType.php b/src/Bundle/ChillMainBundle/Form/NotificationCommentType.php
index 7aa3a6cb1..59563cd01 100644
--- a/src/Bundle/ChillMainBundle/Form/NotificationCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/NotificationCommentType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillTextareaType;
diff --git a/src/Bundle/ChillMainBundle/Form/NotificationType.php b/src/Bundle/ChillMainBundle/Form/NotificationType.php
index 22fd19baf..72af92533 100644
--- a/src/Bundle/ChillMainBundle/Form/NotificationType.php
+++ b/src/Bundle/ChillMainBundle/Form/NotificationType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php b/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
index 706ba4f08..4963cf61a 100644
--- a/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
+++ b/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Form\Utils\PermissionsGroupFlagProvider;
diff --git a/src/Bundle/ChillMainBundle/Form/ScopeType.php b/src/Bundle/ChillMainBundle/Form/ScopeType.php
index c0c08ffbf..ecfca89dd 100644
--- a/src/Bundle/ChillMainBundle/Form/ScopeType.php
+++ b/src/Bundle/ChillMainBundle/Form/ScopeType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/AddressDateType.php b/src/Bundle/ChillMainBundle/Form/Type/AddressDateType.php
index 299728d6e..daa691735 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/AddressDateType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/AddressDateType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/AddressType.php b/src/Bundle/ChillMainBundle/Form/Type/AddressType.php
index 24872650f..814cde833 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/AddressType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/AddressType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php b/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php
index 3391fc845..326882761 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php
index 88d5d3ce0..87f5009ef 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php
index f0d9d5eae..271a8eb55 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillDateType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillDateType.php
index 1b7f51115..111ba1986 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillDateType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillDateType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
index 2580058e8..802e6ab3e 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use libphonenumber\PhoneNumberFormat;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php
index 18bfd885b..5dde8c23e 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/CommentType.php b/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
index fb64ed3b1..822673b03 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
index 11b079f4a..ddeee2607 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
index 6646cd2b5..54851393f 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php
index 76f217df6..9acad1732 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\DataTransformer;
 
 use Chill\MainBundle\Repository\AddressRepository;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
index 1bc02f9dd..963c79d9a 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\DataTransformer;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
index f41223d17..de41a48fb 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\DataTransformer;
 
 use DateInterval;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
index 95c447119..c2a0ebe3e 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\DataTransformer;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
index 48ef5cdf0..b437c5238 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\DataTransformer;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
index 4122c5509..538ce61ab 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\DataTransformer;
 
 use Doctrine\ORM\EntityManagerInterface;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
index 5f6c3ed65..3457bbfb4 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\DataTransformer;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php b/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
index a99ee6135..63b3f0591 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Form\Type\DataTransformer\DateIntervalTransformer;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php
index 9a5d97083..8ca93292e 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\Export;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
index 4b0c0694b..8cb3d85f3 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\Export;
 
 use Chill\MainBundle\Export\ExportManager;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php
index 8612dd690..9d45048a6 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\Export;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/FormatterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/FormatterType.php
index c7c87e949..65bc00c4d 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/FormatterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/FormatterType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\Export;
 
 use Chill\MainBundle\Export\ExportManager;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index e74d8e8f4..45f4db0e7 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\Export;
 
 use Chill\MainBundle\Center\GroupingCenterInterface;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
index 885be3c27..0e0d5f403 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\Export;
 
 use Chill\MainBundle\Export\ExportManager;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
index 2b6cdc21d..ad5368aa7 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type\Listing;
 
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php b/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
index 20933563a..3a65c1252 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
index 053ee31e1..fc97e644b 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php b/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
index 0381bfd0d..4a54fda24 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Civility;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index 3bc4df436..91a6410da 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php b/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
index 456ff753f..8e0218020 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\PostalCode;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
index a96c0e353..d1806de62 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
index 36c599f71..6102a9995 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php
index ae5ab075e..980790f69 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
index 73cdeb075..dcbb49440 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Country;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php
index b4db6393e..ed1f523dc 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
index 8e46f4508..f3b506ea4 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Language;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php b/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
index 822ff0101..f30cd5aa3 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 /*
diff --git a/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php b/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
index c9a644aa9..8420a1a40 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillMainBundle/Form/UserCurrentLocationType.php b/src/Bundle/ChillMainBundle/Form/UserCurrentLocationType.php
index e7ae27b3a..0228f8c06 100644
--- a/src/Bundle/ChillMainBundle/Form/UserCurrentLocationType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserCurrentLocationType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Location;
diff --git a/src/Bundle/ChillMainBundle/Form/UserJobType.php b/src/Bundle/ChillMainBundle/Form/UserJobType.php
index 74d69bd07..263ad90bd 100644
--- a/src/Bundle/ChillMainBundle/Form/UserJobType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserJobType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
diff --git a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
index d2e60c1ef..90445f21d 100644
--- a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Psr\Log\LoggerInterface;
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index 34c49bc38..e011e85a9 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Form/Utils/PermissionsGroupFlagProvider.php b/src/Bundle/ChillMainBundle/Form/Utils/PermissionsGroupFlagProvider.php
index f4a91f100..d3d0855b8 100644
--- a/src/Bundle/ChillMainBundle/Form/Utils/PermissionsGroupFlagProvider.php
+++ b/src/Bundle/ChillMainBundle/Form/Utils/PermissionsGroupFlagProvider.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form\Utils;
 
 interface PermissionsGroupFlagProvider
diff --git a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
index b70e7a55b..5184e5339 100644
--- a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
+++ b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillMainBundle/Form/WorkflowTransitionType.php b/src/Bundle/ChillMainBundle/Form/WorkflowTransitionType.php
index 1692928dd..64e0b03eb 100644
--- a/src/Bundle/ChillMainBundle/Form/WorkflowTransitionType.php
+++ b/src/Bundle/ChillMainBundle/Form/WorkflowTransitionType.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php b/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php
index 8dfd2df8a..abe17a8df 100644
--- a/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php
+++ b/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification\Counter;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
index 69fcf66f0..e718b699d 100644
--- a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification\Email;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
index cb9d2db92..a97a6df36 100644
--- a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification\EventListener;
 
 use Chill\MainBundle\Notification\NotificationPersisterInterface;
diff --git a/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php b/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php
index 00add5f4f..2543627c6 100644
--- a/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php
+++ b/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification\Exception;
 
 use RuntimeException;
diff --git a/src/Bundle/ChillMainBundle/Notification/Mailer.php b/src/Bundle/ChillMainBundle/Notification/Mailer.php
index 2607f1ffb..97abc95b6 100644
--- a/src/Bundle/ChillMainBundle/Notification/Mailer.php
+++ b/src/Bundle/ChillMainBundle/Notification/Mailer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php
index 774609512..3b7de06a1 100644
--- a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php
index 45ebcd30c..017c59a5a 100644
--- a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php b/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php
index d426e3cd7..b2a95a140 100644
--- a/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php b/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php
index da98e305b..3825ea48f 100644
--- a/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php
index ed3a8cf66..91f44c981 100644
--- a/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php
index eb017d912..54d94868d 100644
--- a/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php
+++ b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification\Templating;
 
 use Twig\Extension\AbstractExtension;
diff --git a/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php
index 1e52e128e..1338d4bb7 100644
--- a/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php
+++ b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Notification\Templating;
 
 use Chill\MainBundle\Entity\NotificationComment;
diff --git a/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php b/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php
index 3a236f5c1..e658fd1fb 100644
--- a/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php
+++ b/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Pagination;
 
 use Twig\Environment;
diff --git a/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php b/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php
index ed540b0c2..d4f101f8c 100644
--- a/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php
+++ b/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Pagination;
 
 use Twig\Environment;
diff --git a/src/Bundle/ChillMainBundle/Pagination/Page.php b/src/Bundle/ChillMainBundle/Pagination/Page.php
index c93af4508..e5020bcc6 100644
--- a/src/Bundle/ChillMainBundle/Pagination/Page.php
+++ b/src/Bundle/ChillMainBundle/Pagination/Page.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Pagination;
 
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
diff --git a/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php b/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
index d7da19708..75e36395c 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Pagination;
 
 use Iterator;
diff --git a/src/Bundle/ChillMainBundle/Pagination/PageInterface.php b/src/Bundle/ChillMainBundle/Pagination/PageInterface.php
index acca7301c..32656d791 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PageInterface.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PageInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Pagination;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Pagination/Paginator.php b/src/Bundle/ChillMainBundle/Pagination/Paginator.php
index 54fa36084..805427dbe 100644
--- a/src/Bundle/ChillMainBundle/Pagination/Paginator.php
+++ b/src/Bundle/ChillMainBundle/Pagination/Paginator.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Pagination;
 
 use RuntimeException;
diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
index 5b3684d3c..af6f03478 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Pagination;
 
 use Symfony\Component\HttpFoundation\RequestStack;
diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
index bf7130516..ec0df4718 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Pagination;
 
 use Countable;
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
index 12e74550e..7379fe6e0 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Phonenumber;
 
 use libphonenumber\PhoneNumber;
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index fa1b097c8..298302fc5 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Phonenumber;
 
 use GuzzleHttp\Client;
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/Templating.php b/src/Bundle/ChillMainBundle/Phonenumber/Templating.php
index c07d8c5a8..da22412ca 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/Templating.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/Templating.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Phonenumber;
 
 use Twig\Extension\AbstractExtension;
diff --git a/src/Bundle/ChillMainBundle/Redis/ChillRedis.php b/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
index 2ae13b2ac..44dc1b3fc 100644
--- a/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
+++ b/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Redis;
 
 use Redis;
diff --git a/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php b/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
index 6d61c408c..78a231d89 100644
--- a/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
+++ b/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Redis;
 
 use RuntimeException;
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
index 8a0755902..51126526e 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\AddressReference;
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
index a6d739de4..144643457 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
index 6a52f3399..af128a7ba 100644
--- a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Repository/CenterRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/CenterRepositoryInterface.php
index eb656f322..347ba21c6 100644
--- a/src/Bundle/ChillMainBundle/Repository/CenterRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/CenterRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
index 3604f25d0..f46a321ab 100644
--- a/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Civility;
diff --git a/src/Bundle/ChillMainBundle/Repository/CountryRepository.php b/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
index 055f41195..e9dc70c02 100644
--- a/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Country;
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
index 7db7c9458..de5800ca6 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\GeographicalUnitLayer;
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerRepositoryInterface.php
index dbc100bf7..e8145cde1 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\GeographicalUnitLayer;
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
index b62cf4ac8..7e8f9a68e 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\GeographicalUnit;
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php
index 76db33422..288313423 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Doctrine\Persistence\ObjectRepository;
diff --git a/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php b/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
index f8b11ceac..ab80f0f66 100644
--- a/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\GroupCenter;
diff --git a/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php b/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
index 88e00a6c4..284b0f2e5 100644
--- a/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Language;
diff --git a/src/Bundle/ChillMainBundle/Repository/LocationRepository.php b/src/Bundle/ChillMainBundle/Repository/LocationRepository.php
index 253298d49..787e2a8b1 100644
--- a/src/Bundle/ChillMainBundle/Repository/LocationRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/LocationRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Location;
diff --git a/src/Bundle/ChillMainBundle/Repository/LocationTypeRepository.php b/src/Bundle/ChillMainBundle/Repository/LocationTypeRepository.php
index e8d5579d0..ff8a70e39 100644
--- a/src/Bundle/ChillMainBundle/Repository/LocationTypeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/LocationTypeRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\LocationType;
diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
index b4ab74a25..dde3e8609 100644
--- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php b/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
index 18f8ff777..775c8d498 100644
--- a/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\PermissionsGroup;
diff --git a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
index 1c4a69366..bad7e8e45 100644
--- a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Country;
diff --git a/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
index 2475f9497..dafb2b0d4 100644
--- a/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\RoleScope;
diff --git a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
index 058b2d94e..753a24f2c 100644
--- a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php
index e9de77018..463cdac8e 100644
--- a/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php
index 6dc446111..9aedd2d8d 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
index 206096b96..c9489bd9e 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php b/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
index 13eb9e481..5b441bd29 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\UserJob;
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
index 7b7d5d2ab..8c464f2e3 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\GroupCenter;
diff --git a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
index a73da74b0..05b0e9f01 100644
--- a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository\Workflow;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php
index e4f0aa45d..38a847090 100644
--- a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Repository\Workflow;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php b/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php
index bc16929b7..6439ed111 100644
--- a/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php
+++ b/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Routing\Loader;
 
 use Symfony\Component\Config\Loader\Loader;
diff --git a/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php b/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
index 23d4a5724..8a2feee48 100644
--- a/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
+++ b/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Routing;
 
 use Knp\Menu\MenuItem;
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
index 022339568..5dee2f91b 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Routing\MenuBuilder;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
index bb4910ca6..006f7ff18 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Routing\MenuBuilder;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
index b885e1641..e643ebff2 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Routing\MenuBuilder;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
index 10acf2d6c..8ab24cdd7 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Routing\MenuBuilder;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
index cacf9c073..88c38e5de 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Routing\MenuBuilder;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
index 7c485022b..2fca23878 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Routing;
 
 use Knp\Menu\FactoryInterface;
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
index bf59bfcb8..58eeaa634 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Routing;
 
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
diff --git a/src/Bundle/ChillMainBundle/Search/AbstractSearch.php b/src/Bundle/ChillMainBundle/Search/AbstractSearch.php
index 099c4e438..df2c808be 100644
--- a/src/Bundle/ChillMainBundle/Search/AbstractSearch.php
+++ b/src/Bundle/ChillMainBundle/Search/AbstractSearch.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 use DateTime;
diff --git a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
index baace22c1..d3bea6509 100644
--- a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search\Entity;
 
 use Chill\MainBundle\Repository\UserRepository;
diff --git a/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php b/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php
index dbe34c00b..0e91ad23c 100644
--- a/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php
+++ b/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/Bundle/ChillMainBundle/Search/Model/Result.php b/src/Bundle/ChillMainBundle/Search/Model/Result.php
index 96d021187..107801b6f 100644
--- a/src/Bundle/ChillMainBundle/Search/Model/Result.php
+++ b/src/Bundle/ChillMainBundle/Search/Model/Result.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search\Model;
 
 class Result
diff --git a/src/Bundle/ChillMainBundle/Search/ParsingException.php b/src/Bundle/ChillMainBundle/Search/ParsingException.php
index 1c53463a5..5e96027da 100644
--- a/src/Bundle/ChillMainBundle/Search/ParsingException.php
+++ b/src/Bundle/ChillMainBundle/Search/ParsingException.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 use Exception;
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApi.php b/src/Bundle/ChillMainBundle/Search/SearchApi.php
index 5c4026a45..26c32df4c 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApi.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApi.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 use Chill\MainBundle\Pagination\Paginator;
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiInterface.php b/src/Bundle/ChillMainBundle/Search/SearchApiInterface.php
index 111bd5e5e..54c662f74 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiInterface.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 interface SearchApiInterface
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
index 1f3a1b3df..14368c35a 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 use RuntimeException;
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php b/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
index 57193a96d..9b353d1ca 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 use function array_push;
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiResult.php b/src/Bundle/ChillMainBundle/Search/SearchApiResult.php
index ac47de087..c133c986b 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiResult.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiResult.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 use Symfony\Component\Serializer\Annotation as Serializer;
diff --git a/src/Bundle/ChillMainBundle/Search/SearchInterface.php b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
index 0c9369808..5f854c683 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchInterface.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Search/SearchProvider.php b/src/Bundle/ChillMainBundle/Search/SearchProvider.php
index efae25751..918ccecc9 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchProvider.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 use function array_key_exists;
diff --git a/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php b/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
index 6868a53f6..95166c6f9 100644
--- a/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
+++ b/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 use Exception;
diff --git a/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php b/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
index 36ee550e0..b8db72fb2 100644
--- a/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
+++ b/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search;
 
 use Exception;
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php b/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
index 6035744e1..fb75703cd 100644
--- a/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
+++ b/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search\Utils;
 
 use DateTimeImmutable;
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php b/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
index c67b3582a..e3b0732fe 100644
--- a/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
+++ b/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search\Utils;
 
 use libphonenumber\PhoneNumberUtil;
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php b/src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php
index 23c1dae6b..919c0cf1a 100644
--- a/src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php
+++ b/src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Search\Utils;
 
 class SearchExtractionResult
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
index 2392457b8..3bd3ec4d6 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
index c1db57b7f..cddf72378 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
index 0e4d739f6..e8a8903b2 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
index dae75f111..1c4dd5409 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php
index 013cac51d..869aa7b08 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
index 01f04acd4..0fab8dd0b 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
index f95e93c2b..494150b04 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
index 64d40ad15..58a277dcf 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
index 82dfc7681..8525acf37 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
index 0a6c239f4..8d2019f9f 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
index ebf35ad7e..46b40bdbd 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 interface VoterGeneratorInterface
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php
index 405faae60..1cbbd5bd2 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 interface VoterHelperFactoryInterface
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php
index 557a5e247..8e2c3d4e2 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
index 079c43c3b..0cf7def6a 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
diff --git a/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php b/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
index 317ec4cd1..8c144ddd8 100644
--- a/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security;
 
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
index 5e183e478..859e8461f 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEventSubscriber.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEventSubscriber.php
index 3bd747428..2b612a4ca 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEventSubscriber.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\PasswordRecover;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
index 223aa1494..407bee368 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Redis\ChillRedis;
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
index a47443486..58c249c5c 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
index 1244e2a61..8c9e9edd5 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
index 5d3673b84..35a97eb2d 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Security/ProvideRoleHierarchyInterface.php b/src/Bundle/ChillMainBundle/Security/ProvideRoleHierarchyInterface.php
index 5a7d73eae..3296440d1 100644
--- a/src/Bundle/ChillMainBundle/Security/ProvideRoleHierarchyInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/ProvideRoleHierarchyInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Security/ProvideRoleInterface.php b/src/Bundle/ChillMainBundle/Security/ProvideRoleInterface.php
index b6680946c..16dd3fa64 100644
--- a/src/Bundle/ChillMainBundle/Security/ProvideRoleInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/ProvideRoleInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
index e2fafbf7f..b34254c31 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Resolver;
 
 final class CenterResolverDispatcher implements CenterResolverDispatcherInterface
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcherInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcherInterface.php
index 95bd03e20..244bd76a8 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcherInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcherInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php
index 2c4e1f8f8..3daa9e668 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
index dc873ee79..044df0cdf 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManagerInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManagerInterface.php
index 34de9ecb6..01261a100 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManagerInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManagerInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
index 0da9e1151..29ed7bb93 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\HasCenterInterface;
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
index b2b5e97e5..6e10fbe07 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\HasScopeInterface;
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
index 66bfdb4ee..b4023e31c 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Resolver;
 
 use Twig\TwigFilter;
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
index 0e4cfdc78..55d01b057 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
index 2d5601ffa..865590a8e 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillMainBundle/Security/RoleProvider.php b/src/Bundle/ChillMainBundle/Security/RoleProvider.php
index 15b7f69ff..a84541f16 100644
--- a/src/Bundle/ChillMainBundle/Security/RoleProvider.php
+++ b/src/Bundle/ChillMainBundle/Security/RoleProvider.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security;
 
 use function array_fill_keys;
diff --git a/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php b/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
index b25c513fd..2ba6049b4 100644
--- a/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
+++ b/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Security\UserProvider;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php b/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php
index 758ca55b4..2ca71d74b 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Model;
 
 use Chill\MainBundle\Pagination\PaginatorInterface;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php b/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php
index da1d348c7..3bfbf21db 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Model;
 
 use JsonSerializable;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
index 0809863f6..f8d8e87e8 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
index c4d7fa871..79ec41e6b 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
index 08b22871f..44b489012 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Serializer\Model\Collection;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
index 2cddb73db..1c876ce9c 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
index d3161fd4a..de92c11b4 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use DateTime;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
index 76ba52a3d..4a46ce5e8 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use LogicException;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
index 1cf94ac9f..d3149bb0b 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use Doctrine\ORM\EntityManagerInterface;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
index b74520436..f57beb4c6 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
index c231071d3..b3bd1c02e 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
index 4c09aaa55..709b9fbd9 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use ArrayObject;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index f76b1e5c8..6bdf48056 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use libphonenumber\NumberParseException;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
index 479cc6864..6ccbed097 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Doctrine\Model\Point;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
index fc5853c17..77a1dcb80 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
index 8ffc8533c..802e1f3c9 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
index b034dbca7..bab4ddd24 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Service\Import;
 
 use League\Csv\Reader;
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
index 474cb53de..ea1aa8d33 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Service\Import;
 
 use Doctrine\DBAL\Connection;
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
index c30b7c4f2..608085557 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Service\Import;
 
 use Exception;
diff --git a/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php b/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php
index 2668d2c2e..49aa8fea7 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Service\Import;
 
 use Doctrine\DBAL\Connection;
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
index a5b8b216b..0a1536bbc 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Service\Import;
 
 use League\Csv\Reader;
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php
index 20b41420f..5f5544c53 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Service\Import;
 
 use Doctrine\DBAL\Connection;
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
index 26a52c840..264247706 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Service\Import;
 
 use League\Csv\Reader;
diff --git a/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php b/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
index 9e1648753..644485693 100644
--- a/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
+++ b/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Service\Mailer;
 
 use Psr\Log\LoggerInterface;
diff --git a/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php b/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
index 6d3075d6f..c53dbfcb3 100644
--- a/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating;
 
 use Twig\Extension\AbstractExtension;
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php b/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
index 9bb29c21d..f2cb1e8c4 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating;
 
 use Parsedown;
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php b/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
index 782522760..05b3fd8c2 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating;
 
 use DateTimeInterface;
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php b/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
index 478920f05..477999b5d 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating;
 
 use Symfony\Bridge\Twig\Extension\RoutingExtension;
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
index d82b2885a..1d81d49aa 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Entity;
 
 abstract class AbstractChillEntityRender implements ChillEntityRenderInterface
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
index 3a97d0ef6..93ce8bca3 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
index 87a15955a..71b8fe292 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Entity;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
index 2081f3d9a..b83c88910 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Entity;
 
 use Twig\Extension\AbstractExtension;
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
index d55b8bfd7..b5151ff20 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Entity;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
index aa2401c1e..a8af6718c 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
index 1fc83c2db..3ceac9d61 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php b/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
index 965c80fda..ae5677d5a 100644
--- a/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
+++ b/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Events;
 
 use ArrayAccess;
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
index 64694285e..ff19d926e 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Listing;
 
 use Chill\MainBundle\Form\Type\Listing\FilterOrderType;
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
index 38e2f3542..6d05ac730 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Listing;
 
 use Symfony\Component\Form\FormFactoryInterface;
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
index fd6b4622d..666575493 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Listing;
 
 use Symfony\Component\Form\FormFactoryInterface;
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactoryInterface.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactoryInterface.php
index 223e2d568..369f2687a 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactoryInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Listing;
 
 interface FilterOrderHelperFactoryInterface
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php b/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php
index 15e570009..f8bf89096 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Listing;
 
 use Twig\Environment;
diff --git a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
index 66687711c..fa6d40ac4 100644
--- a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating;
 
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
diff --git a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelperInterface.php b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelperInterface.php
index 0d7fe6d4c..600ce6e3f 100644
--- a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelperInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating;
 
 interface TranslatableStringHelperInterface
diff --git a/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php b/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
index 6f614f93d..d71be3c8d 100644
--- a/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating;
 
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
diff --git a/src/Bundle/ChillMainBundle/Templating/UI/CountNotificationUser.php b/src/Bundle/ChillMainBundle/Templating/UI/CountNotificationUser.php
index 80dde8fa1..f1c9c0ae6 100644
--- a/src/Bundle/ChillMainBundle/Templating/UI/CountNotificationUser.php
+++ b/src/Bundle/ChillMainBundle/Templating/UI/CountNotificationUser.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\UI;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Templating/UI/NotificationCounterInterface.php b/src/Bundle/ChillMainBundle/Templating/UI/NotificationCounterInterface.php
index 528903cbf..1a8fa09a1 100644
--- a/src/Bundle/ChillMainBundle/Templating/UI/NotificationCounterInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/UI/NotificationCounterInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\UI;
 
 use Symfony\Component\Security\Core\User\UserInterface;
diff --git a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetInterface.php b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetInterface.php
index 16f33057d..538bdb47d 100644
--- a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Widget;
 
 use Twig\Environment;
diff --git a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
index dd3b8ee7f..4bb08a3d4 100644
--- a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Templating\Widget;
 
 use Chill\MainBundle\Templating\Events\DelegatedBlockRenderingEvent;
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
index cf5fe5c31..edd9bad19 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Test\Export;
 
 use Doctrine\ORM\AbstractQuery;
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
index 60d539573..bbd030066 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Test\Export;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
index bef4fd200..699ab71f3 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Test\Export;
 
 use Doctrine\ORM\QueryBuilder;
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php
index 9e4d6ea68..7dc17b730 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Test;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareCircleTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareCircleTrait.php
index 3aa3ebd11..2ec50add4 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareCircleTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareCircleTrait.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Test;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
index 213eaed60..b34d9f4a8 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Test;
 
 use LogicException;
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php
index 286322f5e..ac64e39d2 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Test;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
index 662438a98..b16406963 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Test;
 
 use Chill\MainBundle\Entity\GroupCenter;
diff --git a/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php b/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
index 82a2c434f..a4a63712c 100644
--- a/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Test;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php
index 05b18407a..19c89faa0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Authorization;
 
 use Chill\MainBundle\Security\ParentRoleHelper;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
index 441a323ac..94716bb44 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
@@ -1,14 +1,15 @@
 <?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 Controller;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php
index b62d56b0d..80e5eba14 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php
@@ -1,16 +1,10 @@
 <?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);
 
-/**
- * Chill is a software for social workers.
+/*
+ * 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.
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
index e10879760..2f5a6b23d 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
index 33dbcc4ee..06dc210c9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
index a7c53a75d..72d642f60 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php
index 96b707ee7..14404bf0f 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php
@@ -1,14 +1,15 @@
 <?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 Controller;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php
index aec392045..fe78cc50f 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php
@@ -1,14 +1,15 @@
 <?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 Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php
index b7cb73cbf..a64afea46 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php
index 5df1e1290..d19f66a99 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php
@@ -1,16 +1,10 @@
 <?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);
 
-/**
- * Chill is a software for social workers.
+/*
+ * 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.
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
index 8530308e3..db7ea1023 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
index a2cf41951..85987c07b 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
@@ -1,14 +1,15 @@
 <?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 Bundle\ChillMainBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
index 4e101e370..b36f15e10 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
index d96f9647a..b59a6c938 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index c7c916f8b..af0010551 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
index bcb5b2d26..325f03077 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Doctrine\Model;
 
 use Chill\MainBundle\Doctrine\Model\Point;
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
index 0575fa52a..0fb756bf9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
@@ -1,14 +1,15 @@
 <?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 Entity;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php
index 91783a77b..f08c95c56 100644
--- a/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Entity\Workflow;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
index 87508dfbf..28b33d6b8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Export;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
index e7a6ee096..6d4c992ac 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Form\Type;
 
 use Chill\MainBundle\Entity\GroupCenter;
diff --git a/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
index 4c1b5c304..c7dead3aa 100644
--- a/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
@@ -1,14 +1,15 @@
 <?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 Notification\EventListener;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
index ca9eef6c6..5c2a239d3 100644
--- a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Pagination;
 
 use Chill\MainBundle\Pagination\Page;
diff --git a/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php b/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
index 23bd4d890..af5c16f6b 100644
--- a/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Pagination;
 
 use Chill\MainBundle\Pagination\Paginator;
diff --git a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
index 26287e9bc..db6ed6e76 100644
--- a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Routing\Loader;
 
 use Chill\MainBundle\Phonenumber\PhonenumberHelper;
diff --git a/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php b/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
index 9f0291007..b8c3a41ba 100644
--- a/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Routing\Loader;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php b/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
index e04b33e59..f3c13a2d2 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Search;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php b/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
index 339145d9f..4297bedd7 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
@@ -1,14 +1,15 @@
 <?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 Search;
 
 use Chill\MainBundle\Search\SearchApiQuery;
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
index e9cbd5e3c..1330819a0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Search;
 
 use Chill\MainBundle\Search\ParsingException;
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
index 310fac60e..5d350372a 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
@@ -1,14 +1,15 @@
 <?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 Search\Utils;
 
 use Chill\MainBundle\Search\Utils\ExtractDateFromPattern;
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
index 4e2553be9..f2aceb18b 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
@@ -1,14 +1,15 @@
 <?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 Search\Utils;
 
 use Chill\MainBundle\Search\Utils\ExtractPhonenumberFromPattern;
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
index 32382713a..e492d3182 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
index 8e29a190b..b5510ba6d 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
index ee7431554..fe4c05ec0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Security\Resolver;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
index bc0e6d8cb..5b75eb8c8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Security\Resolver;
 
 use Chill\MainBundle\Entity\HasScopeInterface;
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
index 5d15e7d91..16ca73e23 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Security\Resolver;
 
 use Chill\MainBundle\Entity\HasScopeInterface;
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php
index c925954bf..283a67327 100644
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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 Serializer\Normalizer;
 
 use Chill\MainBundle\Serializer\Normalizer\DateNormalizer;
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
index 5f5431d7c..91d169569 100644
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php
index 1e0d4ef29..a27c3b669 100644
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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 Serializer\Normalizer;
 
 use Chill\MainBundle\Serializer\Normalizer\PhonenumberNormalizer;
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php b/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php
index 0ed1f2059..8b4ab0aaf 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php
@@ -1,14 +1,15 @@
 <?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 Services\Import;
 
 use Chill\MainBundle\Entity\PostalCode;
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php b/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php
index 60ad20fc5..d393f0d4c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php
@@ -1,14 +1,15 @@
 <?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 Services\Import;
 
 use Chill\MainBundle\Service\Import\GeographicalUnitBaseImporter;
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php b/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php
index ce40d40bf..be4866069 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php
@@ -1,14 +1,15 @@
 <?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 Services\Import;
 
 use Chill\MainBundle\Repository\CountryRepository;
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
index 8ed185aa9..8df9ffa62 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Services;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
diff --git a/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php b/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
index 89edc17d6..136646bf6 100644
--- a/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Templating;
 
 use Chill\MainBundle\Templating\ChillMarkdownRenderExtension;
diff --git a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
index 3f828bfc5..1cd6aa1bd 100644
--- a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Templating\Entity;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillMainBundle/Tests/TestHelper.php b/src/Bundle/ChillMainBundle/Tests/TestHelper.php
index 205474685..d3a96b471 100644
--- a/src/Bundle/ChillMainBundle/Tests/TestHelper.php
+++ b/src/Bundle/ChillMainBundle/Tests/TestHelper.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests;
 
 use Symfony\Component\BrowserKit\Client;
diff --git a/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php b/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
index 6fd0facd4..8bb432d87 100644
--- a/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Util;
 
 use Chill\MainBundle\Util\CountriesInfo;
diff --git a/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php b/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
index 694677a8f..8ae4b9362 100644
--- a/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Util;
 
 use Chill\MainBundle\Util\DateRangeCovering;
diff --git a/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php b/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php
index 365b01a67..3b1be96ee 100644
--- a/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Tests\Workflow\EventSubscriber;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php b/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
index a6cd9d6df..16c863263 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Timeline;
 
 use DateTime;
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php b/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
index 98c812ef2..4aad97d5b 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Timeline;
 
 use LogicException;
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php b/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
index 23e60ef97..00c4a871d 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Timeline;
 
 use function strtr;
diff --git a/src/Bundle/ChillMainBundle/Util/CountriesInfo.php b/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
index e5b392856..d66552a88 100644
--- a/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
+++ b/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Util;
 
 use UnexpectedValueException;
diff --git a/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php b/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
index 253f72aef..64694112e 100644
--- a/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
+++ b/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Util;
 
 use DateTimeImmutable;
diff --git a/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php b/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php
index 27fbe2f50..908cb5e9d 100644
--- a/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php
+++ b/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Validation\Constraint;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php b/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
index fe61d4655..a6af024ad 100644
--- a/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
+++ b/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Validation\Constraint;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillMainBundle/Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php b/src/Bundle/ChillMainBundle/Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php
index 4b2a5d5b4..bc86ea6f0 100644
--- a/src/Bundle/ChillMainBundle/Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php
+++ b/src/Bundle/ChillMainBundle/Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Validation\Constraint;
 
 use Chill\MainBundle\Validation\Validator\UserUniqueEmailAndUsername;
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php b/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
index 6f3e810f0..35936d762 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Validation\Validator;
 
 use Chill\MainBundle\Entity\RoleScope;
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php b/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
index 4ece73852..6336b1d1e 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Validation\Validator;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
index 267b2a70b..484fe2cf3 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Validation\Validator;
 
 use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
diff --git a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistency.php b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistency.php
index 8b405db6a..f44b2a378 100644
--- a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistency.php
+++ b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistency.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Validator\Constraints\Entity;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
index 398c7b551..6feba536e 100644
--- a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
+++ b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Validator\Constraints\Entity;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
diff --git a/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraint.php b/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraint.php
index 88378e9ce..eadd3b060 100644
--- a/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraint.php
+++ b/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraint.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Validator\Constraints\Export;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraintValidator.php b/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraintValidator.php
index f395008d7..4fe701906 100644
--- a/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraintValidator.php
+++ b/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraintValidator.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Validator\Constraints\Export;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
diff --git a/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php b/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
index aaac6b216..5069c3626 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\Counter;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
index b63546742..0b0e778a8 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php
index 3766a3f41..c5da2871e 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
index 0f6a4799a..e01c0dc7b 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\EventSubscriber;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
index c56dc34ce..d72ea6d4b 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\EventSubscriber;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php
index d91926dc5..ecef80c45 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\EventSubscriber;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
diff --git a/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php b/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php
index 99ad5b88c..1bd9a3fbe 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\Exception;
 
 use RuntimeException;
diff --git a/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php b/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
index 32f78a548..d6a70db92 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\Helper;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php b/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php
index 2f29afc56..ca711487c 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\Notification;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php b/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php
index 310c0126b..5bb2be9a5 100644
--- a/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php
+++ b/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtension.php b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtension.php
index 839c461b3..540457146 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtension.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtension.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\Templating;
 
 use Twig\Extension\AbstractExtension;
diff --git a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
index 48e8e5130..9a9d6a0ea 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\Templating;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreation.php b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreation.php
index dc01f9019..9321719a7 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreation.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreation.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\Validator;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
index abb14a952..2a3767dc5 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\Validator;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValid.php b/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValid.php
index 7c2d954b2..27a0fd02d 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValid.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValid.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\Validator;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php b/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
index 6b8378033..ccdede251 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
@@ -1,14 +1,15 @@
 <?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\MainBundle\Workflow\Validator;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20100000000000.php b/src/Bundle/ChillMainBundle/migrations/Version20100000000000.php
index 89454c356..9809feb4c 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20100000000000.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20100000000000.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20141128194409.php b/src/Bundle/ChillMainBundle/migrations/Version20141128194409.php
index 37de9c102..ad80aba6d 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20141128194409.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20141128194409.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php b/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
index ac80f2a58..28d809197 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20150821122935.php b/src/Bundle/ChillMainBundle/migrations/Version20150821122935.php
index 500ac9de4..12f03c7d7 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20150821122935.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20150821122935.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php b/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
index d1a8a31d1..b92df0400 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php b/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
index a15ee7c8c..7d5f2af62 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php b/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
index 7771756a7..9ad57f296 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php b/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php
index e56936aed..50c826d2d 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180911093642.php b/src/Bundle/ChillMainBundle/migrations/Version20180911093642.php
index 86e5585e3..cfcd732c5 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180911093642.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180911093642.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20200422122715.php b/src/Bundle/ChillMainBundle/migrations/Version20200422122715.php
index 95a9abe51..5698c0d30 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20200422122715.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20200422122715.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210304085819.php b/src/Bundle/ChillMainBundle/migrations/Version20210304085819.php
index 5f15147e4..407b77646 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210304085819.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210304085819.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php b/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
index 3e5d17a4a..820ae8e42 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php b/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php
index 3eaa4630d..86df6bea0 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210420115006.php b/src/Bundle/ChillMainBundle/migrations/Version20210420115006.php
index b0b281d06..9d38f5be8 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210420115006.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210420115006.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210503085107.php b/src/Bundle/ChillMainBundle/migrations/Version20210503085107.php
index 0f664e2b2..faabd40ff 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210503085107.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210503085107.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210505153727.php b/src/Bundle/ChillMainBundle/migrations/Version20210505153727.php
index eca166ae9..db3373dd1 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210505153727.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210505153727.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210525144016.php b/src/Bundle/ChillMainBundle/migrations/Version20210525144016.php
index f917a5bf1..bbba2569b 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210525144016.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210525144016.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php b/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php
index 09a0a52fd..007e53bf5 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php b/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php
index 54160273e..6b943863c 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210616134328.php b/src/Bundle/ChillMainBundle/migrations/Version20210616134328.php
index ed4603b17..9d45d819d 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210616134328.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210616134328.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php b/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
index cfd449dd0..f4d248fda 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210929192242.php b/src/Bundle/ChillMainBundle/migrations/Version20210929192242.php
index 5e22201c3..bf9188403 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210929192242.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210929192242.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211006151653.php b/src/Bundle/ChillMainBundle/migrations/Version20211006151653.php
index c564c30eb..d778cbd97 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211006151653.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211006151653.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211007150019.php b/src/Bundle/ChillMainBundle/migrations/Version20211007150019.php
index 33cb2fd42..4cc318bdc 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211007150019.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211007150019.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211012141336.php b/src/Bundle/ChillMainBundle/migrations/Version20211012141336.php
index 4d1050b94..10a869439 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211012141336.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211012141336.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211013124455.php b/src/Bundle/ChillMainBundle/migrations/Version20211013124455.php
index c40446834..3424eac13 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211013124455.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211013124455.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211015084653.php b/src/Bundle/ChillMainBundle/migrations/Version20211015084653.php
index 52cf53aac..2052dd675 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211015084653.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211015084653.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211022094429.php b/src/Bundle/ChillMainBundle/migrations/Version20211022094429.php
index f11dbf42b..f249a0a85 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211022094429.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211022094429.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211116162847.php b/src/Bundle/ChillMainBundle/migrations/Version20211116162847.php
index d9011049f..8f7c8aebc 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211116162847.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211116162847.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211119173554.php b/src/Bundle/ChillMainBundle/migrations/Version20211119173554.php
index 9494337fd..725ede6c3 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211119173554.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211119173554.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211123093355.php b/src/Bundle/ChillMainBundle/migrations/Version20211123093355.php
index b6618d25e..2093a2467 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211123093355.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211123093355.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211125142016.php b/src/Bundle/ChillMainBundle/migrations/Version20211125142016.php
index 08f3815de..b220888ca 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211125142016.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211125142016.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211125142017.php b/src/Bundle/ChillMainBundle/migrations/Version20211125142017.php
index 7f938b241..dcc239fe3 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211125142017.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211125142017.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211213112628.php b/src/Bundle/ChillMainBundle/migrations/Version20211213112628.php
index 012ab27d9..3b3fe8000 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211213112628.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211213112628.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211216213649.php b/src/Bundle/ChillMainBundle/migrations/Version20211216213649.php
index 4e5e4d9d9..23bcffd5c 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211216213649.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211216213649.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211225231532.php b/src/Bundle/ChillMainBundle/migrations/Version20211225231532.php
index eabcce641..21fa1053e 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211225231532.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211225231532.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211228183221.php b/src/Bundle/ChillMainBundle/migrations/Version20211228183221.php
index b74579959..66fd6c6a3 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211228183221.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211228183221.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211228215919.php b/src/Bundle/ChillMainBundle/migrations/Version20211228215919.php
index 12e7b747d..97d205e95 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211228215919.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211228215919.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211229140308.php b/src/Bundle/ChillMainBundle/migrations/Version20211229140308.php
index cfa0b4b5a..0d0650434 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211229140308.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211229140308.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211230003532.php b/src/Bundle/ChillMainBundle/migrations/Version20211230003532.php
index 20d75749c..925a87828 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211230003532.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211230003532.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220112123436.php b/src/Bundle/ChillMainBundle/migrations/Version20220112123436.php
index 7358a3b4b..48ff952ff 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220112123436.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220112123436.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220112150413.php b/src/Bundle/ChillMainBundle/migrations/Version20220112150413.php
index c38649711..0a547b11c 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220112150413.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220112150413.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220112161136.php b/src/Bundle/ChillMainBundle/migrations/Version20220112161136.php
index 89abc11d7..fb068934a 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220112161136.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220112161136.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220114132105.php b/src/Bundle/ChillMainBundle/migrations/Version20220114132105.php
index 2e7d7a99c..6001f81ba 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220114132105.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220114132105.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220114165950.php b/src/Bundle/ChillMainBundle/migrations/Version20220114165950.php
index 5489d3f1c..0b89d0ba1 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220114165950.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220114165950.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220120155303.php b/src/Bundle/ChillMainBundle/migrations/Version20220120155303.php
index 617d24b27..ce9117fc0 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220120155303.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220120155303.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220124085957.php b/src/Bundle/ChillMainBundle/migrations/Version20220124085957.php
index 17b58825d..7a6ac4edf 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220124085957.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220124085957.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220125134253.php b/src/Bundle/ChillMainBundle/migrations/Version20220125134253.php
index 7bcf003f9..f57469d40 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220125134253.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220125134253.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220128211748.php b/src/Bundle/ChillMainBundle/migrations/Version20220128211748.php
index 8a61e5f72..76e77af91 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220128211748.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220128211748.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220217133607.php b/src/Bundle/ChillMainBundle/migrations/Version20220217133607.php
index b6c6106f1..07c66f226 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220217133607.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220217133607.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220223171457.php b/src/Bundle/ChillMainBundle/migrations/Version20220223171457.php
index b62f4a88a..2dd2c6394 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220223171457.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220223171457.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php b/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php
index 23a7f2ab6..21578d07a 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220325134944.php b/src/Bundle/ChillMainBundle/migrations/Version20220325134944.php
index 58a20d220..e61d2a63a 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220325134944.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220325134944.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220413154743.php b/src/Bundle/ChillMainBundle/migrations/Version20220413154743.php
index 174419cda..837b6fc42 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220413154743.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220413154743.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220413225830.php b/src/Bundle/ChillMainBundle/migrations/Version20220413225830.php
index 4fdb48de3..0c00e237f 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220413225830.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220413225830.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220413230159.php b/src/Bundle/ChillMainBundle/migrations/Version20220413230159.php
index 52e4a4fff..f005a558f 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220413230159.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220413230159.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220506131307.php b/src/Bundle/ChillMainBundle/migrations/Version20220506131307.php
index f3360d94a..672270744 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220506131307.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220506131307.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220506145935.php b/src/Bundle/ChillMainBundle/migrations/Version20220506145935.php
index 9df382214..1e0e17aa1 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220506145935.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220506145935.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
index ec99ce2ba..d93ed0f64 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220516085659.php b/src/Bundle/ChillMainBundle/migrations/Version20220516085659.php
index 8e4d7347b..8f9e766a2 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220516085659.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220516085659.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220711150006.php b/src/Bundle/ChillMainBundle/migrations/Version20220711150006.php
index 0bac5ac96..901b5fb85 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220711150006.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220711150006.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php b/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php
index 69ffd856f..8fb3ecb3f 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220730204216.php b/src/Bundle/ChillMainBundle/migrations/Version20220730204216.php
index e4ad98318..cf0e298fb 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220730204216.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220730204216.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220829132409.php b/src/Bundle/ChillMainBundle/migrations/Version20220829132409.php
index 0da81d182..089907e27 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220829132409.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220829132409.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220913174922.php b/src/Bundle/ChillMainBundle/migrations/Version20220913174922.php
index f00cb5aa1..6789e6dda 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220913174922.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220913174922.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20221003112151.php b/src/Bundle/ChillMainBundle/migrations/Version20221003112151.php
index b9753ce8c..dd8bfb13a 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20221003112151.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20221003112151.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20221003132620.php b/src/Bundle/ChillMainBundle/migrations/Version20221003132620.php
index 8186ce7ed..4fe007f44 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20221003132620.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20221003132620.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
index 04dfb25cc..817da0b49 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\AccompanyingPeriod\Events;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
index aacb283c3..2b9dd8b11 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\AccompanyingPeriod\Events;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodLinkedWithSocialIssuesEntityInterface.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodLinkedWithSocialIssuesEntityInterface.php
index 566e05440..d3d9e84ab 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodLinkedWithSocialIssuesEntityInterface.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodLinkedWithSocialIssuesEntityInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\AccompanyingPeriod\SocialIssueConsistency;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
index 05d25104e..82d79b2d7 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\AccompanyingPeriod\SocialIssueConsistency;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestion.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestion.php
index 552a7a879..4f169d3be 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestion.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestion.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\AccompanyingPeriod\Suggestion;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestionInterface.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestionInterface.php
index 2abf4ce40..e4c577c2c 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestionInterface.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestionInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\AccompanyingPeriod\Suggestion;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php b/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
index 92306dd05..3f5e789bc 100644
--- a/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
+++ b/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Actions;
 
 use Symfony\Component\EventDispatcher\Event;
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
index 63c6313ac..270750ff5 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Actions\Remove;
 
 use Chill\PersonBundle\Actions\ActionEvent;
diff --git a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
index 5143592b8..ffbbc3a10 100644
--- a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
+++ b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\CRUD\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php b/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
index 684f78d61..c5f5a87c7 100644
--- a/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
+++ b/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\CRUD\Controller;
 
 use BadMethodCallException;
diff --git a/src/Bundle/ChillPersonBundle/ChillPersonBundle.php b/src/Bundle/ChillPersonBundle/ChillPersonBundle.php
index 4e73d2137..86db08bea 100644
--- a/src/Bundle/ChillPersonBundle/ChillPersonBundle.php
+++ b/src/Bundle/ChillPersonBundle/ChillPersonBundle.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle;
 
 use Chill\PersonBundle\DependencyInjection\CompilerPass\AccompanyingPeriodTimelineCompilerPass;
diff --git a/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php b/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
index 4a2e86236..c1853d4f5 100644
--- a/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
+++ b/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Command;
 
 use Chill\PersonBundle\Actions\Remove\PersonMove;
diff --git a/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php b/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
index fd328efc4..b238fee84 100644
--- a/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+++ b/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Command;
 
 use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
diff --git a/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
index b04cff13a..e4f0d8b5c 100644
--- a/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Command;
 
 use Chill\PersonBundle\Service\Import\ChillImporter;
diff --git a/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php b/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php
index 5d503007f..0dc2806c4 100644
--- a/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php
+++ b/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Command;
 
 use Chill\PersonBundle\Service\AccompanyingPeriod\OldDraftAccompanyingPeriodRemoverInterface;
diff --git a/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php b/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
index 7226e96c9..8d93d1d37 100644
--- a/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
+++ b/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Config;
 
 /**
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
index d1730d977..66a57bcda 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
index 09af4a3cf..965c37f38 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index bf7f24f4b..61f8035c3 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
index fb25a3ff7..0482151f2 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
index ec5db6222..ce44071c1 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index 2a9c43da7..6dc79ce33 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
index ef38b7335..9182b3257 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\Entity\Location;
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
index 796d384ca..b0e045aa8 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminController.php b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
index b59cbc4a5..5bf340f08 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
index 8e9b9d14d..00c12b9a8 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
index f10c1229f..072620387 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
index 1144688fe..6b89009ed 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php
index 418d04531..4add1d181 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeController.php
index e7fc5b203..1fb659d16 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
index 503867a3e..f52d364f4 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
index cacba0630..1b5b541d5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdPositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdPositionController.php
index 781c264b5..d09c4fb40 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdPositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdPositionController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/MaritalStatusController.php b/src/Bundle/ChillPersonBundle/Controller/MaritalStatusController.php
index 2297dee32..6cffa7578 100644
--- a/src/Bundle/ChillPersonBundle/Controller/MaritalStatusController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/MaritalStatusController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php b/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
index e62c0c123..6366db522 100644
--- a/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/OriginController.php b/src/Bundle/ChillPersonBundle/Controller/OriginController.php
index b7caae3be..cde67b474 100644
--- a/src/Bundle/ChillPersonBundle/Controller/OriginController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/OriginController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
index d4c5b334d..25533aa0f 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
index 5be598426..98ea42575 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index a4a29216c..2d3f10dfd 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
index 3b5e1da7b..a7a4c8737 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\ActivityBundle\Entity\Activity;
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index 6d35f8140..e7d43ed10 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\PersonBundle\Entity\Person\PersonResource;
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceKindController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceKindController.php
index ca3047a97..e0eccbfca 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceKindController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceKindController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
index 1fd54f14c..f0682f281 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Controller/RelationController.php b/src/Bundle/ChillPersonBundle/Controller/RelationController.php
index 8f0c7fa44..d2d01110f 100644
--- a/src/Bundle/ChillPersonBundle/Controller/RelationController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/RelationController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php b/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php
index 271b0cff7..a078bd28b 100644
--- a/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
index bdc6c1b5e..9eda048c8 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
index fc11f7f52..31422dcaf 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/EvaluationController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/EvaluationController.php
index 2cf672c35..c45015a0c 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/EvaluationController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/EvaluationController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/GoalController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/GoalController.php
index 38bd13267..3c21a4c2e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/GoalController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/GoalController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/ResultController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/ResultController.php
index f2d9a1d4d..3c469ad4b 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/ResultController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/ResultController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php
index 47cc246bd..a68a336d8 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
index 57dd38e80..976e8c683 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
index 98b40311d..ce9533581 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php
index a9d1238da..4f08adfe4 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php
index 3ce3848fd..49009fe89 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
index a6042b0a6..084ee11b1 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
diff --git a/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php b/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
index 7402698d9..ee25675f7 100644
--- a/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
diff --git a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
index 321f212d5..bb02e5c62 100644
--- a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php
index 5b4eeb723..fb34aaeb5 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\Helper;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php
index 00281311e..4d29509f2 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\Helper;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php
index c1d045ac4..efcd03858 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php
index 1e392c9f2..d169b1335 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
index 2d368d2f4..73a447ea4 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
index 83698735e..2dd32de0a 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
index 1e6435c8b..635b99f04 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
index 02b5ef2e7..bb2d2e956 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php
index b1d306ef8..09d328fdf 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php
index fed7d2817..6848f56ac 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\PersonBundle\Entity\Household\Position;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
index 45a9f6fd4..9a2fd308b 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\PersonBundle\Entity\MaritalStatus;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index b3bdd908f..07b8c32ef 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
index 7b368bbe8..2c46fb223 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
index c7ce18091..690395f77 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\PersonBundle\Entity\Relationships\Relation;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
index 18b2788f6..dcb512d1e 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
index 4501ef51e..0d5e9abf4 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DataFixtures\ORM;
 
 use Chill\PersonBundle\Service\Import\SocialWorkMetadata;
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 47b414ce2..cb0d749a0 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DependencyInjection;
 
 use Chill\MainBundle\DependencyInjection\MissingBundleException;
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php b/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
index 31c04a59b..096eb2281 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DependencyInjection\CompilerPass;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
index 7b483a633..e907ed5ce 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\DependencyInjection;
 
 use DateInterval;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
index 14c9fb694..264a6a217 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartAddressId.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartAddressId.php
index 5b9e784f1..fd7ce0b93 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartAddressId.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartAddressId.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryCode.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryCode.php
index ca130478c..3da15decf 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryCode.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryCode.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryId.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryId.php
index 3672c2a74..3866d66ef 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryId.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryId.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryName.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryName.php
index b6da85ee4..f658a6f73 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryName.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryName.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartIsNoAddress.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartIsNoAddress.php
index 4390fb6a8..7a2abbea2 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartIsNoAddress.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartIsNoAddress.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeCode.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeCode.php
index 09804b241..109a7ce19 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeCode.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeCode.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeId.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeId.php
index bd2536047..4f0cdc684 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeId.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeId.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeLabel.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeLabel.php
index 5edb77e6f..914b752e6 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeLabel.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeLabel.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress1.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress1.php
index 344b7e3c2..ce131646f 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress1.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress1.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress2.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress2.php
index 2827016bc..bd088a852 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress2.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress2.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartValidFrom.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartValidFrom.php
index 89ef28606..6cf178ddf 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartValidFrom.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartValidFrom.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index ab51bbf85..146a93ead 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php
index 1dcb5a1bf..1ff8d5c14 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 9c0eade3b..d5bae5a34 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index 615c33825..461b6509c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
index 5e412a82c..f94a04850 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
index 4dc3d958c..a343071e2 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
index aa12f0416..2ae3ab2de 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\AccompanyingPeriod;
 
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
index 039489864..15a805254 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
index 492d7d995..b8e717a46 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\AccompanyingPeriod;
 
 use DateTimeImmutable;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php
index 73f2e069a..2b010a1fa 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php
index 4e0e2493f..f1592373a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
index 161f5c316..d0740b3e0 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity;
 
 use DateTime;
diff --git a/src/Bundle/ChillPersonBundle/Entity/HasPerson.php b/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
index 1bee7127c..134c30411 100644
--- a/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
+++ b/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity;
 
 /**
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
index 91d9cea57..ac19ed0e7 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Household;
 
 use ArrayIterator;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
index 8aef3a0fa..99da54e03 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Household;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php
index 03d1a401a..276f69394 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Household;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index 2de526ee6..409dbcc00 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Household;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
index 3bb204c6f..ed603cf5b 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Household;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
index 378bc0d9f..3cff1535a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Household;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php b/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
index 05f47ffcf..2606012bc 100644
--- a/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
+++ b/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 731b41905..037f25f2b 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity;
 
 use ArrayIterator;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
index 30de1f55a..c7ed9ba2c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php
index a9ec61251..ed024dff9 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
index 0c9e416c2..d6b2c35c6 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index b1022cf4c..cb9939d34 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
index f450997fa..68699b52b 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Person;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
index bfa3760fa..163aaa0e3 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
index 4fe1e5fca..6bae6faa5 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
index c00eb91fa..f403c650d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
index 7f0e28ddb..a6c92ff88 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity;
 
 use DateTime;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
index b2be55059..2839e3276 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Relationships;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
index 62fbb63a9..0cc4539b9 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\Relationships;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
index 131cc4bac..a3ab15e61 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\SocialWork;
 
 use DateInterval;
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
index 30abaa3ef..1a2ea1bd0 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\SocialWork;
 
 use DateTimeInterface;
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
index e147ec9d8..1595dbd74 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\SocialWork;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
index fbd271b44..fa2740493 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\SocialWork;
 
 use DateInterval;
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
index fb277f56c..301fe2550 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Entity\SocialWork;
 
 use DateTimeInterface;
diff --git a/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php b/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php
index 2f4a1a92e..c84a6e632 100644
--- a/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php
+++ b/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Event\Person;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
index 83f9ca460..4c99f314d 100644
--- a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
+++ b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\EventListener;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
index 993435ce5..029282e5d 100644
--- a/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
+++ b/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\EventListener;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php b/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
index 4fa0b9ad8..cdc58bf8d 100644
--- a/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
+++ b/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export;
 
 use Doctrine\ORM\QueryBuilder;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
index b51b31c60..07bfd4bf2 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
index de3075747..edd724b7b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
index a2a4919aa..e97c02c22 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
index ee54da2af..aad6e0768 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
index 297faf049..070d305b8 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
index 292303cea..9f39bd21e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
index 884b9c8e9..49b3671ec 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
index c418ea39f..6fc40278c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php
index df48d61af..5f5342941 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
index e9c2ef878..4526963ad 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
index 26e724526..890ff7bd9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
index b56f70614..c10aa9e9d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
index 2f716c92a..679dcd67c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
index f711cf9ef..7b7a33b4b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
index dc8d2cfb3..ccf637446 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
index e013f94d3..cf4574d65 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
index 809bb9645..c0cdd57f1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
index 29420d5c9..f137d4961 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\EvaluationAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
index d51575d6e..f2f9a6979 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\HouseholdAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
index 6e180934b..ac8ef292e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\HouseholdAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
index a2cbe3ba3..5e431deda 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
index 4fac30f42..04be4f7f6 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
index 3cfadc355..c4fa5a1e4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
index feccafe50..8bd7e668c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Entity\GeographicalUnit;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
index 1f902357e..db994c5a8 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
index 333523487..5f3a31b4d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
index eb58913c3..c459117e4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
index 38fd40071..31c21dbb5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
index 353602db9..70301d74f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
index 97745f576..85ca3d51c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
index c95f4bf50..719d5c5fd 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
index 33469f719..23013db2d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
index 215c51c3c..fa7de924f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
index 9db70af91..400b5fc64 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Declarations.php b/src/Bundle/ChillPersonBundle/Export/Declarations.php
index 0f4d84e3c..6a1bffc52 100644
--- a/src/Bundle/ChillPersonBundle/Export/Declarations.php
+++ b/src/Bundle/ChillPersonBundle/Export/Declarations.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export;
 
 /**
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
index f3995a335..8b3e4db0d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php b/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
index 544734055..d3d70be5d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
index 2b358634f..45cceeec3 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
index c411fad2e..f15127204 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php b/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
index df48fe7c6..a746c45b5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php b/src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php
index caf6cdbc2..3e00b7167 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
index e1d8788a7..5018f6245 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Export;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
index 543be933c..f1997b729 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\DirectExportInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php b/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
index f59be8399..084637b1d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
index b52b8b34a..aaa36eab5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
index 3ec26183c..114bc5955 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
index 9b2fd7634..9633fa25a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\Location;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
index 636524d04..7b9bccb8e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
index 4d1784cb3..a7722e614 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilter.php
index 6c098e028..7dd3235bd 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php
index 8e164d668..9f259d650 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
index b9c835080..0bfb20427 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
index 3b95261db..d0924a9c4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
index f720896c4..4f1266b67 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
index a98a6ec11..df3a98c38 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
index 814819a57..356cb5597 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
index 200d8e8b0..fdbe3476c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
index 6e680849d..75bf2dfc7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
index 299dbafb6..e56e41bf7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
index 0664f2a8d..3b9601c38 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
index 598652ff8..df6c86ed4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php
index dda95ff74..b068bd381 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
index 74f6fef75..dcb9f4203 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\EvaluationFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
index 371955bfa..439ffe849 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\EvaluationFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
index 94b55b67c..5aeaaf2cb 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\HouseholdFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilter.php
index 9258c9b0a..edefd08c7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodFilter.php
index 0c97ac6bf..516a3d1f3 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilter.php
index 00ff885ba..3bf8f6a55 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
index 394ccddcb..c445d8f27 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
index 30d0612a0..9a386e7f0 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
index c764bdbb7..63100307c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
@@ -42,7 +43,7 @@ class DeadOrAliveFilter implements FilterInterface
                         'person.birthdate',
                         ':date_calc'
                     )
-               ),
+                ),
                 $qb->expr()->andX(
                     $qb->expr()->isNotNull('person.deathdate'),
                     $qb->expr()->gt(
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
index ba8e8c150..601f01efa 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
index 02833d14c..68db2c993 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
index 7463c36a9..37efd90f9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Entity\GeographicalUnit;
@@ -106,11 +107,11 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
                 'units' => implode(
                     ', ',
                     array_map(
-                            function (GeographicalUnit $item) {
+                        function (GeographicalUnit $item) {
                                 return $this->translatableStringHelper->localize($item->getLayer()->getName()) . ' > ' . $item->getUnitName();
                             },
-                            $data['units']->toArray()
-                        )
+                        $data['units']->toArray()
+                    )
                 ),
             ],
         ];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
index 5d136c0e6..f78f26e9b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
index eec380170..a98e9bd93 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Entity\Country;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
index ce632ddd0..430d456a7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
index 53e9de406..8e9789856 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
index f43cc458a..cae97189b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Entity\UserJob;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
index a52b9e177..e06aeac9e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
index 6efaf9989..0d1f7738f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
index 41125cfe1..65ce55adf 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php b/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php
index fc7dc97a3..a8fb835c0 100644
--- a/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php
+++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillTextareaType;
diff --git a/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseType.php b/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseType.php
index 55d7f7c92..976cdbd01 100644
--- a/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseType.php
+++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
index ec1766088..68de9ed62 100644
--- a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
+++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
index 7ff30524f..7b3264da2 100644
--- a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+++ b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\ChoiceLoader;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php b/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
index 9cf24d8c3..539559cb4 100644
--- a/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
+++ b/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 124db26eb..cb2edfe59 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
index d63c5f214..49d9b05eb 100644
--- a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
+++ b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\DataMapper;
 
 use Chill\PersonBundle\Entity\PersonAltName;
diff --git a/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php b/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php
index 1db70bce5..1b4cfb9b5 100644
--- a/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php
+++ b/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\DataTransformer;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php
index 0348b0c39..9cfbbbf6c 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionTypeType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionTypeType.php
index ad95c9f7a..57b7d3c26 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionTypeType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionTypeType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
index 192142043..b015103dc 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdPositionType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdPositionType.php
index ebd0ac966..2ebc85733 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdPositionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdPositionType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdType.php
index 68f00fa22..ce9d46895 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Form/MaritalStatusType.php b/src/Bundle/ChillPersonBundle/Form/MaritalStatusType.php
index fb81331c6..e2aace833 100644
--- a/src/Bundle/ChillPersonBundle/Form/MaritalStatusType.php
+++ b/src/Bundle/ChillPersonBundle/Form/MaritalStatusType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
diff --git a/src/Bundle/ChillPersonBundle/Form/OriginType.php b/src/Bundle/ChillPersonBundle/Form/OriginType.php
index e3c08b359..7d47e1501 100644
--- a/src/Bundle/ChillPersonBundle/Form/OriginType.php
+++ b/src/Bundle/ChillPersonBundle/Form/OriginType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php b/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php
index 52ed35db6..63be401f9 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php b/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php
index 7ecbcdc9b..ffec30b1c 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\PersonBundle\Form\Type\PickPersonType;
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php
index 8e050cbce..790e12fab 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
index 31af0a649..418fb941d 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillTextareaType;
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php
index 68ebd3ef4..7995f1efd 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\CustomFieldsBundle\Form\Type\CustomFieldType;
diff --git a/src/Bundle/ChillPersonBundle/Form/RelationType.php b/src/Bundle/ChillPersonBundle/Form/RelationType.php
index e1887115f..e1b094518 100644
--- a/src/Bundle/ChillPersonBundle/Form/RelationType.php
+++ b/src/Bundle/ChillPersonBundle/Form/RelationType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
diff --git a/src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php b/src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php
index 8efcf091a..2a2935a26 100644
--- a/src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php
+++ b/src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\CommentType;
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php
index c1261754c..585a0f417 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\SocialWork;
 
 use Chill\MainBundle\Form\Type\DateIntervalType;
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
index ef459f8da..e7cd52d2b 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\SocialWork;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php
index b8a130950..81afbef67 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\SocialWork;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
index 77c94fa9d..3cedc4039 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\SocialWork;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
index 5aa76fbc6..6e57743b3 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\SocialWork;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php b/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
index 600720ddf..ea71b76ee 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\Type;
 
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/GenderType.php b/src/Bundle/ChillPersonBundle/Form/Type/GenderType.php
index 90d548265..5812be56c 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/GenderType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/GenderType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\Type;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php b/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
index 02335c397..1000292d6 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\Type;
 
 use Chill\MainBundle\Templating\TranslatableStringHelper;
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
index 3b1de28c7..3dc28b243 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\Type;
 
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
index 41c90406f..fa235077f 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\Type;
 
 use Chill\MainBundle\Form\Type\DataTransformer\EntityToJsonTransformer;
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
index 1bc2d5e14..87d147974 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
index 742efbc7d..bd205d7bc 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Form\Type;
 
 use Chill\MainBundle\Form\Type\DataTransformer\ObjectToIdTransformer;
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
index 8ae41a98b..203de0f75 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Household;
 
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php b/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
index 7d1b19d51..b9c5d361f 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Household;
 
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 57be8fecf..96874ec17 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
index afd9f9484..2119caca1 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
index 4dc43bcaa..4d777d3d4 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
index 683f4e7b6..80a7c3c77 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
index a7244ac15..cab94bd53 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
index a4d3f8d03..83cba6287 100644
--- a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index 103fd2b88..e19227910 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
index 183d2353e..42000e731 100644
--- a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Menu;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/UserMenuBuilder.php
index d390c9993..55ffc2952 100644
--- a/src/Bundle/ChillPersonBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/UserMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php
index 384daf07b..f7cdb804a 100644
--- a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php
+++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Notification;
 
 use Chill\MainBundle\Entity\Notification;
diff --git a/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php b/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
index 7f8da3671..9c6902ddc 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Privacy;
 
 /*
diff --git a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
index 10e25c327..a38ca351c 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Privacy;
 
 /*
diff --git a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
index 480ddcb24..b6505f11b 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Privacy;
 
 /*
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php
index d2dfe094a..b5e23b954 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
index 3273e3a7d..92b93237e 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
index 1f432e4e0..307a91e5e 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
index 8a9fd42cd..3c74b5a50 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
index 5cf394df6..0c98be5ea 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
index 73bc3ff5d..9c7d23308 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\AccompanyingPeriod;
 
 use Doctrine\Persistence\ObjectRepository;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
index 0da6fc662..88cc43f24 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
index 5d7c10f7e..c2263b595 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
index 8eee0e9e4..5806c1f64 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
index 653fed9c2..0757163ad 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\MainBundle\Entity\Location;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
index e8d0bd856..5ff1fa2c3 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
index cbfb3e6d9..5b9f245df 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
index ab7006fd8..0f9caa0ca 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
index 48dabd054..f13e9bf76 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Household;
 
 use Chill\MainBundle\Entity\AddressReference;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepositoryInterface.php
index e13d8b888..2f22a7278 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Household;
 
 use Chill\MainBundle\Entity\AddressReference;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
index 23f79c7f5..217ec230b 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
index 45931b4da..16969d150 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
index e4729cd72..f8bdb6852 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
index 196bfc269..7fb15e64f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
index 2cd370260..730502625 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
index 2ceab9b9e..dd00e12b9 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\Position;
diff --git a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
index 58b4aa7fa..81a221ad6 100644
--- a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\MaritalStatus;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryInterface.php
index 832a7ff30..e3ff987fc 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Person;
 
 use Doctrine\Persistence\ObjectRepository;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php b/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php
index 3fa73730e..a32805dbd 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Person;
 
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index f7b361436..d5564bd37 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
index 72d4682c8..72f8f3efc 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\MainBundle\Search\SearchApiQuery;
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
index 6e5533f78..8c82ad2d9 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\PersonAltName;
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
index 8fe586760..24cf47296 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
index 144cea507..d3cc73791 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
index a0847a844..9d73263e8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person\PersonResource;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php
index ddf82ca8d..169bc2b1f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Relationships;
 
 use Chill\PersonBundle\Entity\Relationships\Relation;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php
index 9549a4564..dbaa61cce 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\Relationships;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
index 4e6131de0..13bab7ea0 100644
--- a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
index cb651b9ae..0301f30d3 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
index ec74b1919..1f284c1d7 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
index 744c42577..804372649 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
index 4d9597f83..4924f6995 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
index 0900796d6..6c583177f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
@@ -1,32 +1,13 @@
 <?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);
 
 /*
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace Chill\PersonBundle\Repository\SocialWork;
diff --git a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
index 9b18ae244..f1bbae644 100644
--- a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+++ b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Search;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php b/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
index 6e7953b8e..5c209766d 100644
--- a/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
+++ b/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Search;
 
 use Chill\MainBundle\Search\SearchApiInterface;
diff --git a/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php b/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
index e2c84275c..e06fe7819 100644
--- a/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
+++ b/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Search;
 
 use Chill\MainBundle\Search\SearchApiInterface;
diff --git a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
index c046c8947..5953562a8 100644
--- a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
+++ b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Search;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php
index 6e326b990..e36995da0 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Security\Authorization;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php
index d17a44dd3..84a5cec73 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Security\Authorization;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
index b9c9fb219..840df862d 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
index 7ce259714..4ca3750a4 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Security\Authorization;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php
index eb6af5caa..db43ed241 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Security\Authorization;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
index 24df2bbc5..7505627fb 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Security\Authorization;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
index 900c948c1..217d08051 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
index 14984fc67..f641aeed9 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
index 0a00b4000..44fb4574a 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
index ca7589e79..573887d8b 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
index d9472184e..3d7aa5548 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
index 472fa6d9b..1fe0ff5fe 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Serializer\Normalizer\DiscriminatedObjectDenormalizer;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
index e76c9cb55..f2dd7b990 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
index 77e289e6a..761decde4 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php
index cf3033e65..8b903e261 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
index e8febcf5d..9ea09f4d1 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
index 4a110125e..6540149f3 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use ArrayObject;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
index f77a8c669..00a948624 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
index 7d9813ce4..4065f8ce9 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\BudgetBundle\Service\Summary\SummaryBudgetInterface;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index 6149eff9e..33f030958 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizerInterface.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizerInterface.php
index fd41752a8..ee78e64ea 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizerInterface.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizerInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
index 52a0f701c..859a66780 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
index 52ba07a93..53a010473 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
index 0e5fb3730..48bab4488 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
index 1b5ac32b7..20918ef39 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Serializer\Normalizer;
 
 use ArrayObject;
diff --git a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php
index 47a34e88c..08cd6738b 100644
--- a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php
+++ b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Service\AccompanyingPeriod;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
diff --git a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php
index 882fefe3b..32fc025df 100644
--- a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Service\AccompanyingPeriod;
 
 use DateInterval;
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index d3400034b..d9bd36d01 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Service\DocGenerator;
 
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
index 1e25b3ab1..75b5a1f19 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Service\DocGenerator;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 90712c64d..45dcb4720 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Service\DocGenerator;
 
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 231e674b2..f7e1ebd0a 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Service\DocGenerator;
 
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
diff --git a/src/Bundle/ChillPersonBundle/Service/Import/ChillImporter.php b/src/Bundle/ChillPersonBundle/Service/Import/ChillImporter.php
index 8f0a53157..2e8262894 100644
--- a/src/Bundle/ChillPersonBundle/Service/Import/ChillImporter.php
+++ b/src/Bundle/ChillPersonBundle/Service/Import/ChillImporter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Service\Import;
 
 interface ChillImporter
diff --git a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
index 83342a435..153bcad51 100644
--- a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Service\Import;
 
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
diff --git a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php
index 00d1de6ef..c3a7edd09 100644
--- a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Service\Import;
 
 interface SocialWorkMetadataInterface extends ChillImporter
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
index d4c7c6d10..0709062a8 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
index 11236955c..3b20f6ab2 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRenderInterface.php b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRenderInterface.php
index 631402851..8f0d950f1 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRenderInterface.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRenderInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
index 8c340f305..bad9e689e 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
index d8239a082..bf127a265 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
index 56574541e..175c7c5ea 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
diff --git a/src/Bundle/ChillPersonBundle/Test/PreparePersonTrait.php b/src/Bundle/ChillPersonBundle/Test/PreparePersonTrait.php
index dfbcd6d15..3e5aadd51 100644
--- a/src/Bundle/ChillPersonBundle/Test/PreparePersonTrait.php
+++ b/src/Bundle/ChillPersonBundle/Test/PreparePersonTrait.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Test;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
index 37c4ba788..2871023cb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\AccompanyingPeriod;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php
index 892bd29f5..1a03a7442 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php
@@ -1,14 +1,15 @@
 <?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 AccompanyingPeriod\Events;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
index 8888868cb..026845c1f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\AccompanyingPeriod\SocialIssueConsistency;
 
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php
index 8867872d3..5fad084f6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php
@@ -1,14 +1,15 @@
 <?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 AccompanyingPeriod\Workflow;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
index b6c3f1977..e79687b4f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
index bfc67ecda..9c7ff4450 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
index 98fa0ab2d..218ffb334 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php
index 32f3a598c..c82f78960 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php
@@ -1,14 +1,15 @@
 <?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 Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
index 94a0ac243..c4ab9edb0 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
index fe3b2a407..50aeae2f4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
index 4706a14d8..a8931148d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
@@ -1,14 +1,15 @@
 <?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 Bundle\ChillPersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
index 7b483d8cd..39762729e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
index 3d675ec16..63a7194ec 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
index 11f1ee43d..f364bf0be 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
index c034e7a03..482164bd8 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
index 15ff6f116..a3dc1c4b8 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 //ini_set('memory_limit', '-1');
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
index 2a5b4c6b1..408d04769 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
index 6526745a2..436fbfe26 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
index 7f01d3c4b..91b6e9214 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
index 5b6d89974..af211b6ea 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
index 4ffc9fdc4..63842718e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
index b67e38e87..3ca0b05be 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Entity\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
index 0fcf414ce..09bf54f0c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Entity;
 
 use ArrayIterator;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
index eb696cf93..7d888bf3c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
@@ -1,14 +1,15 @@
 <?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 Bundle\ChillPersonBundle\Tests\Entity\Household;
 
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
index b7b805be8..833312be5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
@@ -1,14 +1,15 @@
 <?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 Entity\Household;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
index 4633c3fcb..0a682bf3d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Entity;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
index a3b49b596..658886cff 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Entity\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php b/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php
index 65d10f68a..6fca992d4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php
@@ -1,14 +1,15 @@
 <?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 Event\Person;
 
 use Chill\MainBundle\Entity\Address;
diff --git a/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php b/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
index 5ea140d0e..ab75745d8 100644
--- a/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
@@ -1,14 +1,15 @@
 <?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);
-
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
 use Chill\PersonBundle\EventListener\PersonEventListener;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
index 84487b0b6..efda551ca 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
index 2aa4e3e3e..f8b7e4789 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
index a96b14d28..3b2a76fd0 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
index 616ee83c5..45f46b88c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
index c4a2fc74e..28f327750 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
index cd5b1f4c7..0f6f5988a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php
index 8808961bf..fa0956404 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
index e4c976cc9..7a4afc00b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php
index f1b980640..696d9b5f9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
index a2126c47c..5a96dcb56 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
index c5c04374f..a8e9fec2e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php
index f91fedad9..90c3eee77 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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 Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
index 84924e262..932e7a003 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
index 066ff2bc5..dbbc8d7ef 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
index 66b59e5f9..074a236e3 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
index 360937cac..7630125fd 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
index f038c8a1c..dd79533bf 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
index 624f03ef5..5e5833964 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\EvaluationAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
index 429cf825b..3f0b579f4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
index 5e017144e..98e6f3d00 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php
index 031ded74c..dd1b36399 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
index a22135ec5..859a22f47 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php
index 16bca62d9..13e3896db 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
index 036b00302..173e47e57 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
index a24210fb4..e7702df08 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php
index 7de9587eb..50fe66704 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
index 3ba391d60..c788ae046 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
index deef482ee..fa7e42c14 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
index 429833569..04b5f7b40 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
index e8ed02aa1..e00c60a89 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
index 060655eb3..381d7bf9f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
index cca033b5b..999e2aebf 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
index 95b3a784c..8884ec18a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
index 6ce9827f3..efe1198f7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
@@ -1,14 +1,15 @@
 <?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 Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
index fe7d91753..2cc200cee 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountSocialWorkActionsTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountSocialWorkActionsTest.php
index 6fd26ff74..7a0a11b12 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountSocialWorkActionsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountSocialWorkActionsTest.php
@@ -1,14 +1,15 @@
 <?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 Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
index d3564c0c6..512dca755 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
index 543c938f2..3d5b74490 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
@@ -1,14 +1,15 @@
 <?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 Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php
index ac94a9c33..a58253844 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php
index 5c25abefc..655600364 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php
index df301537c..03a40c31c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\Location;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php
index 02e0de4d2..f1e7daccb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php
index c3e185e1f..ac2273e30 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php
index 0507333ab..e458dc3d7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php
index 12c3ce96f..ed891dbd7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php
index 7f5fe9f32..49fe8793a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php
index b0fdb24b9..d6f14080c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php
index 72a838f1e..fead2632c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php
index 2f4c0caf8..3d941c309 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php
index e11e8228f..21cf37d77 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php
index 3182d0063..1cb6c12ec 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php
index ade7de2f9..8d700aee8 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php
index d56c57741..9b2ec45a5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php
index 15454c899..77fa682b0 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php
index 9b7eec446..f5cfb303f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php
index 0dce61dc3..1c25e5abe 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
index c6c407348..70804a80e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\EvaluationFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
index 71658d711..ab58ca601 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\EvaluationFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
index c0eccef81..2c724fde7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\HouseholdFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilterTest.php
index 1440eca51..16a9ace8a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodFilterTest.php
index 943f20d73..c36aee6a1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilterTest.php
index 1cb46257d..15394997f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
index 0131016ab..c3e798085 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php
index 68664b8b7..8f39072f2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
index ce48394c6..ec4e3f039 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
index 6562233e4..b3056860a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php
index 9ebf99b6d..0ae912d20 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
index a01566ba8..b4f539dc4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
index e142fa9a0..4b8c8e7ff 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Entity\Country;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
index 1c9225f80..fd939ae3f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
index 4ce578ca2..0488c87dc 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php
index 76462ebe5..ed9545bba 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
index 8b4a69c98..ecf908b9b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php
index 2eb1301ca..f9c11c470 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php
index 99fb3aae9..c86235280 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
index c92de01c6..28c5dbd94 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Form\Type;
 
 use Chill\PersonBundle\Form\Type\PickPersonType;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
index 77eeed387..3b8490a67 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Household;
 
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
index 3f7ac3027..9b4b23d62 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Repository;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php b/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
index b49f6be12..00c4434ab 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Search;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
index f3caf6d36..edb865560 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
index 7e6330988..a63d422bf 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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 Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
index 81efad3d8..71d0f6f31 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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 Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php
index f46e76932..2327416c3 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php
@@ -1,14 +1,15 @@
 <?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 Serializer\Normalizer;
 
 use Chill\DocStoreBundle\Entity\StoredObject;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
index c67e07b5e..864513f0c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
index c5e3c7311..93d7a69e9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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 Serializer\Normalizer;
 
 use Chill\BudgetBundle\Service\Summary\SummaryBudgetInterface;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
index 13fa54178..f3a3b72ec 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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 Serializer\Normalizer;
 
 use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
index e8589e11c..ad28cc049 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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 Serializer\Normalizer;
 
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php
index 4d2af31bf..db874a31c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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 Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
index 9e602ea90..f6abc04a2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Timeline;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
index 954c74826..6e2658ba1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Validator\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
index 85f973ab0..e88466168 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Validator\Household;
 
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
index 3b534d713..d2c17e346 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Validator\Household;
 
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
index e08e05cd6..87e545cbf 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Validator\Person;
 
 use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
index 05b8b31b2..2965e62fa 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
@@ -1,14 +1,15 @@
 <?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 Validator\Person;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
index 716e34fa8..947c6de57 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
@@ -1,14 +1,15 @@
 <?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 Validator\Person;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php b/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
index 44696ebe4..1e6782be6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Tests\Workflows;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
index 8ead27b2f..db87be36a 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Timeline;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
diff --git a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
index 8017586e7..f0183d35a 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Timeline;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
index 9b15da6bc..4994e13ab 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Timeline;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidity.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidity.php
index c4bd30ed3..80e4ae93a 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidity.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidity.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
index 940290315..656384660 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Chill\ActivityBundle\Repository\ActivityRepository;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ConfidentialCourseMustHaveReferrer.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ConfidentialCourseMustHaveReferrer.php
index c85130f9b..f90843994 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ConfidentialCourseMustHaveReferrer.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ConfidentialCourseMustHaveReferrer.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ConfidentialCourseMustHaveReferrerValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ConfidentialCourseMustHaveReferrerValidator.php
index 2e19488bc..e6da5883e 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ConfidentialCourseMustHaveReferrerValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ConfidentialCourseMustHaveReferrerValidator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidity.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidity.php
index 58f595da9..44628d0da 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidity.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidity.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
index 777fc8bf9..0f80a3ade 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlap.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlap.php
index 7ad44ff15..4f687bb67 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlap.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlap.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
index f9f88debe..50e3d289b 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Chill\MainBundle\Util\DateRangeCovering;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheck.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheck.php
index 4619b37f9..6e9f48618 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheck.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheck.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php
index daf4d67f7..cc8b36179 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequential.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequential.php
index 924a0c868..4954df640 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequential.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequential.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\Household;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
index eba6fd87e..60968aeb8 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\Household;
 
 use Chill\MainBundle\Util\DateRangeCovering;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolder.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolder.php
index f2f6c96d3..7cfc1d687 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolder.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolder.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\Household;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php
index 49a995341..2f7ff35e8 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\Household;
 
 use Chill\MainBundle\Util\DateRangeCovering;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
index fc21fd329..7bfe15b08 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\Person;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
index 20463f44f..66a966b5d 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\Person;
 
 use DateInterval;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
index 45c172e1f..d84c417d3 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\Person;
 
 /**
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
index 967b5672f..8f903ab07 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\Person;
 
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicate.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicate.php
index db4d7c0d6..e445aeddf 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicate.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicate.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\Relationship;
 
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php
index 9c71f442d..b5b42439a 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Validator\Constraints\Relationship;
 
 use Chill\PersonBundle\Entity\Relationships\Relationship;
diff --git a/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php b/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
index d0e021ed9..10ce2a1ed 100644
--- a/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
+++ b/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Widget;
 
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
index 9e2f326fb..34072fa1e 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Widget;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget/PersonFilteringInterface.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget/PersonFilteringInterface.php
index c882f96a8..a0cfef8f7 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget/PersonFilteringInterface.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget/PersonFilteringInterface.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Widget\PersonListWidget;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
index 26e4a39da..bcbb4626f 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index 578d8e195..63b9ab434 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Workflow;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
index ddd6ded38..d9779d856 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Workflow;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
index 3fda24c4f..f4b7a1265 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
@@ -1,14 +1,15 @@
 <?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\PersonBundle\Workflow;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20141129010948.php b/src/Bundle/ChillPersonBundle/migrations/Version20141129010948.php
index b64cb1c5e..34972ccfd 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20141129010948.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20141129010948.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150212173934.php b/src/Bundle/ChillPersonBundle/migrations/Version20150212173934.php
index 668e2c074..5da322e9f 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150212173934.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150212173934.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php b/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
index 000f74899..14f951907 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php b/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php
index fd846e7fb..24f080a89 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php b/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
index 6d80d97a6..ec3eb4e26 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php b/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
index 41855c45c..1901a883f 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php b/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
index 68021abde..660c836c5 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php b/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
index d226dc1b2..77d59bb72 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php b/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php
index cad37ac43..eb9ccec5b 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160818151130.php b/src/Bundle/ChillPersonBundle/migrations/Version20160818151130.php
index 43d2281f7..819ad44fa 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160818151130.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160818151130.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20170117131924.php b/src/Bundle/ChillPersonBundle/migrations/Version20170117131924.php
index aa2c36fe3..9338b2d2c 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20170117131924.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20170117131924.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php b/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
index 18d86b90c..7c8672eb0 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php b/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
index 84a251fd4..ac9741d34 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php b/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php
index 2c570b9a0..f3afb742b 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php b/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
index 51a3492de..0780f5699 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20190701124238.php b/src/Bundle/ChillPersonBundle/migrations/Version20190701124238.php
index 75ed5aa9c..24ffb7bfb 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20190701124238.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20190701124238.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20191106103452.php b/src/Bundle/ChillPersonBundle/migrations/Version20191106103452.php
index 3d03f61ae..0470938f9 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20191106103452.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20191106103452.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php b/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
index 1b06528af..3f65396b2 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php b/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php
index 42c4a553b..7528ea444 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php b/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
index 7232a8dac..8af146adb 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200422125935.php b/src/Bundle/ChillPersonBundle/migrations/Version20200422125935.php
index 8d9da0e48..d84fe0ecc 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200422125935.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200422125935.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210128152747.php b/src/Bundle/ChillPersonBundle/migrations/Version20210128152747.php
index 995625359..394c767c5 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210128152747.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210128152747.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php b/src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php
index 2f52f9d00..f3b72ce26 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php b/src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php
index d0a14caa4..059431f45 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php b/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
index b947963f0..a82db95b6 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210329090904.php b/src/Bundle/ChillPersonBundle/migrations/Version20210329090904.php
index 7cc589e12..f99aac9da 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210329090904.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210329090904.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210329113152.php b/src/Bundle/ChillPersonBundle/migrations/Version20210329113152.php
index 062c7fd17..cd61c5ad2 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210329113152.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210329113152.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210329144338.php b/src/Bundle/ChillPersonBundle/migrations/Version20210329144338.php
index 34111e6c1..a11d599d0 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210329144338.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210329144338.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210330164922.php b/src/Bundle/ChillPersonBundle/migrations/Version20210330164922.php
index 6e2c80107..d4497aebf 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210330164922.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210330164922.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210331084527.php b/src/Bundle/ChillPersonBundle/migrations/Version20210331084527.php
index 7ba75efa9..197abd11a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210331084527.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210331084527.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php b/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
index c340ab989..4c8c1e747 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php b/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
index 2ef445f32..c1940e42d 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php b/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php
index cdf9d3374..9375a13e1 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php
index 23dc6e9ec..94293eba3 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php b/src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php
index 7da2d67d0..703e07ba7 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210505093408.php b/src/Bundle/ChillPersonBundle/migrations/Version20210505093408.php
index d79b31e3c..d43b4299f 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210505093408.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210505093408.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210505154316.php b/src/Bundle/ChillPersonBundle/migrations/Version20210505154316.php
index cddb987bf..535d073a5 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210505154316.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210505154316.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210518075908.php b/src/Bundle/ChillPersonBundle/migrations/Version20210518075908.php
index 7b3517c19..44d9fc588 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210518075908.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210518075908.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210518162439.php b/src/Bundle/ChillPersonBundle/migrations/Version20210518162439.php
index 210d35008..75bba5f5f 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210518162439.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210518162439.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210519204938.php b/src/Bundle/ChillPersonBundle/migrations/Version20210519204938.php
index c2c9333fc..55c840ce8 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210519204938.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210519204938.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php b/src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php
index 6953689b0..ebdbf458d 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php b/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
index ad261b59a..c0aaf76b2 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210528111624.php b/src/Bundle/ChillPersonBundle/migrations/Version20210528111624.php
index 9e90da31a..ac9f7b104 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210528111624.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210528111624.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210528132405.php b/src/Bundle/ChillPersonBundle/migrations/Version20210528132405.php
index 926bf605a..41928f7ca 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210528132405.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210528132405.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210528142121.php b/src/Bundle/ChillPersonBundle/migrations/Version20210528142121.php
index e1a39b258..6d659c711 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210528142121.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210528142121.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210614191600.php b/src/Bundle/ChillPersonBundle/migrations/Version20210614191600.php
index 37f740e09..e47ae74f4 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210614191600.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210614191600.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210615074857.php b/src/Bundle/ChillPersonBundle/migrations/Version20210615074857.php
index 97926c02a..3440631e9 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210615074857.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210615074857.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php b/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
index ad6b44dfe..f8525163e 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210617073504.php b/src/Bundle/ChillPersonBundle/migrations/Version20210617073504.php
index 1083d872d..a5b721df7 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210617073504.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210617073504.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210618080702.php b/src/Bundle/ChillPersonBundle/migrations/Version20210618080702.php
index a75377615..ccd3a63c4 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210618080702.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210618080702.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210620143757.php b/src/Bundle/ChillPersonBundle/migrations/Version20210620143757.php
index fbea185f4..d86ae09a1 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210620143757.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210620143757.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210623135043.php b/src/Bundle/ChillPersonBundle/migrations/Version20210623135043.php
index 8cb57e5e1..e1b775371 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210623135043.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210623135043.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210623142046.php b/src/Bundle/ChillPersonBundle/migrations/Version20210623142046.php
index 3e7d6a22e..9fb3ed9ed 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210623142046.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210623142046.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210624131722.php b/src/Bundle/ChillPersonBundle/migrations/Version20210624131722.php
index 32de7a8da..9329a7aa4 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210624131722.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210624131722.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210624131723.php b/src/Bundle/ChillPersonBundle/migrations/Version20210624131723.php
index 98f73e0c6..ef6c63acf 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210624131723.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210624131723.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210727152826.php b/src/Bundle/ChillPersonBundle/migrations/Version20210727152826.php
index 226c06bb5..d89fba2a4 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210727152826.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210727152826.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210729163023.php b/src/Bundle/ChillPersonBundle/migrations/Version20210729163023.php
index b303b5fbc..6c5338551 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210729163023.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210729163023.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210730094514.php b/src/Bundle/ChillPersonBundle/migrations/Version20210730094514.php
index e1f6a1c29..8932ed9a0 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210730094514.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210730094514.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210730205407.php b/src/Bundle/ChillPersonBundle/migrations/Version20210730205407.php
index f93d33e06..e662f62e5 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210730205407.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210730205407.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210802202838.php b/src/Bundle/ChillPersonBundle/migrations/Version20210802202838.php
index c83390b80..1bcec2128 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210802202838.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210802202838.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php b/src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php
index 02553b629..2ba11fbba 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php b/src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php
index dbb2aaa33..d77fbf5f2 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php b/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php
index 2b2baa1d3..87726d375 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php b/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php
index f3535787f..0a867885b 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php b/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php
index 980218c92..ebbbad61a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211020131133.php b/src/Bundle/ChillPersonBundle/migrations/Version20211020131133.php
index 43e1e4535..bd4a14834 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211020131133.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211020131133.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php b/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php
index adaf6b578..5a2e55352 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211025141226.php b/src/Bundle/ChillPersonBundle/migrations/Version20211025141226.php
index 289b5e090..c6ee84756 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211025141226.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211025141226.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211029075117.php b/src/Bundle/ChillPersonBundle/migrations/Version20211029075117.php
index 222900450..f04dcc35a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211029075117.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211029075117.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211108100849.php b/src/Bundle/ChillPersonBundle/migrations/Version20211108100849.php
index 2fea4a64c..72b192382 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211108100849.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211108100849.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211112170027.php b/src/Bundle/ChillPersonBundle/migrations/Version20211112170027.php
index 4339b43a9..3dd0ec124 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211112170027.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211112170027.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211119211101.php b/src/Bundle/ChillPersonBundle/migrations/Version20211119211101.php
index e3ba27e81..201f3094b 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211119211101.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211119211101.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211119215630.php b/src/Bundle/ChillPersonBundle/migrations/Version20211119215630.php
index bcc461104..6c5ddf59a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211119215630.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211119215630.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211213150253.php b/src/Bundle/ChillPersonBundle/migrations/Version20211213150253.php
index f02ad75b0..946eacce5 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211213150253.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211213150253.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php b/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php
index 53282e83f..25368961e 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211213213755.php b/src/Bundle/ChillPersonBundle/migrations/Version20211213213755.php
index 347ea35bf..5ba1f6001 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211213213755.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211213213755.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211216154008.php b/src/Bundle/ChillPersonBundle/migrations/Version20211216154008.php
index 1cd430055..33b4484d1 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211216154008.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211216154008.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211223150721.php b/src/Bundle/ChillPersonBundle/migrations/Version20211223150721.php
index 1dac13f96..b7bbc3506 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211223150721.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211223150721.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220104133334.php b/src/Bundle/ChillPersonBundle/migrations/Version20220104133334.php
index ca65f8c1e..478050c1e 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220104133334.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220104133334.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220119091025.php b/src/Bundle/ChillPersonBundle/migrations/Version20220119091025.php
index c047b3dca..206631c14 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220119091025.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220119091025.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php b/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php
index a5cb09fca..8ad119fb8 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220121121310.php b/src/Bundle/ChillPersonBundle/migrations/Version20220121121310.php
index 01fe951e1..94e00a030 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220121121310.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220121121310.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php b/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php
index 7b602ba22..3c74b144e 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220214200327.php b/src/Bundle/ChillPersonBundle/migrations/Version20220214200327.php
index 995cb30c7..1890a33be 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220214200327.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220214200327.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php b/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php
index b54483955..fa22eb607 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220224145951.php b/src/Bundle/ChillPersonBundle/migrations/Version20220224145951.php
index 75712f458..17783f9ba 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220224145951.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220224145951.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php b/src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php
index 7840cdfce..fc85eddb5 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php b/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
index c168521ed..568003547 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php b/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
index 211a2e68a..fcc4d53cf 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220425000000.php b/src/Bundle/ChillPersonBundle/migrations/Version20220425000000.php
index 1dd50d224..85dc7362b 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220425000000.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220425000000.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php b/src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php
index aab3678d9..ddf98b89e 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220429133023.php b/src/Bundle/ChillPersonBundle/migrations/Version20220429133023.php
index 70ef42202..6196131ec 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220429133023.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220429133023.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php b/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
index 75b598db3..062596420 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php b/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php
index e04d6b90a..baf887b2d 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillReportBundle/ChillReportBundle.php b/src/Bundle/ChillReportBundle/ChillReportBundle.php
index b791932e8..b27aeaa5e 100644
--- a/src/Bundle/ChillReportBundle/ChillReportBundle.php
+++ b/src/Bundle/ChillReportBundle/ChillReportBundle.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillReportBundle/Controller/ReportController.php b/src/Bundle/ChillReportBundle/Controller/ReportController.php
index e322fb791..952318db7 100644
--- a/src/Bundle/ChillReportBundle/Controller/ReportController.php
+++ b/src/Bundle/ChillReportBundle/Controller/ReportController.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
index 75a35030a..a53e7caf6 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\DataFixtures\ORM;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
index f5826f2f7..7938a2d6c 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\DataFixtures\ORM;
 
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
index 9c8a9798c..706e52c8b 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
index a1d705ca2..7dfd8fefa 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\DataFixtures\ORM;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
diff --git a/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php b/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
index 3acf8d5ee..8eb7478a2 100644
--- a/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
+++ b/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\DependencyInjection;
 
 use Chill\CustomFieldsBundle\Form\Type\LinkedCustomFieldsType;
diff --git a/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php
index c3218bc20..56a6ebc1d 100644
--- a/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillReportBundle/Entity/Report.php b/src/Bundle/ChillReportBundle/Entity/Report.php
index bfe654f43..edc583b4b 100644
--- a/src/Bundle/ChillReportBundle/Entity/Report.php
+++ b/src/Bundle/ChillReportBundle/Entity/Report.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Entity;
 
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
diff --git a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
index 9a476ec87..cce6c3ac7 100644
--- a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+++ b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Export\Export;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
diff --git a/src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php b/src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
index ab9726c23..6d51daf20 100644
--- a/src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
+++ b/src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Export\Export;
 
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
diff --git a/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php b/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
index 84facc5ba..d653095aa 100644
--- a/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
+++ b/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Export\Filter;
 
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillReportBundle/Form/ReportType.php b/src/Bundle/ChillReportBundle/Form/ReportType.php
index 80163f4ba..245a79c18 100644
--- a/src/Bundle/ChillReportBundle/Form/ReportType.php
+++ b/src/Bundle/ChillReportBundle/Form/ReportType.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Form;
 
 use Chill\CustomFieldsBundle\Form\Type\CustomFieldType;
diff --git a/src/Bundle/ChillReportBundle/Search/ReportSearch.php b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
index 4ec06ba7d..cc9aa00e4 100644
--- a/src/Bundle/ChillReportBundle/Search/ReportSearch.php
+++ b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Search;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php b/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
index be24a37f7..eccd689f2 100644
--- a/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
+++ b/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
index f25b639be..b0e1aac8c 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Tests\Controller;
 
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
index cc93214f3..844422a3a 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Tests\Controller;
 
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
diff --git a/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php b/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
index 689e24699..064216eee 100644
--- a/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Tests\DependencyInjection;
 
 use Exception;
diff --git a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
index b8d4510de..617166842 100644
--- a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Tests\Export\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
diff --git a/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php b/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
index b52e2f321..b8d108612 100644
--- a/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Tests\Search;
 
 use DateTime;
diff --git a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
index 8a312fb89..8752555c2 100644
--- a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Tests\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
index 4fcac191b..aac077976 100644
--- a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Tests\Timeline;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
index afff2c049..5c9ab8227 100644
--- a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+++ b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
@@ -1,14 +1,15 @@
 <?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\ReportBundle\Timeline;
 
 use Chill\CustomFieldsBundle\Service\CustomFieldsHelper;
diff --git a/src/Bundle/ChillReportBundle/migrations/Version20141129012050.php b/src/Bundle/ChillReportBundle/migrations/Version20141129012050.php
index 287521396..8da88721f 100644
--- a/src/Bundle/ChillReportBundle/migrations/Version20141129012050.php
+++ b/src/Bundle/ChillReportBundle/migrations/Version20141129012050.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Report;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
index 0bb50c9e1..fc33c2db3 100644
--- a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
+++ b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Report;
 
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillTaskBundle/ChillTaskBundle.php b/src/Bundle/ChillTaskBundle/ChillTaskBundle.php
index b12e4be76..49e84704d 100644
--- a/src/Bundle/ChillTaskBundle/ChillTaskBundle.php
+++ b/src/Bundle/ChillTaskBundle/ChillTaskBundle.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle;
 
 use Chill\TaskBundle\DependencyInjection\Compiler\TaskWorkflowDefinitionCompilerPass;
diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
index 355015215..e119eae61 100644
--- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
diff --git a/src/Bundle/ChillTaskBundle/Controller/TaskController.php b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
index 2acd63bc1..7b2b97a58 100644
--- a/src/Bundle/ChillTaskBundle/Controller/TaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Controller;
 
 use Chill\TaskBundle\Entity\AbstractTask;
diff --git a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
index 8d10926cd..53723c153 100644
--- a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
+++ b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php b/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
index a535cae11..4f6dcd0d4 100644
--- a/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
+++ b/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\DependencyInjection;
 
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php b/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
index 3ea1e1054..e4cbb6597 100644
--- a/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
+++ b/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\DependencyInjection\Compiler;
 
 use Chill\TaskBundle\Event\Lifecycle\TaskLifecycleEvent;
diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php
index 4388bfd7b..e944a4ffd 100644
--- a/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
index 267bd8bcd..a3806ffbf 100644
--- a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Entity;
 
 use Chill\MainBundle\Entity\HasCenterInterface;
diff --git a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
index fa497c8cb..54bd46c01 100644
--- a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Entity;
 
 use DateTime;
diff --git a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
index 2d9e3abcb..3c9c10d73 100644
--- a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Entity;
 
 use DateInterval;
diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
index 00e3fe3a2..ce3b7b9e9 100644
--- a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
+++ b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Entity\Task;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
index eff13d1e9..31ab01abf 100644
--- a/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
+++ b/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Entity\Task;
 
 use Chill\TaskBundle\Entity\SingleTask;
diff --git a/src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php b/src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php
index 49576e6d0..fdc261c38 100644
--- a/src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php
+++ b/src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Event\Lifecycle;
 
 use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
diff --git a/src/Bundle/ChillTaskBundle/Event/TaskEvent.php b/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
index fd0028825..1d73035ab 100644
--- a/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
+++ b/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Event;
 
 use Chill\TaskBundle\Entity\AbstractTask;
diff --git a/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php b/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
index 101eac377..adacc90ca 100644
--- a/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
+++ b/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Event\UI;
 
 use Chill\TaskBundle\Entity\AbstractTask;
diff --git a/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php b/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
index b762a6b88..2198b0b84 100644
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Form;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
index 7bb5a10c4..046d1eb15 100644
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
index 47503f052..2a2f7edfa 100644
--- a/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
index 69cb6afb6..091c54600 100644
--- a/src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
index cdc849d8a..e44f293ed 100644
--- a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php b/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php
index c8b8982c2..a2baeadd5 100644
--- a/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Repository;
 
 /**
diff --git a/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php b/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php
index c481236a5..d8ab2c279 100644
--- a/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Repository;
 
 /**
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
index 11fd1aa4c..0daf5a19a 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Repository;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php
index 84679c34f..d8a933465 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Repository;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
index b4c5b6833..c984d2593 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Repository;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
index 5e6943f92..cc75d6655 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Security\Authorization;
 
 use Symfony\Component\EventDispatcher\Event;
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
index 1038ac42f..22be7a862 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php b/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
index 8d5c19924..1ce12b534 100644
--- a/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
+++ b/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Templating;
 
 use Chill\TaskBundle\Entity\AbstractTask;
diff --git a/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php b/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
index 2ba4bef2f..a0e7d8111 100644
--- a/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
+++ b/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Templating\UI;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php b/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
index 5b3953961..6ae18544e 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php b/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
index e11c2d37d..adfb14e4c 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php b/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php
index 2cd0788ac..8ab6e7c1f 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Tests\Repository;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
index 8ea0c2010..eee0bc9c6 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Timeline;
 
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
diff --git a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
index 8cf302303..39cdd3819 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Timeline;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
diff --git a/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php b/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
index 62073175c..17e7a3555 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Workflow\Definition;
 
 use Chill\TaskBundle\Entity\AbstractTask;
diff --git a/src/Bundle/ChillTaskBundle/Workflow/Event/DefaultTaskGuardEvent.php b/src/Bundle/ChillTaskBundle/Workflow/Event/DefaultTaskGuardEvent.php
index a1f954c85..c912ce9f3 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/Event/DefaultTaskGuardEvent.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/Event/DefaultTaskGuardEvent.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Workflow\Event;
 
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
diff --git a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php
index 4b1b13eb8..b0d40f943 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Workflow;
 
 interface TaskWorkflowDefinition
diff --git a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
index 748e5bca6..6f3532443 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
@@ -1,14 +1,15 @@
 <?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\TaskBundle\Workflow;
 
 use Chill\TaskBundle\Entity\AbstractTask;
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php b/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
index 233a860cd..2aeb06491 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Task;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php b/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
index 6f7bd3cd5..47a170149 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Task;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php b/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
index 3a38c78ba..9149ae2c5 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Task;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php b/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php
index 517896cd7..c356304ac 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Task;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php b/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
index 8d934c0de..3e2579194 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Task;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php b/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
index 9d5a9bdcb..2cffce880 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Task;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20210909153533.php b/src/Bundle/ChillTaskBundle/migrations/Version20210909153533.php
index edffd12f9..1cebe6343 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20210909153533.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20210909153533.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Task;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20211029213909.php b/src/Bundle/ChillTaskBundle/migrations/Version20211029213909.php
index 93ec4207d..aa73df6e8 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20211029213909.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20211029213909.php
@@ -1,14 +1,15 @@
 <?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\Migrations\Task;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php b/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php
index 671db11e6..dfde892fb 100644
--- a/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php
+++ b/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle;
 
 use Chill\ThirdPartyBundle\DependencyInjection\CompilerPass\ThirdPartyTypeCompilerPass;
diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
index 187ce3d8d..036a190d0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyCategoryController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyCategoryController.php
index 1e0bcc508..b6c7a62e1 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyCategoryController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyCategoryController.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
index 637ce68e4..b69181ef1 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
index 905461ca5..a4db2621d 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadCenters;
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
index 1bacbfc32..d218d3683 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\DataFixtures\ORM;
 
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php
index 1b55ef8ef..29d3f43cf 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\DataFixtures\ORM;
 
 use Chill\ThirdPartyBundle\Entity\ThirdPartyProfession;
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index 03a3daf5f..ae30582c6 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\DependencyInjection;
 
 use Chill\ThirdPartyBundle\Controller\ThirdPartyCategoryController;
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
index df7f29e54..fd71a3e77 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\DependencyInjection\CompilerPass;
 
 use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php
index f5afe3bb2..bccf77806 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index a1df7ca55..5a94fb7c7 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
index 7ce362360..4058e6653 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Entity;
 
 use Chill\ThirdPartyBundle\Repository\ThirdPartyCategoryRepository;
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
index 896888a73..a68d0912a 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Entity;
 
 use Chill\ThirdPartyBundle\Repository\ThirdPartyProfessionRepository;
diff --git a/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php b/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
index bdeed8866..ab2136878 100644
--- a/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
+++ b/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\EventListener;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php b/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
index 92e70c79e..baf7cfd5b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Form\ChoiceLoader;
 
 use Chill\MainBundle\Entity\Center;
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyCategoryType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyCategoryType.php
index ec1152710..fae78f8c2 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyCategoryType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyCategoryType.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index 242fa997b..069f5208a 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillCollectionType;
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
index e7fb11c74..6697f4a71 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Form\Type;
 
 use Chill\MainBundle\Search\SearchInterface;
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
index 1965fff9c..d40f43e43 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Form\Type;
 
 use Chill\MainBundle\Templating\TranslatableStringHelper;
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
index 7c2fbff4f..d663f05d6 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Form\Type;
 
 use Chill\MainBundle\Form\Type\DataTransformer\EntityToJsonTransformer;
diff --git a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
index 545f1db15..7d78a566d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php b/src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
index f50610439..c803ebe54 100644
--- a/src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
index f67417767..d38e2783b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Repository;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepositoryInterface.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepositoryInterface.php
index 0bda192e2..b8ed34234 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepositoryInterface.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Repository;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyCategoryRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyCategoryRepository.php
index 8d3ac35df..db26a9754 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyCategoryRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyCategoryRepository.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Repository;
 
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyProfessionRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyProfessionRepository.php
index 1a336de2d..81decc0d2 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyProfessionRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyProfessionRepository.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Repository;
 
 use Chill\ThirdPartyBundle\Entity\ThirdPartyProfession;
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
index affb9db40..20b907012 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Repository;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
index 83a2add2d..0d5276811 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Search;
 
 use Chill\MainBundle\Search\SearchApiInterface;
diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
index a2a371f3b..587d82402 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Search;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
diff --git a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
index 0622a12cc..be285da8e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
+++ b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Security\Voter;
 
 use Chill\MainBundle\Entity\User;
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 5eb8895b3..9e58f0307 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
diff --git a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
index 4fe3da927..2cf6aad77 100644
--- a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+++ b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php
index 86bce1901..a00a3831a 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
index 4dc6dbc55..cb5dd5a29 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
@@ -1,14 +1,15 @@
 <?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\ThirdParty\Tests\Entity;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php
index 1aaad8531..24192f955 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Tests\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Civility;
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php
index 39c0f58e4..d2a20de1d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\Tests\Serializer\Normalizer;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
diff --git a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
index 36eafb288..90395b447 100644
--- a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
+++ b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\ThirdPartyType;
 
 use function array_keys;
diff --git a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeProviderInterface.php b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeProviderInterface.php
index 3289a7cb1..396c71f7b 100644
--- a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeProviderInterface.php
+++ b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeProviderInterface.php
@@ -1,14 +1,15 @@
 <?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\ThirdPartyBundle\ThirdPartyType;
 
 /**
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
index e842bd11d..00cb307c1 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php
index 650e7e824..f848ac12b 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
index 754263653..864b2e53f 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
index ec62b7cd2..f3b0350ed 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
index b17fe5a49..0e16bb923 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php
index 507c0316e..f69dfd9ff 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20210719105918.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20210719105918.php
index 3242e677b..f858521a1 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20210719105918.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20210719105918.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211006200924.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211006200924.php
index 60ab49cd8..c70231dfc 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211006200924.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211006200924.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007150459.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007150459.php
index 29ecc702e..9d31e7830 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007150459.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007150459.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php
index 90ae37391..f35967936 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007194942.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007194942.php
index ac1b04486..60e08f589 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007194942.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007194942.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php
index 6ffb33472..9ce89ccb8 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220322095659.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220322095659.php
index 140539d1e..359743222 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220322095659.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220322095659.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220324175549.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220324175549.php
index ae91699aa..9b95ce3dc 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220324175549.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220324175549.php
@@ -1,14 +1,15 @@
 <?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\Migrations\ThirdParty;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php b/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php
index ac7ed05cb..5af2e926b 100644
--- a/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php
+++ b/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php
@@ -1,14 +1,15 @@
 <?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\WopiBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Editor.php b/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
index cca6f86e8..628bf4fc9 100644
--- a/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
+++ b/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
@@ -1,14 +1,15 @@
 <?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\WopiBundle\Controller;
 
 use ChampsLibres\WopiLib\Contract\Service\Configuration\ConfigurationInterface;
diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
index 37a9e2fa6..90a7a3428 100644
--- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
+++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
@@ -1,14 +1,15 @@
 <?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\WopiBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php
index fe33d68bf..00fb6a450 100644
--- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php
@@ -1,14 +1,15 @@
 <?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\WopiBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php b/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php
index 1dfb5e6af..9078a1342 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php
+++ b/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php
@@ -1,14 +1,15 @@
 <?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);
-
 use Chill\WopiBundle\Controller\Editor;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
index 0df482135..342040da1 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
+++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
@@ -1,14 +1,15 @@
 <?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 Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php b/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
index 064027be6..bee32732a 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
@@ -1,14 +1,15 @@
 <?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\WopiBundle\Service\Controller;
 
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php b/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
index a2fd907e5..51fbca1de 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
@@ -1,14 +1,15 @@
 <?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\WopiBundle\Service\Controller;
 
 use SplFileInfo;
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
index debf63c70..b2b39b5e5 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
@@ -1,14 +1,15 @@
 <?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\WopiBundle\Service\Wopi;
 
 use ChampsLibres\WopiLib\Contract\Entity\Document;
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
index a6cf0e8cd..2750a4cbb 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
@@ -1,14 +1,15 @@
 <?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\WopiBundle\Service\Wopi;
 
 use ChampsLibres\WopiLib\Contract\Entity\Document;
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
index 72ee221d7..c02d3f775 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
@@ -1,14 +1,15 @@
 <?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\WopiBundle\Service\Wopi;
 
 use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface;
diff --git a/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php b/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php
index ac086e75f..fc4f435ec 100644
--- a/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php
+++ b/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php
@@ -1,14 +1,15 @@
 <?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\WopiBundle\Tests\Service\Wopi;
 
 use Chill\DocStoreBundle\Entity\StoredObject;