From aa4566b5abad39f79504375bb06870c85fb5098d Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sun, 30 Nov 2025 12:06:00 +0300 Subject: [PATCH 1/3] PHP 8.5 support --- .github/workflows/composer-require-checker.yml | 2 +- .github/workflows/db-mssql.yml | 1 + .github/workflows/db-mysql.yml | 1 + .github/workflows/db-oracle.yml | 1 + .github/workflows/db-pgsql.yml | 1 + .github/workflows/db-sqlite.yml | 1 + .github/workflows/mutation.yml | 2 +- .github/workflows/rector-cs.yml | 2 +- README.md | 2 +- composer.json | 14 ++++++++++---- tools/.gitignore | 2 ++ tools/infection/composer.json | 10 ++++++++++ tools/psalm/composer.json | 5 +++++ 13 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 tools/.gitignore create mode 100644 tools/infection/composer.json create mode 100644 tools/psalm/composer.json diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml index 1face1f24..2f8aece62 100644 --- a/.github/workflows/composer-require-checker.yml +++ b/.github/workflows/composer-require-checker.yml @@ -25,6 +25,6 @@ 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'] required-packages: >- ['db'] diff --git a/.github/workflows/db-mssql.yml b/.github/workflows/db-mssql.yml index b9d2b0c52..f41302a69 100644 --- a/.github/workflows/db-mssql.yml +++ b/.github/workflows/db-mssql.yml @@ -40,6 +40,7 @@ jobs: - 8.2 - 8.3 - 8.4 + - 8.5 services: mssql: diff --git a/.github/workflows/db-mysql.yml b/.github/workflows/db-mysql.yml index 6f3e05c2e..72aff8f72 100644 --- a/.github/workflows/db-mysql.yml +++ b/.github/workflows/db-mysql.yml @@ -40,6 +40,7 @@ jobs: - 8.2 - 8.3 - 8.4 + - 8.5 services: mysql: diff --git a/.github/workflows/db-oracle.yml b/.github/workflows/db-oracle.yml index 651c53be9..f424c9f24 100644 --- a/.github/workflows/db-oracle.yml +++ b/.github/workflows/db-oracle.yml @@ -40,6 +40,7 @@ jobs: - 8.2 - 8.3 - 8.4 + - 8.5 services: oci: diff --git a/.github/workflows/db-pgsql.yml b/.github/workflows/db-pgsql.yml index 109eb223d..9012a1399 100644 --- a/.github/workflows/db-pgsql.yml +++ b/.github/workflows/db-pgsql.yml @@ -38,6 +38,7 @@ jobs: - 8.2 - 8.3 - 8.4 + - 8.5 services: postgres: diff --git a/.github/workflows/db-sqlite.yml b/.github/workflows/db-sqlite.yml index 81328d6d3..9b0fa2722 100644 --- a/.github/workflows/db-sqlite.yml +++ b/.github/workflows/db-sqlite.yml @@ -44,6 +44,7 @@ jobs: - 8.2 - 8.3 - 8.4 + - 8.5 steps: - name: Checkout. diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index 639e72daf..19688b50e 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -32,7 +32,7 @@ jobs: os: - ubuntu-latest php: - - 8.4 + - 8.5 services: postgres: diff --git a/.github/workflows/rector-cs.yml b/.github/workflows/rector-cs.yml index 3c670a95f..d6a42ee5f 100644 --- a/.github/workflows/rector-cs.yml +++ b/.github/workflows/rector-cs.yml @@ -24,6 +24,6 @@ jobs: token: ${{ secrets.YIISOFT_GITHUB_TOKEN }} with: repository: ${{ github.event.pull_request.head.repo.full_name }} - php: '8.4' + php: '8.5' required-packages: >- ['db'] diff --git a/README.md b/README.md index 33bdb8e58..4642c3dad 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Supported databases: ## Requirements -- PHP 8.1 - 8.4. +- PHP 8.1 - 8.5. ## Installation diff --git a/composer.json b/composer.json index 01923e861..a7857f5c3 100644 --- a/composer.json +++ b/composer.json @@ -29,18 +29,17 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": "8.1 - 8.4", + "php": "8.1 - 8.5", "yiisoft/db": "dev-master" }, "require-dev": { "ext-pdo": "*", + "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.58", "rector/rector": "^2.2.3", - "roave/infection-static-analysis-plugin": "^1.35", "spatie/phpunit-watcher": "^1.24", - "vimeo/psalm": "^5.26.1 || ^6.8.8", "yiisoft/aliases": "^2.0", "yiisoft/arrays": "^3.2", "yiisoft/cache": "^3.1", @@ -74,10 +73,17 @@ "Yiisoft\\ActiveRecord\\Tests\\": "tests" } }, + "extra": { + "bamarni-bin": { + "bin-links": true, + "target-directory": "tools", + "forward-command": true + } + }, "config": { "sort-packages": true, "allow-plugins": { - "infection/extension-installer": true, + "bamarni/composer-bin-plugin": true, "composer/package-versions-deprecated": true } }, diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 000000000..cf452dcfc --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1,2 @@ +/*/vendor +/*/composer.lock diff --git a/tools/infection/composer.json b/tools/infection/composer.json new file mode 100644 index 000000000..18be2ea10 --- /dev/null +++ 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 new file mode 100644 index 000000000..44e11e3ef --- /dev/null +++ b/tools/psalm/composer.json @@ -0,0 +1,5 @@ +{ + "require-dev": { + "vimeo/psalm": "^5.26.1 || ^6.8.8" + } +} From c3626fbd53e9589feb38298e5c4d8cd81f54e178 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sun, 30 Nov 2025 16:35:06 +0300 Subject: [PATCH 2/3] fix --- .github/workflows/mutation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index 19688b50e..60038ead3 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -57,8 +57,8 @@ jobs: ini-values: memory_limit=-1 coverage: pcov - - name: Update composer. - run: composer self-update + - name: Install Composer dependencies + uses: ramsey/composer-install@v3 - name: Remove unused dependencies of DB drivers run: composer remove --dev yiisoft/db-sqlite yiisoft/db-mysql yiisoft/db-mssql yiisoft/db-oracle From 1ba2293b11f3d1b65a437fe7044b1bed0ed3549d Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Tue, 2 Dec 2025 11:07:14 +0300 Subject: [PATCH 3/3] fix --- .github/workflows/mutation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index d5ec1ee63..202eb5e68 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -71,6 +71,6 @@ jobs: - name: Run infection. run: | - vendor/bin/roave-infection-static-analysis-plugin --threads=2 --ignore-msi-with-no-mutations --min-covered-msi=100 --test-framework-options="--testsuite=Pgsql" + vendor/bin/infection --threads=2 --ignore-msi-with-no-mutations --min-covered-msi=100 --test-framework-options="--testsuite=Pgsql" env: STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}