diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 327717c..8a996a5 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -13,14 +13,14 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Validate composer.json and composer.lock
               run: composer validate
 
             - name: Cache Composer packages
               id: composer-cache
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
                 path: vendor
                 key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
@@ -44,15 +44,15 @@ jobs:
                 - 7.2
                 - 7.3
                 - 7.4
-              composer-args: [ "" ]
-              include:
-                - php: 8.0
-                  composer-args: --ignore-platform-reqs
-            fail-fast: false
+                - 8.0
+                - 8.1
+                - 8.2
+                - 8.3
+                - 8.4
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Install PHP
               uses: shivammathur/setup-php@v2
@@ -60,17 +60,17 @@ jobs:
                   php-version: ${{ matrix.php }}
 
             - name: Cache PHP dependencies
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
                   path: vendor
                   key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
                   restore-keys: ${{ runner.os }}-php-${{ matrix.php }}-composer-
 
             - name: Install dependencies
-              run: composer install --prefer-dist --no-progress ${{ matrix.composer-args }}
+              run: composer install --prefer-dist --no-progress
 
             - name: Tests
               run: composer test
 
             - name: Tests coverage
-              run: composer coverage
+              run: composer coverage
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34776c0..412cd73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.2] - 2025-02-02
+### Fixed
+- Support for PHP 8.4 [#2]
+
 ## [2.0.1] - 2020-12-02
 ### Added
 - Support for PHP 8
diff --git a/composer.json b/composer.json
index e139833..420b471 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         "squizlabs/php_codesniffer": "^3.0",
         "oscarotero/php-cs-fixer-config": "^1.0",
         "phpstan/phpstan": "^0.12",
-        "laminas/laminas-diactoros": "^2.3"
+        "laminas/laminas-diactoros": "^2|^3"
     },
     "autoload": {
         "psr-4": {