Merge branch '2.x' into 2.next

Author: LordSimal

.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
                     --health-retries 5
 
         steps:
-            -   uses: actions/checkout@v5
+            -   uses: actions/checkout@v6
 
             -   name: Setup MySQL
                 if: matrix.db-type == 'mysql'
@@ -112,7 +112,7 @@ jobs:
         runs-on: ubuntu-22.04
 
         steps:
-            -   uses: actions/checkout@v5
+            -   uses: actions/checkout@v6
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2