From b9683f8a3c895306fda4d5e5cab221c9212cb2ce Mon Sep 17 00:00:00 2001 From: David Grudl Date: Sun, 25 Oct 2020 17:25:28 +0100 Subject: [PATCH] updated nette/coding-standard --- .travis.yml | 5 ++--- ecs.php | 21 +++++++++++++++++++++ tests/coding-standard.yml | 7 ------- 3 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 ecs.php delete mode 100644 tests/coding-standard.yml diff --git a/.travis.yml b/.travis.yml index ebac7525..a2a20139 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,6 @@ after_failure: jobs: include: - name: Nette Code Checker - php: 7.4 install: - travis_retry composer create-project nette/code-checker temp/code-checker ^3 --no-progress script: @@ -43,9 +42,9 @@ jobs: - name: Nette Coding Standard php: 7.4 install: - - travis_retry composer create-project nette/coding-standard temp/coding-standard ^2 --no-progress + - travis_retry composer create-project nette/coding-standard temp/coding-standard ^3 --no-progress script: - - php temp/coding-standard/ecs check src tests examples --config tests/coding-standard.yml + - php temp/coding-standard/ecs check src tests - stage: Static Analysis (informative) diff --git a/ecs.php b/ecs.php new file mode 100644 index 00000000..c169402d --- /dev/null +++ b/ecs.php @@ -0,0 +1,21 @@ +import(PRESET_DIR . '/php71.php'); + + $parameters = $containerConfigurator->parameters(); + + $parameters->set('skip', [ + // issue #260 + PhpCsFixer\Fixer\Operator\TernaryToNullCoalescingFixer::class => ['src/Dibi/HashMap.php'], + SlevomatCodingStandard\Sniffs\ControlStructures\RequireNullCoalesceOperatorSniff::class => ['src/Dibi/HashMap.php'], + ]); +}; diff --git a/tests/coding-standard.yml b/tests/coding-standard.yml deleted file mode 100644 index cb09844e..00000000 --- a/tests/coding-standard.yml +++ /dev/null @@ -1,7 +0,0 @@ -imports: - - { resource: '../temp/coding-standard/coding-standard-php71.yml' } - -parameters: - skip: - PhpCsFixer\Fixer\Operator\TernaryToNullCoalescingFixer: - - src/Dibi/HashMap.php # issue #260