Skip to content

Commit b1b2ade

Browse files
Upgrade symplify/easy-coding-standard package to 12.2 (#4367)
2 parents d545549 + 3d8940d commit b1b2ade

10 files changed

Lines changed: 168 additions & 369 deletions

File tree

.github/workflows/run-checks-tests.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,5 @@ jobs:
2525
tools: composer
2626
- name: Install Composer dependencies
2727
run: composer update --optimize-autoloader --no-interaction ${{ matrix.composer-prefered-dependencies }}
28-
- name: Run parallel-lint
29-
run: php vendor/bin/parallel-lint ./src ./tests ./examples
30-
- name: Run Easy Coding Standards
31-
run: php vendor/bin/ecs check --verbose ./src ./tests ./examples
3228
- name: Run PHPUnit
3329
run: php vendor/bin/phpunit tests

composer.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,19 @@
1818
"require": {
1919
"php": "^8.3",
2020
"ext-tokenizer": "*",
21-
"friendsofphp/php-cs-fixer": "^3.3.1",
21+
"friendsofphp/php-cs-fixer": "^3.50.0",
2222
"nette/utils": "^3.1.3",
2323
"php-parallel-lint/php-parallel-lint": "^1.3.1",
2424
"phpstan/phpstan": "^1.6.8",
2525
"slevomat/coding-standard": "~8.15.0",
2626
"squizlabs/php_codesniffer": "^3.6.2",
2727
"symfony/finder": "^5.4",
28-
"symplify/easy-coding-standard": "^10.3.3"
28+
"symplify/easy-coding-standard": "^12.2.0"
2929
},
3030
"require-dev": {
3131
"phpunit/phpunit": "^11.2.1",
3232
"nikic/php-parser": "^5.0"
3333
},
34-
"conflict": {
35-
"friendsofphp/php-cs-fixer": ">=3.50.0"
36-
},
3734
"autoload": {
3835
"psr-4": {
3936
"Shopsys\\CodingStandards\\": "src/"

ecs.php

Lines changed: 156 additions & 205 deletions
Large diffs are not rendered by default.

src/CsFixer/RedundantMarkDownTrailingSpacesFixer.php

Lines changed: 0 additions & 91 deletions
This file was deleted.

src/SetList/SetList.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Shopsys\CodingStandards\SetList;
6+
7+
class SetList
8+
{
9+
public const string SHOPSYS_CODING_STANDARD = __DIR__ . '/../../ecs.php';
10+
}

tests/Unit/CsFixer/RedundantMarkDownTrailingSpacesFixer/RedundantMarkDownTrailingSpacesFixerTest.php

Lines changed: 0 additions & 29 deletions
This file was deleted.

tests/Unit/CsFixer/RedundantMarkDownTrailingSpacesFixer/config.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/Unit/CsFixer/RedundantMarkDownTrailingSpacesFixer/correct/correct.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

tests/Unit/CsFixer/RedundantMarkDownTrailingSpacesFixer/fixed/fixed.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

tests/Unit/CsFixer/RedundantMarkDownTrailingSpacesFixer/wrong/wrong.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)