From 0374baa8a8299780f5284c44da6d23440b081f3d Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Wed, 26 May 2021 11:24:36 +0100 Subject: [PATCH] update ECS and composer.json, allow PHP 7.2+ --- .github/workflows/coding_standard.yaml | 4 ++-- composer.json | 6 ++++-- ecs.php | 15 +++++---------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/coding_standard.yaml b/.github/workflows/coding_standard.yaml index fa949ec..2fa1066 100644 --- a/.github/workflows/coding_standard.yaml +++ b/.github/workflows/coding_standard.yaml @@ -12,9 +12,9 @@ jobs: # see https://github.com/shivammathur/setup-php - uses: shivammathur/setup-php@v2 with: - php-version: 7.4 + php-version: 8.0 coverage: none - run: composer install --no-progress --ansi - - run: vendor/bin/ecs check-markdown README.md --ansi \ No newline at end of file + - run: vendor/bin/ecs check-markdown README.md --ansi diff --git a/composer.json b/composer.json index a9d7503..9c258aa 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,9 @@ { + "name": "jupeter/clean-code-php", + "description": "Clean Code concepts adapted for PHP", "require": { - "php": "^7.2", - "symplify/easy-coding-standard": "^8.3" + "php": ">=7.2", + "symplify/easy-coding-standard": "^9.3" }, "scripts": { "check-cs": "vendor/bin/ecs check-markdown README.md", diff --git a/ecs.php b/ecs.php index 9b945f6..b2e209e 100644 --- a/ecs.php +++ b/ecs.php @@ -11,19 +11,14 @@ use Symplify\EasyCodingStandard\ValueObject\Set\SetList; return static function (ContainerConfigurator $containerConfigurator): void { + $containerConfigurator->import(SetList::COMMON); + $containerConfigurator->import(SetList::CLEAN_CODE); + $containerConfigurator->import(SetList::PSR_12); + $containerConfigurator->import(SetList::SYMPLIFY); + $parameters = $containerConfigurator->parameters(); $parameters->set(Option::PATHS, [__DIR__ . '/src', __DIR__ . '/config', __DIR__ . '/ecs.php']); - $parameters->set(Option::SETS, [ - SetList::COMMON, - SetList::CLEAN_CODE, - SetList::DEAD_CODE, - SetList::PSR_12, - SetList::PHP_70, - SetList::PHP_71, - SetList::SYMPLIFY, - ]); - $parameters->set(Option::SKIP, [ BlankLineAfterOpeningTagFixer::class => null, StrictComparisonFixer::class => null,