From ae1569dc6529b3745e713a37c1ddac88532a5342 Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Tue, 1 Apr 2025 08:53:52 +0200 Subject: [PATCH 1/2] ci: Add cs2pr handling for php-cs-fixer; avoid doing composer install --- .github/workflows/style-check.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/style-check.yml b/.github/workflows/style-check.yml index 1d228e58..861f7f40 100644 --- a/.github/workflows/style-check.yml +++ b/.github/workflows/style-check.yml @@ -8,11 +8,8 @@ on: branches: - master -env: - COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist" - jobs: - tests: + style-check: name: "Style Check" runs-on: ubuntu-latest @@ -28,10 +25,8 @@ jobs: extensions: "intl, zip" ini-values: "memory_limit=-1, phar.readonly=0, error_reporting=E_ALL, display_errors=On" php-version: "7.4" - tools: composer - - - name: "Update dependencies" - run: "composer update ${{ env.COMPOSER_FLAGS }}" + tools: cs2pr, php-cs-fixer:3.3 - name: "Run style-check" - run: "composer style-check" + run: | + composer style-check -- --format=checkstyle src | cs2pr From d5b1e9a7dfa6994ffad90c802a3d6276c808cc21 Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Tue, 1 Apr 2025 09:00:23 +0200 Subject: [PATCH 2/2] docs: changelog entry --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e03a6255..7dbd7d7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,8 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Use parallel-lint and cs2pr for improved feedback on linting errors ([#812](https://github.com/jsonrainbow/json-schema/pull/812)) - Array with number values with mathematical equality are considered valid ([#813](https://github.com/jsonrainbow/json-schema/pull/813)) -## Changed +### Changed - Correct PHPStan findings in validator ([#808](https://github.com/jsonrainbow/json-schema/pull/808)) +- Add cs2pr handling for php-cs-fixer; avoid doing composer install ([#814](https://github.com/jsonrainbow/json-schema/pull/814)) ## [6.3.1] - 2025-03-18 ### Fixed