Merge branch 'master' into join-doc

Author: vjik

.github/workflows/active-record.yml

@@ -24,7 +24,7 @@ jobs:
 
     env:
       COMPOSER_ROOT_VERSION: dev-master
-      PHP_VERSION: 8.4
+      PHP_VERSION: 8.5
       EXTENSIONS: pdo, pdo_mysql, pdo_oci, pdo_pgsql, pdo_sqlite, pdo_sqlsrv
 
     runs-on: ubuntu-latest

.github/workflows/build.yml

@@ -42,6 +42,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
 
     steps:
       - name: Checkout.

.github/workflows/composer-require-checker.yml

@@ -27,4 +27,4 @@ jobs:
     uses: yiisoft/actions/.github/workflows/composer-require-checker.yml@master
     with:
       php: >-
-        ['8.1', '8.2', '8.3', '8.4']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']

.github/workflows/db-mariadb.yml

@@ -29,13 +29,14 @@ jobs:
     env:
       COMPOSER_ROOT_VERSION: dev-master
       EXTENSIONS: pdo, pdo_mysql
+      YII_MYSQL_TYPE: 'mariadb'
 
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
         php:
-          - 8.4
+          - 8.5
 
         mariadb:
           - mariadb:10.4
@@ -53,6 +54,8 @@ jobs:
             mariadb: mariadb:latest
           - php: 8.3
             mariadb: mariadb:latest
+          - php: 8.4
+            mariadb: mariadb:latest
 
     services:
       mysql:

.github/workflows/db-migration.yml

@@ -24,7 +24,7 @@ jobs:
 
     env:
       COMPOSER_ROOT_VERSION: dev-master
-      PHP_VERSION: 8.4
+      PHP_VERSION: 8.5
       EXTENSIONS: pdo, pdo_mysql, pdo_oci, pdo_pgsql, pdo_sqlite, pdo_sqlsrv
 
     runs-on: ubuntu-latest

.github/workflows/db-mssql-2017.yml

@@ -28,7 +28,7 @@ jobs:
 
     env:
       COMPOSER_ROOT_VERSION: dev-master
-      PHP_VERSION: 8.4
+      PHP_VERSION: 8.5
       EXTENSIONS: pdo, pdo_sqlsrv
 
     runs-on: windows-latest

.github/workflows/db-mssql.yml

@@ -39,6 +39,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
 
         mssql:
           - 2022-latest

.github/workflows/db-mysql.yml

@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.4
+          - 8.5
 
         mysql:
           - mysql:5.7
@@ -48,6 +48,8 @@ jobs:
             mysql: mysql:latest
           - php: 8.3
             mysql: mysql:latest
+          - php: 8.4
+            mysql: mysql:latest
 
     services:
       mysql:

.github/workflows/db-oracle.yml

@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.4
+          - 8.5
 
         oracle:
           - 18
@@ -48,6 +48,8 @@ jobs:
             oracle: 21
           - php: 8.3
             oracle: 21
+          - php: 8.4
+            oracle: 21
 
     services:
       oci:

.github/workflows/db-pgsql.yml

@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.4
+          - 8.5
 
         pgsql:
           - 9
@@ -47,14 +47,17 @@ jobs:
           - 15
           - 16
           - 17
+          - 18
 
         include:
           - php: 8.1
-            pgsql: 17
+            pgsql: 18
           - php: 8.2
-            pgsql: 17
+            pgsql: 18
           - php: 8.3
-            pgsql: 17
+            pgsql: 18
+          - php: 8.4
+            pgsql: 18
 
     services:
       postgres: