diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 865812d8..899417de 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,11 +15,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
+        php-version: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
         composer-flags: [ '', '--prefer-lowest' ]
         exclude:
           - php-version: '8.4'
             composer-flags: '--prefer-lowest'
+          - php-version: '8.5'
+            composer-flags: '--prefer-lowest'
     steps:
       - uses: actions/checkout@v6
 
@@ -39,7 +41,7 @@ jobs:
         run: composer test
 
   coverage:
-    name: PHP 8.4 - Test with coverage
+    name: PHP 8.5 - Test with coverage
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -47,7 +49,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.4
+          php-version: 8.5
           coverage: pcov
 
       - name: Install dependencies
@@ -74,7 +76,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.5
           coverage: none
 
       - name: Install dependencies
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index b1f184e2..74cbe2c1 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -7,7 +7,6 @@
 use Closure;
 use FD\LogViewer\Service\File\Monolog\MonologLineParser;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
-use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -16,10 +15,12 @@
  */
 final class Configuration implements ConfigurationInterface
 {
+    /**
+     * @return TreeBuilder<'array'>
+     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        $tree = new TreeBuilder('fd_log_viewer');
-        /** @var ArrayNodeDefinition $rootNode */
+        $tree     = new TreeBuilder('fd_log_viewer');
         $rootNode = $tree->getRootNode();
 
         $rootNode
@@ -31,10 +32,12 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $tree;
     }
 
-    private function configureLogFiles(): NodeDefinition
+    /**
+     * @return ArrayNodeDefinition<null>
+     */
+    private function configureLogFiles(): ArrayNodeDefinition
     {
-        $tree = new TreeBuilder('log_files');
-        /** @var ArrayNodeDefinition $rootNode */
+        $tree     = new TreeBuilder('log_files');
         $rootNode = $tree->getRootNode();
 
         return $rootNode
@@ -113,10 +116,12 @@ private function configureLogFiles(): NodeDefinition
             ->end();
     }
 
-    private function configureHosts(): NodeDefinition
+    /**
+     * @return ArrayNodeDefinition<null>
+     */
+    private function configureHosts(): ArrayNodeDefinition
     {
-        $tree = new TreeBuilder('hosts');
-        /** @var ArrayNodeDefinition $rootNode */
+        $tree     = new TreeBuilder('hosts');
         $rootNode = $tree->getRootNode();
 
         return $rootNode