10 files changed, 19 insertions, 30 deletions
diff --git a/app/Http/Middleware/BootModules.php b/app/Http/Middleware/BootModules.php
index cec85b017a..45cf36677f 100644
--- a/app/Http/Middleware/BootModules.php
+++ b/app/Http/Middleware/BootModules.php
@@ -31,11 +31,9 @@ use Psr\Http\Server\RequestHandlerInterface;
  */
 class BootModules implements MiddlewareInterface
 {
-    /** @var ModuleService */
-    private $module_service;
+    private ModuleService $module_service;
 
-    /** @var ModuleThemeInterface */
-    private $theme;
+    private ModuleThemeInterface $theme;
 
     /**
      * BootModules constructor.
diff --git a/app/Http/Middleware/CompressResponse.php b/app/Http/Middleware/CompressResponse.php
index c17ba26d5e..1e0083fc33 100644
--- a/app/Http/Middleware/CompressResponse.php
+++ b/app/Http/Middleware/CompressResponse.php
@@ -51,8 +51,7 @@ class CompressResponse implements MiddlewareInterface
         'image/svg+xml',
     ];
 
-    /** @var StreamFactoryInterface */
-    protected $stream_factory;
+    protected StreamFactoryInterface $stream_factory;
 
     /**
      * CompressResponse constructor.
diff --git a/app/Http/Middleware/DoHousekeeping.php b/app/Http/Middleware/DoHousekeeping.php
index a31381d70f..4d241f45a2 100644
--- a/app/Http/Middleware/DoHousekeeping.php
+++ b/app/Http/Middleware/DoHousekeeping.php
@@ -50,8 +50,7 @@ class DoHousekeeping implements MiddlewareInterface
     // Run the cleanup every N requests.
     private const PROBABILITY = 250;
 
-    /** @var HousekeepingService */
-    private $housekeeping_service;
+    private HousekeepingService $housekeeping_service;
 
     /**
      * Housekeeping constructor.
diff --git a/app/Http/Middleware/HandleExceptions.php b/app/Http/Middleware/HandleExceptions.php
index dd6c9ec346..085015049d 100644
--- a/app/Http/Middleware/HandleExceptions.php
+++ b/app/Http/Middleware/HandleExceptions.php
@@ -54,8 +54,7 @@ class HandleExceptions implements MiddlewareInterface, StatusCodeInterface
 {
     use ViewResponseTrait;
 
-    /** @var TreeService */
-    private $tree_service;
+    private TreeService $tree_service;
 
     /**
      * HandleExceptions constructor.
diff --git a/app/Http/Middleware/LoadRoutes.php b/app/Http/Middleware/LoadRoutes.php
index e191fefd49..71c54eb789 100644
--- a/app/Http/Middleware/LoadRoutes.php
+++ b/app/Http/Middleware/LoadRoutes.php
@@ -37,11 +37,9 @@ use const PHP_URL_PATH;
  */
 class LoadRoutes implements MiddlewareInterface
 {
-    /** @var ApiRoutes */
-    private $api_routes;
+    private ApiRoutes $api_routes;
 
-    /** @var WebRoutes */
-    private $web_routes;
+    private WebRoutes $web_routes;
 
     /**
      * @param ApiRoutes $api_routes
diff --git a/app/Http/Middleware/ReadConfigIni.php b/app/Http/Middleware/ReadConfigIni.php
index 03ad802115..ae5acf9573 100644
--- a/app/Http/Middleware/ReadConfigIni.php
+++ b/app/Http/Middleware/ReadConfigIni.php
@@ -34,8 +34,7 @@ use function parse_ini_file;
  */
 class ReadConfigIni implements MiddlewareInterface
 {
-    /** @var SetupWizard */
-    private $setup_wizard;
+    private SetupWizard $setup_wizard;
 
     /**
      * @param SetupWizard $setup_wizard
diff --git a/app/Http/Middleware/Router.php b/app/Http/Middleware/Router.php
index b4294ab287..ee4dd5e11d 100644
--- a/app/Http/Middleware/Router.php
+++ b/app/Http/Middleware/Router.php
@@ -41,14 +41,11 @@ use function str_contains;
  */
 class Router implements MiddlewareInterface
 {
-    /** @var ModuleService */
-    private $module_service;
+    private ModuleService $module_service;
 
-    /** @var RouterContainer */
-    private $router_container;
+    private RouterContainer $router_container;
 
-    /** @var TreeService */
-    private $tree_service;
+    private TreeService $tree_service;
 
     /**
      * Router constructor.
@@ -57,8 +54,11 @@ class Router implements MiddlewareInterface
      * @param RouterContainer $router_container
      * @param TreeService     $tree_service
      */
-    public function __construct(ModuleService $module_service, RouterContainer $router_container, TreeService $tree_service)
-    {
+    public function __construct(
+        ModuleService $module_service,
+        RouterContainer $router_container,
+        TreeService $tree_service
+    ) {
         $this->module_service   = $module_service;
         $this->router_container = $router_container;
         $this->tree_service     = $tree_service;
diff --git a/app/Http/Middleware/UpdateDatabaseSchema.php b/app/Http/Middleware/UpdateDatabaseSchema.php
index 48c83720e3..99492130aa 100644
--- a/app/Http/Middleware/UpdateDatabaseSchema.php
+++ b/app/Http/Middleware/UpdateDatabaseSchema.php
@@ -31,8 +31,7 @@ use Psr\Http\Server\RequestHandlerInterface;
  */
 class UpdateDatabaseSchema implements MiddlewareInterface
 {
-    /** @var MigrationService */
-    private $migration_service;
+    private MigrationService $migration_service;
 
     /**
      * @param MigrationService $migration_service
diff --git a/app/Http/Middleware/UseLanguage.php b/app/Http/Middleware/UseLanguage.php
index f290466019..4d1a4d519d 100644
--- a/app/Http/Middleware/UseLanguage.php
+++ b/app/Http/Middleware/UseLanguage.php
@@ -38,8 +38,7 @@ use Psr\Http\Server\RequestHandlerInterface;
  */
 class UseLanguage implements MiddlewareInterface
 {
-    /** @var ModuleService */
-    private $module_service;
+    private ModuleService $module_service;
 
     /**
      * UseTheme constructor.
diff --git a/app/Http/Middleware/UseTheme.php b/app/Http/Middleware/UseTheme.php
index 4102feec02..ae4c230441 100644
--- a/app/Http/Middleware/UseTheme.php
+++ b/app/Http/Middleware/UseTheme.php
@@ -37,8 +37,7 @@ use function app;
  */
 class UseTheme implements MiddlewareInterface
 {
-    /** @var ModuleService */
-    private $module_service;
+    private ModuleService $module_service;
 
     /**
      * UseTheme constructor.