diff --git a/.php_cs.dist b/.php_cs.dist
index 8a7b2b37..4e352a0d 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -1,6 +1,14 @@
 <?php
 
+$fileHeaderComment = <<<COMMENT
+This file is part of the Kimai time-tracking app.
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+COMMENT;
+
 return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
     ->setRules([
         'encoding' => true,
         'full_opening_tag' => true,
@@ -14,6 +22,9 @@ return PhpCsFixer\Config::create()
         'lowercase_constants' => true,
         'lowercase_keywords' => true,
         'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+        'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],
+        'no_php4_constructor' => true,
+        'ordered_imports' => true,
         'no_break_comment' => true,
         'no_closing_tag' => true,
         'no_spaces_after_function_name' => true,
diff --git a/src/Controller/AbstractController.php b/src/Controller/AbstractController.php
index dc495841..e2e4e8f5 100644
--- a/src/Controller/AbstractController.php
+++ b/src/Controller/AbstractController.php
@@ -9,8 +9,8 @@
 
 namespace App\Controller;
 
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
 /**
  * The abstract base controller.
diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php
index ad5e1fa3..635ef1db 100644
--- a/src/Controller/ActivityController.php
+++ b/src/Controller/ActivityController.php
@@ -9,10 +9,10 @@
 
 namespace App\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use App\Entity\Activity;
 use App\Repository\ActivityRepository;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 /**
  * Controller used to manage activity contents in the public part of the site.
diff --git a/src/Controller/Admin/ActivityController.php b/src/Controller/Admin/ActivityController.php
index 13df3250..21965296 100644
--- a/src/Controller/Admin/ActivityController.php
+++ b/src/Controller/Admin/ActivityController.php
@@ -10,16 +10,16 @@
 namespace App\Controller\Admin;
 
 use App\Controller\AbstractController;
-use Pagerfanta\Pagerfanta;
-use Symfony\Component\HttpFoundation\Request;
 use App\Entity\Activity;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use App\Form\ActivityEditForm;
 use App\Form\Toolbar\ActivityToolbarForm;
 use App\Repository\Query\ActivityQuery;
+use Pagerfanta\Pagerfanta;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Controller used to manage activities in the admin part of the site.
diff --git a/src/Controller/Admin/CustomerController.php b/src/Controller/Admin/CustomerController.php
index d11fc1cf..b5b62298 100644
--- a/src/Controller/Admin/CustomerController.php
+++ b/src/Controller/Admin/CustomerController.php
@@ -10,15 +10,15 @@
 namespace App\Controller\Admin;
 
 use App\Controller\AbstractController;
-use Pagerfanta\Pagerfanta;
-use Symfony\Component\HttpFoundation\Request;
 use App\Entity\Customer;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use App\Form\CustomerEditForm;
 use App\Form\Toolbar\CustomerToolbarForm;
 use App\Repository\Query\CustomerQuery;
+use Pagerfanta\Pagerfanta;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Controller used to manage activities in the admin part of the site.
diff --git a/src/Controller/Admin/ProjectController.php b/src/Controller/Admin/ProjectController.php
index fb16fee6..db6881f2 100644
--- a/src/Controller/Admin/ProjectController.php
+++ b/src/Controller/Admin/ProjectController.php
@@ -10,17 +10,17 @@
 namespace App\Controller\Admin;
 
 use App\Controller\AbstractController;
-use Pagerfanta\Pagerfanta;
-use Symfony\Component\HttpFoundation\Request;
 use App\Entity\Customer;
 use App\Entity\Project;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use App\Form\ProjectEditForm;
 use App\Form\Toolbar\ProjectToolbarForm;
 use App\Repository\Query\ProjectQuery;
+use Pagerfanta\Pagerfanta;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Controller used to manage projects in the admin part of the site.
diff --git a/src/Controller/Admin/TimesheetController.php b/src/Controller/Admin/TimesheetController.php
index 18de477b..6c94c1af 100644
--- a/src/Controller/Admin/TimesheetController.php
+++ b/src/Controller/Admin/TimesheetController.php
@@ -16,10 +16,10 @@ use App\Form\TimesheetEditForm;
 use App\Form\Toolbar\TimesheetAdminToolbarForm;
 use App\Repository\Query\TimesheetQuery;
 use Pagerfanta\Pagerfanta;
-use Symfony\Component\HttpFoundation\Request;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Controller used for manage timesheet entries in the admin part of the site.
diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php
index 6ed6c171..c05e485e 100644
--- a/src/Controller/DashboardController.php
+++ b/src/Controller/DashboardController.php
@@ -9,16 +9,16 @@
 
 namespace App\Controller;
 
-use App\Entity\User;
 use App\Entity\Activity;
 use App\Entity\Customer;
 use App\Entity\Project;
 use App\Entity\Timesheet;
+use App\Entity\User;
 use App\Repository\Query\TimesheetQuery;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 /**
  * Dashboard controller for the admin area.
diff --git a/src/Controller/HelpController.php b/src/Controller/HelpController.php
index 7c920cea..0189ffb5 100644
--- a/src/Controller/HelpController.php
+++ b/src/Controller/HelpController.php
@@ -10,10 +10,10 @@
 namespace App\Controller;
 
 use App\Constants;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 /**
  * This controller can render the markdown documentation from /var/docs/
diff --git a/src/Controller/ProfileController.php b/src/Controller/ProfileController.php
index 79a93ac7..9ea2001a 100644
--- a/src/Controller/ProfileController.php
+++ b/src/Controller/ProfileController.php
@@ -9,18 +9,18 @@
 
 namespace App\Controller;
 
+use App\Entity\Timesheet;
 use App\Entity\User;
 use App\Form\UserEditType;
 use App\Form\UserPasswordType;
 use App\Form\UserPreferencesForm;
 use App\Form\UserRolesType;
+use App\Repository\TimesheetRepository;
 use App\Voter\UserVoter;
-use Symfony\Component\Form\Form;
-use App\Entity\Timesheet;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
-use App\Repository\TimesheetRepository;
+use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/src/Controller/TimesheetController.php b/src/Controller/TimesheetController.php
index bdb1186f..174cd3f8 100644
--- a/src/Controller/TimesheetController.php
+++ b/src/Controller/TimesheetController.php
@@ -15,10 +15,10 @@ use App\Form\TimesheetEditForm;
 use App\Form\Toolbar\TimesheetToolbarForm;
 use App\Repository\Query\TimesheetQuery;
 use Pagerfanta\Pagerfanta;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/src/DataFixtures/TimesheetFixtures.php b/src/DataFixtures/TimesheetFixtures.php
index 3fe90645..adb19d18 100644
--- a/src/DataFixtures/TimesheetFixtures.php
+++ b/src/DataFixtures/TimesheetFixtures.php
@@ -9,11 +9,11 @@
 
 namespace App\DataFixtures;
 
-use App\Entity\User;
 use App\Entity\Activity;
 use App\Entity\Customer;
 use App\Entity\Project;
 use App\Entity\Timesheet;
+use App\Entity\User;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\Persistence\ObjectManager;
 
diff --git a/src/Doctrine/TablePrefixSubscriber.php b/src/Doctrine/TablePrefixSubscriber.php
index 7d191b5e..46e854fd 100644
--- a/src/Doctrine/TablePrefixSubscriber.php
+++ b/src/Doctrine/TablePrefixSubscriber.php
@@ -9,8 +9,8 @@
 
 namespace App\Doctrine;
 
-use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 use Doctrine\Common\EventSubscriber;
+use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 
 /**
  * Adds a prefix to every doctrine entity AKA database table
diff --git a/src/Doctrine/TimesheetSubscriber.php b/src/Doctrine/TimesheetSubscriber.php
index 95beaad1..5d94a58d 100644
--- a/src/Doctrine/TimesheetSubscriber.php
+++ b/src/Doctrine/TimesheetSubscriber.php
@@ -9,11 +9,11 @@
 
 namespace App\Doctrine;
 
+use App\Entity\Timesheet;
 use App\Timesheet\CalculatorInterface;
 use Doctrine\Common\EventSubscriber;
-use Doctrine\ORM\Event\PreUpdateEventArgs;
 use Doctrine\ORM\Event\LifecycleEventArgs;
-use App\Entity\Timesheet;
+use Doctrine\ORM\Event\PreUpdateEventArgs;
 
 /**
  * A listener to make sure all Timesheet entries will have a proper duration.
diff --git a/src/Entity/User.php b/src/Entity/User.php
index cccdb9b8..80bfd9a2 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -1,14 +1,21 @@
 <?php
 
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace App\Entity;
 
 use App\Validator\Constraints as KimaiAssert;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 
 /**
  * Application main User entity.
diff --git a/src/Entity/UserPreference.php b/src/Entity/UserPreference.php
index 8189ca80..7425c97f 100644
--- a/src/Entity/UserPreference.php
+++ b/src/Entity/UserPreference.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Event/ConfigureMenuEvent.php b/src/Event/ConfigureMenuEvent.php
index 2009cca5..1bce8630 100644
--- a/src/Event/ConfigureMenuEvent.php
+++ b/src/Event/ConfigureMenuEvent.php
@@ -10,8 +10,8 @@
 namespace App\Event;
 
 use Avanzu\AdminThemeBundle\Event\SidebarMenuEvent;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * The ConfigureMenuEvent is used for populating navigations.
diff --git a/src/EventSubscriber/MenuBuilderSubscriber.php b/src/EventSubscriber/MenuBuilderSubscriber.php
index d6762c53..8c1e22f4 100644
--- a/src/EventSubscriber/MenuBuilderSubscriber.php
+++ b/src/EventSubscriber/MenuBuilderSubscriber.php
@@ -9,11 +9,11 @@
 
 namespace App\EventSubscriber;
 
-use App\Event\ConfigureMainMenuEvent;
 use App\Event\ConfigureAdminMenuEvent;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Avanzu\AdminThemeBundle\Model\MenuItemModel;
+use App\Event\ConfigureMainMenuEvent;
 use Avanzu\AdminThemeBundle\Event\SidebarMenuEvent;
+use Avanzu\AdminThemeBundle\Model\MenuItemModel;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
diff --git a/src/EventSubscriber/MenuSubscriber.php b/src/EventSubscriber/MenuSubscriber.php
index 4c9ece66..4b1d5907 100644
--- a/src/EventSubscriber/MenuSubscriber.php
+++ b/src/EventSubscriber/MenuSubscriber.php
@@ -9,10 +9,10 @@
 
 namespace App\EventSubscriber;
 
-use App\Event\ConfigureMainMenuEvent;
 use App\Event\ConfigureAdminMenuEvent;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use App\Event\ConfigureMainMenuEvent;
 use Avanzu\AdminThemeBundle\Model\MenuItemModel;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
 /**
diff --git a/src/EventSubscriber/RedirectToLocaleSubscriber.php b/src/EventSubscriber/RedirectToLocaleSubscriber.php
index 8e91f27b..53833e64 100644
--- a/src/EventSubscriber/RedirectToLocaleSubscriber.php
+++ b/src/EventSubscriber/RedirectToLocaleSubscriber.php
@@ -1,9 +1,7 @@
 <?php
 
 /*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
+ * This file is part of the Kimai time-tracking app.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,8 +9,8 @@
 
 namespace App\EventSubscriber;
 
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
diff --git a/src/Form/ActivityEditForm.php b/src/Form/ActivityEditForm.php
index 56db6c1f..c8c99d93 100644
--- a/src/Form/ActivityEditForm.php
+++ b/src/Form/ActivityEditForm.php
@@ -9,9 +9,9 @@
 
 namespace App\Form;
 
-use App\Form\Type\YesNoType;
 use App\Entity\Activity;
 use App\Form\Type\ProjectType;
+use App\Form\Type\YesNoType;
 use App\Repository\ProjectRepository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
diff --git a/src/Form/TimesheetEditForm.php b/src/Form/TimesheetEditForm.php
index 97ecf4e3..052829f0 100644
--- a/src/Form/TimesheetEditForm.php
+++ b/src/Form/TimesheetEditForm.php
@@ -9,16 +9,16 @@
 
 namespace App\Form;
 
+use App\Entity\Timesheet;
+use App\Form\Type\ActivityGroupedWithCustomerNameType;
 use App\Form\Type\DurationType;
 use App\Form\Type\UserType;
+use App\Repository\ActivityRepository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use App\Entity\Timesheet;
-use App\Form\Type\ActivityGroupedWithCustomerNameType;
-use App\Repository\ActivityRepository;
 
 /**
  * Defines the form used to manipulate Timesheet entries.
diff --git a/src/Form/Toolbar/ActivityToolbarForm.php b/src/Form/Toolbar/ActivityToolbarForm.php
index e870047d..bc63ae86 100644
--- a/src/Form/Toolbar/ActivityToolbarForm.php
+++ b/src/Form/Toolbar/ActivityToolbarForm.php
@@ -9,9 +9,9 @@
 
 namespace App\Form\Toolbar;
 
+use App\Repository\Query\ActivityQuery;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use App\Repository\Query\ActivityQuery;
 
 /**
  * Defines the form used for filtering the activities.
diff --git a/src/Form/Toolbar/CustomerToolbarForm.php b/src/Form/Toolbar/CustomerToolbarForm.php
index 952824b8..0f0e6002 100644
--- a/src/Form/Toolbar/CustomerToolbarForm.php
+++ b/src/Form/Toolbar/CustomerToolbarForm.php
@@ -9,9 +9,9 @@
 
 namespace App\Form\Toolbar;
 
+use App\Repository\Query\CustomerQuery;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use App\Repository\Query\CustomerQuery;
 
 /**
  * Defines the form used for filtering the customer.
diff --git a/src/Form/Toolbar/ProjectToolbarForm.php b/src/Form/Toolbar/ProjectToolbarForm.php
index eeaa8886..508e0490 100644
--- a/src/Form/Toolbar/ProjectToolbarForm.php
+++ b/src/Form/Toolbar/ProjectToolbarForm.php
@@ -9,9 +9,9 @@
 
 namespace App\Form\Toolbar;
 
+use App\Repository\Query\ProjectQuery;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use App\Repository\Query\ProjectQuery;
 
 /**
  * Defines the form used for filtering the projects.
diff --git a/src/Form/Toolbar/TimesheetToolbarForm.php b/src/Form/Toolbar/TimesheetToolbarForm.php
index ce189c80..0ccbeb6c 100644
--- a/src/Form/Toolbar/TimesheetToolbarForm.php
+++ b/src/Form/Toolbar/TimesheetToolbarForm.php
@@ -9,10 +9,10 @@
 
 namespace App\Form\Toolbar;
 
+use App\Repository\Query\TimesheetQuery;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use App\Repository\Query\TimesheetQuery;
 
 /**
  * Defines the form used for filtering the timesheet.
diff --git a/src/Form/Type/ActivityType.php b/src/Form/Type/ActivityType.php
index 2ce8098b..6b6834f5 100644
--- a/src/Form/Type/ActivityType.php
+++ b/src/Form/Type/ActivityType.php
@@ -9,11 +9,11 @@
 
 namespace App\Form\Type;
 
+use App\Entity\Activity;
+use App\Repository\ActivityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use App\Entity\Activity;
-use App\Repository\ActivityRepository;
 
 /**
  * Custom form field type to select an activity.
diff --git a/src/Form/Type/CustomerType.php b/src/Form/Type/CustomerType.php
index 821e2270..0771ca40 100644
--- a/src/Form/Type/CustomerType.php
+++ b/src/Form/Type/CustomerType.php
@@ -9,10 +9,10 @@
 
 namespace App\Form\Type;
 
+use App\Repository\CustomerRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use App\Repository\CustomerRepository;
 
 /**
  * Custom form field type to select a customer.
diff --git a/src/Form/Type/ProjectType.php b/src/Form/Type/ProjectType.php
index 08b3f2e1..c70c07e3 100644
--- a/src/Form/Type/ProjectType.php
+++ b/src/Form/Type/ProjectType.php
@@ -9,11 +9,11 @@
 
 namespace App\Form\Type;
 
+use App\Entity\Project;
+use App\Repository\ProjectRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use App\Entity\Project;
-use App\Repository\ProjectRepository;
 
 /**
  * Custom form field type to select a project.
diff --git a/src/Repository/ActivityRepository.php b/src/Repository/ActivityRepository.php
index 2228adc3..09356fd0 100644
--- a/src/Repository/ActivityRepository.php
+++ b/src/Repository/ActivityRepository.php
@@ -9,12 +9,12 @@
 
 namespace App\Repository;
 
-use App\Entity\User;
-use Doctrine\ORM\Query;
 use App\Entity\Activity;
 use App\Entity\Timesheet;
+use App\Entity\User;
 use App\Model\ActivityStatistic;
 use App\Repository\Query\ActivityQuery;
+use Doctrine\ORM\Query;
 
 /**
  * Class ActivityRepository
diff --git a/src/Repository/CustomerRepository.php b/src/Repository/CustomerRepository.php
index 15a65c96..10340293 100644
--- a/src/Repository/CustomerRepository.php
+++ b/src/Repository/CustomerRepository.php
@@ -10,12 +10,12 @@
 namespace App\Repository;
 
 use App\Entity\Activity;
+use App\Entity\Customer;
 use App\Entity\Project;
 use App\Entity\Timesheet;
-use Doctrine\ORM\Query;
-use App\Entity\Customer;
 use App\Model\CustomerStatistic;
 use App\Repository\Query\CustomerQuery;
+use Doctrine\ORM\Query;
 
 /**
  * Class CustomerRepository
diff --git a/src/Repository/ProjectRepository.php b/src/Repository/ProjectRepository.php
index 823ffc56..f9b43436 100644
--- a/src/Repository/ProjectRepository.php
+++ b/src/Repository/ProjectRepository.php
@@ -10,11 +10,11 @@
 namespace App\Repository;
 
 use App\Entity\Activity;
-use App\Entity\Timesheet;
-use Doctrine\ORM\Query;
 use App\Entity\Project;
+use App\Entity\Timesheet;
 use App\Model\ProjectStatistic;
 use App\Repository\Query\ProjectQuery;
+use Doctrine\ORM\Query;
 
 /**
  * Class ProjectRepository
diff --git a/src/Repository/Query/TimesheetQuery.php b/src/Repository/Query/TimesheetQuery.php
index de3f6ed3..bfebf891 100644
--- a/src/Repository/Query/TimesheetQuery.php
+++ b/src/Repository/Query/TimesheetQuery.php
@@ -9,8 +9,8 @@
 
 namespace App\Repository\Query;
 
-use App\Entity\User;
 use App\Entity\Activity;
+use App\Entity\User;
 
 /**
  * Can be used for advanced timesheet repository queries.
diff --git a/src/Repository/TimesheetRepository.php b/src/Repository/TimesheetRepository.php
index 1623d0bc..bb5301dd 100644
--- a/src/Repository/TimesheetRepository.php
+++ b/src/Repository/TimesheetRepository.php
@@ -9,18 +9,18 @@
 
 namespace App\Repository;
 
-use App\Entity\User;
 use App\Entity\Activity;
 use App\Entity\Timesheet;
-use Doctrine\DBAL\Types\Type;
-use Doctrine\ORM\QueryBuilder;
-use Pagerfanta\Pagerfanta;
+use App\Entity\User;
 use App\Model\Statistic\Month;
 use App\Model\Statistic\Year;
 use App\Model\TimesheetGlobalStatistic;
 use App\Model\TimesheetStatistic;
-use DateTime;
 use App\Repository\Query\TimesheetQuery;
+use DateTime;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\QueryBuilder;
+use Pagerfanta\Pagerfanta;
 
 /**
  * Class TimesheetRepository
diff --git a/src/Twig/Extensions.php b/src/Twig/Extensions.php
index 68734fe2..badab677 100644
--- a/src/Twig/Extensions.php
+++ b/src/Twig/Extensions.php
@@ -9,9 +9,9 @@
 
 namespace App\Twig;
 
+use App\Entity\Timesheet;
 use App\Utils\Duration;
 use Symfony\Component\Intl\Intl;
-use App\Entity\Timesheet;
 use Twig\TwigFilter;
 
 /**
diff --git a/src/Voter/ActivityVoter.php b/src/Voter/ActivityVoter.php
index a509e1aa..e1d37b95 100644
--- a/src/Voter/ActivityVoter.php
+++ b/src/Voter/ActivityVoter.php
@@ -9,9 +9,9 @@
 
 namespace App\Voter;
 
+use App\Entity\Activity;
 use App\Entity\User;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use App\Entity\Activity;
 
 /**
  * A voter to check permissions on Activities.
diff --git a/src/Voter/CustomerVoter.php b/src/Voter/CustomerVoter.php
index a2138552..667eca70 100644
--- a/src/Voter/CustomerVoter.php
+++ b/src/Voter/CustomerVoter.php
@@ -9,9 +9,9 @@
 
 namespace App\Voter;
 
+use App\Entity\Customer;
 use App\Entity\User;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use App\Entity\Customer;
 
 /**
  * A voter to check permissions on Customers.
diff --git a/src/Voter/ProjectVoter.php b/src/Voter/ProjectVoter.php
index e3d3143b..e8bfb5c2 100644
--- a/src/Voter/ProjectVoter.php
+++ b/src/Voter/ProjectVoter.php
@@ -9,9 +9,9 @@
 
 namespace App\Voter;
 
+use App\Entity\Project;
 use App\Entity\User;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use App\Entity\Project;
 
 /**
  * A voter to check permissions on Projects.
diff --git a/src/Voter/TimesheetVoter.php b/src/Voter/TimesheetVoter.php
index 8d35999a..a9b64ced 100644
--- a/src/Voter/TimesheetVoter.php
+++ b/src/Voter/TimesheetVoter.php
@@ -9,10 +9,10 @@
 
 namespace App\Voter;
 
-use App\Entity\User;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use App\Entity\Activity;
 use App\Entity\Timesheet;
+use App\Entity\User;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
  * A voter to check permissions on Timesheets.
diff --git a/tests/Repository/Query/CustomerQueryTest.php b/tests/Repository/Query/CustomerQueryTest.php
index f8f21d1a..4fdd1a2a 100644
--- a/tests/Repository/Query/CustomerQueryTest.php
+++ b/tests/Repository/Query/CustomerQueryTest.php
@@ -9,8 +9,8 @@
 
 namespace App\Tests\Repository\Query;
 
-use App\Repository\Query\VisibilityQuery;
 use App\Repository\Query\CustomerQuery;
+use App\Repository\Query\VisibilityQuery;
 
 /**
  * @covers \App\Repository\Query\CustomerQuery
diff --git a/tests/Repository/Query/TimesheetQueryTest.php b/tests/Repository/Query/TimesheetQueryTest.php
index b752204c..904abef5 100644
--- a/tests/Repository/Query/TimesheetQueryTest.php
+++ b/tests/Repository/Query/TimesheetQueryTest.php
@@ -9,10 +9,10 @@
 
 namespace App\Tests\Repository\Query;
 
-use App\Entity\User;
 use App\Entity\Activity;
 use App\Entity\Customer;
 use App\Entity\Project;
+use App\Entity\User;
 use App\Repository\Query\TimesheetQuery;
 
 /**
diff --git a/tests/Voter/TimesheetVoterTest.php b/tests/Voter/TimesheetVoterTest.php
index 17687418..24f25c2a 100644
--- a/tests/Voter/TimesheetVoterTest.php
+++ b/tests/Voter/TimesheetVoterTest.php
@@ -9,14 +9,14 @@
 
 namespace App\Tests\Voter;
 
+use App\Entity\Customer;
+use App\Entity\Timesheet;
 use App\Entity\User;
+use App\Voter\TimesheetVoter;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
-use App\Entity\Customer;
-use App\Entity\Timesheet;
-use App\Voter\TimesheetVoter;
 
 /**
  * @covers \App\Voter\TimesheetVoter