diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index ada98fe..2f62fad 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -20,6 +20,7 @@ jobs:
           - "locked"
         php-version:
           - "7.4"
+          - "8.0"
         operating-system:
           - "ubuntu-latest"
 
diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
index 78c4e93..5418e54 100644
--- a/.github/workflows/mutation-tests.yml
+++ b/.github/workflows/mutation-tests.yml
@@ -20,6 +20,7 @@ jobs:
           - "locked"
         php-version:
           - "7.4"
+          - "8.0"
         operating-system:
           - "ubuntu-latest"
 
@@ -60,4 +61,4 @@ jobs:
         env:
           INFECTION_BADGE_API_KEY: ${{ secrets.INFECTION_BADGE_API_KEY }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
-  
+
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 0fb4782..3029d6d 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -20,6 +20,7 @@ jobs:
           - "locked"
         php-version:
           - "7.4"
+          - "8.0"
         operating-system:
           - "ubuntu-latest"
 
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index 65e638c..49079e7 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -20,6 +20,7 @@ jobs:
           - "locked"
         php-version:
           - "7.4"
+          - "8.0"
         operating-system:
           - "ubuntu-latest"
 
diff --git a/src/MiddlewarePipeline.php b/src/MiddlewarePipeline.php
index 5ba31ca..4f675fb 100644
--- a/src/MiddlewarePipeline.php
+++ b/src/MiddlewarePipeline.php
@@ -53,7 +53,6 @@ function (ServerRequestInterface $request) {
                 /** @var string $requestId */
                 $requestId = $request->getAttribute('request_id');
                 try {
-                    /** @var MiddlewareInterface $middleware */
                     $middleware = $this->concurrentPipelines[$requestId]->dequeue();
 
                     $response = $middleware->process($request, $this);
@@ -84,7 +83,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 /** @var string $requestId */
                 $requestId = $request->getAttribute('request_id');
                 try {
-                    /** @var MiddlewareQueue $queue */
                     $queue = $this->concurrentPipelines[$requestId];
                     $next = new NextHandler($queue, $handler);