From 12101ec1fe6af54841b607c3f19e57aec159d08d Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sun, 30 Nov 2025 11:59:14 +0300 Subject: [PATCH 1/2] PHP 8.5 support --- .github/workflows/build.yml | 4 +++- .github/workflows/composer-require-checker.yml | 2 +- .github/workflows/mutation.yml | 2 +- .github/workflows/rector-cs.yml | 2 +- CHANGELOG.md | 2 +- README.md | 2 +- composer.json | 14 ++++++++++---- tools/.gitignore | 2 ++ tools/infection/composer.json | 10 ++++++++++ tools/psalm/composer.json | 5 +++++ 10 files changed, 35 insertions(+), 10 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/build.yml b/.github/workflows/build.yml index 8a1ec339c..1984d676f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: strategy: matrix: php: - - 8.4 + - 8.5 pgsql: - 9 @@ -56,6 +56,8 @@ jobs: pgsql: 17 - php: 8.3 pgsql: 17 + - php: 8.4 + pgsql: 17 services: postgres: 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/mutation.yml b/.github/workflows/mutation.yml index 6e8837040..3f790201f 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -34,7 +34,7 @@ jobs: - 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/CHANGELOG.md b/CHANGELOG.md index 32a9e6579..5907dd388 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,7 +32,7 @@ - New #384: Add `IndexMethod` class (@Tigrov) - Bug #387: Explicitly mark nullable parameters (@vjik) - Enh #386, #449: Refactor array, structured and JSON expression builders (@Tigrov) -- Chg #388: Change supported PHP versions to `8.1 - 8.4` (@Tigrov) +- Chg #388, #469: Change supported PHP versions to `8.1 - 8.5` (@Tigrov, @vjik) - Enh #388: Minor refactoring (@Tigrov) - Chg #390: Remove `yiisoft/json` dependency (@Tigrov) - Enh #393, #430: Refactor according changes in `db` package (@Tigrov) diff --git a/README.md b/README.md index a03d93cf1..dd45f1184 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Driver supports PostgreSQL 9 or higher. ## Requirements -- PHP 8.1 - 8.4. +- PHP 8.1 - 8.5. - `pdo_pgsql` PHP extension. ## Installation diff --git a/composer.json b/composer.json index b58afefa5..d999f6ea2 100644 --- a/composer.json +++ b/composer.json @@ -31,19 +31,18 @@ } ], "require": { - "php": "8.1 - 8.4", + "php": "8.1 - 8.5", "ext-pdo": "*", "ext-pdo_pgsql": "*", "yiisoft/db": "dev-master" }, "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", "vlucas/phpdotenv": "^5.6.1", "yiisoft/aliases": "^2.0", "yiisoft/psr-dummy-provider": "^1.0", @@ -65,10 +64,17 @@ }, "files": ["tests/bootstrap.php"] }, + "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 0ad00d794223aa21dad6471de455946e044285b1 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sun, 30 Nov 2025 16:30:11 +0300 Subject: [PATCH 2/2] 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 3f790201f..5d249a45c 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -59,8 +59,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: Install db. uses: yiisoft/actions/install-packages@master