diff --git a/.github/workflows/bc.yml b/.github/workflows/bc.yml index 3276dd02..ffbd2ed1 100644 --- a/.github/workflows/bc.yml +++ b/.github/workflows/bc.yml @@ -24,4 +24,4 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.4'] + ['8.5'] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0473d1cb..86dc06f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,9 @@ jobs: php: - 8.1 - 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 index 777dc57d..28b516dd 100644 --- a/.github/workflows/composer-require-checker.yml +++ b/.github/workflows/composer-require-checker.yml @@ -31,6 +31,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/mssql.yml b/.github/workflows/mssql.yml index 0607ba40..8611f9b2 100644 --- a/.github/workflows/mssql.yml +++ b/.github/workflows/mssql.yml @@ -41,6 +41,7 @@ jobs: - 8.2 - 8.3 - 8.4 + - 8.5 services: mssql: diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index c2ca5cef..89bc6723 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -33,7 +33,7 @@ jobs: strategy: matrix: php: - - 8.4 + - 8.5 services: postgres: @@ -58,8 +58,8 @@ jobs: ini-values: date.timezone='UTC' coverage: pcov - - name: Update composer. - run: composer self-update + - name: Install Composer dependencies + uses: ramsey/composer-install@v3 - name: Install db and db-pgsql. uses: yiisoft/actions/install-packages@master @@ -69,6 +69,6 @@ jobs: - name: Run infection. run: | - vendor/bin/roave-infection-static-analysis-plugin --threads=2 --ignore-msi-with-no-mutations --only-covered --test-framework-options="--testsuite=Pgsql" + vendor/bin/infection --threads=2 --ignore-msi-with-no-mutations --test-framework-options="--testsuite=Pgsql" env: STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }} diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index 1145b9ba..e9eab9ce 100644 --- a/.github/workflows/mysql.yml +++ b/.github/workflows/mysql.yml @@ -41,6 +41,7 @@ jobs: - 8.2 - 8.3 - 8.4 + - 8.5 services: mysql: diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index 07f797ee..4a9678e2 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -41,6 +41,7 @@ jobs: - 8.2 - 8.3 - 8.4 + - 8.5 services: oci: diff --git a/.github/workflows/pgsql.yml b/.github/workflows/pgsql.yml index 6c965129..1f2036cb 100644 --- a/.github/workflows/pgsql.yml +++ b/.github/workflows/pgsql.yml @@ -41,6 +41,7 @@ jobs: - 8.2 - 8.3 - 8.4 + - 8.5 services: postgres: diff --git a/.github/workflows/rector-cs.yml b/.github/workflows/rector-cs.yml index 0c2dbd61..9410a414 100644 --- a/.github/workflows/rector-cs.yml +++ b/.github/workflows/rector-cs.yml @@ -26,6 +26,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/.github/workflows/sqlite.yml b/.github/workflows/sqlite.yml index 367c8d1a..288a514d 100644 --- a/.github/workflows/sqlite.yml +++ b/.github/workflows/sqlite.yml @@ -43,7 +43,9 @@ jobs: php: - 8.1 - 8.2 + - 8.3 - 8.4 + - 8.5 steps: - name: Checkout. diff --git a/CHANGELOG.md b/CHANGELOG.md index 09b298f2..09413efd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - Chg #279: Use `ColumnBuilder` class to create table column definitions (@Tigrov) - Enh #282, #283, #293: Adapt to Yii DB changes (@Tigrov) - Bug #286: Explicitly mark nullable parameters (@vjik) -- Chg #287: Change supported PHP versions to `8.1 - 8.4` (@Tigrov) +- Chg #287, #308: Change supported PHP versions to `8.1 - 8.5` (@Tigrov, @vjik) - Enh #287: Minor refactoring (@Tigrov) - Enh #289: Revert transactional migration when adding migration to history fails (@Tigrov) - Chg #290: Remove `ext-filter` from `require` section of `composer.json` (@Tigrov) diff --git a/README.md b/README.md index 9e1c9339..8b0061f9 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Supports the following databases out of the box: ## Requirements -- PHP 8.1 - 8.4. +- PHP 8.1 - 8.5. ## Installation diff --git a/composer.json b/composer.json index 5a77b8cb..d160d913 100644 --- a/composer.json +++ b/composer.json @@ -31,19 +31,18 @@ } ], "require": { - "php": "8.1 - 8.4", + "php": "8.1 - 8.5", "symfony/console": "^6.0|^7.0", "yiisoft/db": "dev-master", "yiisoft/injector": "^1.2" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.3", "friendsofphp/php-cs-fixer": "^3.89.2", "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/db-sqlite": "dev-master", "yiisoft/di": "^1.3", "yiisoft/files": "^2.0", @@ -69,6 +68,11 @@ } }, "extra": { + "bamarni-bin": { + "bin-links": true, + "target-directory": "tools", + "forward-command": true + }, "config-plugin-options": { "source-directory": "config" }, @@ -80,7 +84,7 @@ "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" + } +}