diff --git a/Module.php b/Module.php
index 7acd7ebff641b753e6b1340c0f7d2ff1d5d3946d..ee6ed1f7ff7e3ca878d34563c9b688a264d5304b 100644
--- a/Module.php
+++ b/Module.php
@@ -3,21 +3,12 @@
 namespace UnicaenDbAnonym;
 
 use Laminas\Config\Factory as ConfigFactory;
-use Unicaen\Console\Adapter\AdapterInterface;
-use Laminas\Mvc\ModuleRouteListener;
-use Laminas\Mvc\MvcEvent;
 use Laminas\Stdlib\Glob;
+use Unicaen\Console\Adapter\AdapterInterface;
 
 class Module
 {
-//    public function onBootstrap(MvcEvent $e)
-//    {
-//        $eventManager        = $e->getApplication()->getEventManager();
-//        $moduleRouteListener = new ModuleRouteListener();
-//        $moduleRouteListener->attach($eventManager);
-//    }
-
-    public function getConfig()
+    public function getConfig(): array
     {
         $paths = array_merge(
             [__DIR__ . '/config/module.config.php'],
@@ -49,7 +40,7 @@ class Module
     /**
      * @inheritDoc
      */
-    public function getConsoleUsage(AdapterInterface $console)
+    public function getConsoleUsage(AdapterInterface $console): array
     {
         return [
             /**
diff --git a/src/UnicaenDbAnonym/Controller/ConsoleController.php b/src/UnicaenDbAnonym/Controller/ConsoleController.php
index f0409e539d88db8b853dd9879a4afa31e78ec4d1..5215f73a73db4c16bca8c9711dc3f15ea16afb94 100644
--- a/src/UnicaenDbAnonym/Controller/ConsoleController.php
+++ b/src/UnicaenDbAnonym/Controller/ConsoleController.php
@@ -3,19 +3,14 @@
 namespace UnicaenDbAnonym\Controller;
 
 use Exception;
+use RuntimeException;
 use Unicaen\Console\Controller\AbstractConsoleController;
-use UnicaenApp\Exception\RuntimeException;
 use UnicaenDbAnonym\Service\AnonymServiceAwareTrait;
 
 class ConsoleController extends AbstractConsoleController
 {
     use AnonymServiceAwareTrait;
 
-    /**
-     * @var string
-     */
-    protected $outputDir;
-
     public function genererAction()
     {
         $start = microtime(true);
diff --git a/src/UnicaenDbAnonym/Controller/IndexController.php b/src/UnicaenDbAnonym/Controller/IndexController.php
index c633ab72d4bb37578feeba6cbaac799a36b2cb8c..d23f34f914b226d2387f01ebcbcef6980e6098bb 100755
--- a/src/UnicaenDbAnonym/Controller/IndexController.php
+++ b/src/UnicaenDbAnonym/Controller/IndexController.php
@@ -5,7 +5,7 @@ namespace UnicaenDbAnonym\Controller;
 use Application\Controller\AbstractController;
 use Exception;
 use Laminas\View\Model\ViewModel;
-use UnicaenApp\Exception\RuntimeException;
+use RuntimeException;
 use UnicaenApp\Service\SQL\RunSQLResult;
 use UnicaenDbAnonym\Service\AnonymServiceAwareTrait;
 
diff --git a/src/UnicaenDbAnonym/Controller/IndexControllerFactory.php b/src/UnicaenDbAnonym/Controller/IndexControllerFactory.php
index 785a848a83c66d1fd29a65d8760b3f71da10225d..ca5a74bee08050a5e8353cfdf61bd1977905e1d4 100644
--- a/src/UnicaenDbAnonym/Controller/IndexControllerFactory.php
+++ b/src/UnicaenDbAnonym/Controller/IndexControllerFactory.php
@@ -12,6 +12,8 @@ class IndexControllerFactory
      *
      * @param ContainerInterface $container
      * @return IndexController
+     * @throws \Psr\Container\ContainerExceptionInterface
+     * @throws \Psr\Container\NotFoundExceptionInterface
      */
     public function __invoke(ContainerInterface $container): IndexController
     {
diff --git a/src/UnicaenDbAnonym/Service/AnonymService.php b/src/UnicaenDbAnonym/Service/AnonymService.php
index 6f3c4fa021899c433b27dea29492f53c47993887..a30ff13ae874d0b2b1f786b620b9e7d9ccfccb1d 100644
--- a/src/UnicaenDbAnonym/Service/AnonymService.php
+++ b/src/UnicaenDbAnonym/Service/AnonymService.php
@@ -17,12 +17,12 @@ class AnonymService
     /**
      * @var array
      */
-    protected $entitiesConfig = [];
+    protected array $entitiesConfig = [];
 
     /**
      * @var array
      */
-    protected $outputConfig = [];
+    protected array $outputConfig = [];
 
     /**
      * @param array $config
@@ -105,6 +105,7 @@ class AnonymService
 
     /**
      * @throws \Doctrine\DBAL\ConnectionException
+     * @throws \Doctrine\DBAL\Exception
      */
     public function anonymiser(): RunSQLResult
     {
@@ -122,6 +123,7 @@ class AnonymService
 
     /**
      * @throws \Doctrine\DBAL\ConnectionException
+     * @throws \Doctrine\DBAL\Exception
      */
     public function restaurer(): RunSQLResult
     {
diff --git a/src/UnicaenDbAnonym/Service/AnonymServiceAwareTrait.php b/src/UnicaenDbAnonym/Service/AnonymServiceAwareTrait.php
index 29387326b0bdbde2c4cf7858e5258390c5448f0d..cab44fe1bef8dbcfb01a6c4d92972be59ecb9a22 100644
--- a/src/UnicaenDbAnonym/Service/AnonymServiceAwareTrait.php
+++ b/src/UnicaenDbAnonym/Service/AnonymServiceAwareTrait.php
@@ -7,7 +7,7 @@ trait AnonymServiceAwareTrait
     /**
      * @var AnonymService
      */
-    protected $anonymService;
+    protected AnonymService $anonymService;
 
     /**
      * @param AnonymService $anonymService
diff --git a/src/UnicaenDbAnonym/Service/DbService.php b/src/UnicaenDbAnonym/Service/DbService.php
index c7c9f3719edb99be28fd80ef6a66b32468ff0af9..5e19a5f31098467963ef82cb1bb52e8e3d182d8a 100644
--- a/src/UnicaenDbAnonym/Service/DbService.php
+++ b/src/UnicaenDbAnonym/Service/DbService.php
@@ -4,9 +4,11 @@ namespace UnicaenDbAnonym\Service;
 
 use Doctrine\DBAL\ConnectionException;
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Faker\Factory;
+use Faker\Generator;
 use Laminas\Log\Logger;
 use Laminas\Log\Writer\Stream;
 use Locale;
@@ -23,22 +25,22 @@ class DbService
     /**
      * @var \Doctrine\ORM\EntityManager
      */
-    protected $entityManager;
+    protected EntityManager $entityManager;
 
     /**
      * @var \Doctrine\DBAL\Platforms\AbstractPlatform
      */
-    protected $databasePlatform;
+    protected AbstractPlatform $databasePlatform;
 
     /**
      * @var string
      */
-    protected $updateSQLTemplate = 'update %s set %s where id = %d ;';
+    protected string $updateSQLTemplate = 'update %s set %s where id = %d ;';
 
     /**
      * @var \Faker\Generator $faker
      */
-    protected $faker;
+    protected Generator $faker;
 
 
     public function __construct()
@@ -159,6 +161,7 @@ class DbService
 
     /**
      * @throws \Doctrine\DBAL\ConnectionException
+     * @throws \Doctrine\DBAL\Exception
      */
     public function lancerScript(string $scriptPath): RunSQLResult
     {
diff --git a/src/UnicaenDbAnonym/Service/DbServiceAwareTrait.php b/src/UnicaenDbAnonym/Service/DbServiceAwareTrait.php
index 3e83baf3d33921fcf10d9e760ce4a9067277521b..285c08e4a79ff7b4f5f3f9e12fd03f0ef1c157ea 100644
--- a/src/UnicaenDbAnonym/Service/DbServiceAwareTrait.php
+++ b/src/UnicaenDbAnonym/Service/DbServiceAwareTrait.php
@@ -7,7 +7,7 @@ trait DbServiceAwareTrait
     /**
      * @var DbService $dbService
      */
-    protected $dbService;
+    protected DbService $dbService;
 
     public function setDbService(DbService $dbService)
     {