diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
index 7822d4f0591ab3ff1bc9495561029bcc460d1fdf..7f7909e3b76be46f350f6fba3c82a52252b77e4c 100644
--- a/features/bootstrap/FeatureContext.php
+++ b/features/bootstrap/FeatureContext.php
@@ -42,7 +42,7 @@ class FeatureContext implements Context
     public function theResponseShouldBeReceived()
     {
         if (null === $this->response) {
-            throw new \RuntimeException('No response received');
+            throw new RuntimeException('No response received');
         }
     }
 }
diff --git a/features/bootstrap/bootstrap.php b/features/bootstrap/bootstrap.php
index a5d686144d5ae0a905f1b6bb44625d39e40e4150..0c92af730128a1951bc9b46a8f1a48a802709bea 100644
--- a/features/bootstrap/bootstrap.php
+++ b/features/bootstrap/bootstrap.php
@@ -5,7 +5,7 @@ use Symfony\Component\Dotenv\Dotenv;
 // The check is to ensure we don't use .env in production
 if (!isset($_SERVER['APP_ENV'])) {
     if (!class_exists(Dotenv::class)) {
-        throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
+        throw new RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
     }
     (new Dotenv())->load(__DIR__ . '/../../.env');
 }
diff --git a/src/Domain/Notification/Event/LateActionEvent.php b/src/Domain/Notification/Event/LateActionEvent.php
index 961af61612fda350d1281e6342de010fc78a4f05..98d02f3334b63cbe1d8f4b45894b3666e7b3b2fb 100644
--- a/src/Domain/Notification/Event/LateActionEvent.php
+++ b/src/Domain/Notification/Event/LateActionEvent.php
@@ -7,10 +7,6 @@ use Symfony\Contracts\EventDispatcher\Event;
 
 class LateActionEvent extends Event
 {
-    /**
-     * @var Mesurement
-     *                 The object that generated the notification
-     */
     protected Mesurement $mesurement;
 
     public function __construct(Mesurement $mesurement)
diff --git a/src/Domain/Notification/Event/LateRequestEvent.php b/src/Domain/Notification/Event/LateRequestEvent.php
index eb95fd7da86f50cc102aebeeef4515fd1f750a36..3bd75cdb0b40269029410be652112946af0a8d3f 100644
--- a/src/Domain/Notification/Event/LateRequestEvent.php
+++ b/src/Domain/Notification/Event/LateRequestEvent.php
@@ -7,10 +7,6 @@ use Symfony\Contracts\EventDispatcher\Event;
 
 class LateRequestEvent extends Event
 {
-    /**
-     * @var Request
-     *              The object that generated the notification
-     */
     protected Request $request;
 
     public function __construct(Request $request)
diff --git a/src/Domain/Notification/Event/LateSurveyEvent.php b/src/Domain/Notification/Event/LateSurveyEvent.php
index 0e99fa0798e4eca2d1255cccb30b0000acb5df1f..53441bd40f77da25e23a9d51a2604559006d50c4 100644
--- a/src/Domain/Notification/Event/LateSurveyEvent.php
+++ b/src/Domain/Notification/Event/LateSurveyEvent.php
@@ -7,10 +7,6 @@ use Symfony\Contracts\EventDispatcher\Event;
 
 class LateSurveyEvent extends Event
 {
-    /**
-     * @var Survey
-     *             The object that generated the notification
-     */
     protected Survey $survey;
 
     public function __construct(Survey $survey)
diff --git a/src/Domain/Notification/Event/NoLoginEvent.php b/src/Domain/Notification/Event/NoLoginEvent.php
index b45528cadf67be0f1118e42e2df04e5f2523c7f2..430ab2b4107a561e6da9734b4f0a6d9c9585245d 100644
--- a/src/Domain/Notification/Event/NoLoginEvent.php
+++ b/src/Domain/Notification/Event/NoLoginEvent.php
@@ -7,10 +7,6 @@ use Symfony\Contracts\EventDispatcher\Event;
 
 class NoLoginEvent extends Event
 {
-    /**
-     * @var User
-     *           The object that generated the notification
-     */
     protected User $user;
 
     public function __construct(User $user)
diff --git a/src/Domain/Registry/Form/Type/ToolType.php b/src/Domain/Registry/Form/Type/ToolType.php
index 5b49a88a115ed4a1c05fc76f98d1ff752efea5e0..920a3df57ee28c0e23f63de844a9fe6f4d1071f8 100644
--- a/src/Domain/Registry/Form/Type/ToolType.php
+++ b/src/Domain/Registry/Form/Type/ToolType.php
@@ -139,8 +139,8 @@ class ToolType extends AbstractType
                         if (count($authenticatedUser->getServices()) > 0) {
                             /** @var Service $service */
                             foreach ($authenticatedUser->getServices() as $i => $service) {
-                                $ors->add($qb->expr()->eq('c.service', ':service'.$i));
-                                $qb->setParameter(':service'.$i, $service);
+                                $ors->add($qb->expr()->eq('c.service', ':service' . $i));
+                                $qb->setParameter(':service' . $i, $service);
                             }
                             $qb->andWhere($ors);
                         }
diff --git a/src/Domain/User/Model/User.php b/src/Domain/User/Model/User.php
index a69e5705591c2bb2b6b4c7bda65244684e4a2281..ebc60fb5d956af7792e7602d96b0eb5596e0b7a2 100644
--- a/src/Domain/User/Model/User.php
+++ b/src/Domain/User/Model/User.php
@@ -138,10 +138,6 @@ class User implements LoggableSubject, UserInterface, CollectivityRelated, Passw
      */
     private $ssoKey;
 
-    /**
-     * @var bool|null
-     *                Whther this user's actions do not generate notifications
-     */
     private ?bool $notGeneratesNotifications;
 
     /**
diff --git a/src/Infrastructure/ORM/Registry/Repository/Proof.php b/src/Infrastructure/ORM/Registry/Repository/Proof.php
index 826d62c3d353bb718e5abee1026c41d1c635ef90..0cc4117117ed9a4ac29d2037e9aeae0f853b9265 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Proof.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Proof.php
@@ -74,7 +74,7 @@ class Proof implements Repository\Proof
      *
      * @throws \Exception
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     protected function createQueryBuilder()
     {
diff --git a/src/Infrastructure/ORM/Registry/Repository/Request.php b/src/Infrastructure/ORM/Registry/Repository/Request.php
index bd5f4f50022a0d979a30d54ac9d7172b4f982667..0406db92ddc9647bc2bd758e9b19eec1a13c1b84 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Request.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Request.php
@@ -78,7 +78,7 @@ class Request implements Repository\Request
      *
      * @throws \Exception
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     protected function createQueryBuilder()
     {