Merge branch '2.x' into 2.next

Author: LordSimal

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: [ '8.1', '8.2', '8.3' ]
+                php-version: [ '8.1', '8.2', '8.3', '8.4' ]
                 db-type: [ sqlite, mysql, pgsql ]
 
         services: