Bump to php 8 5

.github/workflows/bc.yml

@@ -33,4 +33,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.4']
+        ['8.5']

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

@@ -35,4 +35,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']

.github/workflows/mariadb.yml

@@ -28,37 +28,46 @@ concurrency:
 
 jobs:
   tests:
-    name: PHP ${{ matrix.php }}-${{ matrix.mariadb }}
+    name: PHP ${{ matrix.php }}-mariadb-${{ matrix.mariadb }}
 
     env:
       EXTENSIONS: pdo, pdo_mysql
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       max-parallel: 2
       matrix:
-        os:
-          - ubuntu-latest
-
         php:
-          - 8.1
-          - 8.2
-          - 8.3
-          - 8.4
+          - 8.5
 
         mariadb:
-          - mariadb:10.4
-          - mariadb:10.5
-          - mariadb:10.6
-          - mariadb:10.7
-          - mariadb:10.8
-          - mariadb:10.9
-          - mariadb:latest
+          - 10.4
+          - 10.5
+          - 10.6
+          - 10.7
+          - 10.8
+          - 10.9
+          - 10
+          - 11.0
+          - 11
+          - 12.0
+          - 12
+          - latest
+
+        include:
+          - php: 8.1
+            mariadb: latest
+          - php: 8.2
+            mariadb: latest
+          - php: 8.3
+            mariadb: latest
+          - php: 8.4
+            mariadb: latest
 
     services:
       mysql:
-        image: ${{ matrix.mariadb }}
+        image: mariadb:${{ matrix.mariadb }}
         env:
           MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true
           MARIADB_ROOT_PASSWORD: ''
@@ -82,6 +91,10 @@ jobs:
       - name: Update composer.
         run: composer self-update
 
+      - uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--prefer-dist --no-interaction --no-progress --ansi"
+
       - name: Install db-mysql.
         run: composer require yiisoft/db-mysql --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 

.github/workflows/mssql.yml

@@ -33,7 +33,7 @@ jobs:
     env:
       extensions: pdo, pdo_sqlsrv-5.12
 
-    runs-on: 'ubuntu-latest'
+    runs-on: ubuntu-latest
 
     strategy:
       max-parallel: 2
@@ -43,9 +43,10 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
 
         mssql:
-          - server: 2022-latest
+          - server: 2025-latest
             odbc-version: 18
             flag: "-C"
 
@@ -55,6 +56,11 @@ jobs:
               server: 2019-latest
               odbc-version: 18
               flag: "-C"
+          - php: 8.4
+            mssql:
+              server: 2022-latest
+              odbc-version: 18
+              flag: "-C"
 
     services:
       mssql:
@@ -91,6 +97,10 @@ jobs:
       - name: Update composer.
         run: composer self-update
 
+      - uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--prefer-dist --no-interaction --no-progress --ansi"
+
       - name: Install db-mssql.
         run: composer require yiisoft/db-mssql --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 

.github/workflows/mutation.yml

@@ -39,11 +39,11 @@ jobs:
           - ubuntu-latest
 
         php:
-          - 8.4
+          - 8.5
 
     services:
       postgres:
-        image: postgres:15
+        image: postgres:18
         env:
           POSTGRES_USER: root
           POSTGRES_PASSWORD: root
@@ -68,6 +68,10 @@ jobs:
       - name: Update composer.
         run: composer self-update
 
+      - uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--prefer-dist --no-interaction --no-progress --ansi"
+
       - name: Install db-pgsql.
         run: composer require yiisoft/db-pgsql --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 

.github/workflows/mysql.yml

@@ -33,27 +33,33 @@ jobs:
     env:
       extensions: pdo, pdo_mysql
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       max-parallel: 2
       matrix:
-        os:
-          - ubuntu-latest
-
         php:
-          - 8.1
-          - 8.2
-          - 8.3
-          - 8.4
+          - 8.5
 
         mysql:
-          - mysql:5.7
-          - mysql:latest
+          - 5.7
+          - 8.4
+          - 9.5
+          - latest
+
+        include:
+          - php: 8.1
+            mysql: latest
+          - php: 8.2
+            mysql: latest
+          - php: 8.3
+            mysql: latest
+          - php: 8.4
+            mysql: latest
 
     services:
       mysql:
-        image: ${{ matrix.mysql }}
+        image: mysql:${{ matrix.mysql }}
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: true
           MYSQL_PASSWORD: ''
@@ -77,6 +83,10 @@ jobs:
       - name: Update composer.
         run: composer self-update
 
+      - uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--prefer-dist --no-interaction --no-progress --ansi"
+
       - name: Install db-mysql.
         run: composer require yiisoft/db-mysql --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 

.github/workflows/oracle.yml

@@ -33,24 +33,28 @@ jobs:
     env:
       extensions: pdo, pdo_oci, oci8
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       max-parallel: 2
       matrix:
-        os:
-          - ubuntu-latest
-
         php:
-          - 8.1
-          - 8.2
-          - 8.3
-          - 8.4
+          - 8.5
 
         oracle:
           - 18
           - 21
 
+        include:
+          - php: 8.1
+            oracle: latest
+          - php: 8.2
+            oracle: latest
+          - php: 8.3
+            oracle: latest
+          - php: 8.4
+            oracle: latest
+
     services:
       oci:
         image: gvenzl/oracle-xe:${{ matrix.oracle }}
@@ -82,6 +86,10 @@ jobs:
       - name: Update composer.
         run: composer self-update
 
+      - uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--prefer-dist --no-interaction --no-progress --ansi"
+
       - name: Install db-oracle.
         run: composer require yiisoft/db-oracle --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 

.github/workflows/pgsql.yml

@@ -33,19 +33,13 @@ jobs:
     env:
       extensions: pdo, pdo_pgsql
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       max-parallel: 2
       matrix:
-        os:
-          - ubuntu-latest
-
         php:
-          - 8.1
-          - 8.2
-          - 8.3
-          - 8.4
+          - 8.5
 
         pgsql:
           - 9
@@ -55,6 +49,20 @@ jobs:
           - 13
           - 14
           - 15
+          - 16
+          - 17
+          - 18
+          - latest
+
+        include:
+          - php: 8.1
+            pgsql: latest
+          - php: 8.2
+            pgsql: latest
+          - php: 8.3
+            pgsql: latest
+          - php: 8.4
+            pgsql: latest
 
     services:
       postgres:
@@ -83,6 +91,10 @@ jobs:
       - name: Update composer.
         run: composer self-update
 
+      - uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--prefer-dist --no-interaction --no-progress --ansi"
+
       - name: Install db-pgsql.
         run: composer require yiisoft/db-pgsql --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 

.github/workflows/rector.yml

@@ -25,4 +25,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1']
+        ['8.5']

.github/workflows/sqlite.yml

@@ -64,14 +64,18 @@ jobs:
       - name: Update composer.
         run: composer self-update
 
+      - uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--prefer-dist --no-interaction --no-progress --ansi"
+
       - name: Install db-sqlite.
         run: composer require yiisoft/db-sqlite --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run tests with phpunit.
         run: vendor/bin/phpunit --testsuite=Sqlite --coverage-clover=coverage.xml --colors=always
 
       - name: Upload coverage to Codecov.
-        if: matrix.php == '8.4'
+        if: matrix.php == '8.5'
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/static.yml

@@ -43,6 +43,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
 
     steps:
       - name: Checkout.
@@ -58,6 +59,10 @@ jobs:
       - name: Update composer.
         run: composer self-update
 
+      - uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--prefer-dist --no-interaction --no-progress --ansi"
+
       - name: Install dependencies with composer.
         run: composer require yiisoft/db-sqlite --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 

CHANGELOG.md

@@ -3,6 +3,6 @@
 ## 1.0.1 under development
 
 - Chg #88: Bump supported version of `yiisoft/db` to `^2.0` (@batyrmastyr)
-- Chg #91: Change supported PHP versions to `8.1 - 8.4` (@batyrmastyr)
+- Chg #91, #94: Change supported PHP versions to `8.1 - 8.5` (@batyrmastyr)
 
 1.0.0 May 09, 2023

README.md

@@ -17,17 +17,17 @@ This package implements database-based [PSR-16](https://www.php-fig.org/psr/psr-
 
 ## Supported databases
 
-| Packages | PHP | Versions | CI-Actions |
-|----------|-----|----------|------------|
-| [[db-mssql]](https://github.com/yiisoft/db-mssql) | **8.0 - 8.2** | **2017 - 2022** | [![mssql](https://github.com/yiisoft/cache-db/actions/workflows/mssql.yml/badge.svg)](https://github.com/yiisoft/cache-db/actions/workflows/mssql.yml) | |
-| [[db-mysql/mariadb]](https://github.com/yiisoft/db-mysql)  | **8.0 - 8.2** |  **5.7-8.0**/**10.4-10.10** | [![mysql](https://github.com/yiisoft/cache-db/actions/workflows/mysql.yml/badge.svg)](https://github.com/yiisoft/cache-db/actions/workflows/mysql.yml)   |
-| [[db-oracle]](https://github.com/yiisoft/db-oracle) | **8.0 - 8.2** |  **11C - 21C** | [![oracle](https://github.com/yiisoft/cache-db/actions/workflows/oracle.yml/badge.svg)](https://github.com/yiisoft/cache-db/actions/workflows/oracle.yml) |
-| [[db-pgsql]](https://github.com/yiisoft/db-pgsql)  | **8.0 - 8.2** | **9.0 - 15.0** | [![pgsql](https://github.com/yiisoft/cache-db/actions/workflows/pgsql.yml/badge.svg)](https://github.com/yiisoft/cache-db/actions/workflows/pgsql.yml) |
-| [[db-sqlite]](https://github.com/yiisoft/db-sqlite) | **8.0 - 8.2** |  **3:latest** | [![sqlite](https://github.com/yiisoft/cache-db/actions/workflows/sqlite.yml/badge.svg)](https://github.com/yiisoft/cache-db/actions/workflows/sqlite.yml) |
+| Packages | PHP           | Versions                   | CI-Actions |
+|----------|---------------|----------------------------|------------|
+| [[db-mssql]](https://github.com/yiisoft/db-mssql) | **8.1 - 8.5** | **2017 - 2025**            | [![mssql](https://github.com/yiisoft/cache-db/actions/workflows/mssql.yml/badge.svg)](https://github.com/yiisoft/cache-db/actions/workflows/mssql.yml) | |
+| [[db-mysql/mariadb]](https://github.com/yiisoft/db-mysql)  | **8.1 - 8.5** | **5.7-9.5**/**10.4-12.10** | [![mysql](https://github.com/yiisoft/cache-db/actions/workflows/mysql.yml/badge.svg)](https://github.com/yiisoft/cache-db/actions/workflows/mysql.yml)   |
+| [[db-oracle]](https://github.com/yiisoft/db-oracle) | **8.1 - 8.5** | **11C - 21C**              | [![oracle](https://github.com/yiisoft/cache-db/actions/workflows/oracle.yml/badge.svg)](https://github.com/yiisoft/cache-db/actions/workflows/oracle.yml) |
+| [[db-pgsql]](https://github.com/yiisoft/db-pgsql)  | **8.1 - 8.5** | **9.0 - 18.0**             | [![pgsql](https://github.com/yiisoft/cache-db/actions/workflows/pgsql.yml/badge.svg)](https://github.com/yiisoft/cache-db/actions/workflows/pgsql.yml) |
+| [[db-sqlite]](https://github.com/yiisoft/db-sqlite) | **8.1 - 8.5** | **3:latest**               | [![sqlite](https://github.com/yiisoft/cache-db/actions/workflows/sqlite.yml/badge.svg)](https://github.com/yiisoft/cache-db/actions/workflows/sqlite.yml) |
 
 ## Requirements
 
-- PHP 8.0 or higher.
+- PHP 8.1 - 8.5.
 - `PDO` PHP extension.
 
 ## Installation