From 7b82fca4c7eb3cf93ce356c5e47b54cfac9ffb48 Mon Sep 17 00:00:00 2001 From: meyerbaptiste Date: Thu, 13 Apr 2017 15:13:13 +0200 Subject: [PATCH] Add an .editorconfig file --- .editorconfig | 8 ++++++++ .travis.yml | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..5177e9e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,8 @@ +root = true +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/.travis.yml b/.travis.yml index 3c74b4f..e000442 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,35 +3,35 @@ language: php sudo: false cache: - directories: - - $HOME/.composer/cache + directories: + - $HOME/.composer/cache matrix: - fast_finish: true - include: - - php: 5.5 - - php: 5.5 - env: deps='low' lint=1 - - php: 5.6 - - php: 5.6 - env: deps='low' - - php: 7.0 - - php: 7.0 - env: deps='low' - - php: 7.1 - - php: 7.1 - env: deps='low' - - php: hhvm - - php: hhvm - env: deps='low' + fast_finish: true + include: + - php: 5.5 + - php: 5.5 + env: deps='low' lint=1 + - php: 5.6 + - php: 5.6 + env: deps='low' + - php: 7.0 + - php: 7.0 + env: deps='low' + - php: 7.1 + - php: 7.1 + env: deps='low' + - php: hhvm + - php: hhvm + env: deps='low' before_install: - - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.1.1/php-cs-fixer.phar; fi + - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.1.1/php-cs-fixer.phar; fi install: - - if [[ ! $deps ]]; then composer update --prefer-dist --no-progress --no-suggest --ansi; fi - - if [[ $deps = 'low' ]]; then composer update --prefer-dist --no-progress --no-suggest --prefer-stable --prefer-lowest --ansi; fi + - if [[ ! $deps ]]; then composer update --prefer-dist --no-progress --no-suggest --ansi; fi + - if [[ $deps = 'low' ]]; then composer update --prefer-dist --no-progress --no-suggest --prefer-stable --prefer-lowest --ansi; fi script: - - if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff; fi - - vendor/bin/phpunit - - vendor/bin/behat + - if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff; fi + - vendor/bin/phpunit + - vendor/bin/behat