Skip to content

Commit

Permalink
minor #42 Fix cs-fixer config (ogizanagi)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.x-dev branch.

Discussion
----------

Fix cs-fixer config

Commits
-------

1ae9a1e Fix cs-fixer config
  • Loading branch information
ogizanagi committed Nov 23, 2017
2 parents 527629c + 1ae9a1e commit 7ac0c29
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .php_cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ EOF;

$finder = PhpCsFixer\Finder::create()
->in(__DIR__)
->exclude(__DIR__ . '/tests/Fixtures/Integration/Symfony/app/cache')
->exclude('tests/Fixtures/Integration/Symfony/app/cache')
;

return PhpCsFixer\Config::create()
Expand Down
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ branches:

env:
global:
- CHECK_PHP_SYNTAX="no"
- CHECK_CODE_STYLE="no"
- ENABLE_CODE_COVERAGE="no"
- COMPOSER_FLAGS=""
- SYMFONY_VERSION=""
Expand All @@ -28,7 +28,9 @@ matrix:
env: SYMFONY_VERSION="3.3.*"
# most recent versions
- php: 7.1
env: SYMFONY_VERSION="3.4.*" CHECK_PHP_SYNTAX="yes"
env:
- SYMFONY_VERSION="3.4.*"
- CHECK_CODE_STYLE="yes"
- php: 7.2
env: SYMFONY_VERSION="4.0.*"
# bleeding edge (unreleased dev versions where failures are allowed)
Expand All @@ -44,15 +46,15 @@ cache:
before_install:
- if [[ "$ENABLE_CODE_COVERAGE" != "yes" ]]; then phpenv config-rm xdebug.ini || true; fi;
- if [[ "$SYMFONY_VERSION" != "" ]]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
- if [[ "$CHECK_PHP_SYNTAX" != "yes" ]]; then composer remove "friendsofphp/php-cs-fixer" --no-update --no-interaction --dev; fi;
- if [[ "$CHECK_CODE_STYLE" != "yes" ]]; then composer remove "friendsofphp/php-cs-fixer" --no-update --no-interaction --dev; fi;

install:
- composer update --prefer-dist --no-interaction --optimize-autoloader --prefer-stable --no-progress $COMPOSER_FLAGS
- if [[ "$ENABLE_CODE_COVERAGE" == "yes" ]]; then composer require --dev satooshi/php-coveralls; fi;

script:
- if [[ "$ENABLE_CODE_COVERAGE" == "yes" ]]; then vendor/bin/simple-phpunit --coverage-text --coverage-clover build/logs/clover.xml; else vendor/bin/simple-phpunit; fi;
- if [[ "$CHECK_PHP_SYNTAX" == "yes" ]]; then vendor/bin/php-cs-fixer fix --config=.php_cs --dry-run --no-interaction --diff --path-mode=intersection; fi;
- if [[ "$CHECK_CODE_STYLE" == "yes" ]]; then PHP_CS_FIXER_FUTURE_MODE=1 vendor/bin/php-cs-fixer fix --config=.php_cs --dry-run --no-interaction --diff; fi;

after_success:
- if [[ "$ENABLE_CODE_COVERAGE" == "yes" ]]; then php vendor/bin/coveralls -v; fi;

0 comments on commit 7ac0c29

Please sign in to comment.