diff --git a/.travis.yml b/.travis.yml index 1a518ecec..ff7212eec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,13 +25,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 - - php temp/coding-standard/ecs check src tests --config tests/coding-standard.neon + - php temp/code-checker/code-checker + - php temp/coding-standard/ecs check src tests --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 b6abf1fad..000000000 --- a/tests/coding-standard.neon +++ /dev/null @@ -1,7 +0,0 @@ -includes: - - ../temp/coding-standard/coding-standard-php56.neon - -parameters: - skip: - PHP_CodeSniffer\Standards\PSR1\Sniffs\Methods\CamelCapsMethodNameSniff: - - tests/Utils/FileSystem.phpt # RemoteStream extends streamWrapper diff --git a/tests/coding-standard.yml b/tests/coding-standard.yml new file mode 100644 index 000000000..650908972 --- /dev/null +++ b/tests/coding-standard.yml @@ -0,0 +1,7 @@ +imports: + - { resource: '../temp/coding-standard/coding-standard-php56.yml' } + +parameters: + skip: + PHP_CodeSniffer\Standards\PSR1\Sniffs\Methods\CamelCapsMethodNameSniff: + - tests/Utils/FileSystem.phpt # RemoteStream extends streamWrapper