diff --git a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
index 2739930f5..1f19def23 100644
--- a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Notification\EventListener;
 
 use Chill\MainBundle\Notification\NotificationPersisterInterface;
@@ -9,7 +18,6 @@ use Symfony\Component\HttpKernel\Event\TerminateEvent;
 
 class PersistNotificationOnTerminateEventSubscriber implements EventSubscriberInterface
 {
-
     private EntityManagerInterface $em;
 
     private NotificationPersisterInterface $persister;
@@ -25,7 +33,7 @@ class PersistNotificationOnTerminateEventSubscriber implements EventSubscriberIn
         return [
             'kernel.terminate' => [
                 ['onKernelTerminate', 1024], // we must ensure that the priority is before sending email
-            ]
+            ],
         ];
     }
 
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php b/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php
index b8bd132ed..d426e3cd7 100644
--- a/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\Notification;
@@ -8,11 +17,6 @@ class NotificationPersister implements NotificationPersisterInterface
 {
     private array $waitingNotifications = [];
 
-    public function persist(Notification $notification): void
-    {
-        $this->waitingNotifications[] = $notification;
-    }
-
     /**
      * @return array|Notification[]
      */
@@ -20,4 +24,9 @@ class NotificationPersister implements NotificationPersisterInterface
     {
         return $this->waitingNotifications;
     }
+
+    public function persist(Notification $notification): void
+    {
+        $this->waitingNotifications[] = $notification;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php b/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php
index a87b5f90a..da98e305b 100644
--- a/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php
@@ -1,11 +1,20 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\Notification;
 
 /**
- * Store the notification
+ * Store the notification.
  *
  * Those notification will be stored into database by the kernel. This
  * will also ensure that this happens outside of regular operations
@@ -13,10 +22,10 @@ use Chill\MainBundle\Entity\Notification;
  */
 interface NotificationPersisterInterface
 {
-    public function persist(Notification $notification): void;
-
     /**
      * @return array|Notification[]
      */
     public function getWaitingNotifications(): array;
+
+    public function persist(Notification $notification): void;
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
index bfd9b68f8..4c1b5c304 100644
--- a/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Notification\EventListener;
 
 use Chill\MainBundle\Entity\Notification;
@@ -11,7 +20,11 @@ use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\HttpKernel\Event\TerminateEvent;
 
-class PersistNotificationOnTerminateEventSubscriberTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PersistNotificationOnTerminateEventSubscriberTest extends TestCase
 {
     use ProphecyTrait;
 
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
index 6b0004f9b..45fe4db70 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Notification\NotificationPersisterInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Security;
@@ -25,11 +24,10 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserRefEventSubscriber implements EventSubscriberInterface
 {
+    private EngineInterface $engine;
 
     private NotificationPersisterInterface $notificationPersister;
 
-    private EngineInterface $engine;
-
     private Security $security;
 
     private TranslatorInterface $translator;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
index 25851965f..1fe398290 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
@@ -41,8 +41,8 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="text")
      * @Groups({"read", "write"})
-     * @Assert\NotBlank()
-     * @Assert\NotNull()
+     * @Assert\NotBlank
+     * @Assert\NotNull
      */
     private $content;