From 0ce43d57d2617ee38b8e33b54624cd3356024aaa Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sun, 30 Nov 2025 11:56:02 +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.yml | 2 +- CHANGELOG.md | 2 +- README.md | 5 +++++ composer.json | 14 ++++++++++---- tools/.gitignore | 2 ++ tools/infection/composer.json | 10 ++++++++++ tools/psalm/composer.json | 5 +++++ 10 files changed, 39 insertions(+), 9 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 acf4efc0..aeee3259 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.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/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml index 1face1f2..2f8aece6 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 4f33fe7c..064555b0 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -34,7 +34,7 @@ jobs: - ubuntu-latest php: - - 8.4 + - 8.5 services: oci: diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index 3c670a95..d6a42ee5 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.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 f14b44a3..f5bef9f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,7 +34,7 @@ - New #301: Add `IndexType` class (@Tigrov) - New #303: Support JSON type (@Tigrov) - Bug #305: Explicitly mark nullable parameters (@vjik) -- Chg #306: Change supported PHP versions to `8.1 - 8.4` (@Tigrov) +- Chg #306, #385: Change supported PHP versions to `8.1 - 8.5` (@Tigrov, @vjik) - Enh #306: Minor refactoring (@Tigrov) - New #307: Add parameters `$ifExists` and `$cascade` to `CommandInterface::dropTable()` and `DDLQueryBuilderInterface::dropTable()` methods (@vjik) diff --git a/README.md b/README.md index 800880d6..e8d484cc 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,11 @@ a command builder class, and a set of classes for representing database tables a Driver supports Oracle 12c - 21c. +## Requirements + +- PHP 8.1 - 8.5. +- `pdo` PHP extension. + ## Installation The package could be installed with [Composer](https://getcomposer.org): diff --git a/composer.json b/composer.json index 2c335cf6..52fb6da0 100644 --- a/composer.json +++ b/composer.json @@ -31,17 +31,16 @@ ], "require": { "ext-pdo": "*", - "php": "8.1 - 8.4", + "php": "8.1 - 8.5", "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", @@ -63,10 +62,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 00000000..cf452dcf --- /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 00000000..18be2ea1 --- /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 00000000..44e11e3e --- /dev/null +++ b/tools/psalm/composer.json @@ -0,0 +1,5 @@ +{ + "require-dev": { + "vimeo/psalm": "^5.26.1 || ^6.8.8" + } +} From d62051898ee8fe0a75e175fc66cd99cd08ccc948 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sun, 30 Nov 2025 16:29:35 +0300 Subject: [PATCH 2/2] fix --- .github/workflows/mutation.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index 064555b0..9d9fd50a 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -66,6 +66,9 @@ jobs: ini-values: memory_limit=-1 coverage: pcov + - name: Install Composer dependencies + uses: ramsey/composer-install@v3 + - name: Install db. uses: yiisoft/actions/install-packages@master with: