diff --git a/.travis.yml b/.travis.yml index 5f35bbf0..2961c51f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,12 +29,12 @@ jobs: php: 7.1 install: # Install Nette Code Checker - - travis_retry composer create-project nette/code-checker temp/code-checker ~2 --no-progress + - travis_retry composer create-project nette/code-checker temp/code-checker ^3 --no-progress # Install Nette Coding Standard - - travis_retry composer create-project nette/coding-standard temp/coding-standard --no-progress + - travis_retry composer create-project nette/coding-standard temp/coding-standard ^2 --no-progress script: - - php temp/code-checker/src/code-checker.php --short-arrays --strict-types - - php temp/coding-standard/ecs check src tests examples --config tests/coding-standard.neon + - php temp/code-checker/code-checker --strict-types + - php temp/coding-standard/ecs check src tests examples --config tests/coding-standard.yml - stage: Code Coverage diff --git a/tests/coding-standard.neon b/tests/coding-standard.neon deleted file mode 100644 index 1bc8b74e..00000000 --- a/tests/coding-standard.neon +++ /dev/null @@ -1,7 +0,0 @@ -includes: - - ../temp/coding-standard/coding-standard-php71.neon - -parameters: - skip: - PhpCsFixer\Fixer\Operator\TernaryToNullCoalescingFixer: - - src/Dibi/HashMap.php # issue #260 diff --git a/tests/coding-standard.yml b/tests/coding-standard.yml new file mode 100644 index 00000000..cb09844e --- /dev/null +++ b/tests/coding-standard.yml @@ -0,0 +1,7 @@ +imports: + - { resource: '../temp/coding-standard/coding-standard-php71.yml' } + +parameters: + skip: + PhpCsFixer\Fixer\Operator\TernaryToNullCoalescingFixer: + - src/Dibi/HashMap.php # issue #260