From 1bcd67afb1faf866888d3b0171980707f8b32c03 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Fri, 31 Jul 2026 09:44:02 +0300 Subject: [PATCH 1/4] Replace StyleCI to PHP CS Fixer --- .github/workflows/bc.yml_ | 33 ---------------- .github/workflows/build.yml | 38 +++++++++---------- .../workflows/composer-require-checker.yml | 37 ++++++++---------- .github/workflows/mutation.yml | 33 ++++++++-------- .github/workflows/rector-cs.yml | 2 +- .github/workflows/static.yml | 35 ++++++++--------- .github/workflows/zizmor.yml | 20 +++++----- 7 files changed, 75 insertions(+), 123 deletions(-) delete mode 100644 .github/workflows/bc.yml_ diff --git a/.github/workflows/bc.yml_ b/.github/workflows/bc.yml_ deleted file mode 100644 index 00041a9..0000000 --- a/.github/workflows/bc.yml_ +++ /dev/null @@ -1,33 +0,0 @@ -on: - pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'phpunit.xml.dist' - - 'psalm.xml' - push: - branches: ['master'] - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'phpunit.xml.dist' - - 'psalm.xml' - -name: backwards compatibility - -jobs: - roave_bc_check: - uses: yiisoft/actions/.github/workflows/bc.yml@master - with: - os: >- - ['ubuntu-latest'] - php: >- - ['8.1'] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a3ae8b2..0516d51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,29 +1,25 @@ +name: build + on: pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'psalm.xml' - + paths: &paths + - 'migrations/**' + - 'src/**' + - 'tests/**' + - 'phpunit.xml.dist' + - 'composer.json' + - '.github/workflows/build.yml' push: branches: ['master'] - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'psalm.xml' - -name: build + paths: *paths permissions: contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: phpunit: uses: yiisoft/actions/.github/workflows/phpunit.yml@master @@ -31,4 +27,6 @@ jobs: os: >- ['ubuntu-latest', 'windows-latest'] php: >- - ['8.1', '8.2', '8.3'] + ['8.1', '8.2', '8.3', '8.4', '8.5'] + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml index 560a8c0..38ada11 100644 --- a/.github/workflows/composer-require-checker.yml +++ b/.github/workflows/composer-require-checker.yml @@ -1,31 +1,24 @@ +name: Composer require checker + on: pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'phpunit.xml.dist' - - 'psalm.xml' - + paths: &paths + - 'migrations/**' + - 'src/**' + - 'tests/**' + - 'composer.json' + - '.github/workflows/composer-require-checker.yml' push: branches: ['master'] - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'phpunit.xml.dist' - - 'psalm.xml' - -name: Composer require checker + paths: *paths permissions: contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: composer-require-checker: uses: yiisoft/actions/.github/workflows/composer-require-checker.yml@master @@ -33,4 +26,4 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.1', '8.2', '8.3'] + ['8.1', '8.2', '8.3', '8.4', '8.5'] diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index c0c78fc..ccc8ec9 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -1,27 +1,26 @@ +name: mutation test + on: pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'psalm.xml' - + paths: &paths + - 'migrations/**' + - 'src/**' + - 'tests/**' + - 'phpunit.xml.dist' + - 'infection.json.dist' + - 'composer.json' + - '.github/workflows/mutation.yml' push: branches: ['master'] - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'psalm.xml' - -name: mutation test + paths: *paths permissions: contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: mutation: uses: yiisoft/actions/.github/workflows/roave-infection.yml@master diff --git a/.github/workflows/rector-cs.yml b/.github/workflows/rector-cs.yml index 9ecb99e..11ef33c 100644 --- a/.github/workflows/rector-cs.yml +++ b/.github/workflows/rector-cs.yml @@ -21,7 +21,7 @@ concurrency: jobs: rector-cs: permissions: - contents: write # Required to commit formatting fixes back to the PR + contents: write # Required to commit formatting fixes back to the PR uses: yiisoft/actions/.github/workflows/rector-cs.yml@master with: php: '8.1' diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 2047aec..fa79a03 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -1,29 +1,24 @@ +name: static analysis + on: pull_request: - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'phpunit.xml.dist' - + paths: &paths + - 'migrations/**' + - 'src/**' + - 'psalm.xml' + - 'composer.json' + - '.github/workflows/static.yml' push: branches: ['master'] - paths-ignore: - - 'docs/**' - - 'README.md' - - 'CHANGELOG.md' - - '.gitignore' - - '.gitattributes' - - 'infection.json.dist' - - 'phpunit.xml.dist' - -name: static analysis + paths: *paths permissions: contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: psalm: uses: yiisoft/actions/.github/workflows/psalm.yml@master @@ -31,4 +26,4 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.1', '8.2', '8.3'] + ['8.1', '8.2', '8.3', '8.4', '8.5'] diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index 430255d..6ff2a77 100644 --- a/.github/workflows/zizmor.yml +++ b/.github/workflows/zizmor.yml @@ -1,21 +1,21 @@ name: GitHub Actions Security Analysis with zizmor 🌈 on: - push: - branches: - - master - - main - paths: - - '.github/**.yml' - - '.github/**.yaml' pull_request: - paths: + paths: &paths - '.github/**.yml' - '.github/**.yaml' + push: + branches: ['master'] + paths: *paths permissions: - actions: read # Required by zizmor when reading workflow metadata through the API. - contents: read # Required to read workflow files. + actions: read # Required by zizmor when reading workflow metadata through the API + contents: read # Required to read workflow files + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: zizmor: From 6f1678bcc6c2cb863d1535e969cd24393337d9c6 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Fri, 31 Jul 2026 11:46:42 +0300 Subject: [PATCH 2/4] fix --- composer.json | 2 +- psalm.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 74cbad4..0bb2fbf 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "rector/rector": "^2.0.3", "roave/infection-static-analysis-plugin": "^1.34", "spatie/phpunit-watcher": "^1.23", - "vimeo/psalm": "^5.20", + "vimeo/psalm": "^5.26.1 || ^6.16.1", "yiisoft/cache": "^3.2", "yiisoft/code-style": "^1.1", "yiisoft/db-sqlite": "^2.0" diff --git a/psalm.xml b/psalm.xml index 2a2f7e5..3ce6412 100644 --- a/psalm.xml +++ b/psalm.xml @@ -1,6 +1,7 @@ Date: Fri, 31 Jul 2026 11:47:53 +0300 Subject: [PATCH 3/4] fix --- .github/workflows/bc.yml_ | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/bc.yml_ diff --git a/.github/workflows/bc.yml_ b/.github/workflows/bc.yml_ new file mode 100644 index 0000000..ca24241 --- /dev/null +++ b/.github/workflows/bc.yml_ @@ -0,0 +1,26 @@ +name: backwards compatibility + +on: + pull_request: + paths: &paths + - 'src/**' + - 'migrations/**' + - '.github/workflows/bc.yml' + - 'composer.json' + push: + branches: ['master'] + paths: *paths + +permissions: + contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + roave_bc_check: + uses: yiisoft/actions/.github/workflows/bc.yml@master + with: + php: >- + ['8.1'] From 3e243686d7c46cb546af1c2606969eb6b9ce072b Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Fri, 31 Jul 2026 11:48:36 +0300 Subject: [PATCH 4/4] fix --- .github/workflows/rector-cs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rector-cs.yml b/.github/workflows/rector-cs.yml index 11ef33c..9ecb99e 100644 --- a/.github/workflows/rector-cs.yml +++ b/.github/workflows/rector-cs.yml @@ -21,7 +21,7 @@ concurrency: jobs: rector-cs: permissions: - contents: write # Required to commit formatting fixes back to the PR + contents: write # Required to commit formatting fixes back to the PR uses: yiisoft/actions/.github/workflows/rector-cs.yml@master with: php: '8.1'