From a6925613f48b9228d7cb6ed3fd0361b7d27f0267 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Thu, 13 Sep 2018 01:05:54 +0200 Subject: [PATCH] travis: uses NCS 2 & CS 3 --- .travis.yml | 8 ++++---- tests/coding-standard.neon | 13 ------------- tests/coding-standard.yml | 13 +++++++++++++ 3 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 tests/coding-standard.neon create mode 100644 tests/coding-standard.yml diff --git a/.travis.yml b/.travis.yml index 7206cbf48..6e001d760 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,13 +23,13 @@ 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 -i tests/Utils/fixtures.reflection - - php temp/coding-standard/ecs check src tests --config tests/coding-standard.neon + - php temp/code-checker/code-checker --strict-types -i tests/Utils/fixtures.reflection + - php temp/coding-standard/ecs check src tests --config tests/coding-standard.yml - stage: Static Analysis diff --git a/tests/coding-standard.neon b/tests/coding-standard.neon deleted file mode 100644 index b56c2d7f6..000000000 --- a/tests/coding-standard.neon +++ /dev/null @@ -1,13 +0,0 @@ -includes: - - ../temp/coding-standard/coding-standard-php71.neon - -parameters: - skip: - PHP_CodeSniffer\Standards\PSR1\Sniffs\Methods\CamelCapsMethodNameSniff: - - tests/Utils/FileSystem.phpt # RemoteStream extends streamWrapper - - PhpCsFixer\Fixer\Import\SingleImportPerStatementFixer: - - src/Utils/Arrays.php # use function - - src/Utils/Callback.php # use function - - src/Utils/Html.php # use function - - src/Utils/Strings.php # use function diff --git a/tests/coding-standard.yml b/tests/coding-standard.yml new file mode 100644 index 000000000..be180e6e1 --- /dev/null +++ b/tests/coding-standard.yml @@ -0,0 +1,13 @@ +imports: + - { resource: '../temp/coding-standard/coding-standard-php71.yml' } + +parameters: + skip: + PHP_CodeSniffer\Standards\PSR1\Sniffs\Methods\CamelCapsMethodNameSniff: + - tests/Utils/FileSystem.phpt # RemoteStream extends streamWrapper + + PhpCsFixer\Fixer\Import\SingleImportPerStatementFixer: + - src/Utils/Arrays.php # use function + - src/Utils/Callback.php # use function + - src/Utils/Html.php # use function + - src/Utils/Strings.php # use function