PHP 8.5 support (#1113)

vjik · web-flow · commit ffc950dec156 · 2025-12-01T12:02:21.000+03:00
diff --git a/.github/workflows/active-record.yml b/.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
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,6 +42,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
 
     steps:
       - name: Checkout.
diff --git a/.github/workflows/composer-require-checker.yml b/.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']
diff --git a/.github/workflows/db-mariadb.yml b/.github/workflows/db-mariadb.yml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.4
+          - 8.5
 
         mariadb:
           - mariadb:10.4
@@ -54,6 +54,8 @@ jobs:
             mariadb: mariadb:latest
           - php: 8.3
             mariadb: mariadb:latest
+          - php: 8.4
+            mariadb: mariadb:latest
 
     services:
       mysql:
diff --git a/.github/workflows/db-migration.yml b/.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
diff --git a/.github/workflows/db-mssql-2017.yml b/.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
diff --git a/.github/workflows/db-mssql.yml b/.github/workflows/db-mssql.yml
@@ -39,6 +39,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
 
         mssql:
           - 2022-latest
diff --git a/.github/workflows/db-mysql.yml b/.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:
diff --git a/.github/workflows/db-oracle.yml b/.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:
diff --git a/.github/workflows/db-pgsql.yml b/.github/workflows/db-pgsql.yml
@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.4
+          - 8.5
 
         pgsql:
           - 9
@@ -56,6 +56,8 @@ jobs:
             pgsql: 18
           - php: 8.3
             pgsql: 18
+          - php: 8.4
+            pgsql: 18
 
     services:
       postgres:
diff --git a/.github/workflows/db-sqlite.yml b/.github/workflows/db-sqlite.yml
@@ -43,6 +43,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
 
     steps:
       - name: Checkout.
diff --git a/.github/workflows/rector-cs.yml b/.github/workflows/rector-cs.yml
@@ -25,4 +25,4 @@ jobs:
       token: ${{ secrets.YIISOFT_GITHUB_TOKEN }}
     with:
       repository: ${{ github.event.pull_request.head.repo.full_name }}
-      php: '8.4'
+      php: '8.5'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -69,7 +69,7 @@
 - Enh #929: Refactor array, structured and JSON column type expressions and expression builders (@Tigrov)
 - Enh #929: Implement lazy arrays for array, structured and JSON column types (@Tigrov)
 - Bug #933: Explicitly mark nullable parameters (@vjik)
-- Chg #911: Change supported PHP versions to `8.1 - 8.4` (@Tigrov)
+- Chg #911, #1113: Change supported PHP versions to `8.1 - 8.5` (@Tigrov, @vjik)
 - Enh #911, #940: Minor refactoring (@Tigrov)
 - Chg #938, #936, #937: Remove `ext-json`, `ext-ctype`, `ext-mbstring` from `require` section of `composer.json` (@Tigrov) 
 - Chg #936: Remove `hasLimit()` and `hasOffset()` methods from `AbstractDQLQueryBuilder` class (@Tigrov)
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ Optional packages that provide additional functionality:
 
 ## Requirements
 
-- PHP 8.1 - 8.4.
+- PHP 8.1 - 8.5.
 - `pdo` PHP extension.
 
 ## Installation
diff --git a/composer.json b/composer.json
@@ -30,21 +30,20 @@
         }
     ],
     "require": {
-        "php": "8.1 - 8.4",
+        "php": "8.1 - 8.5",
         "ext-pdo": "*",
         "psr/log": "^2.0|^3.0",
         "psr/simple-cache": "^2.0|^3.0",
         "psr/simple-cache-implementation": "*",
         "yiisoft/db-implementation": "1.0.0"
     },
     "require-dev": {
+        "bamarni/composer-bin-plugin": "^1.8.3",
         "friendsofphp/php-cs-fixer": "^3.89.1",
         "maglnet/composer-require-checker": "^4.7.1",
         "phpunit/phpunit": "^10.5.45",
         "rector/rector": "^2.0.10",
-        "roave/infection-static-analysis-plugin": "^1.35",
         "spatie/phpunit-watcher": "^1.24",
-        "vimeo/psalm": "^5.26.1 || ^6.8.8",
         "yiisoft/aliases": "^3.0",
         "yiisoft/di": "^1.3",
         "yiisoft/dummy-provider": "^1.1",
@@ -87,6 +86,11 @@
         }
     },
     "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "target-directory": "tools",
+            "forward-command": true
+        },
         "config-plugin-options": {
             "source-directory": "config"
         },
@@ -97,7 +101,7 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "infection/extension-installer": true,
+            "bamarni/composer-bin-plugin": true,
             "composer/package-versions-deprecated": true,
             "yiisoft/config": false
         }
diff --git a/tests/Common/CommonCommandTest.php b/tests/Common/CommonCommandTest.php
@@ -519,7 +519,7 @@ public function testBatchInsert(
      */
     public function testBatchInsertDataTypesLocale(): void
     {
-        $locale = setlocale(LC_NUMERIC, 0);
+        $locale = setlocale(LC_NUMERIC, '');
 
         if ($locale === false) {
             $this->markTestSkipped('Your platform does not support locales.');
diff --git a/tools/.gitignore b/tools/.gitignore
@@ -0,0 +1,2 @@
+/*/vendor
+/*/composer.lock
diff --git a/tools/infection/composer.json b/tools/infection/composer.json
@@ -0,0 +1,10 @@
+{
+    "require-dev": {
+        "infection/infection": "^0.26 || ^0.31.9"
+    },
+    "config": {
+        "allow-plugins": {
+            "infection/extension-installer": true
+        }
+    }
+}
diff --git a/tools/psalm/composer.json b/tools/psalm/composer.json
@@ -0,0 +1,5 @@
+{
+    "require-dev": {
+        "vimeo/psalm": "^5.26.1 || ^6.8.8"
+    }
+}

-Original file line number
+Diff line change
           - 8.2
           - 8.3
           - 8.4
 +          - 8.5
     steps:
       - name: Checkout.