diff --git a/.laminas-ci.json b/.laminas-ci.json
index cd24f855..b9c3c8d2 100644
--- a/.laminas-ci.json
+++ b/.laminas-ci.json
@@ -7,5 +7,8 @@
         "pgsql",
         "sqlite3",
         "sqlsrv"
-    ]
+    ],
+    "ignore_php_platform_requirements": {
+        "8.4": true
+    }
 }
diff --git a/composer.json b/composer.json
index d1e8b9f9..18d6751d 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
         }
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "laminas/laminas-stdlib": "^3.7.1"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index a9713ff5..02611eff 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "bab14dbc23e177873fe7698ca0c27a52",
+    "content-hash": "530e1c27cb76ea638bebbbae69616749",
     "packages": [
         {
             "name": "laminas/laminas-stdlib",
@@ -2526,7 +2526,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
     },
     "platform-dev": [],
     "platform-overrides": {
diff --git a/docs/book/adapter.md b/docs/book/adapter.md
index 95ad7de7..67ffa8ce 100644
--- a/docs/book/adapter.md
+++ b/docs/book/adapter.md
@@ -170,10 +170,10 @@ The above example will go through the following steps:
 - execute the `Statement` object, producing a `Result` object.
 - check the `Result` object to check if the supplied SQL was a result set
   producing statement:
-  - if the query produced a result set, clone the `ResultSet` prototype,
+    - if the query produced a result set, clone the `ResultSet` prototype,
     inject the `Result` as its datasource, and return the new `ResultSet`
     instance.
-  - otherwise, return the `Result`.
+    - otherwise, return the `Result`.
 
 ## Query Execution
 
diff --git a/docs/book/table-gateway.md b/docs/book/table-gateway.md
index 05ebc0b2..300dda8c 100644
--- a/docs/book/table-gateway.md
+++ b/docs/book/table-gateway.md
@@ -227,26 +227,26 @@ listed.
 - `preInitialize` (no parameters)
 - `postInitialize` (no parameters)
 - `preSelect`, with the following parameters:
-  - `select`, with type `Laminas\Db\Sql\Select`
+    - `select`, with type `Laminas\Db\Sql\Select`
 - `postSelect`, with the following parameters:
-  - `statement`, with type `Laminas\Db\Adapter\Driver\StatementInterface`
-  - `result`, with type `Laminas\Db\Adapter\Driver\ResultInterface`
-  - `resultSet`, with type `Laminas\Db\ResultSet\ResultSetInterface`
+    - `statement`, with type `Laminas\Db\Adapter\Driver\StatementInterface`
+    - `result`, with type `Laminas\Db\Adapter\Driver\ResultInterface`
+    - `resultSet`, with type `Laminas\Db\ResultSet\ResultSetInterface`
 - `preInsert`, with the following parameters:
-  - `insert`, with type `Laminas\Db\Sql\Insert`
+    - `insert`, with type `Laminas\Db\Sql\Insert`
 - `postInsert`, with the following parameters:
-  - `statement` with type `Laminas\Db\Adapter\Driver\StatementInterface`
-  - `result` with type `Laminas\Db\Adapter\Driver\ResultInterface`
+    - `statement` with type `Laminas\Db\Adapter\Driver\StatementInterface`
+    - `result` with type `Laminas\Db\Adapter\Driver\ResultInterface`
 - `preUpdate`, with the following parameters:
-  - `update`, with type `Laminas\Db\Sql\Update`
+    - `update`, with type `Laminas\Db\Sql\Update`
 - `postUpdate`, with the following parameters:
-  - `statement`, with type `Laminas\Db\Adapter\Driver\StatementInterface`
-  - `result`, with type `Laminas\Db\Adapter\Driver\ResultInterface`
+    - `statement`, with type `Laminas\Db\Adapter\Driver\StatementInterface`
+    - `result`, with type `Laminas\Db\Adapter\Driver\ResultInterface`
 - `preDelete`, with the following parameters:
-  - `delete`, with type `Laminas\Db\Sql\Delete`
+    - `delete`, with type `Laminas\Db\Sql\Delete`
 - `postDelete`, with the following parameters:
-  - `statement`, with type `Laminas\Db\Adapter\Driver\StatementInterface`
-  - `result`, with type `Laminas\Db\Adapter\Driver\ResultInterface`
+    - `statement`, with type `Laminas\Db\Adapter\Driver\StatementInterface`
+    - `result`, with type `Laminas\Db\Adapter\Driver\ResultInterface`
 
 Listeners receive a `Laminas\Db\TableGateway\Feature\EventFeature\TableGatewayEvent`
 instance as an argument. Within the listener, you can retrieve a parameter by