From c300b181ed08170332dd1e067655847402ba502f Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 8 Jun 2026 09:22:36 +0100 Subject: [PATCH 1/2] Register missing fixers in default set, enforce CS in CI, fix README --- .github/workflows/code_analysis.yaml | 33 ++++++++++++++++++++++------ README.md | 4 ++-- config/symplify.php | 4 ++++ 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.github/workflows/code_analysis.yaml b/.github/workflows/code_analysis.yaml index 429cc80a..0455fad0 100644 --- a/.github/workflows/code_analysis.yaml +++ b/.github/workflows/code_analysis.yaml @@ -30,11 +30,7 @@ jobs: - name: 'Coding Standard' - run: composer fix-cs --ansi - - - - name: 'Tests' - run: vendor/bin/phpunit + run: composer check-cs --ansi - name: 'Check Active Classes' @@ -44,7 +40,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # see https://github.com/shivammathur/setup-php - uses: shivammathur/setup-php@v2 @@ -53,7 +49,7 @@ jobs: coverage: none # composer install cache - https://github.com/ramsey/composer-install - - uses: "ramsey/composer-install@v2" + - uses: "ramsey/composer-install@v3" # Override code from symplify/coding-standard shipped with ECS - run: | @@ -61,3 +57,26 @@ jobs: ln -s $PWD/src vendor/symplify/easy-coding-standard/vendor/symplify/coding-standard/ - run: ${{ matrix.actions.run }} + + tests: + strategy: + fail-fast: false + matrix: + php-version: [ '8.2', '8.3', '8.4' ] + + name: Tests (PHP ${{ matrix.php-version }}) + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + # see https://github.com/shivammathur/setup-php + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + coverage: none + + # composer install cache - https://github.com/ramsey/composer-install + - uses: "ramsey/composer-install@v3" + + - run: vendor/bin/phpunit diff --git a/README.md b/README.md index 48c2ebd1..2fa0a1dc 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ vendor/bin/ecs --fix
-# 12 Rules to Keep Your Code Clean +# 14 Rules to Keep Your Code Clean ## ArrayListItemNewlineFixer @@ -165,7 +165,7 @@ Remove docblock descriptions which duplicate their property name Remove docblock descriptions which duplicate their method name -- class: [`Symplify\CodingStandard\Fixer\Annotation\RemoveRedundantDescriptionFixer`](../src/Fixer/Annotation/RemoveRedundantDescriptionFixer.php) +- class: [`Symplify\CodingStandard\Fixer\Annotation\RemoveMethodNameDuplicateDescriptionFixer`](../src/Fixer/Annotation/RemoveMethodNameDuplicateDescriptionFixer.php) ```diff /** diff --git a/config/symplify.php b/config/symplify.php index e4ea86d1..b9922804 100644 --- a/config/symplify.php +++ b/config/symplify.php @@ -8,11 +8,13 @@ use Symplify\CodingStandard\Fixer\Annotation\RemovePropertyVariableNameDescriptionFixer; use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayListItemNewlineFixer; use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayOpenerAndCloserNewlineFixer; +use Symplify\CodingStandard\Fixer\ArrayNotation\StandaloneLineInMultilineArrayFixer; use Symplify\CodingStandard\Fixer\Commenting\ParamReturnAndVarTagMalformsFixer; use Symplify\CodingStandard\Fixer\Commenting\RemoveUselessDefaultCommentFixer; use Symplify\CodingStandard\Fixer\LineLength\LineLengthFixer; use Symplify\CodingStandard\Fixer\Spacing\MethodChainingNewlineFixer; use Symplify\CodingStandard\Fixer\Spacing\SpaceAfterCommaHereNowDocFixer; +use Symplify\CodingStandard\Fixer\Spacing\StandaloneLineConstructorParamFixer; use Symplify\CodingStandard\Fixer\Spacing\StandaloneLinePromotedPropertyFixer; use Symplify\CodingStandard\Fixer\Strict\BlankLineAfterStrictTypesFixer; use Symplify\EasyCodingStandard\Config\ECSConfig; @@ -29,7 +31,9 @@ // arrays ArrayListItemNewlineFixer::class, ArrayOpenerAndCloserNewlineFixer::class, + StandaloneLineInMultilineArrayFixer::class, StandaloneLinePromotedPropertyFixer::class, + StandaloneLineConstructorParamFixer::class, // newlines MethodChainingNewlineFixer::class, From 7f2a924e43d6fb7ddda6a631bb82ee93b78e5019 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 8 Jun 2026 09:29:27 +0100 Subject: [PATCH 2/2] Keep unit tests in code_analysis matrix --- .github/workflows/code_analysis.yaml | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/.github/workflows/code_analysis.yaml b/.github/workflows/code_analysis.yaml index 0455fad0..da111f3e 100644 --- a/.github/workflows/code_analysis.yaml +++ b/.github/workflows/code_analysis.yaml @@ -32,6 +32,10 @@ jobs: name: 'Coding Standard' run: composer check-cs --ansi + - + name: 'Tests' + run: vendor/bin/phpunit + - name: 'Check Active Classes' run: vendor/bin/class-leak check src --ansi @@ -57,26 +61,3 @@ jobs: ln -s $PWD/src vendor/symplify/easy-coding-standard/vendor/symplify/coding-standard/ - run: ${{ matrix.actions.run }} - - tests: - strategy: - fail-fast: false - matrix: - php-version: [ '8.2', '8.3', '8.4' ] - - name: Tests (PHP ${{ matrix.php-version }}) - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - # see https://github.com/shivammathur/setup-php - - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-version }} - coverage: none - - # composer install cache - https://github.com/ramsey/composer-install - - uses: "ramsey/composer-install@v3" - - - run: vendor/bin/phpunit