diff --git a/.php_cs b/.php_cs index 49ee926957e..83782b0f551 100644 --- a/.php_cs +++ b/.php_cs @@ -1,14 +1,14 @@ in(__DIR__); -use SLLH\StyleCIBridge\ConfigBridge; +$config = PhpCsFixer\Config::create() + ->setRiskyAllowed(true) + ->setRules([ -$config = ConfigBridge::create(); -$config->setUsingCache(true); - -if (method_exists($config, 'setRiskyAllowed')) { - $config->setRiskyAllowed(true); -} + ]) + ->setFinder($finder) +; return $config; diff --git a/.travis.yml b/.travis.yml index 6aa267626d5..07916214473 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,13 @@ language: php sudo: false cache: - directories: - - vendor - - $HOME/.composer/cache + directories: + - vendor + - $HOME/.composer/cache + +env: + global: + - TEST_COMMAND="vendor/bin/phpunit --verbose --coverage-text" php: - 5.6 @@ -16,9 +20,15 @@ matrix: include: - php: hhvm dist: trusty + - php: 7.2 + name: Backward compatibillity check + env: DEPENDENCIES="roave/backward-compatibility-check" TEST_COMMAND="./vendor/bin/roave-backward-compatibility-check" + +before_install: + - if ! [ -z "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi; install: - travis_retry composer install --no-interaction script: - - vendor/bin/phpunit --verbose --coverage-text + - $TEST_COMMAND diff --git a/composer.json b/composer.json index 9c96c716a3f..903a0365bad 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,6 @@ "php-http/guzzle6-adapter": "^1.0", "php-http/mock-client": "^1.0", "guzzlehttp/psr7": "^1.2", - "sllh/php-cs-fixer-styleci-bridge": "^1.3", "cache/array-adapter": "^0.4" }, "autoload": {