diff --git a/.gitignore b/.gitignore index 3ac8fd5b..b9b8922e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea/ +.php_cs .php_cs.cache .vagrant build.properties diff --git a/.php_cs b/.php_cs.dist similarity index 100% rename from .php_cs rename to .php_cs.dist diff --git a/.travis.yml b/.travis.yml index 26f576d6..7499a729 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ before_script: - php public/index.php migrations:migrate --no-interaction --verbose script: - - vendor/bin/php-cs-fixer fix --config-file=./.php_cs --dry-run --diff -v + - vendor/bin/php-cs-fixer fix --config-file=./.php_cs.dist --dry-run --diff -v - vendor/bin/phpunit --configuration phpunit.xml notifications: diff --git a/Makefile b/Makefile index b4f11655..6d26056d 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ composer: composer install --prefer-dist cs: composer - vendor/bin/php-cs-fixer fix --config-file=.php_cs --diff --verbose + vendor/bin/php-cs-fixer fix --config-file=.php_cs.dist --diff --verbose test: composer cp config/autoload/travis.php.local.dist config/autoload/travis.local.php