diff --git a/src/DependencyInjection/StofDoctrineExtensionsExtension.php b/src/DependencyInjection/StofDoctrineExtensionsExtension.php
index 278314e5..3cd28fbe 100644
--- a/src/DependencyInjection/StofDoctrineExtensionsExtension.php
+++ b/src/DependencyInjection/StofDoctrineExtensionsExtension.php
@@ -82,9 +82,9 @@ class StofDoctrineExtensionsExtension extends Extension
     );
 
     /** @var list<string> */
-    private $entityManagers   = array();
+    private array $entityManagers = array();
     /** @var list<string> */
-    private $documentManagers = array();
+    private array $documentManagers = array();
 
     /**
      * @return void
diff --git a/src/EventListener/BlameListener.php b/src/EventListener/BlameListener.php
index 5ba8214a..62bd2b53 100644
--- a/src/EventListener/BlameListener.php
+++ b/src/EventListener/BlameListener.php
@@ -18,12 +18,9 @@
  */
 class BlameListener implements EventSubscriberInterface
 {
-    /** @var AuthorizationCheckerInterface|null */
-    private $authorizationChecker;
-    /** @var TokenStorageInterface|null */
-    private $tokenStorage;
-    /** @var BlameableListener */
-    private $blameableListener;
+    private ?AuthorizationCheckerInterface $authorizationChecker;
+    private ?TokenStorageInterface $tokenStorage;
+    private BlameableListener $blameableListener;
 
     public function __construct(BlameableListener $blameableListener, TokenStorageInterface $tokenStorage = null, AuthorizationCheckerInterface $authorizationChecker = null)
     {
diff --git a/src/EventListener/IpTraceListener.php b/src/EventListener/IpTraceListener.php
index c62b1e37..857c1b41 100644
--- a/src/EventListener/IpTraceListener.php
+++ b/src/EventListener/IpTraceListener.php
@@ -13,8 +13,7 @@
  */
 final class IpTraceListener implements EventSubscriberInterface
 {
-    /** @var IpTraceableListener */
-    private $ipTraceableListener;
+    private IpTraceableListener $ipTraceableListener;
 
     public function __construct(IpTraceableListener $ipTraceableListener)
     {
diff --git a/src/EventListener/LocaleListener.php b/src/EventListener/LocaleListener.php
index aaf981fa..7d12bfb8 100644
--- a/src/EventListener/LocaleListener.php
+++ b/src/EventListener/LocaleListener.php
@@ -14,8 +14,7 @@
  */
 class LocaleListener implements EventSubscriberInterface
 {
-    /** @var TranslatableListener */
-    private $translatableListener;
+    private TranslatableListener $translatableListener;
 
     public function __construct(TranslatableListener $translatableListener)
     {
diff --git a/src/EventListener/LoggerListener.php b/src/EventListener/LoggerListener.php
index 959fc41a..72576cd5 100644
--- a/src/EventListener/LoggerListener.php
+++ b/src/EventListener/LoggerListener.php
@@ -20,12 +20,10 @@
  */
 class LoggerListener implements EventSubscriberInterface
 {
-    /** @var AuthorizationCheckerInterface|null */
-    private $authorizationChecker;
-    /** @var TokenStorageInterface|null */
-    private $tokenStorage;
+    private ?AuthorizationCheckerInterface $authorizationChecker;
+    private ?TokenStorageInterface  $tokenStorage;
     /** @var LoggableListener<T> */
-    private $loggableListener;
+    private LoggableListener $loggableListener;
 
     /**
      * @param LoggableListener<T> $loggableListener
diff --git a/src/Uploadable/UploadableManager.php b/src/Uploadable/UploadableManager.php
index 0d8c2b33..6f6faea1 100644
--- a/src/Uploadable/UploadableManager.php
+++ b/src/Uploadable/UploadableManager.php
@@ -8,16 +8,14 @@
 
 class UploadableManager
 {
-    /** @var \Gedmo\Uploadable\UploadableListener */
-    private $listener;
+    private UploadableListener $listener;
     /** @var class-string<FileInfoInterface> */
-    private $fileInfoClass;
+    private string $fileInfoClass;
 
     /**
-     * @param UploadableListener              $listener
      * @param class-string<FileInfoInterface> $fileInfoClass
      */
-    public function __construct(UploadableListener $listener, $fileInfoClass)
+    public function __construct(UploadableListener $listener, string $fileInfoClass)
     {
         $this->listener = $listener;
         $this->fileInfoClass = $fileInfoClass;
@@ -51,5 +49,4 @@ public function getUploadableListener()
     {
         return $this->listener;
     }
-
 }
diff --git a/src/Uploadable/UploadedFileInfo.php b/src/Uploadable/UploadedFileInfo.php
index 59aac5fd..e370da98 100644
--- a/src/Uploadable/UploadedFileInfo.php
+++ b/src/Uploadable/UploadedFileInfo.php
@@ -7,8 +7,7 @@
 
 class UploadedFileInfo implements FileInfoInterface
 {
-    /** @var UploadedFile */
-    private $uploadedFile;
+    private UploadedFile $uploadedFile;
 
     public function __construct(UploadedFile $uploadedFile)
     {
diff --git a/src/Uploadable/ValidatorConfigurator.php b/src/Uploadable/ValidatorConfigurator.php
index 84705e3d..ce91bf32 100644
--- a/src/Uploadable/ValidatorConfigurator.php
+++ b/src/Uploadable/ValidatorConfigurator.php
@@ -9,13 +9,9 @@
  */
 class ValidatorConfigurator
 {
-    /** @var bool */
-    private $validateWritableDirectory;
+    private bool $validateWritableDirectory;
 
-    /**
-     * @param bool $validateWritableDirectory
-     */
-    public function __construct($validateWritableDirectory)
+    public function __construct(bool $validateWritableDirectory)
     {
         $this->validateWritableDirectory = $validateWritableDirectory;
     }